Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

9 files changed, 77 insertions, 77 deletions

diff --git a/src/codeeditor.cpp b/src/codeeditor.cpp
index 156aabd..77db160 100644
--- a/src/codeeditor.cpp
+++ b/src/codeeditor.cpp
@@ -35,7 +35,7 @@ CodeEditor::CodeEditor(TQWidget *parent, const char *name)
 	m_view = ( Kate::View * ) m_doc->createView( this ) ;
 	m_view->setIconBorder( true ) ;
 
-    connect( m_view, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(slotCursorPositionChanged()) );
+    connect( m_view, TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(slotCursorPositionChanged()) );
 
 	layout->addWidget( m_view ) ;
 	
diff --git a/src/kexportdialog.cpp b/src/kexportdialog.cpp
index a53922d..c636c72 100644
--- a/src/kexportdialog.cpp
+++ b/src/kexportdialog.cpp
@@ -56,25 +56,25 @@ KExportDialog::KExportDialog( TQWidget *parent, const char *name ) : TQDialog(pa
 	button->setText( "OK" ) ;
 	button->setFixedSize( 60, 25 ) ;
 	button->move( 100, 90 ) ;
-	connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnOKClicked() ) ) ;
+	connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( btnOKClicked() ) ) ;
 	
 	button = new TQPushButton( this ) ;
 	button->setText( "Cancel" ) ;
 	button->setFixedSize( 60, 25 ) ;
 	button->move( 200, 90 ) ;
-	connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnCancelClicked() ) ) ;
+	connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( btnCancelClicked() ) ) ;
 
 	button = new TQPushButton( this ) ;
 	button->setText( "..." ) ;
 	button->setFixedSize( 25, 20 ) ;
 	button->move( 270, 10 ) ;
-	connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( showFileDialog() ) )  ;
+	connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( showFileDialog() ) )  ;
 	
 	button = new TQPushButton( this ) ;
 	button->setText( "..." ) ;
 	button->setFixedSize( 25, 20 ) ;
 	button->move( 270, 35 ) ;
-	connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( showDirDialog() )  ) ;
+	connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( showDirDialog() )  ) ;
 		
 	setFixedSize( 340, 130 ) ;
 	setCaption( "Export to VHDL" ) ;
diff --git a/src/kjtagdialog.cpp b/src/kjtagdialog.cpp
index f75910d..ba05c12 100644
--- a/src/kjtagdialog.cpp
+++ b/src/kjtagdialog.cpp
@@ -35,13 +35,13 @@ KJTAGDialog::KJTAGDialog( TQWidget *parent )
 	m_selectFileBtn->setFixedSize( 30, 25 ) ;
 	m_selectFileBtn->move( 205, 15 ) ;
 	m_selectFileBtn->setPixmap( TDEGlobal::iconLoader()->loadIcon( "document-open", TDEIcon::Small ) ) ;
-	connect( m_selectFileBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectFileName() ) ) ;
+	connect( m_selectFileBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selectFileName() ) ) ;
 
 	m_configureBtn = new TQPushButton( "Configure", m_groupConfigure ) ;
 	m_configureBtn->setFixedSize( 60, 25 ) ;
 	m_configureBtn->move( 240, 15 ) ;
 
-	connect( m_configureBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( configure() ) ) ;
+	connect( m_configureBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( configure() ) ) ;
 	
 	m_bitFileLabel = new TQLabel( "Bit file", m_groupConfigure ) ;
 	m_bitFileLabel->setFixedSize( 50, 25 ) ;
@@ -61,8 +61,8 @@ KJTAGDialog::KJTAGDialog( TQWidget *parent )
 	m_debug->move( 10, 60 ) ;
 	
 	m_programmer = new JTAGProgrammer( this ) ;
-	connect( m_programmer, TQT_SIGNAL( progress(int) ), this, TQT_SLOT( progress(int) ) ) ;
-	connect( m_programmer, TQT_SIGNAL( message(const char*) ), this, TQT_SLOT( addMessage(const char*) ) ) ;
+	connect( m_programmer, TQ_SIGNAL( progress(int) ), this, TQ_SLOT( progress(int) ) ) ;
+	connect( m_programmer, TQ_SIGNAL( message(const char*) ), this, TQ_SLOT( addMessage(const char*) ) ) ;
 
 	m_debug->insert( "This option is still very experimental!!\n"
                      "The code is tested with the Spartan-3 Development Board.\n"
diff --git a/src/kpicosim.cpp b/src/kpicosim.cpp
index 18a5f7b..01d0a47 100644
--- a/src/kpicosim.cpp
+++ b/src/kpicosim.cpp
@@ -125,28 +125,28 @@ KPicoSim::KPicoSim() : TDEMainWindow( 0, "KPicoSim" )
 	TDEToolBar *toolbar = new TDEToolBar( this ) ;
 	addDockWindow( toolbar ) ;
 
-	toolbar->insertButton( "document-new", -1, TQT_SIGNAL( clicked() ), m_editor, TQT_SLOT( slotNewFile() ), true, "New" ) ;
-	toolbar->insertButton( "document-open", -1, TQT_SIGNAL( clicked() ), m_editor, TQT_SLOT( slotOpen() ), true, "Open" ) ;
-	toolbar->insertButton( "document-save", -1, TQT_SIGNAL( clicked() ), m_editor, TQT_SLOT( slotSave() ), true, "Save" ) ;
-	toolbar->insertButton( "document-save-as", -1, TQT_SIGNAL( clicked() ), m_editor, TQT_SLOT( slotSaveAs() ), true, "Save As" ) ;
+	toolbar->insertButton( "document-new", -1, TQ_SIGNAL( clicked() ), m_editor, TQ_SLOT( slotNewFile() ), true, "New" ) ;
+	toolbar->insertButton( "document-open", -1, TQ_SIGNAL( clicked() ), m_editor, TQ_SLOT( slotOpen() ), true, "Open" ) ;
+	toolbar->insertButton( "document-save", -1, TQ_SIGNAL( clicked() ), m_editor, TQ_SLOT( slotSave() ), true, "Save" ) ;
+	toolbar->insertButton( "document-save-as", -1, TQ_SIGNAL( clicked() ), m_editor, TQ_SLOT( slotSaveAs() ), true, "Save As" ) ;
 
 	m_debugBar = new TDEToolBar( this ) ;
 	addDockWindow( m_debugBar ) ;
-	m_debugBar->insertButton( UserIcon( "rebuild" ), COMPILE_ID, TQT_SIGNAL( clicked() ), this, TQT_SLOT( compile() ), true, "Compile" ) ;
-	m_debugBar->insertButton( "system-run", START_SIM_ID, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startSim() ), true, "Start/Stop Debug" ) ;
+	m_debugBar->insertButton( UserIcon( "rebuild" ), COMPILE_ID, TQ_SIGNAL( clicked() ), this, TQ_SLOT( compile() ), true, "Compile" ) ;
+	m_debugBar->insertButton( "system-run", START_SIM_ID, TQ_SIGNAL( clicked() ), this, TQ_SLOT( startSim() ), true, "Start/Stop Debug" ) ;
 	m_debugBar->insertSeparator() ;
-	m_debugBar->insertButton( UserIcon( "continue" ), RUN_ID, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startStop() ), false, "Continue" ) ;
+	m_debugBar->insertButton( UserIcon( "continue" ), RUN_ID, TQ_SIGNAL( clicked() ), this, TQ_SLOT( startStop() ), false, "Continue" ) ;
 
-	m_debugBar->insertButton( UserIcon( "next" ), NEXT_ID, TQT_SIGNAL( clicked() ), m_simulator, TQT_SLOT( next() ), false, "Next" ) ;
-	m_debugBar->insertButton( UserIcon( "interrupt" ), INTERRUPT_ID, TQT_SIGNAL( clicked() ), m_simulator, TQT_SLOT( interrupt() ), false, "Interrupt" ) ; 
-	m_debugBar->insertButton( UserIcon( "reset" ), RESET_ID, TQT_SIGNAL( clicked() ), m_simulator, TQT_SLOT( reset() ), false, "Reset" ) ;
+	m_debugBar->insertButton( UserIcon( "next" ), NEXT_ID, TQ_SIGNAL( clicked() ), m_simulator, TQ_SLOT( next() ), false, "Next" ) ;
+	m_debugBar->insertButton( UserIcon( "interrupt" ), INTERRUPT_ID, TQ_SIGNAL( clicked() ), m_simulator, TQ_SLOT( interrupt() ), false, "Interrupt" ) ; 
+	m_debugBar->insertButton( UserIcon( "reset" ), RESET_ID, TQ_SIGNAL( clicked() ), m_simulator, TQ_SLOT( reset() ), false, "Reset" ) ;
 
-	connect( this, TQT_SIGNAL( run() ), m_simulator, TQT_SLOT( run() ) );
-	connect( this, TQT_SIGNAL( stop()  ), m_simulator, TQT_SLOT( stop()  ) ) ;
-	connect( m_simulator, TQT_SIGNAL( stepped( unsigned int ) ), this, TQT_SLOT( stepped( unsigned int ) ) ) ;
-	connect( m_processorView, TQT_SIGNAL( processorRegsChanged() ), this, TQT_SLOT( updateProcessorRegs() ) ) ;
-	connect( m_processorView, TQT_SIGNAL( processorFlagsChanged() ), this, TQT_SLOT( updateProcessorFlags() ) ) ;
-	connect( m_messages, TQT_SIGNAL( clicked( TQListViewItem * ) ), this, TQT_SLOT( messageListClicked( TQListViewItem * ) ) ) ;
+	connect( this, TQ_SIGNAL( run() ), m_simulator, TQ_SLOT( run() ) );
+	connect( this, TQ_SIGNAL( stop()  ), m_simulator, TQ_SLOT( stop()  ) ) ;
+	connect( m_simulator, TQ_SIGNAL( stepped( unsigned int ) ), this, TQ_SLOT( stepped( unsigned int ) ) ) ;
+	connect( m_processorView, TQ_SIGNAL( processorRegsChanged() ), this, TQ_SLOT( updateProcessorRegs() ) ) ;
+	connect( m_processorView, TQ_SIGNAL( processorFlagsChanged() ), this, TQ_SLOT( updateProcessorFlags() ) ) ;
+	connect( m_messages, TQ_SIGNAL( clicked( TQListViewItem * ) ), this, TQ_SLOT( messageListClicked( TQListViewItem * ) ) ) ;
 
 	m_messages->addColumn( "Line" ) ;
 	m_messages->addColumn( "Description" ) ;
@@ -176,62 +176,62 @@ void KPicoSim::buildMenu()
 
 	TDEPopupMenu * exportMenu = new TDEPopupMenu( this ) ;
 
-	exportMenu->insertItem( "VHDL", this, TQT_SLOT( fileExportVHDL() ) ) ;
-//	exportMenu->insertItem( "COE", this, TQT_SLOT( fileExportCOE() ) ) ;
-	exportMenu->insertItem( "MEM", this, TQT_SLOT( fileExportMEM() ) ) ;
-	exportMenu->insertItem( "HEX", this, TQT_SLOT( fileExportHEX() ) ) ;
+	exportMenu->insertItem( "VHDL", this, TQ_SLOT( fileExportVHDL() ) ) ;
+//	exportMenu->insertItem( "COE", this, TQ_SLOT( fileExportCOE() ) ) ;
+	exportMenu->insertItem( "MEM", this, TQ_SLOT( fileExportMEM() ) ) ;
+	exportMenu->insertItem( "HEX", this, TQ_SLOT( fileExportHEX() ) ) ;
 
 	m_fileMenu = new TDEPopupMenu( this ) ;
-	m_fileMenu->insertItem( ldr->loadIcon( "document-new", TDEIcon::Small ), "New", this, TQT_SLOT( slotFileNew() ) ) ;
-	m_fileMenu->insertItem( ldr->loadIcon( "document-open", TDEIcon::Small ), "Open", m_editor, TQT_SLOT( slotOpen() ) ) ;
+	m_fileMenu->insertItem( ldr->loadIcon( "document-new", TDEIcon::Small ), "New", this, TQ_SLOT( slotFileNew() ) ) ;
+	m_fileMenu->insertItem( ldr->loadIcon( "document-open", TDEIcon::Small ), "Open", m_editor, TQ_SLOT( slotOpen() ) ) ;
 	m_fileMenu->insertSeparator() ;
-	m_fileMenu->insertItem( ldr->loadIcon( "document-save", TDEIcon::Small ), "Save", m_editor, TQT_SLOT( slotSave() ), TQKeySequence( "CTRL+S" ) ) ;
-	m_fileMenu->insertItem( ldr->loadIcon( "document-save-as", TDEIcon::Small ), "Save As...", m_editor, TQT_SLOT( slotSaveAs() ) ) ;
+	m_fileMenu->insertItem( ldr->loadIcon( "document-save", TDEIcon::Small ), "Save", m_editor, TQ_SLOT( slotSave() ), TQKeySequence( "CTRL+S" ) ) ;
+	m_fileMenu->insertItem( ldr->loadIcon( "document-save-as", TDEIcon::Small ), "Save As...", m_editor, TQ_SLOT( slotSaveAs() ) ) ;
 	m_fileMenu->insertSeparator() ;
-	m_fileMenu->insertItem( ldr->loadIcon( "document-print", TDEIcon::Small ), "Print...", m_editor, TQT_SLOT( slotPrint() ), TQKeySequence( "CTRL+P" ) ) ;
+	m_fileMenu->insertItem( ldr->loadIcon( "document-print", TDEIcon::Small ), "Print...", m_editor, TQ_SLOT( slotPrint() ), TQKeySequence( "CTRL+P" ) ) ;
 	m_fileMenu->insertSeparator() ;
 	m_fileMenu->insertItem( "Export", exportMenu ) ;
 	m_fileMenu->insertSeparator() ;
-	m_fileMenu->insertItem( ldr->loadIcon( "window-close", TDEIcon::Small ), "Quit", this, TQT_SLOT( slotClose() ) ) ;
+	m_fileMenu->insertItem( ldr->loadIcon( "window-close", TDEIcon::Small ), "Quit", this, TQ_SLOT( slotClose() ) ) ;
 
 	m_editMenu = new TDEPopupMenu( this ) ;
-	m_editMenu->insertItem( ldr->loadIcon( "edit-undo", TDEIcon::Small ), "Undo", m_editor, TQT_SLOT( slotUndo() ),TQKeySequence( "CTRL+Z" ) ) ;
-	m_editMenu->insertItem( ldr->loadIcon( "edit-redo", TDEIcon::Small ), "Redo", m_editor, TQT_SLOT( slotRedo() ),TQKeySequence( "CTRL+SHIFT+Z" ) ) ;
+	m_editMenu->insertItem( ldr->loadIcon( "edit-undo", TDEIcon::Small ), "Undo", m_editor, TQ_SLOT( slotUndo() ),TQKeySequence( "CTRL+Z" ) ) ;
+	m_editMenu->insertItem( ldr->loadIcon( "edit-redo", TDEIcon::Small ), "Redo", m_editor, TQ_SLOT( slotRedo() ),TQKeySequence( "CTRL+SHIFT+Z" ) ) ;
 	m_editMenu->insertSeparator() ;
-	m_editMenu->insertItem( "Select All", m_editor, TQT_SLOT( slotSelectAll() ),TQKeySequence( "CTRL+A" ) ) ;
+	m_editMenu->insertItem( "Select All", m_editor, TQ_SLOT( slotSelectAll() ),TQKeySequence( "CTRL+A" ) ) ;
 	m_editMenu->insertSeparator() ;
-	m_editMenu->insertItem( ldr->loadIcon( "edit-cut", TDEIcon::Small ), "Cut", m_editor, TQT_SLOT( slotCut() ),TQKeySequence( "CTRL+X" ) ) ;
-	m_editMenu->insertItem( ldr->loadIcon( "edit-copy", TDEIcon::Small ), "Copy", m_editor, TQT_SLOT( slotCopy() ),TQKeySequence( "CTRL+C" ) ) ;
-	m_editMenu->insertItem( ldr->loadIcon( "edit-paste", TDEIcon::Small ), "Paste", m_editor, TQT_SLOT( slotPaste() ),TQKeySequence( "CTRL+V" ) ) ;
+	m_editMenu->insertItem( ldr->loadIcon( "edit-cut", TDEIcon::Small ), "Cut", m_editor, TQ_SLOT( slotCut() ),TQKeySequence( "CTRL+X" ) ) ;
+	m_editMenu->insertItem( ldr->loadIcon( "edit-copy", TDEIcon::Small ), "Copy", m_editor, TQ_SLOT( slotCopy() ),TQKeySequence( "CTRL+C" ) ) ;
+	m_editMenu->insertItem( ldr->loadIcon( "edit-paste", TDEIcon::Small ), "Paste", m_editor, TQ_SLOT( slotPaste() ),TQKeySequence( "CTRL+V" ) ) ;
 	m_editMenu->insertSeparator() ;
-	m_editMenu->insertItem( ldr->loadIcon( "edit-find", TDEIcon::Small ), "Find...", m_editor, TQT_SLOT( slotFind() ), TQKeySequence( "CTRL+F" ) ) ;
-	m_editMenu->insertItem( "Find Next", m_editor, TQT_SLOT( slotFindNext() ), TQKeySequence( "F3" ) ) ;
+	m_editMenu->insertItem( ldr->loadIcon( "edit-find", TDEIcon::Small ), "Find...", m_editor, TQ_SLOT( slotFind() ), TQKeySequence( "CTRL+F" ) ) ;
+	m_editMenu->insertItem( "Find Next", m_editor, TQ_SLOT( slotFindNext() ), TQKeySequence( "F3" ) ) ;
 
 
 	m_debugMenu = new TDEPopupMenu( this ) ;
 	m_debugMenu->insertSeparator() ;
-	m_debugMenu->insertItem( ldr->loadIcon( "rebuild", TDEIcon::Small ), "Compile", this, TQT_SLOT( compile() ), TQKeySequence( "SHIFT+F9" ) ) ;
-	m_debugMenu->insertItem( ldr->loadIcon( "system-run", TDEIcon::Small ), "Start Debug", this, TQT_SLOT( startSim() ), TQKeySequence( "F9" ) , START_SIM_ID ) ;
+	m_debugMenu->insertItem( ldr->loadIcon( "rebuild", TDEIcon::Small ), "Compile", this, TQ_SLOT( compile() ), TQKeySequence( "SHIFT+F9" ) ) ;
+	m_debugMenu->insertItem( ldr->loadIcon( "system-run", TDEIcon::Small ), "Start Debug", this, TQ_SLOT( startSim() ), TQKeySequence( "F9" ) , START_SIM_ID ) ;
 
 	m_debugMenu->insertSeparator() ;
-	m_debugMenu->insertItem( "Continue", this, TQT_SLOT( startStop() ), TQKeySequence( "F10" ) , RUN_ID ) ;
-	m_debugMenu->insertItem( "Next", m_simulator, TQT_SLOT( next() ), TQKeySequence( "F5" ) , NEXT_ID ) ;
-	m_debugMenu->insertItem( "Interrupt", m_simulator, TQT_SLOT( interrupt() ), TQKeySequence( "F4" ) , INTERRUPT_ID ) ;
-	m_debugMenu->insertItem( "Reset", m_simulator, TQT_SLOT( reset() ), TQKeySequence( "F11" ) , RESET_ID ) ;
+	m_debugMenu->insertItem( "Continue", this, TQ_SLOT( startStop() ), TQKeySequence( "F10" ) , RUN_ID ) ;
+	m_debugMenu->insertItem( "Next", m_simulator, TQ_SLOT( next() ), TQKeySequence( "F5" ) , NEXT_ID ) ;
+	m_debugMenu->insertItem( "Interrupt", m_simulator, TQ_SLOT( interrupt() ), TQKeySequence( "F4" ) , INTERRUPT_ID ) ;
+	m_debugMenu->insertItem( "Reset", m_simulator, TQ_SLOT( reset() ), TQKeySequence( "F11" ) , RESET_ID ) ;
 
 	m_debugMenu->insertSeparator() ;
-	m_debugMenu->insertItem( "Toggle Breakpoint", m_editor, TQT_SLOT( slotToggleBreakpoint() ), TQKeySequence( "F8" ) ) ;
+	m_debugMenu->insertItem( "Toggle Breakpoint", m_editor, TQ_SLOT( slotToggleBreakpoint() ), TQKeySequence( "F8" ) ) ;
 
 	m_settingsMenu = new TDEPopupMenu( this ) ;
-	m_settingsMenu->insertItem( "Configure Editor...", m_editor, TQT_SLOT( slotShowConfig() ) ) ;
+	m_settingsMenu->insertItem( "Configure Editor...", m_editor, TQ_SLOT( slotShowConfig() ) ) ;
 
 	m_peripheralMenu = new TDEPopupMenu( this ) ;
-	m_peripheralMenu->insertItem( "I/O Port", this, TQT_SLOT( newIOPort() ) ) ;
-	m_peripheralMenu->insertItem( "Scratchpad", this, TQT_SLOT( showScratchpad() ), 0, VIEW_SCRATCHPAD_ID ) ;
-	m_peripheralMenu->insertItem( "Serial port", this, TQT_SLOT( showSerialPort() ), 0, VIEW_SERIAL_ID ) ;
+	m_peripheralMenu->insertItem( "I/O Port", this, TQ_SLOT( newIOPort() ) ) ;
+	m_peripheralMenu->insertItem( "Scratchpad", this, TQ_SLOT( showScratchpad() ), 0, VIEW_SCRATCHPAD_ID ) ;
+	m_peripheralMenu->insertItem( "Serial port", this, TQ_SLOT( showSerialPort() ), 0, VIEW_SERIAL_ID ) ;
 
 	m_jtagMenu = new TDEPopupMenu( this ) ;
-	m_jtagMenu->insertItem( "Download", this, TQT_SLOT( jtagDownload() ) ) ;
+	m_jtagMenu->insertItem( "Download", this, TQ_SLOT( jtagDownload() ) ) ;
 
 	TDEAboutData *aboutData = new TDEAboutData( 
 		"kpicosim", 
@@ -367,7 +367,7 @@ void KPicoSim::newIOPort()
 	KPortView * ioport = new KPortView( m_simulator->getCpu(), 0 ) ;			/* port id is 0 */
 //	m_ioList.append( ioport ) ;
 	addDockWindow( ioport, DockRight ) ;
-//	connect( ioport, TQT_SIGNAL( closing( KPortView* ) ), this, TQT_SLOT( removeIOPort( KPortView* ) ) ) ;
+//	connect( ioport, TQ_SIGNAL( closing( KPortView* ) ), this, TQ_SLOT( removeIOPort( KPortView* ) ) ) ;
 }
 
 void KPicoSim::showSerialPort()
@@ -623,7 +623,7 @@ void KPicoSim::openGUI()
 		ioport->readConfig( config, group ) ;
 		m_ioList.append( ioport ) ;
 		addDockWindow( ioport, DockRight ) ;
-		connect( ioport, TQT_SIGNAL( closing( KPortView* ) ), this, TQT_SLOT( removeIOPort( KPortView* ) ) ) ;
+		connect( ioport, TQ_SIGNAL( closing( KPortView* ) ), this, TQ_SLOT( removeIOPort( KPortView* ) ) ) ;
 	}
 */
 }
diff --git a/src/kportview.cpp b/src/kportview.cpp
index f26d997..b20a7c8 100644
--- a/src/kportview.cpp
+++ b/src/kportview.cpp
@@ -48,7 +48,7 @@ KPortView::KPortView( CPicoBlaze *cpu, TQWidget *parent, const char *name)
 	m_editID->setText( "0" ) ;
 	m_editID->setFixedSize( 30, 20 ) ;
 	m_editID->move( 2, 22 );
-	connect( m_editID, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( setID( const TQString &) ) ) ;
+	connect( m_editID, TQ_SIGNAL( textChanged( const TQString &) ), this, TQ_SLOT( setID( const TQString &) ) ) ;
 	
 	int i ;
 	for ( i = 0 ; i < 8 ; i++ ) {
@@ -65,10 +65,10 @@ KPortView::KPortView( CPicoBlaze *cpu, TQWidget *parent, const char *name)
 	m_port = new KPort( 0 ) ;
 	m_cpu->addPort( m_port ) ;
 	
-	connect( m_port, TQT_SIGNAL( read() ), this, TQT_SLOT( read() ) ) ;
-	connect( m_port, TQT_SIGNAL( write(unsigned char) ), this, TQT_SLOT( write(unsigned char) ) ) ;
-	connect( m_readable, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( readableToggled(bool) ) ) ;
-	connect( m_writeable, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( writeableToggled(bool) ) ) ;
+	connect( m_port, TQ_SIGNAL( read() ), this, TQ_SLOT( read() ) ) ;
+	connect( m_port, TQ_SIGNAL( write(unsigned char) ), this, TQ_SLOT( write(unsigned char) ) ) ;
+	connect( m_readable, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( readableToggled(bool) ) ) ;
+	connect( m_writeable, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( writeableToggled(bool) ) ) ;
 	
 	setWidget( widget ) ;
 	setCloseMode( Always ) ;
diff --git a/src/kprocessorview.cpp b/src/kprocessorview.cpp
index c483681..3bf4334 100644
--- a/src/kprocessorview.cpp
+++ b/src/kprocessorview.cpp
@@ -10,8 +10,8 @@
 
 MyListView::MyListView(TQWidget *parent) : TDEListView(parent)
 {
-	connect( this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ),
-             TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
+	connect( this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ),
+             TQ_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
 }
 
 MyListView::~MyListView()
@@ -42,8 +42,8 @@ TDEProcessorView::TDEProcessorView(TQWidget *parent, const char *name)
 	
 	view = new MyListView( this ) ;
 	
-	connect( view, TQT_SIGNAL( itemRenamed( TQListViewItem*) ), this, TQT_SLOT( slotItemRenamed(TQListViewItem*) ) ) ;
-	connect( view, TQT_SIGNAL( showPopupMenu() ), this, TQT_SLOT( showPopupMenu() ) ) ;
+	connect( view, TQ_SIGNAL( itemRenamed( TQListViewItem*) ), this, TQ_SLOT( slotItemRenamed(TQListViewItem*) ) ) ;
+	connect( view, TQ_SIGNAL( showPopupMenu() ), this, TQ_SLOT( showPopupMenu() ) ) ;
 
 	view->addColumn( "Register" ) ;
 	view->addColumn( "Value" ) ;
@@ -104,7 +104,7 @@ void TDEProcessorView::slotHexMode()
 void TDEProcessorView::showPopupMenu() 
 {
 	TQPopupMenu *menu = new TQPopupMenu( this ) ;
-	menu->insertItem( "Hexadecimal", this, TQT_SLOT( slotHexMode() ), 0, 1 ) ;
+	menu->insertItem( "Hexadecimal", this, TQ_SLOT( slotHexMode() ), 0, 1 ) ;
 	menu->setItemChecked( 1, m_bHexMode ) ;	
 	menu->exec( TQCursor::pos() );
 }
diff --git a/src/kserialview.cpp b/src/kserialview.cpp
index b2f5a58..550ed82 100644
--- a/src/kserialview.cpp
+++ b/src/kserialview.cpp
@@ -79,13 +79,13 @@ KSerialView::KSerialView( CPicoBlaze *cpu, TQWidget * parent ) : TQWidget( paren
 	statusPortID->setFixedSize( 40, 18 ) ;
 	
 	statusPort->setReadValue( 0 ) ;	// Buffers are empty, nothing received.
-	connect( txPort, TQT_SIGNAL( write( unsigned char ) ), this, TQT_SLOT( transmit( unsigned char ) ) ) ;
-	connect( rxPort, TQT_SIGNAL( read() ), this, TQT_SLOT( receive() ) ) ;
-	connect( view, TQT_SIGNAL( keyPressed( int ) ), this, TQT_SLOT( keyPressed( int ) ) ) ;
+	connect( txPort, TQ_SIGNAL( write( unsigned char ) ), this, TQ_SLOT( transmit( unsigned char ) ) ) ;
+	connect( rxPort, TQ_SIGNAL( read() ), this, TQ_SLOT( receive() ) ) ;
+	connect( view, TQ_SIGNAL( keyPressed( int ) ), this, TQ_SLOT( keyPressed( int ) ) ) ;
 
-	connect( txPortID, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( updateTxId( const TQString & ) ) ) ;
-	connect( rxPortID, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( updateRxId( const TQString & ) ) ) ;
-	connect( statusPortID, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( updateStatusId( const TQString & ) ) ) ;
+	connect( txPortID, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( updateTxId( const TQString & ) ) ) ;
+	connect( rxPortID, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( updateRxId( const TQString & ) ) ) ;
+	connect( statusPortID, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( updateStatusId( const TQString & ) ) ) ;
 	
 	groupBox = new TQGroupBox( "Status Register", settings ) ;
 	groupBox->setFixedSize( 200, 80 ) ;
@@ -149,8 +149,8 @@ KSerialView::KSerialView( CPicoBlaze *cpu, TQWidget * parent ) : TQWidget( paren
 	frame->move( 149, 20 ) ;
 	frame->setFixedSize( 1, 50 ) ;
 		
-	connect( m_statusBits[ 6 ], TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( txFlagsChanged( bool ) ) ) ;
-	connect( m_statusBits[ 7 ], TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( txFlagsChanged( bool ) ) ) ;
+	connect( m_statusBits[ 6 ], TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( txFlagsChanged( bool ) ) ) ;
+	connect( m_statusBits[ 7 ], TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( txFlagsChanged( bool ) ) ) ;
 	
 	fifoPtr = 0 ;
 	
diff --git a/src/kserialview.h b/src/kserialview.h
index 253ebff..af5813f 100644
--- a/src/kserialview.h
+++ b/src/kserialview.h
@@ -56,7 +56,7 @@ class KSerialWindow : public KTextEdit
 		virtual TQPopupMenu *createPopupMenu( const TQPoint &pos ) 
 		{ 
 			TQPopupMenu *menu = new TQPopupMenu( this ) ;
-			menu->insertItem( "clear view", this, TQT_SLOT( clearView() ) ) ;
+			menu->insertItem( "clear view", this, TQ_SLOT( clearView() ) ) ;
 			return menu ; 
 		}
 	public slots:
diff --git a/src/ksimulator.cpp b/src/ksimulator.cpp
index a76b206..6dd8a84 100644
--- a/src/ksimulator.cpp
+++ b/src/ksimulator.cpp
@@ -31,7 +31,7 @@ KSimulator::KSimulator(TQObject *parent, const char *name )
 	
 	m_timer->stop() ;
 	m_run = false ;
-	connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( next() ) ) ;
+	connect( m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( next() ) ) ;
 }
 
 KSimulator::~KSimulator()