From faf33629bb6562a6f43f930afafe4b22e9cdb60b Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 13 Jan 2024 11:29:06 +0900
Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 qtjava/designer/juic/java/definitions.xsl          |  4 +-
 qtjava/designer/juic/java/methods.xsl              |  2 +-
 qtjava/designer/juic/java/put.xsl                  |  6 +--
 qtjava/javalib/examples/aclock/AnalogClock.java    |  2 +-
 .../examples/addressbook/ABCentralWidget.java      | 16 +++---
 .../javalib/examples/addressbook/ABMainWindow.java | 14 ++---
 qtjava/javalib/examples/addressbook/Main.java      |  2 +-
 .../examples/application/ApplicationWindow.java    | 20 +++----
 qtjava/javalib/examples/application/Main.java      |  2 +-
 .../examples/buttongroups/ButtonsGroups.java       |  6 +--
 qtjava/javalib/examples/checklists/CheckLists.java | 12 ++---
 qtjava/javalib/examples/demo/sql/BookForm.java     |  8 +--
 .../javalib/examples/demo/sql/ConnectDialog.java   |  4 +-
 qtjava/javalib/examples/demo/sql/EditBookForm.java | 34 ++++++------
 .../javalib/examples/demo/widgets/WidgetsBase.java | 26 ++++-----
 qtjava/javalib/examples/dragdrop/DropSite.java     |  2 +-
 qtjava/javalib/examples/dragdrop/Main.java         |  6 +--
 qtjava/javalib/examples/forever/Forever.java       |  4 +-
 qtjava/javalib/examples/hello/Hello.java           |  2 +-
 qtjava/javalib/examples/hello/Main.java            |  2 +-
 qtjava/javalib/examples/helpviewer/HelpWindow.java | 60 ++++++++++-----------
 qtjava/javalib/examples/helpviewer/Main.java       |  8 +--
 qtjava/javalib/examples/iconview/ListenDND.java    |  6 +--
 qtjava/javalib/examples/layout/ExampleWidget.java  |  2 +-
 qtjava/javalib/examples/lineedits/LineEdits.java   | 24 ++++-----
 qtjava/javalib/examples/listbox/ListBoxDemo.java   | 22 ++++----
 qtjava/javalib/examples/mdi/ApplicationWindow.java | 38 ++++++-------
 qtjava/javalib/examples/mdi/Main.java              |  2 +-
 qtjava/javalib/examples/menu/MenuExample.java      | 36 ++++++-------
 qtjava/javalib/examples/popup/Frame.java           | 10 ++--
 .../javalib/examples/progressbar/ProgressBar.java  | 20 +++----
 qtjava/javalib/examples/qfd/FontDisplayer.java     |  8 +--
 qtjava/javalib/examples/qmag/MagWidget.java        | 10 ++--
 qtjava/javalib/examples/qwerty/Editor.java         | 26 ++++-----
 qtjava/javalib/examples/qwerty/Main.java           |  2 +-
 .../examples/rangecontrols/RangeControls.java      |  4 +-
 qtjava/javalib/examples/richtext/MyRichText.java   |  6 +--
 qtjava/javalib/examples/rot13/Rot13.java           |  6 +--
 qtjava/javalib/examples/scribble/Scribble.java     |  8 +--
 .../javalib/examples/showimg/ImageTextEditor.java  | 24 ++++-----
 qtjava/javalib/examples/showimg/ImageViewer.java   | 32 +++++------
 qtjava/javalib/examples/showimg/Main.java          |  2 +-
 qtjava/javalib/examples/sound/SoundPlayer.java     | 14 ++---
 qtjava/javalib/examples/tabdialog/TabDialog.java   |  2 +-
 qtjava/javalib/examples/textedit/Main.java         |  2 +-
 qtjava/javalib/examples/textedit/TextEdit.java     | 62 +++++++++++-----------
 qtjava/javalib/examples/widgets/WidgetView.java    | 62 +++++++++++-----------
 qtjava/javalib/examples/wizard/Wizard.java         | 20 +++----
 qtjava/javalib/org/trinitydesktop/qt/Qt.java       |  4 +-
 qtjava/javalib/test/AppWizardBase.java             |  4 +-
 qtjava/javalib/test/FilePropsPageBase.java         |  4 +-
 qtjava/javalib/test/ISBNValidator.java             |  4 +-
 qtjava/javalib/test/ScribbleWindow.java            | 28 +++++-----
 qtjava/javalib/test/SignalForwarder.java           |  4 +-
 qtjava/javalib/test/TQTimerTest.java               | 32 +++++------
 qtjava/javalib/tutorial/t10/LCDRange.java          |  8 +--
 qtjava/javalib/tutorial/t10/Tut10.java             | 18 +++----
 qtjava/javalib/tutorial/t11/CannonField.java       |  4 +-
 qtjava/javalib/tutorial/t11/LCDRange.java          |  8 +--
 qtjava/javalib/tutorial/t11/Tut11.java             | 20 +++----
 qtjava/javalib/tutorial/t12/CannonField.java       |  4 +-
 qtjava/javalib/tutorial/t12/LCDRange.java          |  8 +--
 qtjava/javalib/tutorial/t12/Tut12.java             | 20 +++----
 qtjava/javalib/tutorial/t13/CannonField.java       |  4 +-
 qtjava/javalib/tutorial/t13/GameBoard.java         | 34 ++++++------
 qtjava/javalib/tutorial/t13/LCDRange.java          |  8 +--
 qtjava/javalib/tutorial/t14/CannonField.java       |  4 +-
 qtjava/javalib/tutorial/t14/GameBoard.java         | 42 +++++++--------
 qtjava/javalib/tutorial/t14/LCDRange.java          |  8 +--
 qtjava/javalib/tutorial/t2/Tut2.java               |  2 +-
 qtjava/javalib/tutorial/t3/Tut3.java               |  2 +-
 qtjava/javalib/tutorial/t4/Tut4.java               |  2 +-
 qtjava/javalib/tutorial/t5/Tut5.java               |  4 +-
 qtjava/javalib/tutorial/t6/LCDRange.java           |  2 +-
 qtjava/javalib/tutorial/t6/Tut6.java               |  2 +-
 qtjava/javalib/tutorial/t7/LCDRange.java           |  8 +--
 qtjava/javalib/tutorial/t7/Tut7.java               |  6 +--
 qtjava/javalib/tutorial/t8/LCDRange.java           |  8 +--
 qtjava/javalib/tutorial/t8/Tut8.java               | 10 ++--
 qtjava/javalib/tutorial/t9/LCDRange.java           |  8 +--
 qtjava/javalib/tutorial/t9/Tut9.java               | 10 ++--
 81 files changed, 513 insertions(+), 513 deletions(-)

(limited to 'qtjava')

diff --git a/qtjava/designer/juic/java/definitions.xsl b/qtjava/designer/juic/java/definitions.xsl
index f04fbd62..94653074 100644
--- a/qtjava/designer/juic/java/definitions.xsl
+++ b/qtjava/designer/juic/java/definitions.xsl
@@ -631,9 +631,9 @@
         </xsl:variable>
         <xsl:value-of select="$nlIndent8"/>
         <xsl:value-of select="concat('connect( ', $sender,
-                                               ', SIGNAL( &quot;', $signal, '&quot; ), ',
+                                               ', TQ_SIGNAL( &quot;', $signal, '&quot; ), ',
                                                   $receiver,
-                                               ', SLOT( &quot;', $slot, '&quot; ));')"/>
+                                               ', TQ_SLOT( &quot;', $slot, '&quot; ));')"/>
     </xsl:template>
     
 </xsl:stylesheet>
diff --git a/qtjava/designer/juic/java/methods.xsl b/qtjava/designer/juic/java/methods.xsl
index b9e27e52..c8573a5e 100644
--- a/qtjava/designer/juic/java/methods.xsl
+++ b/qtjava/designer/juic/java/methods.xsl
@@ -156,7 +156,7 @@
     <xsl:template name="putLanguageChangeSlot">
 
     /**
-     * SLOT
+     * TQ_SLOT
      * languageChange sets the strings according to current language
      */
    protected void languageChange() {
diff --git a/qtjava/designer/juic/java/put.xsl b/qtjava/designer/juic/java/put.xsl
index 884321dc..1bb36ddb 100644
--- a/qtjava/designer/juic/java/put.xsl
+++ b/qtjava/designer/juic/java/put.xsl
@@ -411,7 +411,7 @@
         </xsl:if>
         <xsl:message>Generating slot "<xsl:value-of select="$method"/></xsl:message>
     /**
-     * SLOT <xsl:value-of select="$method"/>
+     * TQ_SLOT <xsl:value-of select="$method"/>
      */
     <xsl:choose>
         <xsl:when test="$abstract">
@@ -419,7 +419,7 @@
         </xsl:when>
         <xsl:otherwise>
     <xsl:value-of select="$method"/> {
-        tqWarning("Warning: SLOT \"<xsl:value-of select="$method"/>\" must be overridden");
+        tqWarning("Warning: TQ_SLOT \"<xsl:value-of select="$method"/>\" must be overridden");
         <xsl:if test="not($return = 'void')">
         <xsl:choose>
             <xsl:when test="$return = 'byte' or $return = 'short' or $return = 'int' or $return = 'long'">
@@ -447,7 +447,7 @@
     <xsl:template name="putSignal">
         <xsl:param name="data"/>
         <xsl:variable name="sig" select="java:cpp-to-java-signature(.)"/>
-    /** SIGNAL <xsl:value-of select="."/> */
+    /** TQ_SIGNAL <xsl:value-of select="."/> */
     </xsl:template>
     
     <!--
diff --git a/qtjava/javalib/examples/aclock/AnalogClock.java b/qtjava/javalib/examples/aclock/AnalogClock.java
index 8982ea34..99dd902a 100644
--- a/qtjava/javalib/examples/aclock/AnalogClock.java
+++ b/qtjava/javalib/examples/aclock/AnalogClock.java
@@ -30,7 +30,7 @@ public AnalogClock( TQWidget parent, String name )
 	super( parent, name );
     time = new Date();		// get current time
     TQTimer internalTimer = new TQTimer( this );	// create internal timer
-    connect( internalTimer, SIGNAL("timeout()"), SLOT("timeout()") );
+    connect( internalTimer, TQ_SIGNAL("timeout()"), TQ_SLOT("timeout()") );
     internalTimer.start( 5000 );		// emit signal every 5 seconds
 }
 
diff --git a/qtjava/javalib/examples/addressbook/ABCentralWidget.java b/qtjava/javalib/examples/addressbook/ABCentralWidget.java
index d299f2f9..f579302a 100644
--- a/qtjava/javalib/examples/addressbook/ABCentralWidget.java
+++ b/qtjava/javalib/examples/addressbook/ABCentralWidget.java
@@ -106,7 +106,7 @@ public void setupTabWidget()
     add = new TQPushButton( "A&dd", input );
     add.resize( add.sizeHint() );
     grid1.addWidget( add, 0, 4 );
-    connect( add, SIGNAL( "clicked()" ), this, SLOT( "addEntry()" ) );
+    connect( add, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "addEntry()" ) );
 
     iFirstName = new TQLineEdit( input );
     iFirstName.resize( iFirstName.sizeHint() );
@@ -131,7 +131,7 @@ public void setupTabWidget()
     change = new TQPushButton( "&Change", input );
     change.resize( change.sizeHint() );
     grid1.addWidget( change, 1, 4 );
-    connect( change, SIGNAL( "clicked()" ), this, SLOT( "changeEntry()" ) );
+    connect( change, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "changeEntry()" ) );
 
     tabWidget.addTab( input, "&Add/Change Entry" );
 
@@ -143,22 +143,22 @@ public void setupTabWidget()
     cFirstName = new TQCheckBox( "First &Name", search );
     cFirstName.resize( cFirstName.sizeHint() );
     grid2.addWidget( cFirstName, 0, 0 );
-    connect( cFirstName, SIGNAL( "clicked()" ), this, SLOT( "toggleFirstName()" ) );
+    connect( cFirstName, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "toggleFirstName()" ) );
 
     cLastName = new TQCheckBox( "&Last Name", search );
     cLastName.resize( cLastName.sizeHint() );
     grid2.addWidget( cLastName, 0, 1 );
-    connect( cLastName, SIGNAL( "clicked()" ), this, SLOT( "toggleLastName()" ) );
+    connect( cLastName, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "toggleLastName()" ) );
 
     cAddress = new TQCheckBox( "Add&ress", search );
     cAddress.resize( cAddress.sizeHint() );
     grid2.addWidget( cAddress, 0, 2 );
-    connect( cAddress, SIGNAL( "clicked()" ), this, SLOT( "toggleAddress()" ) );
+    connect( cAddress, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "toggleAddress()" ) );
 
     cEMail = new TQCheckBox( "&E-Mail", search );
     cEMail.resize( cEMail.sizeHint() );
     grid2.addWidget( cEMail, 0, 3 );
-    connect( cEMail, SIGNAL( "clicked()" ), this, SLOT( "toggleEMail()" ) );
+    connect( cEMail, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "toggleEMail()" ) );
 
     sFirstName = new TQLineEdit( search );
     sFirstName.resize( sFirstName.sizeHint() );
@@ -179,7 +179,7 @@ public void setupTabWidget()
     find = new TQPushButton( "F&ind", search );
     find.resize( find.sizeHint() );
     grid2.addWidget( find, 1, 4 );
-    connect( find, SIGNAL( "clicked()" ), this, SLOT( "findEntries()" ) );
+    connect( find, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "findEntries()" ) );
 
     cFirstName.setChecked( true );
     sFirstName.setEnabled( true );
@@ -202,7 +202,7 @@ public void setupListView()
 
     listView.setSelectionMode( TQListView.Extended );
 
-    connect( listView, SIGNAL( "clicked( TQListViewItem )" ), this, SLOT( "itemSelected( TQListViewItem )" ) );
+    connect( listView, TQ_SIGNAL( "clicked( TQListViewItem )" ), this, TQ_SLOT( "itemSelected( TQListViewItem )" ) );
 
     mainGrid.addWidget( listView, 1, 0 );
     listView.setAllColumnsShowFocus( true );
diff --git a/qtjava/javalib/examples/addressbook/ABMainWindow.java b/qtjava/javalib/examples/addressbook/ABMainWindow.java
index 2574dbff..c3ebb401 100644
--- a/qtjava/javalib/examples/addressbook/ABMainWindow.java
+++ b/qtjava/javalib/examples/addressbook/ABMainWindow.java
@@ -30,16 +30,16 @@ public void setupMenuBar()
     TQPopupMenu file = new TQPopupMenu( this );
     menuBar().insertItem( "&File", file );
 
-    file.insertItem( "New", this, SLOT( "fileNew()" ), new TQKeySequence(CTRL + Key_N) );
-    file.insertItem( new TQIconSet(new TQPixmap( "fileopen.xpm" )), "Open", this, SLOT( "fileOpen()" ), new TQKeySequence(CTRL + Key_O) );
+    file.insertItem( "New", this, TQ_SLOT( "fileNew()" ), new TQKeySequence(CTRL + Key_N) );
+    file.insertItem( new TQIconSet(new TQPixmap( "fileopen.xpm" )), "Open", this, TQ_SLOT( "fileOpen()" ), new TQKeySequence(CTRL + Key_O) );
     file.insertSeparator();
-    file.insertItem( new TQIconSet(new TQPixmap( "filesave.xpm" )), "Save", this, SLOT( "fileSave()" ), new TQKeySequence(CTRL + Key_S) );
-    file.insertItem( "Save As...", this, SLOT( "fileSaveAs()" ) );
+    file.insertItem( new TQIconSet(new TQPixmap( "filesave.xpm" )), "Save", this, TQ_SLOT( "fileSave()" ), new TQKeySequence(CTRL + Key_S) );
+    file.insertItem( "Save As...", this, TQ_SLOT( "fileSaveAs()" ) );
     file.insertSeparator();
-    file.insertItem( new TQIconSet(new TQPixmap( "fileprint.xpm" )), "Print...", this, SLOT( "filePrint()" ), new TQKeySequence(CTRL + Key_P) );
+    file.insertItem( new TQIconSet(new TQPixmap( "fileprint.xpm" )), "Print...", this, TQ_SLOT( "filePrint()" ), new TQKeySequence(CTRL + Key_P) );
     file.insertSeparator();
-    file.insertItem( "Close", this, SLOT( "closeWindow()" ), new TQKeySequence(CTRL + Key_W) );
-    file.insertItem( "Quit", tqApp(), SLOT( "quit()" ), new TQKeySequence(CTRL + Key_Q) );
+    file.insertItem( "Close", this, TQ_SLOT( "closeWindow()" ), new TQKeySequence(CTRL + Key_W) );
+    file.insertItem( "Quit", tqApp(), TQ_SLOT( "quit()" ), new TQKeySequence(CTRL + Key_Q) );
 }
 
 public void setupFileTools()
diff --git a/qtjava/javalib/examples/addressbook/Main.java b/qtjava/javalib/examples/addressbook/Main.java
index 696ec40d..d393a4fe 100644
--- a/qtjava/javalib/examples/addressbook/Main.java
+++ b/qtjava/javalib/examples/addressbook/Main.java
@@ -20,7 +20,7 @@ public static void main( String[] args )
     a.setMainWidget( mw );
     mw.show();
 
-    a.connect( a, Qt.SIGNAL( "lastWindowClosed()" ), a, Qt.SLOT( "quit()" ) );
+    a.connect( a, Qt.TQ_SIGNAL( "lastWindowClosed()" ), a, Qt.TQ_SLOT( "quit()" ) );
     int result = a.exec();
     return;
 }
diff --git a/qtjava/javalib/examples/application/ApplicationWindow.java b/qtjava/javalib/examples/application/ApplicationWindow.java
index 2c68a673..b6091fd3 100644
--- a/qtjava/javalib/examples/application/ApplicationWindow.java
+++ b/qtjava/javalib/examples/application/ApplicationWindow.java
@@ -102,30 +102,30 @@ public class ApplicationWindow extends TQMainWindow {
 				fileQuitAction;
 
 		fileNewAction = new TQAction("New", "&New", new TQKeySequence(CTRL+Key_N), this, "new", false);
-		connect(fileNewAction, SIGNAL("activated()"), this, SLOT("newDoc()"));
+		connect(fileNewAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("newDoc()"));
 
 		fileOpenAction = new TQAction("Open File", new TQIconSet(new TQPixmap(fileopen)), "&Open", new TQKeySequence(CTRL+Key_O), this, "open", false);
-		connect(fileOpenAction, SIGNAL("activated()"), this, SLOT("load()"));
+		connect(fileOpenAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("load()"));
 		TQMimeSourceFactory.defaultFactory().setPixmap("fileopen", new TQPixmap(fileopen));
 		fileOpenAction.setWhatsThis(fileOpenText);
 
 		fileSaveAction = new TQAction("Save File", new TQIconSet(new TQPixmap(filesave)), "&Save", new TQKeySequence(CTRL+Key_S), this, "save", false);
-		connect(fileSaveAction, SIGNAL("activated()"), this, SLOT("save()"));
+		connect(fileSaveAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("save()"));
 		fileSaveAction.setWhatsThis(fileSaveText);
 
 		fileSaveAsAction = new TQAction("Save File As", "Save &as", new TQKeySequence(), this, "save as", false);
-		connect(fileSaveAsAction, SIGNAL("activated()"), this, SLOT("saveAs()"));
+		connect(fileSaveAsAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("saveAs()"));
 		fileSaveAsAction.setWhatsThis(fileSaveText);
 
 		filePrintAction = new TQAction("Print File", new TQIconSet(new TQPixmap(fileprint)), "&Print", new TQKeySequence(CTRL+Key_P), this, "print", false);
-		connect(filePrintAction, SIGNAL("activated()"), this, SLOT("print()"));
+		connect(filePrintAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("print()"));
 		filePrintAction.setWhatsThis(filePrintText);
 
 		fileCloseAction = new TQAction("Close", "&Close", new TQKeySequence(CTRL+Key_W), this, "close", false);
-		connect(fileCloseAction, SIGNAL("activated()"), this, SLOT("close()"));
+		connect(fileCloseAction, TQ_SIGNAL("activated()"), this, TQ_SLOT("close()"));
 
 		fileQuitAction = new TQAction("Quit", "&Quit", new TQKeySequence(CTRL+Key_Q), this, "quit", false);
-		connect(fileQuitAction, SIGNAL("activated()"), tqApp(), SLOT("closeAllWindows()"));
+		connect(fileQuitAction, TQ_SIGNAL("activated()"), tqApp(), TQ_SLOT("closeAllWindows()"));
 
 
 		// populate a tool bar with some actions
@@ -158,10 +158,10 @@ public class ApplicationWindow extends TQMainWindow {
 		TQPopupMenu help = new TQPopupMenu(this, "help");
 		menuBar().insertSeparator();
 		menuBar().insertItem("&Help", help);
-		help.insertItem("&About", this, SLOT("about()"), new TQKeySequence(Key_F1), -1, -1);
-		help.insertItem("About &Qt", this, SLOT("aboutTQt()"));
+		help.insertItem("&About", this, TQ_SLOT("about()"), new TQKeySequence(Key_F1), -1, -1);
+		help.insertItem("About &Qt", this, TQ_SLOT("aboutTQt()"));
 		help.insertSeparator();
-		help.insertItem("What's &This", this, SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1), -1, -1);
+		help.insertItem("What's &This", this, TQ_SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1), -1, -1);
 
 
 		// create and define the central widget
diff --git a/qtjava/javalib/examples/application/Main.java b/qtjava/javalib/examples/application/Main.java
index 34988cb8..607c6d33 100644
--- a/qtjava/javalib/examples/application/Main.java
+++ b/qtjava/javalib/examples/application/Main.java
@@ -6,7 +6,7 @@ public class Main extends TQObject {
 		ApplicationWindow mw = new ApplicationWindow();
 		mw.setCaption("Document 1");
 		mw.show();
-		a.connect(a, SIGNAL("lastWindowClosed()"), a, SLOT("quit()"));
+		a.connect(a, TQ_SIGNAL("lastWindowClosed()"), a, TQ_SLOT("quit()"));
 		a.exec();
 		return;
 	}
diff --git a/qtjava/javalib/examples/buttongroups/ButtonsGroups.java b/qtjava/javalib/examples/buttongroups/ButtonsGroups.java
index 89b1bcb9..466ccd29 100644
--- a/qtjava/javalib/examples/buttongroups/ButtonsGroups.java
+++ b/qtjava/javalib/examples/buttongroups/ButtonsGroups.java
@@ -80,8 +80,8 @@ public ButtonsGroups( TQWidget parent, String name )
     // insert a checkbox...
     state = new TQCheckBox( "E&nable Radiobuttons", bgrp3 );
     state.setChecked( true );
-    // ...and connect its SIGNAL clicked() with the SLOT slotChangeGrp3State()
-    connect( state, SIGNAL(" clicked()"), this, SLOT(" slotChangeGrp3State()") );
+    // ...and connect its signal clicked() with the slot slotChangeGrp3State()
+    connect( state, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" slotChangeGrp3State()") );
 
     // ------------ fourth group
 
@@ -103,7 +103,7 @@ public ButtonsGroups( TQWidget parent, String name )
 }
 
 /*
-  SLOT slotChangeGrp3State()
+  TQ_SLOT slotChangeGrp3State()
  *
   enables/disables the radiobuttons of the third buttongroup
  */
diff --git a/qtjava/javalib/examples/checklists/CheckLists.java b/qtjava/javalib/examples/checklists/CheckLists.java
index d274c1c7..a28d17dd 100644
--- a/qtjava/javalib/examples/checklists/CheckLists.java
+++ b/qtjava/javalib/examples/checklists/CheckLists.java
@@ -73,8 +73,8 @@ CheckLists( TQWidget parent, String name )
     TQPushButton copy1 = new TQPushButton( "  ->  ", this );
     tmp.addWidget( copy1 );
     copy1.setMaximumWidth( copy1.sizeHint().width() );
-    // connect the SIGNAL clicked() of the pushbutton with the SLOT copy1to2()
-    connect( copy1, SIGNAL(" clicked()"), this, SLOT(" copy1to2()") );
+    // connect the signal clicked() of the pushbutton with the slot copy1to2()
+    connect( copy1, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" copy1to2()") );
 
     // another widget for layouting
     TQVBoxLayout vbox2 = new TQVBoxLayout( lay );
@@ -97,8 +97,8 @@ CheckLists( TQWidget parent, String name )
     TQPushButton copy2 = new TQPushButton( "  ->  ", this );
     lay.addWidget( copy2 );
     copy2.setMaximumWidth( copy2.sizeHint().width() );
-    // ...and connect its clicked() SIGNAL to the copy2to3() SLOT
-    connect( copy2, SIGNAL(" clicked()"), this, SLOT(" copy2to3()") );
+    // ...and connect its clicked() signal to the copy2to3() slot
+    connect( copy2, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" copy2to3()") );
 
     tmp = new TQVBoxLayout( lay );
     tmp.setMargin( 5 );
@@ -109,7 +109,7 @@ CheckLists( TQWidget parent, String name )
 }
 
 /*
-  SLOT copy1to2()
+  TQ_SLOT copy1to2()
  *
   Copies all checked ListViewItems from the first ListView to
   the second one, and inserts them as Radio-ListViewItem.
@@ -143,7 +143,7 @@ public void copy1to2()
 }
 
 /*
-  SLOT copy2to3()
+  TQ_SLOT copy2to3()
  *
   Copies the checked item of the second ListView into the
   Label at the right.
diff --git a/qtjava/javalib/examples/demo/sql/BookForm.java b/qtjava/javalib/examples/demo/sql/BookForm.java
index 667207c9..96f39b3c 100644
--- a/qtjava/javalib/examples/demo/sql/BookForm.java
+++ b/qtjava/javalib/examples/demo/sql/BookForm.java
@@ -83,10 +83,10 @@ BookForm( TQWidget parent, String name, int fl )
 
 
     // signals and slots connections
-    connect( editButton, SIGNAL( "clicked()" ), this, SLOT( "editClicked()" ) );
-    connect( AuthorDataTable, SIGNAL( "primeInsert(TQSqlRecord)" ), this, SLOT( "primeInsertAuthor(TQSqlRecord)" ) );
-    connect( AuthorDataTable, SIGNAL( "currentChanged(TQSqlRecord)" ), this, SLOT( "newCurrentAuthor(TQSqlRecord)" ) );
-    connect( connectButton, SIGNAL( "clicked()" ), this, SLOT( "connectClicked()" ) );
+    connect( editButton, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "editClicked()" ) );
+    connect( AuthorDataTable, TQ_SIGNAL( "primeInsert(TQSqlRecord)" ), this, TQ_SLOT( "primeInsertAuthor(TQSqlRecord)" ) );
+    connect( AuthorDataTable, TQ_SIGNAL( "currentChanged(TQSqlRecord)" ), this, TQ_SLOT( "newCurrentAuthor(TQSqlRecord)" ) );
+    connect( connectButton, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "connectClicked()" ) );
 
     // tab order
     setTabOrder( connectButton, editButton );
diff --git a/qtjava/javalib/examples/demo/sql/ConnectDialog.java b/qtjava/javalib/examples/demo/sql/ConnectDialog.java
index ec0f1cc4..1cfc0f01 100644
--- a/qtjava/javalib/examples/demo/sql/ConnectDialog.java
+++ b/qtjava/javalib/examples/demo/sql/ConnectDialog.java
@@ -108,8 +108,8 @@ ConnectDialog( TQWidget parent,  String name, boolean modal, int fl )
 
 
     // signals and slots connections
-    connect( PushButton1, SIGNAL( "clicked()" ), this, SLOT( "accept()" ) );
-    connect( PushButton2, SIGNAL( "clicked()" ), this, SLOT( "reject()" ) );
+    connect( PushButton1, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "accept()" ) );
+    connect( PushButton2, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "reject()" ) );
 
     // tab order
     setTabOrder( comboDriver, editDatabase );
diff --git a/qtjava/javalib/examples/demo/sql/EditBookForm.java b/qtjava/javalib/examples/demo/sql/EditBookForm.java
index 19a3df05..5f39c44d 100644
--- a/qtjava/javalib/examples/demo/sql/EditBookForm.java
+++ b/qtjava/javalib/examples/demo/sql/EditBookForm.java
@@ -157,23 +157,23 @@ EditBookForm( TQWidget parent,  String name, boolean modal, int fl )
 
 
     // signals and slots connections
-    connect( PushButtonFirst, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "first()" ) );
-    connect( BookDataBrowser, SIGNAL( "firstRecordAvailable( boolean )" ), PushButtonFirst, SLOT( "setEnabled(boolean)" ) );
-    connect( PushButtonPrev, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "prev()" ) );
-    connect( BookDataBrowser, SIGNAL( "prevRecordAvailable( boolean )" ), PushButtonPrev, SLOT( "setEnabled(boolean)" ) );
-    connect( PushButtonNext, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "next()" ) );
-    connect( BookDataBrowser, SIGNAL( "nextRecordAvailable( boolean )" ), PushButtonNext, SLOT( "setEnabled(boolean)" ) );
-    connect( PushButtonLast, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "last()" ) );
-    connect( BookDataBrowser, SIGNAL( "lastRecordAvailable( boolean )" ), PushButtonLast, SLOT( "setEnabled(boolean)" ) );
-    connect( PushButtonInsert, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "insert()" ) );
-    connect( PushButtonUpdate, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "update()" ) );
-    connect( PushButtonDelete, SIGNAL( "clicked()" ), BookDataBrowser, SLOT( "del()" ) );
-    connect( PushButtonClose, SIGNAL( "clicked()" ), this, SLOT( "accept()" ) );
-    connect( BookDataBrowser, SIGNAL( "primeUpdate(TQSqlRecord)" ), this, SLOT( "primeUpdateBook(TQSqlRecord)" ) );
-    connect( BookDataBrowser, SIGNAL( "beforeUpdate(TQSqlRecord)" ), this, SLOT( "beforeUpdateBook(TQSqlRecord)" ) );
-    connect( BookDataBrowser, SIGNAL( "beforeInsert(TQSqlRecord)" ), this, SLOT( "beforeUpdateBook(TQSqlRecord)" ) );
-    connect( BookDataBrowser, SIGNAL( "primeInsert(TQSqlRecord)" ), this, SLOT( "primeInsertBook(TQSqlRecord)" ) );
-    connect( BookDataBrowser, SIGNAL( "primeInsert(TQSqlRecord)" ), this, SLOT( "primeInsertBook(TQSqlRecord)" ) );
+    connect( PushButtonFirst, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "first()" ) );
+    connect( BookDataBrowser, TQ_SIGNAL( "firstRecordAvailable( boolean )" ), PushButtonFirst, TQ_SLOT( "setEnabled(boolean)" ) );
+    connect( PushButtonPrev, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "prev()" ) );
+    connect( BookDataBrowser, TQ_SIGNAL( "prevRecordAvailable( boolean )" ), PushButtonPrev, TQ_SLOT( "setEnabled(boolean)" ) );
+    connect( PushButtonNext, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "next()" ) );
+    connect( BookDataBrowser, TQ_SIGNAL( "nextRecordAvailable( boolean )" ), PushButtonNext, TQ_SLOT( "setEnabled(boolean)" ) );
+    connect( PushButtonLast, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "last()" ) );
+    connect( BookDataBrowser, TQ_SIGNAL( "lastRecordAvailable( boolean )" ), PushButtonLast, TQ_SLOT( "setEnabled(boolean)" ) );
+    connect( PushButtonInsert, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "insert()" ) );
+    connect( PushButtonUpdate, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "update()" ) );
+    connect( PushButtonDelete, TQ_SIGNAL( "clicked()" ), BookDataBrowser, TQ_SLOT( "del()" ) );
+    connect( PushButtonClose, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "accept()" ) );
+    connect( BookDataBrowser, TQ_SIGNAL( "primeUpdate(TQSqlRecord)" ), this, TQ_SLOT( "primeUpdateBook(TQSqlRecord)" ) );
+    connect( BookDataBrowser, TQ_SIGNAL( "beforeUpdate(TQSqlRecord)" ), this, TQ_SLOT( "beforeUpdateBook(TQSqlRecord)" ) );
+    connect( BookDataBrowser, TQ_SIGNAL( "beforeInsert(TQSqlRecord)" ), this, TQ_SLOT( "beforeUpdateBook(TQSqlRecord)" ) );
+    connect( BookDataBrowser, TQ_SIGNAL( "primeInsert(TQSqlRecord)" ), this, TQ_SLOT( "primeInsertBook(TQSqlRecord)" ) );
+    connect( BookDataBrowser, TQ_SIGNAL( "primeInsert(TQSqlRecord)" ), this, TQ_SLOT( "primeInsertBook(TQSqlRecord)" ) );
 
     // tab order
     setTabOrder( TQLineEditTitle, TQLineEditPrice );
diff --git a/qtjava/javalib/examples/demo/widgets/WidgetsBase.java b/qtjava/javalib/examples/demo/widgets/WidgetsBase.java
index e64ccf7f..6622d265 100644
--- a/qtjava/javalib/examples/demo/widgets/WidgetsBase.java
+++ b/qtjava/javalib/examples/demo/widgets/WidgetsBase.java
@@ -6036,19 +6036,19 @@ WidgetsBase( TQWidget parent, String name, int fl )
 
 
     // signals and slots connections
-    connect( slider, SIGNAL( "valueChanged(int)" ), lcdDisplay, SLOT( "display(int)" ) );
-    connect( slider, SIGNAL( "valueChanged(int)" ), progressBar, SLOT( "setProgress(int)" ) );
-    connect( dateEdit, SIGNAL( "valueChanged(Calendar)" ), this, SLOT( "updateDateTimeString()" ) );
-    connect( slider, SIGNAL( "valueChanged(int)" ), spinBox, SLOT( "setValue(int)" ) );
-    connect( spinBox, SIGNAL( "valueChanged(int)" ), slider, SLOT( "setValue(int)" ) );
-    connect( spinBox, SIGNAL( "valueChanged(int)" ), progressBar, SLOT( "setProgress(int)" ) );
-    connect( spinBox, SIGNAL( "valueChanged(int)" ), lcdDisplay, SLOT( "display(int)" ) );
-    connect( buttonColorBox, SIGNAL( "activated(String)" ), this, SLOT( "setColor(String)" ) );
-    connect( lineEdit, SIGNAL( "textChanged(String)" ), this, SLOT( "updateColorTest(String)" ) );
-    connect( lineEdit, SIGNAL( "returnPressed()" ), this, SLOT( "setColor()" ) );
-    connect( timeEdit, SIGNAL( "valueChanged(Date)" ), this, SLOT( "updateDateTimeString()" ) );
-    connect( timeEdit, SIGNAL( "valueChanged(Date)" ), this, SLOT( "updateClock()" ) );
-    connect( pushButton, SIGNAL( "clicked()" ), this, SLOT( "resetColors()" ) );
+    connect( slider, TQ_SIGNAL( "valueChanged(int)" ), lcdDisplay, TQ_SLOT( "display(int)" ) );
+    connect( slider, TQ_SIGNAL( "valueChanged(int)" ), progressBar, TQ_SLOT( "setProgress(int)" ) );
+    connect( dateEdit, TQ_SIGNAL( "valueChanged(Calendar)" ), this, TQ_SLOT( "updateDateTimeString()" ) );
+    connect( slider, TQ_SIGNAL( "valueChanged(int)" ), spinBox, TQ_SLOT( "setValue(int)" ) );
+    connect( spinBox, TQ_SIGNAL( "valueChanged(int)" ), slider, TQ_SLOT( "setValue(int)" ) );
+    connect( spinBox, TQ_SIGNAL( "valueChanged(int)" ), progressBar, TQ_SLOT( "setProgress(int)" ) );
+    connect( spinBox, TQ_SIGNAL( "valueChanged(int)" ), lcdDisplay, TQ_SLOT( "display(int)" ) );
+    connect( buttonColorBox, TQ_SIGNAL( "activated(String)" ), this, TQ_SLOT( "setColor(String)" ) );
+    connect( lineEdit, TQ_SIGNAL( "textChanged(String)" ), this, TQ_SLOT( "updateColorTest(String)" ) );
+    connect( lineEdit, TQ_SIGNAL( "returnPressed()" ), this, TQ_SLOT( "setColor()" ) );
+    connect( timeEdit, TQ_SIGNAL( "valueChanged(Date)" ), this, TQ_SLOT( "updateDateTimeString()" ) );
+    connect( timeEdit, TQ_SIGNAL( "valueChanged(Date)" ), this, TQ_SLOT( "updateClock()" ) );
+    connect( pushButton, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "resetColors()" ) );
 
     init();
 }
diff --git a/qtjava/javalib/examples/dragdrop/DropSite.java b/qtjava/javalib/examples/dragdrop/DropSite.java
index 3b85dd93..9209dd51 100644
--- a/qtjava/javalib/examples/dragdrop/DropSite.java
+++ b/qtjava/javalib/examples/dragdrop/DropSite.java
@@ -147,7 +147,7 @@ DragMoviePlayer( TQDragObject p )
 //    TQObject(p),
     dobj = p;
     movie = new TQMovie("trolltech.gif" );
-    movie.connectUpdate(this,SLOT("updatePixmap(TQRect)"));
+    movie.connectUpdate(this,TQ_SLOT("updatePixmap(TQRect)"));
 }
 
 void updatePixmap( TQRect rect )
diff --git a/qtjava/javalib/examples/dragdrop/Main.java b/qtjava/javalib/examples/dragdrop/Main.java
index ed6c5309..3bf475df 100644
--- a/qtjava/javalib/examples/dragdrop/Main.java
+++ b/qtjava/javalib/examples/dragdrop/Main.java
@@ -48,8 +48,8 @@ static DropSite addStuff( TQWidget  parent, boolean image, boolean secret )
     tll.activate();
     parent.resize( parent.sizeHint() );
 
-    TQObject.connect( d, Qt.SIGNAL("message(String)"),
-		      format, Qt.SLOT("setText(String)") );
+    TQObject.connect( d, Qt.TQ_SIGNAL("message(String)"),
+		      format, Qt.TQ_SLOT("setText(String)") );
 	return d;
 }
 
@@ -75,7 +75,7 @@ public static void main( String[] args )
     mw3.setCaption( "Qt Example - Drag and Drop" );
     mw3.show();
 
-    TQObject.connect(Qt.qApp(),Qt.SIGNAL("lastWindowClosed()"),Qt.qApp(),Qt.SLOT("quit()"));
+    TQObject.connect(Qt.qApp(),Qt.TQ_SIGNAL("lastWindowClosed()"),Qt.qApp(),Qt.TQ_SLOT("quit()"));
     a.exec();
 	return;
 }
diff --git a/qtjava/javalib/examples/forever/Forever.java b/qtjava/javalib/examples/forever/Forever.java
index b7a10677..051a39dd 100644
--- a/qtjava/javalib/examples/forever/Forever.java
+++ b/qtjava/javalib/examples/forever/Forever.java
@@ -49,8 +49,8 @@ Forever( TQWidget parent, String name )
     rectangles = 0;
     startTimer( 0 );				// run continuous timer
     TQTimer  counter = new TQTimer( this );
-    connect( counter, SIGNAL("timeout()"),
-	     this, SLOT("updateCaption()") );
+    connect( counter, TQ_SIGNAL("timeout()"),
+	     this, TQ_SLOT("updateCaption()") );
     counter.start( 1000 );
 }
 
diff --git a/qtjava/javalib/examples/hello/Hello.java b/qtjava/javalib/examples/hello/Hello.java
index 5247d495..fec25073 100644
--- a/qtjava/javalib/examples/hello/Hello.java
+++ b/qtjava/javalib/examples/hello/Hello.java
@@ -28,7 +28,7 @@ Hello( String text, TQWidget parent, String name )
     super(parent,name);
 	t = text;
     TQTimer timer = new TQTimer(this);
-    connect( timer, SIGNAL("timeout()"), SLOT("animate()") );
+    connect( timer, TQ_SIGNAL("timeout()"), TQ_SLOT("animate()") );
     timer.start( 40 );
 
     resize( 260, 130 );
diff --git a/qtjava/javalib/examples/hello/Main.java b/qtjava/javalib/examples/hello/Main.java
index c5ebc24c..3e053584 100644
--- a/qtjava/javalib/examples/hello/Main.java
+++ b/qtjava/javalib/examples/hello/Main.java
@@ -29,7 +29,7 @@ public static void main( String[] args )
 	s = "Hello, World";
     Hello h = new Hello( s );
     h.setCaption( "Qt says hello" );
-    TQObject.connect( h, Qt.SIGNAL("clicked()"), a, Qt.SLOT("quit()") );
+    TQObject.connect( h, Qt.TQ_SIGNAL("clicked()"), a, Qt.TQ_SLOT("quit()") );
     h.setFont( new TQFont("times",32,TQFont.Bold) );		// default font
     h.setBackgroundColor( Qt.white() );			// default bg color
     a.setMainWidget( h );
diff --git a/qtjava/javalib/examples/helpviewer/HelpWindow.java b/qtjava/javalib/examples/helpviewer/HelpWindow.java
index c5e4ff7a..006a4722 100644
--- a/qtjava/javalib/examples/helpviewer/HelpWindow.java
+++ b/qtjava/javalib/examples/helpviewer/HelpWindow.java
@@ -42,26 +42,26 @@ HelpWindow( String home_, String _path,
 
     browser.mimeSourceFactory().setFilePath( new String[] { _path } );
     browser.setFrameStyle( TQFrame.Panel | TQFrame.Sunken );
-    connect( browser, SIGNAL(" textChanged()"),
-	     this, SLOT(" textChanged()") );
+    connect( browser, TQ_SIGNAL(" textChanged()"),
+	     this, TQ_SLOT(" textChanged()") );
 
     setCentralWidget( browser );
 
     if ( !home_.equals("") )
 	browser.setSource( home_ );
 
-    connect( browser, SIGNAL(" highlighted( String)"),
-	     statusBar(), SLOT(" message( String)") );
+    connect( browser, TQ_SIGNAL(" highlighted( String)"),
+	     statusBar(), TQ_SLOT(" message( String)") );
 
     resize( 640,700 );
 
     TQPopupMenu file = new TQPopupMenu( this );
-    file.insertItem( tr("&New Window"), this, SLOT(" newWindow()"), new TQKeySequence(CTRL+Key_N) );
-    file.insertItem( tr("&Open File"), this, SLOT(" openFile()"), new TQKeySequence(CTRL+Key_O) );
-    file.insertItem( tr("&Print"), this, SLOT(" print()"), new TQKeySequence(CTRL+Key_P) );
+    file.insertItem( tr("&New Window"), this, TQ_SLOT(" newWindow()"), new TQKeySequence(CTRL+Key_N) );
+    file.insertItem( tr("&Open File"), this, TQ_SLOT(" openFile()"), new TQKeySequence(CTRL+Key_O) );
+    file.insertItem( tr("&Print"), this, TQ_SLOT(" print()"), new TQKeySequence(CTRL+Key_P) );
     file.insertSeparator();
-    file.insertItem( tr("&Close"), this, SLOT(" close()"), new TQKeySequence(CTRL+Key_Q) );
-    file.insertItem( tr("E&xit"), tqApp(), SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_X) );
+    file.insertItem( tr("&Close"), this, TQ_SLOT(" close()"), new TQKeySequence(CTRL+Key_Q) );
+    file.insertItem( tr("E&xit"), tqApp(), TQ_SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_X) );
 
     // The same three icons are used twice each.
     TQIconSet icon_back = new TQIconSet( new TQPixmap("back.xpm") );
@@ -70,16 +70,16 @@ HelpWindow( String home_, String _path,
 
     TQPopupMenu go = new TQPopupMenu( this );
     backwardId = go.insertItem( icon_back,
-				 tr("&Backward"), browser, SLOT(" backward()"),
+				 tr("&Backward"), browser, TQ_SLOT(" backward()"),
 				 new TQKeySequence(CTRL+Key_Left) );
     forwardId = go.insertItem( icon_forward,
-				tr("&Forward"), browser, SLOT(" forward()"),
+				tr("&Forward"), browser, TQ_SLOT(" forward()"),
 				new TQKeySequence(CTRL+Key_Right) );
-    go.insertItem( icon_home, tr("&Home"), browser, SLOT(" home()") );
+    go.insertItem( icon_home, tr("&Home"), browser, TQ_SLOT(" home()") );
 
     TQPopupMenu help = new TQPopupMenu( this );
-    help.insertItem( tr("&About ..."), this, SLOT(" about()") );
-    help.insertItem( tr("About &Qt ..."), this, SLOT(" aboutTQt()") );
+    help.insertItem( tr("&About ..."), this, TQ_SLOT(" about()") );
+    help.insertItem( tr("About &Qt ..."), this, TQ_SLOT(" aboutTQt()") );
 
     hist = new TQPopupMenu( this );
     Iterator it = history.iterator();
@@ -87,11 +87,11 @@ HelpWindow( String home_, String _path,
 		String item = (String) it.next();
 		mHistory.put(new Integer(hist.insertItem( item )), item);
 	}
-    connect( hist, SIGNAL(" activated( int )"),
-	     this, SLOT(" histChosen( int )") );
+    connect( hist, TQ_SIGNAL(" activated( int )"),
+	     this, TQ_SLOT(" histChosen( int )") );
 
     bookm = new TQPopupMenu( this );
-    bookm.insertItem( tr( "Add Bookmark" ), this, SLOT(" addBookmark()") );
+    bookm.insertItem( tr( "Add Bookmark" ), this, TQ_SLOT(" addBookmark()") );
     bookm.insertSeparator();
 
     Iterator it2 = bookmarks.iterator();
@@ -99,8 +99,8 @@ HelpWindow( String home_, String _path,
 		String item = (String) it2.next();
 	    mBookmarks.put(new Integer(bookm.insertItem( item )), item);
 	}
-    connect( bookm, SIGNAL(" activated( int )"),
-	     this, SLOT(" bookmChosen( int )") );
+    connect( bookm, TQ_SIGNAL(" activated( int )"),
+	     this, TQ_SLOT(" bookmChosen( int )") );
 
     menuBar().insertItem( tr("&File"), file );
     menuBar().insertItem( tr("&Go"), go );
@@ -111,29 +111,29 @@ HelpWindow( String home_, String _path,
 
     menuBar().setItemEnabled( forwardId, false);
     menuBar().setItemEnabled( backwardId, false);
-    connect( browser, SIGNAL(" backwardAvailable( boolean )"),
-	     this, SLOT(" setBackwardAvailable( boolean )") );
-    connect( browser, SIGNAL(" forwardAvailable( boolean )"),
-	     this, SLOT(" setForwardAvailable( boolean )") );
+    connect( browser, TQ_SIGNAL(" backwardAvailable( boolean )"),
+	     this, TQ_SLOT(" setBackwardAvailable( boolean )") );
+    connect( browser, TQ_SIGNAL(" forwardAvailable( boolean )"),
+	     this, TQ_SLOT(" setForwardAvailable( boolean )") );
 
 
     TQToolBar toolbar = new TQToolBar( this );
     addToolBar( toolbar, "Toolbar");
     TQToolButton button;
 
-    button = new TQToolButton( icon_back, tr("Backward"), "", browser, SLOT("backward()"), toolbar );
-    connect( browser, SIGNAL(" backwardAvailable(boolean)"), button, SLOT(" setEnabled(boolean)") );
+    button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQ_SLOT("backward()"), toolbar );
+    connect( browser, TQ_SIGNAL(" backwardAvailable(boolean)"), button, TQ_SLOT(" setEnabled(boolean)") );
     button.setEnabled( false );
-    button = new TQToolButton( icon_forward, tr("Forward"), "", browser, SLOT("forward()"), toolbar );
-    connect( browser, SIGNAL(" forwardAvailable(boolean)"), button, SLOT(" setEnabled(boolean)") );
+    button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQ_SLOT("forward()"), toolbar );
+    connect( browser, TQ_SIGNAL(" forwardAvailable(boolean)"), button, TQ_SLOT(" setEnabled(boolean)") );
     button.setEnabled( false );
-    button = new TQToolButton( icon_home, tr("Home"), "", browser, SLOT("home()"), toolbar );
+    button = new TQToolButton( icon_home, tr("Home"), "", browser, TQ_SLOT("home()"), toolbar );
 
     toolbar.addSeparator();
 
     pathCombo = new TQComboBox( true, toolbar );
-    connect( pathCombo, SIGNAL(" activated( String )"),
-	     this, SLOT(" pathSelected( String )") );
+    connect( pathCombo, TQ_SIGNAL(" activated( String )"),
+	     this, TQ_SLOT(" pathSelected( String )") );
     toolbar.setStretchableWidget( pathCombo );
     setRightJustification( true );
     setDockEnabled( DockLeft, false );
diff --git a/qtjava/javalib/examples/helpviewer/Main.java b/qtjava/javalib/examples/helpviewer/Main.java
index 492ca36d..e6dc203d 100644
--- a/qtjava/javalib/examples/helpviewer/Main.java
+++ b/qtjava/javalib/examples/helpviewer/Main.java
@@ -32,10 +32,10 @@ public static void main( String[] args )
     else
 	help.showMaximized();
 
-    TQObject.connect( a, Qt.SIGNAL("aboutToQuit()"),
-                      help, Qt.SLOT("cleanUp()") );
-    TQObject.connect( a, Qt.SIGNAL("lastWindowClosed()"),
-                      a, Qt.SLOT("quit()") );
+    TQObject.connect( a, Qt.TQ_SIGNAL("aboutToQuit()"),
+                      help, Qt.TQ_SLOT("cleanUp()") );
+    TQObject.connect( a, Qt.TQ_SIGNAL("lastWindowClosed()"),
+                      a, Qt.TQ_SLOT("quit()") );
 
     a.exec();
 	return;
diff --git a/qtjava/javalib/examples/iconview/ListenDND.java b/qtjava/javalib/examples/iconview/ListenDND.java
index d6dfbc9f..a7c8b00e 100644
--- a/qtjava/javalib/examples/iconview/ListenDND.java
+++ b/qtjava/javalib/examples/iconview/ListenDND.java
@@ -49,9 +49,9 @@ public static void main( String[] args )
     qiconview.setCaption( "Qt Example - Iconview" );
 
     ListenDND listen_dnd = new ListenDND( qiconview );
-    TQObject.connect( qiconview, SIGNAL(" dropped( TQDropEvent , ArrayList )"),
-		      listen_dnd, SLOT(" dropped( TQDropEvent  )") );
-    TQObject.connect( qiconview, SIGNAL(" moved()"), listen_dnd, SLOT(" moved()") );
+    TQObject.connect( qiconview, TQ_SIGNAL(" dropped( TQDropEvent , ArrayList )"),
+		      listen_dnd, TQ_SLOT(" dropped( TQDropEvent  )") );
+    TQObject.connect( qiconview, TQ_SIGNAL(" moved()"), listen_dnd, TQ_SLOT(" moved()") );
 
     a.setMainWidget( qiconview );
     qiconview.show();
diff --git a/qtjava/javalib/examples/layout/ExampleWidget.java b/qtjava/javalib/examples/layout/ExampleWidget.java
index 566a7825..c66e238d 100644
--- a/qtjava/javalib/examples/layout/ExampleWidget.java
+++ b/qtjava/javalib/examples/layout/ExampleWidget.java
@@ -30,7 +30,7 @@ ExampleWidget( TQWidget parent, String name )
     menubar.setSeparator( TQMenuBar.InWindowsStyle );
     TQPopupMenu popup;
     popup = new TQPopupMenu( this );
-    popup.insertItem( "&Quit", tqApp(), SLOT("quit()") );
+    popup.insertItem( "&Quit", tqApp(), TQ_SLOT("quit()") );
     menubar.insertItem( "&File", popup );
 
     // ...and tell the layout about it.
diff --git a/qtjava/javalib/examples/lineedits/LineEdits.java b/qtjava/javalib/examples/lineedits/LineEdits.java
index f0f00bf1..072e851a 100644
--- a/qtjava/javalib/examples/lineedits/LineEdits.java
+++ b/qtjava/javalib/examples/lineedits/LineEdits.java
@@ -48,9 +48,9 @@ LineEdits( TQWidget parent, String name )
     combo1.insertItem( "Normal", -1 );
     combo1.insertItem( "Password", -1 );
     combo1.insertItem( "No Echo", -1 );
-    // ...and connect the activated() SIGNAL with the slotEchoChanged() SLOT to be able
+    // ...and connect the activated() signal with the slotEchoChanged() slot to be able
     // to react when an item is selected
-    connect( combo1, SIGNAL(" activated( int )"), this, SLOT(" slotEchoChanged( int )") );
+    connect( combo1, TQ_SIGNAL(" activated( int )"), this, TQ_SLOT(" slotEchoChanged( int )") );
 
     // insert the first LineEdit
     lined1 = new TQLineEdit( this );
@@ -70,8 +70,8 @@ LineEdits( TQWidget parent, String name )
     combo2.insertItem( "No Validator", -1 );
     combo2.insertItem( "Integer Validator", -1 );
     combo2.insertItem( "Double Validator", -1 );
-    // ...and again the activated() SIGNAL gets connected with a SLOT
-    connect( combo2, SIGNAL(" activated( int )"), this, SLOT(" slotValidatorChanged( int )") );
+    // ...and again the activated() signal gets connected with a slot
+    connect( combo2, TQ_SIGNAL(" activated( int )"), this, TQ_SLOT(" slotValidatorChanged( int )") );
 
     // and the second LineEdit
     lined2 = new TQLineEdit( this );
@@ -91,8 +91,8 @@ LineEdits( TQWidget parent, String name )
     combo3.insertItem( "Left", -1 );
     combo3.insertItem( "Centered", -1 );
     combo3.insertItem( "Right", -1 );
-    // ...and again the activated() SIGNAL gets connected with a SLOT
-    connect( combo3, SIGNAL(" activated( int )"), this, SLOT(" slotAlignmentChanged( int )") );
+    // ...and again the activated() signal gets connected with a slot
+    connect( combo3, TQ_SIGNAL(" activated( int )"), this, TQ_SLOT(" slotAlignmentChanged( int )") );
 
     // and the third lineedit
     lined3 = new TQLineEdit( this );
@@ -110,8 +110,8 @@ LineEdits( TQWidget parent, String name )
     combo4 = new TQComboBox( false, row4 );
     combo4.insertItem( "False", -1 );
     combo4.insertItem( "True", -1 );
-    // ...and again the activated() SIGNAL gets connected with a SLOT
-    connect( combo4, SIGNAL(" activated( int )"), this, SLOT(" slotReadOnlyChanged( int )") );
+    // ...and again the activated() signal gets connected with a slot
+    connect( combo4, TQ_SIGNAL(" activated( int )"), this, TQ_SLOT(" slotReadOnlyChanged( int )") );
 
     // and the last lineedit
     lined4 = new TQLineEdit( this );
@@ -122,7 +122,7 @@ LineEdits( TQWidget parent, String name )
 }
 
 /*
-  SLOT slotEchoChanged( int i )
+  TQ_SLOT slotEchoChanged( int i )
  *
   i contains the number of the item which the user has been chosen in the
   first Combobox. According to this value, we set the Echo-Mode for the
@@ -147,7 +147,7 @@ void slotEchoChanged( int i )
 }
 
 /*
-  SLOT slotValidatorChanged( int i )
+  TQ_SLOT slotValidatorChanged( int i )
  *
   i contains the number of the item which the user has been chosen in the
   second Combobox. According to this value, we set a validator for the
@@ -177,7 +177,7 @@ void slotValidatorChanged( int i )
 
 
 /*
-  SLOT slotAlignmentChanged( int i )
+  TQ_SLOT slotAlignmentChanged( int i )
  *
   i contains the number of the item which the user has been chosen in
   the third Combobox.  According to this value, we set an alignment
@@ -203,7 +203,7 @@ void slotAlignmentChanged( int i )
 
 
 /*
-  SLOT slotReadOnlyChanged( int i )
+  TQ_SLOT slotReadOnlyChanged( int i )
  *
   i contains the number of the item which the user has been chosen in
   the fourth Combobox.  According to this value, we toggle read-only.
diff --git a/qtjava/javalib/examples/listbox/ListBoxDemo.java b/qtjava/javalib/examples/listbox/ListBoxDemo.java
index 11ce7037..ea496b68 100644
--- a/qtjava/javalib/examples/listbox/ListBoxDemo.java
+++ b/qtjava/javalib/examples/listbox/ListBoxDemo.java
@@ -45,7 +45,7 @@ ListBoxDemo()
     bg.insert( b );
     v.addWidget( b );
     b.setChecked( true );
-    connect( b, SIGNAL("clicked()"), this, SLOT("setNumCols()") );
+    connect( b, TQ_SIGNAL("clicked()"), this, TQ_SLOT("setNumCols()") );
     TQHBoxLayout  h = new TQHBoxLayout();
     v.addLayout( h );
     h.addSpacing( 30 );
@@ -61,7 +61,7 @@ ListBoxDemo()
                           this );
     bg.insert( b );
     v.addWidget( b );
-    connect( b, SIGNAL("clicked()"), this, SLOT("setColsByWidth()") );
+    connect( b, TQ_SIGNAL("clicked()"), this, TQ_SLOT("setColsByWidth()") );
 
     v.addSpacing( 12 );
 
@@ -70,7 +70,7 @@ ListBoxDemo()
                           this );
     bg.insert( b );
     v.addWidget( b );
-    connect( b, SIGNAL("clicked()"), this, SLOT("setNumRows()") );
+    connect( b, TQ_SIGNAL("clicked()"), this, TQ_SLOT("setNumRows()") );
     h = new TQHBoxLayout();
     v.addLayout( h );
     h.addSpacing( 30 );
@@ -87,30 +87,30 @@ ListBoxDemo()
                           this );
     bg.insert( b );
     v.addWidget( b );
-    connect( b, SIGNAL("clicked()"), this, SLOT("setRowsByHeight()") );
+    connect( b, TQ_SIGNAL("clicked()"), this, TQ_SLOT("setRowsByHeight()") );
 
     v.addSpacing( 12 );
 
     TQCheckBox  cb = new TQCheckBox( "Variable-height rows", this );
     cb.setChecked( true );
-    connect( cb, SIGNAL("toggled(boolean)"), this, SLOT("setVariableHeight(boolean)") );
+    connect( cb, TQ_SIGNAL("toggled(boolean)"), this, TQ_SLOT("setVariableHeight(boolean)") );
     v.addWidget( cb );
     v.addSpacing( 6 );
 
     cb = new TQCheckBox( "Variable-width columns", this );
-    connect( cb, SIGNAL("toggled(boolean)"), this, SLOT("setVariableWidth(boolean)") );
+    connect( cb, TQ_SIGNAL("toggled(boolean)"), this, TQ_SLOT("setVariableWidth(boolean)") );
     v.addWidget( cb );
 
     cb = new TQCheckBox( "Extended-Selection", this );
-    connect( cb, SIGNAL("toggled(boolean)"), this, SLOT("setMultiSelection(boolean)") );
+    connect( cb, TQ_SIGNAL("toggled(boolean)"), this, TQ_SLOT("setMultiSelection(boolean)") );
     v.addWidget( cb );
 
     TQPushButton pb = new TQPushButton( "Sort ascending", this );
-    connect( pb, SIGNAL(" clicked()"), this, SLOT(" sortAscending()") );
+    connect( pb, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" sortAscending()") );
     v.addWidget( pb );
 
     pb = new TQPushButton( "Sort descending", this );
-    connect( pb, SIGNAL(" clicked()"), this, SLOT(" sortDescending()") );
+    connect( pb, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" sortDescending()") );
     v.addWidget( pb );
 
     v.addStretch( 100 );
@@ -124,8 +124,8 @@ ListBoxDemo()
     rows.setRange( 1, 256 );
     rows.setValue( 256 );
 
-    connect( columns, SIGNAL("valueChanged(int)"), this, SLOT("setNumCols()") );
-    connect( rows, SIGNAL("valueChanged(int)"), this, SLOT("setNumRows()") );
+    connect( columns, TQ_SIGNAL("valueChanged(int)"), this, TQ_SLOT("setNumCols()") );
+    connect( rows, TQ_SIGNAL("valueChanged(int)"), this, TQ_SLOT("setNumRows()") );
 }
 
 
diff --git a/qtjava/javalib/examples/mdi/ApplicationWindow.java b/qtjava/javalib/examples/mdi/ApplicationWindow.java
index fd0079be..d6e5ce25 100644
--- a/qtjava/javalib/examples/mdi/ApplicationWindow.java
+++ b/qtjava/javalib/examples/mdi/ApplicationWindow.java
@@ -118,12 +118,12 @@ ApplicationWindow()
     openIcon = new TQPixmap( fileopen );
     TQToolButton  fileOpen
 	= new TQToolButton( new TQIconSet(openIcon), "Open File", "",
-			   this, SLOT("load()"), fileTools, "open file" );
+			   this, TQ_SLOT("load()"), fileTools, "open file" );
 
     saveIcon = new TQPixmap( filesave );
     TQToolButton  fileSave
 	= new TQToolButton( new TQIconSet(saveIcon), "Save File", "",
-			   this, SLOT("save()"), fileTools, "save file" );
+			   this, TQ_SLOT("save()"), fileTools, "save file" );
 
     printer = new TQPrinter();
     TQPixmap printIcon;
@@ -131,7 +131,7 @@ ApplicationWindow()
     printIcon = new TQPixmap( fileprint );
     TQToolButton  filePrint
 	= new TQToolButton( new TQIconSet(printIcon), "Print File", "",
-			   this, SLOT("print()"), fileTools, "print file" );
+			   this, TQ_SLOT("print()"), fileTools, "print file" );
     TQWhatsThis.add( filePrint, filePrintText );
 
     TQWhatsThis.whatsThisButton( fileTools );
@@ -142,39 +142,39 @@ ApplicationWindow()
     TQPopupMenu  file = new TQPopupMenu( this );
     menuBar().insertItem( "&File", file );
 
-    file.insertItem( "&New", this, SLOT("newDoc()"), new TQKeySequence(CTRL+Key_N) );
+    file.insertItem( "&New", this, TQ_SLOT("newDoc()"), new TQKeySequence(CTRL+Key_N) );
 
     id = file.insertItem( new TQIconSet(openIcon), "&Open...",
-			   this, SLOT("load()"), new TQKeySequence(CTRL+Key_O) );
+			   this, TQ_SLOT("load()"), new TQKeySequence(CTRL+Key_O) );
     file.setWhatsThis( id, fileOpenText );
 
     id = file.insertItem( new TQIconSet(saveIcon), "&Save",
-			   this, SLOT("save()"), new TQKeySequence(CTRL+Key_S) );
+			   this, TQ_SLOT("save()"), new TQKeySequence(CTRL+Key_S) );
     file.setWhatsThis( id, fileSaveText );
-    id = file.insertItem( "Save &As...", this, SLOT("saveAs()") );
+    id = file.insertItem( "Save &As...", this, TQ_SLOT("saveAs()") );
     file.setWhatsThis( id, fileSaveText );
     file.insertSeparator();
     id = file.insertItem( new TQIconSet(printIcon), "&Print...",
-			   this, SLOT("print()"), new TQKeySequence(CTRL+Key_P) );
+			   this, TQ_SLOT("print()"), new TQKeySequence(CTRL+Key_P) );
     file.setWhatsThis( id, filePrintText );
     file.insertSeparator();
-    file.insertItem( "&Close", this, SLOT("closeWindow()"), new TQKeySequence(CTRL+Key_W) );
-    file.insertItem( "&Quit", tqApp(), SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_Q) );
+    file.insertItem( "&Close", this, TQ_SLOT("closeWindow()"), new TQKeySequence(CTRL+Key_W) );
+    file.insertItem( "&Quit", tqApp(), TQ_SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_Q) );
 
     windowsMenu = new TQPopupMenu( this );
     windowsMenu.setCheckable( true );
-    connect( windowsMenu, SIGNAL(" aboutToShow()"),
-	     this, SLOT(" windowsMenuAboutToShow()") );
+    connect( windowsMenu, TQ_SIGNAL(" aboutToShow()"),
+	     this, TQ_SLOT(" windowsMenuAboutToShow()") );
     menuBar().insertItem( "&Windows", windowsMenu );
 
     menuBar().insertSeparator();
     TQPopupMenu  help = new TQPopupMenu( this );
     menuBar().insertItem( "&Help", help );
 
-    help.insertItem( "&About", this, SLOT("about()"), new TQKeySequence(Key_F1));
-    help.insertItem( "About &Qt", this, SLOT("aboutTQt()"));
+    help.insertItem( "&About", this, TQ_SLOT("about()"), new TQKeySequence(Key_F1));
+    help.insertItem( "About &Qt", this, TQ_SLOT("aboutTQt()"));
     help.insertSeparator();
-    help.insertItem( "What's &This", this, SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1));
+    help.insertItem( "What's &This", this, TQ_SLOT("whatsThis()"), new TQKeySequence(SHIFT+Key_F1));
 
     TQVBox vb = new TQVBox( this );
     vb.setFrameStyle( TQFrame.StyledPanel | TQFrame.Sunken );
@@ -189,7 +189,7 @@ ApplicationWindow()
 MDIWindow newDoc()
 {
     MDIWindow w = new MDIWindow( ws, null, WDestructiveClose );
-    connect( w, SIGNAL("message(String,int)"), statusBar(), SLOT("message(String,int)") );
+    connect( w, TQ_SIGNAL("message(String,int)"), statusBar(), TQ_SLOT("message(String,int)") );
     w.setCaption("unnamed document");
     w.setIcon( new TQPixmap("document.xpm") );
     // show the very first window in maximized mode
@@ -260,8 +260,8 @@ void aboutTQt()
 void windowsMenuAboutToShow()
 {
     windowsMenu.clear();
-    int cascadeId = windowsMenu.insertItem("&Cascade", ws, SLOT("cascade()") );
-    int tileId = windowsMenu.insertItem("&Tile", ws, SLOT("tile()") );
+    int cascadeId = windowsMenu.insertItem("&Cascade", ws, TQ_SLOT("cascade()") );
+    int tileId = windowsMenu.insertItem("&Tile", ws, TQ_SLOT("tile()") );
     windows = ws.windowList();
     if ( windows.size() == 0 ) {
 	windowsMenu.setItemEnabled( cascadeId, false );
@@ -270,7 +270,7 @@ void windowsMenuAboutToShow()
     windowsMenu.insertSeparator();
     for ( int i = 0; i < windows.size(); ++i ) {
 	int id = windowsMenu.insertItem(((TQWidget) windows.get(i)).caption(),
-					 this, SLOT(" windowsMenuActivated( int )") );
+					 this, TQ_SLOT(" windowsMenuActivated( int )") );
 	windowsMenu.setItemParameter( id, i );
 	windowsMenu.setItemChecked( id, ws.activeWindow() == windows.get(i) );
     }
diff --git a/qtjava/javalib/examples/mdi/Main.java b/qtjava/javalib/examples/mdi/Main.java
index daec64d7..e75f1d3c 100644
--- a/qtjava/javalib/examples/mdi/Main.java
+++ b/qtjava/javalib/examples/mdi/Main.java
@@ -17,7 +17,7 @@ public static void main(String[] args) {
     ApplicationWindow  mw = new ApplicationWindow();
     mw.setCaption( "Qt Example - Multiple Documents Interface (MDI)" );
     mw.show();
-    a.connect( a, Qt.SIGNAL("lastWindowClosed()"), a, Qt.SLOT("quit()") );
+    a.connect( a, Qt.TQ_SIGNAL("lastWindowClosed()"), a, Qt.TQ_SLOT("quit()") );
     int res = a.exec();
     return;
 }
diff --git a/qtjava/javalib/examples/menu/MenuExample.java b/qtjava/javalib/examples/menu/MenuExample.java
index dd619d09..10fe5c5c 100644
--- a/qtjava/javalib/examples/menu/MenuExample.java
+++ b/qtjava/javalib/examples/menu/MenuExample.java
@@ -135,32 +135,32 @@ MenuExample( TQWidget parent, String name )
 
     TQPopupMenu print = new TQPopupMenu( this );
     print.insertTearOffHandle();
-    print.insertItem( "&Print to printer", this, SLOT("printer()") );
-    print.insertItem( "Print to &file", this, SLOT("file()") );
-    print.insertItem( "Print to fa&x", this, SLOT("fax()") );
+    print.insertItem( "&Print to printer", this, TQ_SLOT("printer()") );
+    print.insertItem( "Print to &file", this, TQ_SLOT("file()") );
+    print.insertItem( "Print to fa&x", this, TQ_SLOT("fax()") );
     print.insertSeparator();
-    print.insertItem( "Printer &Setup", this, SLOT("printerSetup()") );
+    print.insertItem( "Printer &Setup", this, TQ_SLOT("printerSetup()") );
 
     TQPopupMenu file = new TQPopupMenu( this );
-    file.insertItem( new TQIconSet(p1), "&Open",  this, SLOT("open()"), new TQKeySequence(CTRL+Key_O) );
-    file.insertItem( new TQIconSet(p2), "&New", this, SLOT("news()"), new TQKeySequence(CTRL+Key_N) );
-    file.insertItem( new TQIconSet(p3), "&Save", this, SLOT("save()"), new TQKeySequence(CTRL+Key_S) );
-    file.insertItem( "&Close", this, SLOT("closeDoc()"), new TQKeySequence(CTRL+Key_W) );
+    file.insertItem( new TQIconSet(p1), "&Open",  this, TQ_SLOT("open()"), new TQKeySequence(CTRL+Key_O) );
+    file.insertItem( new TQIconSet(p2), "&New", this, TQ_SLOT("news()"), new TQKeySequence(CTRL+Key_N) );
+    file.insertItem( new TQIconSet(p3), "&Save", this, TQ_SLOT("save()"), new TQKeySequence(CTRL+Key_S) );
+    file.insertItem( "&Close", this, TQ_SLOT("closeDoc()"), new TQKeySequence(CTRL+Key_W) );
     file.insertSeparator();
     file.insertItem( "&Print", print, CTRL+Key_P );
     file.insertSeparator();
-    file.insertItem( "E&xit",  tqApp(), SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) );
+    file.insertItem( "E&xit",  tqApp(), TQ_SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) );
 
     TQPopupMenu edit = new TQPopupMenu( this );
-    int undoID = edit.insertItem( "&Undo", this, SLOT("undo()") );
-    int redoID = edit.insertItem( "&Redo", this, SLOT("redo()") );
+    int undoID = edit.insertItem( "&Undo", this, TQ_SLOT("undo()") );
+    int redoID = edit.insertItem( "&Redo", this, TQ_SLOT("redo()") );
     edit.setItemEnabled( undoID, false );
     edit.setItemEnabled( redoID, false );
 
     TQPopupMenu options = new TQPopupMenu( this );
     options.insertTearOffHandle();
     options.setCaption("Options");
-    options.insertItem( "&Normal Font", this, SLOT("normal()") );
+    options.insertItem( "&Normal Font", this, TQ_SLOT("normal()") );
     options.insertSeparator();
 
     options.polish(); // adjust system settings
@@ -168,12 +168,12 @@ MenuExample( TQWidget parent, String name )
     f.setBold( true );
 //    boldID = options.insertItem( new MyMenuItem( "&Bold", f ) );
     options.setAccel( new TQKeySequence(CTRL+Key_B), boldID );
-    options.connectItem( boldID, this, SLOT("bold()") );
+    options.connectItem( boldID, this, TQ_SLOT("bold()") );
     f = font();
     f.setUnderline( true );
 //    underlineID = options.insertItem( new MyMenuItem( "&Underline", f ) );
     options.setAccel( new TQKeySequence(CTRL+Key_U), underlineID );
-    options.connectItem( underlineID, this, SLOT("underline()") );
+    options.connectItem( underlineID, this, TQ_SLOT("underline()") );
 
     isBold = false;
     isUnderline = false;
@@ -181,8 +181,8 @@ MenuExample( TQWidget parent, String name )
 
 
     TQPopupMenu help = new TQPopupMenu( this );
-    help.insertItem( "&About", this, SLOT("about()"), new TQKeySequence(CTRL+Key_H) );
-    help.insertItem( "About &Qt", this, SLOT("aboutTQt()") );
+    help.insertItem( "&About", this, TQ_SLOT("about()"), new TQKeySequence(CTRL+Key_H) );
+    help.insertItem( "About &Qt", this, TQ_SLOT("aboutTQt()") );
 
     menu = new TQMenuBar( this );
     menu.insertItem( "&File", file );
@@ -198,8 +198,8 @@ MenuExample( TQWidget parent, String name )
     label.setLineWidth( 1 );
     label.setAlignment( AlignCenter );
 
-    connect( this,  SIGNAL("explain(String)"),
-	     label, SLOT("setText(String)") );
+    connect( this,  TQ_SIGNAL("explain(String)"),
+	     label, TQ_SLOT("setText(String)") );
 
     setMinimumSize( 100, 80 );
 }
diff --git a/qtjava/javalib/examples/popup/Frame.java b/qtjava/javalib/examples/popup/Frame.java
index f7608e03..6fbaa7d9 100644
--- a/qtjava/javalib/examples/popup/Frame.java
+++ b/qtjava/javalib/examples/popup/Frame.java
@@ -32,9 +32,9 @@ Frame(TQWidget parent, String name)
 {
     super(parent, name);
     button1 = new TQPushButton("Simple Popup", this);
-    connect ( button1, SIGNAL(" clicked()"), SLOT(" button1Clicked()") );
+    connect ( button1, TQ_SIGNAL(" clicked()"), TQ_SLOT(" button1Clicked()") );
     button2 = new TQPushButton("Fancy Popup", this);
-    connect ( button2, SIGNAL(" pressed()"), SLOT(" button2Pressed()") );
+    connect ( button2, TQ_SIGNAL(" pressed()"), TQ_SLOT(" button2Pressed()") );
 
     TQBoxLayout  l = new TQHBoxLayout( this );
     button1.setMaximumSize(button1.sizeHint());
@@ -54,11 +54,11 @@ Frame(TQWidget parent, String name)
     popup1.setFrameStyle( WinPanel|Raised );
     popup1.resize(150,100);
     TQLineEdit tmpE = new TQLineEdit( popup1 );
-    connect( tmpE, SIGNAL(" returnPressed()"), popup1, SLOT(" hide()") );
+    connect( tmpE, TQ_SIGNAL(" returnPressed()"), popup1, TQ_SLOT(" hide()") );
     tmpE.setGeometry(10,10, 130, 30);
     tmpE.setFocus();
     TQPushButton tmpB = new TQPushButton("Click me!", popup1);
-    connect( tmpB, SIGNAL(" clicked()"), popup1, SLOT(" close()") );
+    connect( tmpB, TQ_SIGNAL(" clicked()"), popup1, TQ_SLOT(" close()") );
     tmpB.setGeometry(10, 50, 130, 30);
 
     // the fancier version uses its own class. It will be shown when
@@ -73,7 +73,7 @@ Frame(TQWidget parent, String name)
 
 //     tmpE = new TQLineEdit( popup2 );
 //     tmpE.setFocus();
-//     connect( tmpE, SIGNAL(" returnPressed()"), popup2, SLOT(" close()") );
+//     connect( tmpE, TQ_SIGNAL(" returnPressed()"), popup2, TQ_SLOT(" close()") );
 //     tmpE.setGeometry(10, 10, 130, 30);
 }
 
diff --git a/qtjava/javalib/examples/progressbar/ProgressBar.java b/qtjava/javalib/examples/progressbar/ProgressBar.java
index 88b547eb..0d05040d 100644
--- a/qtjava/javalib/examples/progressbar/ProgressBar.java
+++ b/qtjava/javalib/examples/progressbar/ProgressBar.java
@@ -67,11 +67,11 @@ ProgressBar( TQWidget parent, String name )
     toplayout.addMultiCellWidget( progress, 1, 1, 0, 1 );
 
     // connect the clicked() SIGNALs of the pushbuttons to SLOTs
-    connect( start, SIGNAL(" clicked()"), this, SLOT(" slotStart()") );
-    connect( reset, SIGNAL(" clicked()"), this, SLOT(" slotReset()") );
+    connect( start, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" slotStart()") );
+    connect( reset, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" slotReset()") );
 
-    // connect the timeout() SIGNAL of the progress-timer to a SLOT
-    connect( timer, SIGNAL(" timeout()"), this, SLOT(" slotTimeout()") );
+    // connect the timeout() TQ_SIGNAL of the progress-timer to a TQ_SLOT
+    connect( timer, TQ_SIGNAL(" timeout()"), this, TQ_SLOT(" slotTimeout()") );
 
     // Let's start with normal speed...
     normal.setChecked( true );
@@ -83,9 +83,9 @@ ProgressBar( TQWidget parent, String name )
 }
 
 /*
-  SLOT slotStart
+  TQ_SLOT slotStart
  *
-  This SLOT is called if the user clicks start/pause/continue
+  This slot is called if the user clicks start/pause/continue
   button
  */
 
@@ -123,9 +123,9 @@ void slotStart()
 }
 
 /*
-  SLOT slotReset
+  TQ_SLOT slotReset
  *
-  This SLOT is called when the user clicks the reset button
+  This slot is called when the user clicks the reset button
  */
 
 void slotReset()
@@ -148,9 +148,9 @@ void slotReset()
 }
 
 /*
-  SLOT slotTimeout
+  TQ_SLOT slotTimeout
  *
-  This SLOT is called each ms when the timer is
+  This slot is called each ms when the timer is
   active (== progress is running)
  */
 
diff --git a/qtjava/javalib/examples/qfd/FontDisplayer.java b/qtjava/javalib/examples/qfd/FontDisplayer.java
index 17dfe6a4..3895726f 100644
--- a/qtjava/javalib/examples/qfd/FontDisplayer.java
+++ b/qtjava/javalib/examples/qfd/FontDisplayer.java
@@ -157,10 +157,10 @@ FontDisplayer( TQWidget parent, String name )
     controls.addSeparator();
     TQPushButton fontbutton = new TQPushButton(tr("Font..."), controls);
 
-    connect(row,SIGNAL("valueChanged(int)"),table,SLOT("setRow(int)"));
-    connect(fontbutton, SIGNAL("clicked()"), table, SLOT("chooseFont()"));
-    connect(table,SIGNAL("fontInformation(String)"),
-	    statusBar(),SLOT("message(String)"));
+    connect(row,TQ_SIGNAL("valueChanged(int)"),table,TQ_SLOT("setRow(int)"));
+    connect(fontbutton, TQ_SIGNAL("clicked()"), table, TQ_SLOT("chooseFont()"));
+    connect(table,TQ_SIGNAL("fontInformation(String)"),
+	    statusBar(),TQ_SLOT("message(String)"));
     table.setRow(0);
     setCentralWidget(table);
 }
diff --git a/qtjava/javalib/examples/qmag/MagWidget.java b/qtjava/javalib/examples/qmag/MagWidget.java
index f701835b..ade43cef 100644
--- a/qtjava/javalib/examples/qmag/MagWidget.java
+++ b/qtjava/javalib/examples/qmag/MagWidget.java
@@ -57,11 +57,11 @@ MagWidget( TQWidget parent, String name )
 
     zoom = new TQComboBox( false, this );
     zoom.insertStrList( zoomfactors, 9 );
-    connect( zoom, SIGNAL("activated(int)"), SLOT("setZoom(int)") );
+    connect( zoom, TQ_SIGNAL("activated(int)"), TQ_SLOT("setZoom(int)") );
 
     refresh = new TQComboBox( false, this );
     refresh.insertStrList( refreshrates, 9 );
-    connect( refresh, SIGNAL("activated(int)"), SLOT("setRefresh(int)") );
+    connect( refresh, TQ_SIGNAL("activated(int)"), TQ_SLOT("setRefresh(int)") );
 
     for( n=0; n<9; n++) {
 	int w2 = zoom.fontMetrics().width( zoomfactors[n] );
@@ -78,20 +78,20 @@ MagWidget( TQWidget parent, String name )
     refresh.setGeometry( x, 2, w+30, 20 );
 
     saveButton = new TQPushButton( this );
-    connect( saveButton, SIGNAL("clicked()"), this, SLOT("save()") );
+    connect( saveButton, TQ_SIGNAL("clicked()"), this, TQ_SLOT("save()") );
     saveButton.setText( "Save" );
     saveButton.setGeometry( x+w+30+2, 2,
 			     10+saveButton.fontMetrics().width("Save"), 20 );
 
     multiSaveButton = new TQPushButton( this );
     multiSaveButton.setToggleButton(true);
-    connect( multiSaveButton, SIGNAL("clicked()"), this, SLOT("multiSave()") );
+    connect( multiSaveButton, TQ_SIGNAL("clicked()"), this, TQ_SLOT("multiSave()") );
     multiSaveButton.setText( "MultiSave" );
     multiSaveButton.setGeometry( saveButton.geometry().right() + 2, 2,
 			     10+multiSaveButton.fontMetrics().width("MultiSave"), 20 );
 
     quitButton = new TQPushButton( this );
-    connect( quitButton, SIGNAL("clicked()"), tqApp(), SLOT("quit()") );
+    connect( quitButton, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()") );
     quitButton.setText( "Quit" );
     quitButton.setGeometry( multiSaveButton.geometry().right() + 2, 2,
 			     10+quitButton.fontMetrics().width("Quit"), 20 );
diff --git a/qtjava/javalib/examples/qwerty/Editor.java b/qtjava/javalib/examples/qwerty/Editor.java
index 5175b7da..36934685 100644
--- a/qtjava/javalib/examples/qwerty/Editor.java
+++ b/qtjava/javalib/examples/qwerty/Editor.java
@@ -46,35 +46,35 @@ Editor( TQWidget  parent , String  name )
     TQPopupMenu  file = new TQPopupMenu(this);
     m.insertItem( "&File", file );
 
-    file.insertItem( "&New",   this, SLOT("newDoc()"),   new TQKeySequence(ALT+Key_N) );
-    file.insertItem( "&Open...",  this, SLOT("load()"),     new TQKeySequence(ALT+Key_O) );
-    file.insertItem( "&Save...",  this, SLOT("save()"),     new TQKeySequence(ALT+Key_S) );
+    file.insertItem( "&New",   this, TQ_SLOT("newDoc()"),   new TQKeySequence(ALT+Key_N) );
+    file.insertItem( "&Open...",  this, TQ_SLOT("load()"),     new TQKeySequence(ALT+Key_O) );
+    file.insertItem( "&Save...",  this, TQ_SLOT("save()"),     new TQKeySequence(ALT+Key_S) );
     file.insertSeparator();
     open_as = new TQPopupMenu(file);
     file.insertItem( "Open &As",  open_as );
     save_as = new TQPopupMenu(file);
     file.insertItem( "Sa&ve As",  save_as );
-    file.insertItem( "Add &Encoding", this, SLOT("addEncoding()") );    
+    file.insertItem( "Add &Encoding", this, TQ_SLOT("addEncoding()") );    
     file.insertSeparator();
-    file.insertItem( "&Print...", this, SLOT("print()"),    new TQKeySequence(ALT+Key_P) );
+    file.insertItem( "&Print...", this, TQ_SLOT("print()"),    new TQKeySequence(ALT+Key_P) );
     file.insertSeparator();
-    file.insertItem( "&Close", this, SLOT("close()"),new TQKeySequence(ALT+Key_W) );
-    file.insertItem( "&Quit",  tqApp(), SLOT("closeAllWindows()"),     new TQKeySequence(ALT+Key_Q) );
+    file.insertItem( "&Close", this, TQ_SLOT("close()"),new TQKeySequence(ALT+Key_W) );
+    file.insertItem( "&Quit",  tqApp(), TQ_SLOT("closeAllWindows()"),     new TQKeySequence(ALT+Key_Q) );
 
-    connect( save_as, SIGNAL("activated(int)"), this, SLOT("saveAsEncoding(int)") );
-    connect( open_as, SIGNAL("activated(int)"), this, SLOT("openAsEncoding(int)") );
+    connect( save_as, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("saveAsEncoding(int)") );
+    connect( open_as, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("openAsEncoding(int)") );
     rebuildCodecList();
 
     TQPopupMenu  edit = new TQPopupMenu(m);
     m.insertItem( "&Edit", edit );
 
-    edit.insertItem( "To &Uppercase",   this, SLOT("toUpper()"),   new TQKeySequence(ALT+Key_U) );
-    edit.insertItem( "To &Lowercase",   this, SLOT("toLower()"),   new TQKeySequence(ALT+Key_L) );
+    edit.insertItem( "To &Uppercase",   this, TQ_SLOT("toUpper()"),   new TQKeySequence(ALT+Key_U) );
+    edit.insertItem( "To &Lowercase",   this, TQ_SLOT("toLower()"),   new TQKeySequence(ALT+Key_L) );
     edit.insertSeparator();
-    edit.insertItem( "&Select Font" ,	 this, SLOT("getFont()"),     new TQKeySequence(ALT+Key_F) );
+    edit.insertItem( "&Select Font" ,	 this, TQ_SLOT("getFont()"),     new TQKeySequence(ALT+Key_F) );
     changed = false;
     e = new TQMultiLineEdit( this, "editor" );
-    connect( e, SIGNAL(" textChanged()"), this, SLOT(" textChanged()") );
+    connect( e, TQ_SIGNAL(" textChanged()"), this, TQ_SLOT(" textChanged()") );
 
     // We use Unifont - if you have it installed you'll see all
     // Unicode character glyphs.
diff --git a/qtjava/javalib/examples/qwerty/Main.java b/qtjava/javalib/examples/qwerty/Main.java
index a2001e15..a59b3a73 100644
--- a/qtjava/javalib/examples/qwerty/Main.java
+++ b/qtjava/javalib/examples/qwerty/Main.java
@@ -32,7 +32,7 @@ public static void main(String[] args)
 	    e.show();
 	}
     }
-    a.connect(a, Qt.SIGNAL("lastWindowClosed()"), a, Qt.SLOT("quit()") );
+    a.connect(a, Qt.TQ_SIGNAL("lastWindowClosed()"), a, Qt.TQ_SLOT("quit()") );
     a.exec();
     return;
 }
diff --git a/qtjava/javalib/examples/rangecontrols/RangeControls.java b/qtjava/javalib/examples/rangecontrols/RangeControls.java
index ea0c9b16..ded6bdc0 100644
--- a/qtjava/javalib/examples/rangecontrols/RangeControls.java
+++ b/qtjava/javalib/examples/rangecontrols/RangeControls.java
@@ -61,7 +61,7 @@ RangeControls( TQWidget parent, String name )
     TQLCDNumber lcd2 = new TQLCDNumber( 2, cell3 );
     lcd2.display( 33 );
     lcd2.setSegmentStyle( TQLCDNumber.Filled );
-    connect( hslider, SIGNAL(" valueChanged( int )"), lcd2, SLOT(" display( int )") );
+    connect( hslider, TQ_SIGNAL(" valueChanged( int )"), lcd2, TQ_SLOT(" display( int )") );
 
     TQHBox cell4 = new TQHBox( row2 );
     cell4.setFrameStyle( TQFrame.WinPanel | TQFrame.Sunken );
@@ -69,6 +69,6 @@ RangeControls( TQWidget parent, String name )
     TQSlider vslider = new TQSlider( 0, 64, 1, 8, Qt.Vertical, cell4 );
     TQLCDNumber lcd3 = new TQLCDNumber( 3, cell4 );
     lcd3.display( 8 );
-    connect( vslider, SIGNAL(" valueChanged( int )"), lcd3, SLOT(" display( int )") );
+    connect( vslider, TQ_SIGNAL(" valueChanged( int )"), lcd3, TQ_SLOT(" display( int )") );
 }
 }
diff --git a/qtjava/javalib/examples/richtext/MyRichText.java b/qtjava/javalib/examples/richtext/MyRichText.java
index f06dde68..7e1fd25b 100644
--- a/qtjava/javalib/examples/richtext/MyRichText.java
+++ b/qtjava/javalib/examples/richtext/MyRichText.java
@@ -108,9 +108,9 @@ MyRichText( TQWidget parent, String name )
 
     bPrev.setEnabled( false );
 
-    connect( bClose, SIGNAL(" clicked()"), tqApp(), SLOT(" quit()") );
-    connect( bPrev, SIGNAL(" clicked()"), this, SLOT(" prev()") );
-    connect( bNext, SIGNAL(" clicked()"), this, SLOT(" next()") );
+    connect( bClose, TQ_SIGNAL(" clicked()"), tqApp(), TQ_SLOT(" quit()") );
+    connect( bPrev, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" prev()") );
+    connect( bNext, TQ_SIGNAL(" clicked()"), this, TQ_SLOT(" next()") );
 
     num = 0;
 }
diff --git a/qtjava/javalib/examples/rot13/Rot13.java b/qtjava/javalib/examples/rot13/Rot13.java
index bfb55edb..472e13eb 100644
--- a/qtjava/javalib/examples/rot13/Rot13.java
+++ b/qtjava/javalib/examples/rot13/Rot13.java
@@ -24,12 +24,12 @@ Rot13()
 {
     left = new TQMultiLineEdit( this, "left" );
     right = new TQMultiLineEdit( this, "right" );
-    connect( left, SIGNAL("textChanged()"), this, SLOT("changeRight()") );
-    connect( right, SIGNAL("textChanged()"), this, SLOT("changeLeft()") );
+    connect( left, TQ_SIGNAL("textChanged()"), this, TQ_SLOT("changeRight()") );
+    connect( right, TQ_SIGNAL("textChanged()"), this, TQ_SLOT("changeLeft()") );
 
     TQPushButton  quit = new TQPushButton( "&Quit", this );
     quit.setFocusPolicy( NoFocus );
-    connect( quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()") );
+    connect( quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()") );
 
     TQGridLayout  l = new TQGridLayout( this, 2, 2, 5 );
     l.addWidget( left, 0, 0 );
diff --git a/qtjava/javalib/examples/scribble/Scribble.java b/qtjava/javalib/examples/scribble/Scribble.java
index 1fedd0e2..cb0abf65 100644
--- a/qtjava/javalib/examples/scribble/Scribble.java
+++ b/qtjava/javalib/examples/scribble/Scribble.java
@@ -153,24 +153,24 @@ Scribble( TQWidget parent, String name )
 
     TQToolBar tools = new TQToolBar( this );
 
-    bSave = new TQToolButton( new TQIconSet(), "Save", "Save as PNG image", this, SLOT(" slotSave()"), tools );
+    bSave = new TQToolButton( new TQIconSet(), "Save", "Save as PNG image", this, TQ_SLOT(" slotSave()"), tools );
     bSave.setText( "Save as..." );
 
     tools.addSeparator();
 
-    bPColor = new TQToolButton( new TQIconSet(), "Choose Pen Color", "Choose Pen Color", this, SLOT(" slotColor()"), tools );
+    bPColor = new TQToolButton( new TQIconSet(), "Choose Pen Color", "Choose Pen Color", this, TQ_SLOT(" slotColor()"), tools );
     bPColor.setText( "Choose Pen Color..." );
 
     tools.addSeparator();
 
     bPWidth = new TQSpinBox( 1, 20, 1, tools );
     TQToolTip.add( bPWidth, "Choose Pen Width" );
-    connect( bPWidth, SIGNAL(" valueChanged( int )"), this, SLOT(" slotWidth( int )") );
+    connect( bPWidth, TQ_SIGNAL(" valueChanged( int )"), this, TQ_SLOT(" slotWidth( int )") );
     bPWidth.setValue( 3 );
 
     tools.addSeparator();
 
-    bClear = new TQToolButton( new TQIconSet(), "Clear Screen", "Clear Screen", this, SLOT(" slotClear()"), tools );
+    bClear = new TQToolButton( new TQIconSet(), "Clear Screen", "Clear Screen", this, TQ_SLOT(" slotClear()"), tools );
     bClear.setText( "Clear Screen" );
 }
 
diff --git a/qtjava/javalib/examples/showimg/ImageTextEditor.java b/qtjava/javalib/examples/showimg/ImageTextEditor.java
index bb4ba0ce..4b6531d0 100644
--- a/qtjava/javalib/examples/showimg/ImageTextEditor.java
+++ b/qtjava/javalib/examples/showimg/ImageTextEditor.java
@@ -54,23 +54,23 @@ ImageTextEditor( TQImage i, TQWidget parent, String name, int f )
     TQPushButton cancel = new TQPushButton("Cancel",hbox);
     TQPushButton ok = new TQPushButton("OK",hbox);
 
-    connect(add,SIGNAL("clicked()"),
-	this,SLOT("addText()"));
+    connect(add,TQ_SIGNAL("clicked()"),
+	this,TQ_SLOT("addText()"));
 
-    connect(remove,SIGNAL("clicked()"),
-	this,SLOT("removeText()"));
+    connect(remove,TQ_SIGNAL("clicked()"),
+	this,TQ_SLOT("removeText()"));
 
-    connect(ok,SIGNAL("clicked()"),
-	this,SLOT("accept()"));
+    connect(ok,TQ_SIGNAL("clicked()"),
+	this,TQ_SLOT("accept()"));
 
-    connect(cancel,SIGNAL("clicked()"),
-	this,SLOT("reject()"));
+    connect(cancel,TQ_SIGNAL("clicked()"),
+	this,TQ_SLOT("reject()"));
 
-    connect(languages,SIGNAL("activated(int)"),
-	this,SLOT("updateText()"));
+    connect(languages,TQ_SIGNAL("activated(int)"),
+	this,TQ_SLOT("updateText()"));
 
-    connect(keys,SIGNAL("activated(int)"),
-	this,SLOT("updateText()"));
+    connect(keys,TQ_SIGNAL("activated(int)"),
+	this,TQ_SLOT("updateText()"));
 
     imageChanged();
 }
diff --git a/qtjava/javalib/examples/showimg/ImageViewer.java b/qtjava/javalib/examples/showimg/ImageViewer.java
index 86f8af26..974a189a 100644
--- a/qtjava/javalib/examples/showimg/ImageViewer.java
+++ b/qtjava/javalib/examples/showimg/ImageViewer.java
@@ -73,32 +73,32 @@ ImageViewer( TQWidget parent, String name, int wFlags )
 	saveimage.insertItem( f );
 	savepixmap.insertItem( f );
     }
-    connect( saveimage, SIGNAL("activated(int)"), this, SLOT("saveImage(int)") );
-    connect( savepixmap, SIGNAL("activated(int)"), this, SLOT("savePixmap(int)") );
+    connect( saveimage, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("saveImage(int)") );
+    connect( savepixmap, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("savePixmap(int)") );
 
     file = new TQPopupMenu( menubar );
     menubar.insertItem( "&File", file );
-    file.insertItem( "&New window", this,  SLOT("newWindow()"), new TQKeySequence(CTRL+Key_N) );
-    file.insertItem( "&Open...", this,  SLOT("openFile()"), new TQKeySequence(CTRL+Key_O) );
+    file.insertItem( "&New window", this,  TQ_SLOT("newWindow()"), new TQKeySequence(CTRL+Key_N) );
+    file.insertItem( "&Open...", this,  TQ_SLOT("openFile()"), new TQKeySequence(CTRL+Key_O) );
     si = file.insertItem( "Save image", saveimage );
     sp = file.insertItem( "Save pixmap", savepixmap );
     file.insertSeparator();
-    file.insertItem( "E&xit", tqApp(),  SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) );
+    file.insertItem( "E&xit", tqApp(),  TQ_SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) );
 
     edit =  new TQPopupMenu( menubar );
     menubar.insertItem( "&Edit", edit );
-    edit.insertItem("&Copy", this, SLOT("copy()"), new TQKeySequence(CTRL+Key_C));
-    edit.insertItem("&Paste", this, SLOT("paste()"), new TQKeySequence(CTRL+Key_V));
+    edit.insertItem("&Copy", this, TQ_SLOT("copy()"), new TQKeySequence(CTRL+Key_C));
+    edit.insertItem("&Paste", this, TQ_SLOT("paste()"), new TQKeySequence(CTRL+Key_V));
     edit.insertSeparator();
-    edit.insertItem("&Horizontal flip", this, SLOT("hFlip()"), new TQKeySequence(ALT+Key_H));
-    edit.insertItem("&Vertical flip", this, SLOT("vFlip()"), new TQKeySequence(ALT+Key_V));
-    edit.insertItem("&Rotate 180", this, SLOT("rot180()"), new TQKeySequence(ALT+Key_R));
+    edit.insertItem("&Horizontal flip", this, TQ_SLOT("hFlip()"), new TQKeySequence(ALT+Key_H));
+    edit.insertItem("&Vertical flip", this, TQ_SLOT("vFlip()"), new TQKeySequence(ALT+Key_V));
+    edit.insertItem("&Rotate 180", this, TQ_SLOT("rot180()"), new TQKeySequence(ALT+Key_R));
     edit.insertSeparator();
-    edit.insertItem("&Text...", this, SLOT("editText()"));
+    edit.insertItem("&Text...", this, TQ_SLOT("editText()"));
     edit.insertSeparator();
-    t1 = edit.insertItem( "Convert to &1 bit", this, SLOT("to1Bit()") );
-    t8 = edit.insertItem( "Convert to &8 bit", this, SLOT("to8Bit()") );
-    t32 = edit.insertItem( "Convert to &32 bit", this, SLOT("to32Bit()") );
+    t1 = edit.insertItem( "Convert to &1 bit", this, TQ_SLOT("to1Bit()") );
+    t8 = edit.insertItem( "Convert to &8 bit", this, TQ_SLOT("to8Bit()") );
+    t32 = edit.insertItem( "Convert to &32 bit", this, TQ_SLOT("to32Bit()") );
 
     options =  new TQPopupMenu( menubar );
     menubar.insertItem( "&Options", options );
@@ -128,9 +128,9 @@ ImageViewer( TQWidget parent, String name, int wFlags )
 
     TQPopupMenu help = new TQPopupMenu( menubar );
     menubar.insertItem( "&Help", help );
-    help.insertItem( "Help!", this, SLOT("giveHelp()"), new TQKeySequence(CTRL+Key_H) );
+    help.insertItem( "Help!", this, TQ_SLOT("giveHelp()"), new TQKeySequence(CTRL+Key_H) );
 
-    connect( options, SIGNAL("activated(int)"), this, SLOT("doOption(int)") );
+    connect( options, TQ_SIGNAL("activated(int)"), this, TQ_SLOT("doOption(int)") );
 
     status = new TQLabel(this);
     status.setFrameStyle( TQFrame.WinPanel | TQFrame.Sunken );
diff --git a/qtjava/javalib/examples/showimg/Main.java b/qtjava/javalib/examples/showimg/Main.java
index 952e65eb..66d44493 100644
--- a/qtjava/javalib/examples/showimg/Main.java
+++ b/qtjava/javalib/examples/showimg/Main.java
@@ -47,7 +47,7 @@ public static void main(String[] args)
 	}
     }
 
-    TQObject.connect(Qt.qApp(), Qt.SIGNAL("lastWindowClosed()"), Qt.qApp(), Qt.SLOT("quit()"));
+    TQObject.connect(Qt.qApp(), Qt.TQ_SIGNAL("lastWindowClosed()"), Qt.qApp(), Qt.TQ_SLOT("quit()"));
 
     a.exec();
     return;
diff --git a/qtjava/javalib/examples/sound/SoundPlayer.java b/qtjava/javalib/examples/sound/SoundPlayer.java
index 3cc76d76..73d54b71 100644
--- a/qtjava/javalib/examples/sound/SoundPlayer.java
+++ b/qtjava/javalib/examples/sound/SoundPlayer.java
@@ -49,15 +49,15 @@ SoundPlayer()
     }
 
     TQPopupMenu file = new TQPopupMenu(this);
-    file.insertItem("Play &1",  this, SLOT("doPlay1()"), new TQKeySequence(CTRL+Key_1));
-    file.insertItem("Play &2",  this, SLOT("doPlay2()"), new TQKeySequence(CTRL+Key_2));
-    file.insertItem("Play from bucket &3",  this, SLOT("doPlay3()"), new TQKeySequence(CTRL+Key_3));
-    file.insertItem("Play from bucket &4",  this, SLOT("doPlay4()"), new TQKeySequence(CTRL+Key_4));
+    file.insertItem("Play &1",  this, TQ_SLOT("doPlay1()"), new TQKeySequence(CTRL+Key_1));
+    file.insertItem("Play &2",  this, TQ_SLOT("doPlay2()"), new TQKeySequence(CTRL+Key_2));
+    file.insertItem("Play from bucket &3",  this, TQ_SLOT("doPlay3()"), new TQKeySequence(CTRL+Key_3));
+    file.insertItem("Play from bucket &4",  this, TQ_SLOT("doPlay4()"), new TQKeySequence(CTRL+Key_4));
     file.insertSeparator();
-    file.insertItem("Play 3 and 4 together",  this, SLOT("doPlay34()"));
-    file.insertItem("Play all together",  this, SLOT("doPlay1234()"));
+    file.insertItem("Play 3 and 4 together",  this, TQ_SLOT("doPlay34()"));
+    file.insertItem("Play all together",  this, TQ_SLOT("doPlay1234()"));
     file.insertSeparator();
-    file.insertItem("E&xit",  tqApp(), SLOT("quit()"));
+    file.insertItem("E&xit",  tqApp(), TQ_SLOT("quit()"));
     menuBar().insertItem("&File", file);
 }
 
diff --git a/qtjava/javalib/examples/tabdialog/TabDialog.java b/qtjava/javalib/examples/tabdialog/TabDialog.java
index 448b97b7..7ce50053 100644
--- a/qtjava/javalib/examples/tabdialog/TabDialog.java
+++ b/qtjava/javalib/examples/tabdialog/TabDialog.java
@@ -27,7 +27,7 @@ TabDialog( TQWidget parent, String name, String _filename )
     setupTab2();
     setupTab3();
 
-    connect( this, SIGNAL(" applyButtonPressed()"), tqApp(), SLOT(" quit()") );
+    connect( this, TQ_SIGNAL(" applyButtonPressed()"), tqApp(), TQ_SLOT(" quit()") );
 }
 
 void setupTab1()
diff --git a/qtjava/javalib/examples/textedit/Main.java b/qtjava/javalib/examples/textedit/Main.java
index 701c702b..e56f83dd 100644
--- a/qtjava/javalib/examples/textedit/Main.java
+++ b/qtjava/javalib/examples/textedit/Main.java
@@ -19,7 +19,7 @@ public static void main(String[] args)
     mw.setCaption( "Richtext Editor" );
     mw.resize( 640, 800 );
     mw.show();
-    a.connect( a, Qt.SIGNAL(" lastWindowClosed()"), a, Qt.SLOT(" quit()") );
+    a.connect( a, Qt.TQ_SIGNAL(" lastWindowClosed()"), a, Qt.TQ_SLOT(" quit()") );
     a.exec();
     return;
 }
diff --git a/qtjava/javalib/examples/textedit/TextEdit.java b/qtjava/javalib/examples/textedit/TextEdit.java
index 657981cb..25437140 100644
--- a/qtjava/javalib/examples/textedit/TextEdit.java
+++ b/qtjava/javalib/examples/textedit/TextEdit.java
@@ -44,8 +44,8 @@ TextEdit( TQWidget parent, String name )
     setupTextActions();
 
     tabWidget = new TQTabWidget( this );
-    connect( tabWidget, SIGNAL(" currentChanged( TQWidget  )"),
-	     this, SLOT(" editorChanged( TQWidget  )") );
+    connect( tabWidget, TQ_SIGNAL(" currentChanged( TQWidget  )"),
+	     this, TQ_SLOT(" editorChanged( TQWidget  )") );
     setCentralWidget( tabWidget );
 
     if ( tqApp().args().length == 0 ) {
@@ -65,31 +65,31 @@ void setupFileActions()
 
     TQAction a;
     a = new TQAction( tr( "New" ), new TQIconSet(new TQPixmap( "filenew.xpm" )), tr( "&New..." ), new TQKeySequence(CTRL + Key_N), this, "fileNew" );
-    connect( a, SIGNAL(" activated()"), this, SLOT(" fileNew()") );
+    connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileNew()") );
     a.addTo( tb );
     a.addTo( menu );
     a = new TQAction( tr( "Open" ), new TQIconSet(new TQPixmap( "fileopen.xpm" )), tr( "&Open..." ), new TQKeySequence(CTRL + Key_O), this, "fileOpen" );
-    connect( a, SIGNAL(" activated()"), this, SLOT(" fileOpen()") );
+    connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileOpen()") );
     a.addTo( tb );
     a.addTo( menu );
     menu.insertSeparator();
     a = new TQAction( tr( "Save" ), new TQIconSet(new TQPixmap( "filesave.xpm" )), tr( "&Save..." ), new TQKeySequence(CTRL + Key_S), this, "fileSave" );
-    connect( a, SIGNAL(" activated()"), this, SLOT(" fileSave()") );
+    connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileSave()") );
     a.addTo( tb );
     a.addTo( menu );
     a = new TQAction( tr( "Save As" ), new TQIconSet(new TQPixmap()), tr( "Save &As..." ), new TQKeySequence(0), this, "fileSaveAs" );
-    connect( a, SIGNAL(" activated()"), this, SLOT(" fileSaveAs()") );
+    connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileSaveAs()") );
     a.addTo( menu );
     menu.insertSeparator();
     a = new TQAction( tr( "Print" ), new TQIconSet(new TQPixmap( "fileprint.xpm" )), tr( "&Print..." ), new TQKeySequence(CTRL + Key_P), this, "filePrint" );
-    connect( a, SIGNAL(" activated()"), this, SLOT(" filePrint()") );
+    connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" filePrint()") );
     a.addTo( tb );
     a.addTo( menu );
     a = new TQAction( tr( "Close" ), new TQIconSet(new TQPixmap()), tr( "&Close" ), new TQKeySequence(0), this, "fileClose" );
-    connect( a, SIGNAL(" activated()"), this, SLOT(" fileClose()") );
+    connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileClose()") );
     a.addTo( menu );
     a = new TQAction( tr( "Exit" ), new TQIconSet(new TQPixmap()), tr( "E&xit" ), new TQKeySequence(0), this, "fileExit" );
-    connect( a, SIGNAL(" activated()"), this, SLOT(" fileExit()") );
+    connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" fileExit()") );
     a.addTo( menu );
 }
 
@@ -102,24 +102,24 @@ void setupEditActions()
 
     TQAction a;
     a = new TQAction( tr( "Undo" ), new TQIconSet(new TQPixmap( "editundo.xpm" )), tr( "&Undo" ), new TQKeySequence(CTRL + Key_Z), this, "editUndo" );
-    connect( a, SIGNAL(" activated()"), this, SLOT(" editUndo()") );
+    connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editUndo()") );
     a.addTo( tb );
     a.addTo( menu );
     a = new TQAction( tr( "Redo" ), new TQIconSet(new TQPixmap( "editredo.xpm" )), tr( "&Redo" ), new TQKeySequence(CTRL + Key_Y), this, "editRedo" );
-    connect( a, SIGNAL(" activated()"), this, SLOT(" editRedo()") );
+    connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editRedo()") );
     a.addTo( tb );
     a.addTo( menu );
     menu.insertSeparator();
     a = new TQAction( tr( "Copy" ), new TQIconSet(new TQPixmap( "editcopy.xpm" )), tr( "&Copy" ), new TQKeySequence(CTRL + Key_C), this, "editCopy" );
-    connect( a, SIGNAL(" activated()"), this, SLOT(" editCopy()") );
+    connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editCopy()") );
     a.addTo( tb );
     a.addTo( menu );
     a = new TQAction( tr( "Cut" ), new TQIconSet(new TQPixmap( "editcut.xpm" )), tr( "Cu&t" ), new TQKeySequence(CTRL + Key_X), this, "editCut" );
-    connect( a, SIGNAL(" activated()"), this, SLOT(" editCut()") );
+    connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editCut()") );
     a.addTo( tb );
     a.addTo( menu );
     a = new TQAction( tr( "Paste" ), new TQIconSet(new TQPixmap( "editpaste.xpm" )), tr( "&Paste" ), new TQKeySequence(CTRL + Key_V), this, "editPaste" );
-    connect( a, SIGNAL(" activated()"), this, SLOT(" editPaste()") );
+    connect( a, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" editPaste()") );
     a.addTo( tb );
     a.addTo( menu );
 }
@@ -139,36 +139,36 @@ void setupTextActions()
     comboStyle.insertItem( "Ordered List (Decimal)" );
     comboStyle.insertItem( "Ordered List (Alpha lower)" );
     comboStyle.insertItem( "Ordered List (Alpha upper)" );
-    connect( comboStyle, SIGNAL(" activated( int )"),
-	     this, SLOT(" textStyle( int )") );
+    connect( comboStyle, TQ_SIGNAL(" activated( int )"),
+	     this, TQ_SLOT(" textStyle( int )") );
 
     comboFont = new TQComboBox( true, tb );
     TQFontDatabase db = new TQFontDatabase();
     comboFont.insertStringList( (String[]) db.families().toArray(new String[0]) );
-    connect( comboFont, SIGNAL(" activated( String  )"),
-	     this, SLOT(" textFamily( String  )") );
+    connect( comboFont, TQ_SIGNAL(" activated( String  )"),
+	     this, TQ_SLOT(" textFamily( String  )") );
     comboFont.lineEdit().setText( TQApplication.font().family() );
 
     comboSize = new TQComboBox( true, tb );
     int[] sizes = db.standardSizes();
     for (int i = 0; i < sizes.length; i++ )
 	comboSize.insertItem( Integer.toString(sizes[i]) );
-    connect( comboSize, SIGNAL(" activated(  String  )"),
-	     this, SLOT(" textSize(  String  )") );
+    connect( comboSize, TQ_SIGNAL(" activated(  String  )"),
+	     this, TQ_SLOT(" textSize(  String  )") );
     comboSize.lineEdit().setText( Integer.toString( TQApplication.font().pointSize() ) );
 
     actionTextBold = new TQAction( tr( "Bold" ), new TQIconSet(new TQPixmap( "textbold.xpm" )), tr( "&Bold" ), new TQKeySequence(CTRL + Key_B), this, "textBold" );
-    connect( actionTextBold, SIGNAL(" activated()"), this, SLOT(" textBold()") );
+    connect( actionTextBold, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" textBold()") );
     actionTextBold.addTo( tb );
     actionTextBold.addTo( menu );
     actionTextBold.setToggleAction( true );
     actionTextItalic = new TQAction( tr( "Italic" ), new TQIconSet(new TQPixmap( "textitalic.xpm" )), tr( "&Italic" ), new TQKeySequence(CTRL + Key_I), this, "textItalic" );
-    connect( actionTextItalic, SIGNAL(" activated()"), this, SLOT(" textItalic()") );
+    connect( actionTextItalic, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" textItalic()") );
     actionTextItalic.addTo( tb );
     actionTextItalic.addTo( menu );
     actionTextItalic.setToggleAction( true );
     actionTextUnderline = new TQAction( tr( "Underline" ), new TQIconSet(new TQPixmap( "textunder.xpm" )), tr( "&Underline" ), new TQKeySequence(CTRL + Key_U), this, "textUnderline" );
-    connect( actionTextUnderline, SIGNAL(" activated()"), this, SLOT(" textUnderline()") );
+    connect( actionTextUnderline, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" textUnderline()") );
     actionTextUnderline.addTo( tb );
     actionTextUnderline.addTo( menu );
     actionTextUnderline.setToggleAction( true );
@@ -176,7 +176,7 @@ void setupTextActions()
 
     TQActionGroup grp = new TQActionGroup( this );
     grp.setExclusive( true );
-    connect( grp, SIGNAL(" selected( TQAction )"), this, SLOT(" textAlign( TQAction )") );
+    connect( grp, TQ_SIGNAL(" selected( TQAction )"), this, TQ_SLOT(" textAlign( TQAction )") );
 
     actionAlignLeft = new TQAction( tr( "Left" ), new TQIconSet(new TQPixmap( "textleft.xpm" )), tr( "&Left" ), new TQKeySequence(CTRL + Key_L), grp, "textLeft" );
     actionAlignLeft.addTo( tb );
@@ -200,7 +200,7 @@ void setupTextActions()
     TQPixmap pix = new TQPixmap( 16, 16 );
     pix.fill( black() );
     actionTextColor = new TQAction( tr( "Color" ), new TQIconSet(pix), tr( "&Color..." ),  new TQKeySequence(0), this, "textColor" );
-    connect( actionTextColor, SIGNAL(" activated()"), this, SLOT(" textColor()") );
+    connect( actionTextColor, TQ_SIGNAL(" activated()"), this, TQ_SLOT(" textColor()") );
     actionTextColor.addTo( tb );
     actionTextColor.addTo( menu );
 }
@@ -232,12 +232,12 @@ TQTextEdit currentEditor()
 
 void doConnections( TQTextEdit e )
 {
-    connect( e, SIGNAL(" currentFontChanged( TQFont  )"),
-	     this, SLOT(" fontChanged(  TQFont  )") );
-    connect( e, SIGNAL(" currentColorChanged(  TQColor  )"),
-	     this, SLOT(" colorChanged(  TQColor  )") );
-    connect( e, SIGNAL(" currentAlignmentChanged( int )"),
-	     this, SLOT(" alignmentChanged( int )") );
+    connect( e, TQ_SIGNAL(" currentFontChanged( TQFont  )"),
+	     this, TQ_SLOT(" fontChanged(  TQFont  )") );
+    connect( e, TQ_SIGNAL(" currentColorChanged(  TQColor  )"),
+	     this, TQ_SLOT(" colorChanged(  TQColor  )") );
+    connect( e, TQ_SIGNAL(" currentAlignmentChanged( int )"),
+	     this, TQ_SLOT(" alignmentChanged( int )") );
 }
 
 void fileNew()
diff --git a/qtjava/javalib/examples/widgets/WidgetView.java b/qtjava/javalib/examples/widgets/WidgetView.java
index e1ae373f..8ef42f9b 100644
--- a/qtjava/javalib/examples/widgets/WidgetView.java
+++ b/qtjava/javalib/examples/widgets/WidgetView.java
@@ -219,7 +219,7 @@ WidgetView( TQWidget parent, String name )
     // put something in it
     TQPixmap openIcon = new TQPixmap( fileopen );
     TQToolButton  toolb = new TQToolButton( new TQIconSet(openIcon), "toolbutton 1",
-					   "", this, SLOT("open()"),
+					   "", this, TQ_SLOT("open()"),
 					   tools, "open file" );
     TQWhatsThis.add( toolb, "This is a <b>TQToolButton</b>. It lives in a "
 		     + "TQToolBar. This particular button doesn't do anything "
@@ -227,13 +227,13 @@ WidgetView( TQWidget parent, String name )
 
     TQPixmap saveIcon = new TQPixmap( filesave );
     toolb = new TQToolButton( new TQIconSet(saveIcon), "toolbutton 2", "",
-			     this, SLOT("dummy()"),
+			     this, TQ_SLOT("dummy()"),
 			     tools, "save file" );
     TQWhatsThis.add( toolb, "This is also a <b>TQToolButton</b>." );
 
     TQPixmap  printIcon = new TQPixmap( fileprint );
     toolb = new TQToolButton( new TQIconSet(printIcon), "toolbutton 3", "",
-			     this, SLOT("dummy()"),
+			     this, TQ_SLOT("dummy()"),
 			     tools, "print file" );
     TQWhatsThis.add( toolb, "This is the third <b>TQToolButton</b>.");
 
@@ -265,10 +265,10 @@ WidgetView( TQWidget parent, String name )
     int id;
     id = popup.insertItem( "&New" );
     popup.setItemEnabled( id, false );
-    id = popup.insertItem( new TQIconSet(openIcon), "&Open", this, SLOT(" open()") );
+    id = popup.insertItem( new TQIconSet(openIcon), "&Open", this, TQ_SLOT(" open()") );
 
     popup.insertSeparator();
-    popup.insertItem( "&Quit", tqApp(), SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) );
+    popup.insertItem( "&Quit", tqApp(), TQ_SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) );
 
 
     textStylePopup = popup = new TQPopupMenu( this );
@@ -294,8 +294,8 @@ WidgetView( TQWidget parent, String name )
     f = font();
     f.setStrikeOut( true );
     id = popup.insertItem( new MyMenuItem( "&Strike", f ) );
-    connect( textStylePopup, SIGNAL("activated(int)"),
-	     this, SLOT("popupSelected(int)") );
+    connect( textStylePopup, TQ_SIGNAL("activated(int)"),
+	     this, TQ_SLOT("popupSelected(int)") );
 */
     // Create an analog and a digital clock
     aclock = new AnalogClock( central );
@@ -317,7 +317,7 @@ WidgetView( TQWidget parent, String name )
     TQPushButton pb;
     pb = new TQPushButton( "&Push button 1", central, "button1" );
     grid.addWidget( pb, 0, 0, AlignVCenter );
-    connect( pb, SIGNAL("clicked()"), SLOT("button1Clicked()") );
+    connect( pb, TQ_SIGNAL("clicked()"), TQ_SLOT("button1Clicked()") );
     TQToolTip.add( pb, "push button 1" );
     TQWhatsThis.add( pb, "This is a <b>TQPushButton</b>.<br>"
 		     + "Click it and watch...<br>"
@@ -336,8 +336,8 @@ WidgetView( TQWidget parent, String name )
     // Create a label containing a TQMovie
     movie = new TQMovie( MOVIEFILENAME );
     movielabel = new TQLabel( central, "label0" );
-    movie.connectStatus(this, SLOT("movieStatus(int)"));
-    movie.connectUpdate(this, SLOT("movieUpdate(TQRect)"));
+    movie.connectStatus(this, TQ_SLOT("movieStatus(int)"));
+    movie.connectUpdate(this, TQ_SLOT("movieUpdate(TQRect)"));
     movielabel.setFrameStyle( TQFrame.Box | TQFrame.Plain );
     movielabel.setMovie( movie );
     movielabel.setFixedSize( 128+movielabel.frameWidth()*2,
@@ -367,7 +367,7 @@ WidgetView( TQWidget parent, String name )
     cb[2].setText( "&Execute" );
     vbox.addWidget( cb[2] );
 
-    connect( bg, SIGNAL("clicked(int)"), SLOT("checkBoxClicked(int)") );
+    connect( bg, TQ_SIGNAL("clicked(int)"), TQ_SLOT("checkBoxClicked(int)") );
 
     TQToolTip.add( cb[0], "check box 1" );
     TQToolTip.add( cb[1], "check box 2" );
@@ -397,7 +397,7 @@ WidgetView( TQWidget parent, String name )
     rb.setText( "&Short Wave" );
     vbox.addWidget(rb);
 
-    connect( bg, SIGNAL("clicked(int)"), SLOT("radioButtonClicked(int)") );
+    connect( bg, TQ_SIGNAL("clicked(int)"), TQ_SLOT("radioButtonClicked(int)") );
     TQToolTip.add( rb, "radio button 3" );
 
     // Create a list box
@@ -410,7 +410,7 @@ WidgetView( TQWidget parent, String name )
 	    lb.insertItem( str );
     }
     grid.addMultiCellWidget( lb, 2, 4, 0, 0 );
-    connect( lb, SIGNAL("selected(int)"), SLOT("listBoxItemSelected(int)") );
+    connect( lb, TQ_SIGNAL("selected(int)"), TQ_SLOT("listBoxItemSelected(int)") );
     TQToolTip.add( lb, "list box" );
 //    new MyWhatsThis( lb );
 
@@ -425,7 +425,7 @@ WidgetView( TQWidget parent, String name )
     sb.setFocusPolicy( TQWidget.TabFocus );
     vbox.addWidget( sb );
 
-    connect( sb, SIGNAL("valueChanged(int)"), SLOT("sliderValueChanged(int)") );
+    connect( sb, TQ_SIGNAL("valueChanged(int)"), TQ_SLOT("sliderValueChanged(int)") );
     TQToolTip.add( sb, "slider" );
     TQWhatsThis.add( sb, "This is a <b>TQSlider</b>. "
 		     + "The tick marks are optional."
@@ -438,8 +438,8 @@ WidgetView( TQWidget parent, String name )
     combo.insertItem( "blue" );
     combo.insertItem( "red" );
     vbox.addWidget( combo );
-    connect( combo, SIGNAL("activated(int)"),
-	     this, SLOT("comboBoxItemActivated(int)") );
+    connect( combo, TQ_SIGNAL("activated(int)"),
+	     this, TQ_SLOT("comboBoxItemActivated(int)") );
     TQToolTip.add( combo, "read-only combo box" );
 
     // Create an editable combo box
@@ -450,8 +450,8 @@ WidgetView( TQWidget parent, String name )
     edCombo.insertItem( "Alterable" );
     edCombo.insertItem( "Inconstant" );
     vbox.addWidget( edCombo );
-    connect( edCombo, SIGNAL("activated(String)"),
-	     this, SLOT("edComboBoxItemActivated(String)") );
+    connect( edCombo, TQ_SIGNAL("activated(String)"),
+	     this, TQ_SLOT("edComboBoxItemActivated(String)") );
     TQToolTip.add( edCombo, "editable combo box" );
 
     edCombo.setAutoCompletion( true );
@@ -463,8 +463,8 @@ WidgetView( TQWidget parent, String name )
     TQSpinBox spin = new TQSpinBox( 0, 10, 1, central, "spin" );
     spin.setSuffix(" mm");
     spin.setSpecialValueText( "Auto" );
-    connect( spin, SIGNAL(" valueChanged(String)"),
-	     SLOT(" spinBoxValueChanged(String)") );
+    connect( spin, TQ_SIGNAL(" valueChanged(String)"),
+	     TQ_SLOT(" spinBoxValueChanged(String)") );
     TQToolTip.add( spin, "spin box" );
     TQWhatsThis.add( spin, "This is a <b>TQSpinBox</b>. "
 		     + "You can chose values in a given range "
@@ -514,8 +514,8 @@ WidgetView( TQWidget parent, String name )
 
 
     grid.addMultiCellWidget( le, 4, 4, 1, 2 );
-    connect( le, SIGNAL("textChanged(String)"),
-	     SLOT("lineEditTextChanged(String)") );
+    connect( le, TQ_SIGNAL("textChanged(String)"),
+	     TQ_SLOT("lineEditTextChanged(String)") );
     TQToolTip.add( le, "single line editor" );
     TQWhatsThis.add( le, "This is a <b>TQLineEdit</b>, you can enter a "
 		     + "single line of text in it. "
@@ -536,14 +536,14 @@ WidgetView( TQWidget parent, String name )
     split.setOpaqueResize( true );
     topLayout.addWidget( split, 1 );
     TQListView lv = new MyListView( split );
-    connect(lv, SIGNAL("selectionChanged()"),
-	    this, SLOT(" selectionChanged()") );
-    connect(lv, SIGNAL("selectionChanged(TQListViewItem)"),
-	    this, SLOT(" selectionChanged(TQListViewItem)") );
-    connect(lv, SIGNAL("clicked(TQListViewItem)"),
-	    this, SLOT(" clicked(TQListViewItem)") );
-    connect(lv, SIGNAL("mySelectionChanged(TQListViewItem)"),
-	    this, SLOT(" mySelectionChanged(TQListViewItem)") );
+    connect(lv, TQ_SIGNAL("selectionChanged()"),
+	    this, TQ_SLOT(" selectionChanged()") );
+    connect(lv, TQ_SIGNAL("selectionChanged(TQListViewItem)"),
+	    this, TQ_SLOT(" selectionChanged(TQListViewItem)") );
+    connect(lv, TQ_SIGNAL("clicked(TQListViewItem)"),
+	    this, TQ_SLOT(" clicked(TQListViewItem)") );
+    connect(lv, TQ_SIGNAL("mySelectionChanged(TQListViewItem)"),
+	    this, TQ_SLOT(" mySelectionChanged(TQListViewItem)") );
     lv.addColumn( "One" );
     lv.addColumn( "Two" );
     lv.setAllColumnsShowFocus( true );
@@ -603,7 +603,7 @@ WidgetView( TQWidget parent, String name )
 
     TQAccel a = new TQAccel( this );
     a.connectItem(  a.insertItem( new TQKeySequence(Key_F9) ),
-		     this, SLOT(" showProperties()") );
+		     this, TQ_SLOT(" showProperties()") );
 
     prog = new TQProgressBar( statusBar(), "progress" );
     prog.setTotalSteps( 100 );
diff --git a/qtjava/javalib/examples/wizard/Wizard.java b/qtjava/javalib/examples/wizard/Wizard.java
index 6c3a42d7..5268202f 100644
--- a/qtjava/javalib/examples/wizard/Wizard.java
+++ b/qtjava/javalib/examples/wizard/Wizard.java
@@ -30,8 +30,8 @@ Wizard( TQWidget parent, String name )
     setupPage1();
     setupPage2();
     setupPage3();
-    connect(this, SIGNAL("selected(String)"), this, SLOT("doShowPage(String)"));
-    connect(finishButton(), SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
+    connect(this, TQ_SIGNAL("selected(String)"), this, TQ_SLOT("doShowPage(String)"));
+    connect(finishButton(), TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()"));
     key.setFocus();
 }
 
@@ -59,8 +59,8 @@ void setupPage1()
     key.setMaxLength( 4 );
     key.setValidator( new TQIntValidator( 1000, 9999, key ) );
 
-    connect( key, SIGNAL(" textChanged( String )"),
-	     this, SLOT(" keyChanged( String )") );
+    connect( key, TQ_SIGNAL(" textChanged( String )"),
+	     this, TQ_SLOT(" keyChanged( String )") );
 
     addPage( page1, "Personal Key" );
 
@@ -115,12 +115,12 @@ void setupPage2()
     phone = new TQLineEdit( row4 );
     email = new TQLineEdit( row5 );
 
-    connect( firstName, SIGNAL(" textChanged( String )"),
-	     this, SLOT(" dataChanged( String )") );
-    connect( lastName, SIGNAL(" textChanged( String )"),
-	     this, SLOT(" dataChanged( String )") );
-    connect( email, SIGNAL(" textChanged( String )"),
-	     this, SLOT(" dataChanged( String )") );
+    connect( firstName, TQ_SIGNAL(" textChanged( String )"),
+	     this, TQ_SLOT(" dataChanged( String )") );
+    connect( lastName, TQ_SIGNAL(" textChanged( String )"),
+	     this, TQ_SLOT(" dataChanged( String )") );
+    connect( email, TQ_SIGNAL(" textChanged( String )"),
+	     this, TQ_SLOT(" dataChanged( String )") );
 
     addPage( page2, "Personal Data" );
 
diff --git a/qtjava/javalib/org/trinitydesktop/qt/Qt.java b/qtjava/javalib/org/trinitydesktop/qt/Qt.java
index 6b9311b6..2532d136 100644
--- a/qtjava/javalib/org/trinitydesktop/qt/Qt.java
+++ b/qtjava/javalib/org/trinitydesktop/qt/Qt.java
@@ -1115,12 +1115,12 @@ public class Qt implements QtSupport {
 	}
 
 	/** Prepend a '2' to a signal string and remove any spaces */
-	public static String SIGNAL(String signal) {
+	public static String TQ_SIGNAL(String signal) {
 		return "2" + sqeezeOut(signal, ' ');
 	}
 
 	/** Prepend a '1' to a slot string and remove any spaces */
-	public static String SLOT(String slot) {
+	public static String TQ_SLOT(String slot) {
 		return "1" + sqeezeOut(slot, ' ');
 	}
 
diff --git a/qtjava/javalib/test/AppWizardBase.java b/qtjava/javalib/test/AppWizardBase.java
index 7eec9481..fcb04c79 100644
--- a/qtjava/javalib/test/AppWizardBase.java
+++ b/qtjava/javalib/test/AppWizardBase.java
@@ -181,8 +181,8 @@ AppWizardBase( TQWidget parent,  String name, boolean modal, int fl )
     addPage( privateWidget_2, tr( "Header" ) );
 
     // signals and slots connections
-    connect( loadheader_button, SIGNAL( "clicked()" ), this, SLOT( "slotLoadHeader()" ) );
-    connect( newheader_button, SIGNAL( "clicked()" ), this, SLOT( "slotNewHeader()" ) );
+    connect( loadheader_button, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "slotLoadHeader()" ) );
+    connect( newheader_button, TQ_SIGNAL( "clicked()" ), this, TQ_SLOT( "slotNewHeader()" ) );
 
     // tab order
     setTabOrder( loadheader_button, newheader_button );
diff --git a/qtjava/javalib/test/FilePropsPageBase.java b/qtjava/javalib/test/FilePropsPageBase.java
index d583a05b..48e79172 100644
--- a/qtjava/javalib/test/FilePropsPageBase.java
+++ b/qtjava/javalib/test/FilePropsPageBase.java
@@ -114,8 +114,8 @@ public FilePropsPageBase( TQWidget parent, String name, int fl )
     grid.addWidget( desc_textview, 1, 1 );
 
     // signals and slots connections
-    connect( classname_edit, SIGNAL( "textChanged(String)" ), this, SLOT( "slotClassnameChanged(String)" ) );
-    connect( classes_listbox, SIGNAL( "mouseButtonClicked(int,TQListBoxItem,TQPoint)" ), this, SLOT( "slotSelectionChanged()" ) );
+    connect( classname_edit, TQ_SIGNAL( "textChanged(String)" ), this, TQ_SLOT( "slotClassnameChanged(String)" ) );
+    connect( classes_listbox, TQ_SIGNAL( "mouseButtonClicked(int,TQListBoxItem,TQPoint)" ), this, TQ_SLOT( "slotSelectionChanged()" ) );
 
     // tab order
     setTabOrder( classes_listbox, classname_edit );
diff --git a/qtjava/javalib/test/ISBNValidator.java b/qtjava/javalib/test/ISBNValidator.java
index 1f03525e..1d909a10 100644
--- a/qtjava/javalib/test/ISBNValidator.java
+++ b/qtjava/javalib/test/ISBNValidator.java
@@ -148,8 +148,8 @@ public class ISBNValidator extends TQValidator
 		
 		// set up a receiver for the returnPressed() signal
 		ReturnReceiver receiver = new ReturnReceiver();
-		TQObject.connect( myedit, SIGNAL( "returnPressed()" ),
-						 receiver, SLOT( "slotReturnPressed()" ) );
+		TQObject.connect( myedit, TQ_SIGNAL( "returnPressed()" ),
+						 receiver, TQ_SLOT( "slotReturnPressed()" ) );
 						
 		myapp.setMainWidget( myedit );
 		myedit.show();
diff --git a/qtjava/javalib/test/ScribbleWindow.java b/qtjava/javalib/test/ScribbleWindow.java
index 33296e3d..fc040f17 100644
--- a/qtjava/javalib/test/ScribbleWindow.java
+++ b/qtjava/javalib/test/ScribbleWindow.java
@@ -42,7 +42,7 @@ public class ScribbleWindow extends TQWidget {
 			
 			// create a pop-up menu
 			_popupmenu = new TQPopupMenu();
-			_popupmenu.insertItem( "&Clear", this, SLOT( "slotClearArea()" ) );
+			_popupmenu.insertItem( "&Clear", this, TQ_SLOT( "slotClearArea()" ) );
 		}
 		
 		/**
@@ -167,10 +167,10 @@ public class ScribbleWindow extends TQWidget {
 		/* The next lines build the menu bar. We first create the menus
 		* one by one, then add them to the menu bar. */
 		_filemenu = new TQPopupMenu();  // create a file menu
-		_filemenu.insertItem( "&Load", this, SLOT( "slotLoad()" ) );
-		_filemenu.insertItem( "&Save", this, SLOT( "slotSave()" ) );
+		_filemenu.insertItem( "&Load", this, TQ_SLOT( "slotLoad()" ) );
+		_filemenu.insertItem( "&Save", this, TQ_SLOT( "slotSave()" ) );
 		_filemenu.insertSeparator();
-		_filemenu.insertItem( "&Quit", tqApp(), SLOT( "quit()" ) );
+		_filemenu.insertItem( "&Quit", tqApp(), TQ_SLOT( "quit()" ) );
 		
 		_colormenu = new TQPopupMenu(); // create a color menu
 		_colormenu.insertItem( "B&lack", COLOR_MENU_ID_BLACK);
@@ -178,12 +178,12 @@ public class ScribbleWindow extends TQWidget {
 		_colormenu.insertItem( "&Blue", COLOR_MENU_ID_BLUE);
 		_colormenu.insertItem( "&Green", COLOR_MENU_ID_GREEN);
 		_colormenu.insertItem( "&Yellow", COLOR_MENU_ID_YELLOW);
-		TQObject.connect( _colormenu, SIGNAL( "activated( int )" ),
-						 this, SLOT( "slotColorMenu( int )" ) );
+		TQObject.connect( _colormenu, TQ_SIGNAL( "activated( int )" ),
+						 this, TQ_SLOT( "slotColorMenu( int )" ) );
 						
 		_helpmenu = new TQPopupMenu();  // create a help menu
-		_helpmenu.insertItem( "&About QtScribble", this, SLOT( "slotAbout()" ) );
-		_helpmenu.insertItem( "&About Qt", this, SLOT( "slotAboutQt()" ) );
+		_helpmenu.insertItem( "&About QtScribble", this, TQ_SLOT( "slotAbout()" ) );
+		_helpmenu.insertItem( "&About Qt", this, TQ_SLOT( "slotAboutQt()" ) );
 		
 		_menubar = new TQMenuBar( this, "" );  // create a menu bar
 		_menubar.insertItem( "&File", _filemenu );
@@ -198,12 +198,12 @@ public class ScribbleWindow extends TQWidget {
 		_scribblearea = new ScribbleArea();
 		_scribblearea.setGeometry( 0, 0, 1000, 1000 );
 		_scrollview.addChild( _scribblearea );
-		TQObject.connect( this, SIGNAL( "colorChanged( TQColor )" ),
-						 _scribblearea, SLOT( "setColor( TQColor )" ) );
-		TQObject.connect( this, SIGNAL( "save( String )" ),
-						 _scribblearea, SLOT( "slotSave( String )" ) );
-		TQObject.connect( this, SIGNAL( "load(String)" ),
-						 _scribblearea, SLOT( "slotLoad( String )" ) );
+		TQObject.connect( this, TQ_SIGNAL( "colorChanged( TQColor )" ),
+						 _scribblearea, TQ_SLOT( "setColor( TQColor )" ) );
+		TQObject.connect( this, TQ_SIGNAL( "save( String )" ),
+						 _scribblearea, TQ_SLOT( "slotSave( String )" ) );
+		TQObject.connect( this, TQ_SIGNAL( "load(String)" ),
+						 _scribblearea, TQ_SLOT( "slotLoad( String )" ) );
 	}
 	
 	protected void resizeEvent( TQResizeEvent event )
diff --git a/qtjava/javalib/test/SignalForwarder.java b/qtjava/javalib/test/SignalForwarder.java
index 28d02560..1d6f2726 100644
--- a/qtjava/javalib/test/SignalForwarder.java
+++ b/qtjava/javalib/test/SignalForwarder.java
@@ -4,8 +4,8 @@ public class SignalForwarder extends TQDialog {
 
 	SignalForwarder() {
 		TQPushButton searchButton = new TQPushButton("Search", this);
-		connect( searchButton, SIGNAL("clicked()"), this, SIGNAL("continueSearch()"));		
-		connect( this, SIGNAL("continueSearch()"), this, SLOT("slotContinueSearch()"));		
+		connect( searchButton, TQ_SIGNAL("clicked()"), this, TQ_SIGNAL("continueSearch()"));		
+		connect( this, TQ_SIGNAL("continueSearch()"), this, TQ_SLOT("slotContinueSearch()"));		
 	}
 
 	public void slotContinueSearch()
diff --git a/qtjava/javalib/test/TQTimerTest.java b/qtjava/javalib/test/TQTimerTest.java
index c10af496..c68fe67e 100644
--- a/qtjava/javalib/test/TQTimerTest.java
+++ b/qtjava/javalib/test/TQTimerTest.java
@@ -44,7 +44,7 @@ public class TQTimerTest extends TQWidget {
 			
 			// create a pop-up menu
 			_popupmenu = new TQPopupMenu();
-			_popupmenu.insertItem( "&Clear", this, Qt.SLOT( "slotClearArea()" ) );
+			_popupmenu.insertItem( "&Clear", this, Qt.TQ_SLOT( "slotClearArea()" ) );
 		}
 		
 		/**
@@ -170,10 +170,10 @@ public class TQTimerTest extends TQWidget {
 		/* The next lines build the menu bar. We first create the menus
 		* one by one, then add them to the menu bar. */
 		_filemenu = new TQPopupMenu();  // create a file menu
-		_filemenu.insertItem( "&Load", this, Qt.SLOT( "slotLoad()" ) );
-		_filemenu.insertItem( "&Save", this, Qt.SLOT( "slotSave()" ) );
+		_filemenu.insertItem( "&Load", this, Qt.TQ_SLOT( "slotLoad()" ) );
+		_filemenu.insertItem( "&Save", this, Qt.TQ_SLOT( "slotSave()" ) );
 		_filemenu.insertSeparator();
-		_filemenu.insertItem( "&Quit", Qt.qApp(), Qt.SLOT( "quit()" ) );
+		_filemenu.insertItem( "&Quit", Qt.qApp(), Qt.TQ_SLOT( "quit()" ) );
 		
 		_colormenu = new TQPopupMenu(); // create a color menu
 		_colormenu.insertItem( "B&lack", COLOR_MENU_ID_BLACK);
@@ -181,12 +181,12 @@ public class TQTimerTest extends TQWidget {
 		_colormenu.insertItem( "&Blue", COLOR_MENU_ID_BLUE);
 		_colormenu.insertItem( "&Green", COLOR_MENU_ID_GREEN);
 		_colormenu.insertItem( "&Yellow", COLOR_MENU_ID_YELLOW);
-		TQObject.connect( _colormenu, SIGNAL( "activated(int)" ),
-						 this, SLOT( "slotColorMenu(int)" ) );
+		TQObject.connect( _colormenu, TQ_SIGNAL( "activated(int)" ),
+						 this, TQ_SLOT( "slotColorMenu(int)" ) );
 						
 		_helpmenu = new TQPopupMenu();  // create a help menu
-		_helpmenu.insertItem( "&About QtScribble", this, SLOT( "slotAbout()" ) );
-		_helpmenu.insertItem( "&About Qt", this, SLOT( "slotAboutQt()" ) );
+		_helpmenu.insertItem( "&About QtScribble", this, TQ_SLOT( "slotAbout()" ) );
+		_helpmenu.insertItem( "&About Qt", this, TQ_SLOT( "slotAboutQt()" ) );
 		
 		_menubar = new TQMenuBar( this, "" );  // create a menu bar
 		_menubar.insertItem( "&File", _filemenu );
@@ -201,12 +201,12 @@ public class TQTimerTest extends TQWidget {
 		_scribblearea = new ScribbleArea();
 		_scribblearea.setGeometry( 0, 0, 1000, 1000 );
 		_scrollview.addChild( _scribblearea );
-		TQObject.connect( this, SIGNAL( "colorChanged(TQColor)" ),
-						 _scribblearea, SLOT( "setColor(TQColor)" ) );
-		TQObject.connect( this, SIGNAL( "save(java.lang.String)" ),
-						 _scribblearea, SLOT( "slotSave(java.lang.String)" ) );
-		TQObject.connect( this, SIGNAL( "load(java.lang.String)" ),
-						 _scribblearea, SLOT( "slotLoad(java.lang.String)" ) );
+		TQObject.connect( this, TQ_SIGNAL( "colorChanged(TQColor)" ),
+						 _scribblearea, TQ_SLOT( "setColor(TQColor)" ) );
+		TQObject.connect( this, TQ_SIGNAL( "save(java.lang.String)" ),
+						 _scribblearea, TQ_SLOT( "slotSave(java.lang.String)" ) );
+		TQObject.connect( this, TQ_SIGNAL( "load(java.lang.String)" ),
+						 _scribblearea, TQ_SLOT( "slotLoad(java.lang.String)" ) );
 	}
 	
 	public void resizeEvent( TQResizeEvent event )
@@ -298,8 +298,8 @@ public class TQTimerTest extends TQWidget {
 		mywidget.setGeometry(50, 500, 400, 400);
     	
     	TQTimer timer = new TQTimer( mywidget );
-		connect( timer, Qt.SIGNAL("timeout()"),
-					mywidget, Qt.SLOT("timerDone()") );
+		connect( timer, Qt.TQ_SIGNAL("timeout()"),
+					mywidget, Qt.TQ_SLOT("timerDone()") );
 		timer.start( 2000, false );                 // 2 seconds single-shot
 		
 		myapp.setMainWidget(mywidget);
diff --git a/qtjava/javalib/tutorial/t10/LCDRange.java b/qtjava/javalib/tutorial/t10/LCDRange.java
index 877c65de..71fdd7e0 100644
--- a/qtjava/javalib/tutorial/t10/LCDRange.java
+++ b/qtjava/javalib/tutorial/t10/LCDRange.java
@@ -10,10 +10,10 @@ public class LCDRange extends TQVBox {
 		slider.setRange(0, 99);
 		slider.setValue(0);
 		
-		connect(slider, SIGNAL("valueChanged(int)"),
-						lcd, SLOT("display(int)"));
-		connect(slider, SIGNAL("valueChanged(int)"),
-						SIGNAL("valueChanged(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						lcd, TQ_SLOT("display(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						TQ_SIGNAL("valueChanged(int)"));
 
 		setFocusProxy(slider);
 	}
diff --git a/qtjava/javalib/tutorial/t10/Tut10.java b/qtjava/javalib/tutorial/t10/Tut10.java
index 2ad781f8..4fd64bb0 100644
--- a/qtjava/javalib/tutorial/t10/Tut10.java
+++ b/qtjava/javalib/tutorial/t10/Tut10.java
@@ -5,7 +5,7 @@ public class Tut10 extends TQWidget {
 		TQPushButton quit = new TQPushButton("&Quit", this, "quit");
 		quit.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
+		connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()"));
 
 		LCDRange angle = new LCDRange(this, "angle");
 		angle.setRange(5, 70);
@@ -15,15 +15,15 @@ public class Tut10 extends TQWidget {
 
 		CannonField cannonField = new CannonField(this, "cannonField");
 
-		connect(angle, SIGNAL("valueChanged(int)"),
-						cannonField, SLOT("setAngle(int)"));
-		connect(cannonField, SIGNAL("angleChanged(int)"),
-						angle, SLOT("setValue(int)"));
+		connect(angle, TQ_SIGNAL("valueChanged(int)"),
+						cannonField, TQ_SLOT("setAngle(int)"));
+		connect(cannonField, TQ_SIGNAL("angleChanged(int)"),
+						angle, TQ_SLOT("setValue(int)"));
 
-		connect(force, SIGNAL("valueChanged(int)"),
-						cannonField, SLOT("setForce(int)"));
-		connect(cannonField, SIGNAL("forceChanged(int)"),
-						force, SLOT("setValue(int)"));
+		connect(force, TQ_SIGNAL("valueChanged(int)"),
+						cannonField, TQ_SLOT("setForce(int)"));
+		connect(cannonField, TQ_SIGNAL("forceChanged(int)"),
+						force, TQ_SLOT("setValue(int)"));
 
 		TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null);
 		grid.addWidget(quit, 0, 0);
diff --git a/qtjava/javalib/tutorial/t11/CannonField.java b/qtjava/javalib/tutorial/t11/CannonField.java
index 8ba81253..5b4e494a 100644
--- a/qtjava/javalib/tutorial/t11/CannonField.java
+++ b/qtjava/javalib/tutorial/t11/CannonField.java
@@ -16,8 +16,8 @@ public class CannonField extends TQWidget {
 		f = 0;
 		timerCount = 0;
 		autoShootTimer = new TQTimer(this, "movement handler");
-		connect(autoShootTimer, SIGNAL("timeout()"),
-						this, SLOT("moveShot()"));
+		connect(autoShootTimer, TQ_SIGNAL("timeout()"),
+						this, TQ_SLOT("moveShot()"));
 		shoot_ang = 0;
 		shoot_f = 0;
 		
diff --git a/qtjava/javalib/tutorial/t11/LCDRange.java b/qtjava/javalib/tutorial/t11/LCDRange.java
index 877c65de..71fdd7e0 100644
--- a/qtjava/javalib/tutorial/t11/LCDRange.java
+++ b/qtjava/javalib/tutorial/t11/LCDRange.java
@@ -10,10 +10,10 @@ public class LCDRange extends TQVBox {
 		slider.setRange(0, 99);
 		slider.setValue(0);
 		
-		connect(slider, SIGNAL("valueChanged(int)"),
-						lcd, SLOT("display(int)"));
-		connect(slider, SIGNAL("valueChanged(int)"),
-						SIGNAL("valueChanged(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						lcd, TQ_SLOT("display(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						TQ_SIGNAL("valueChanged(int)"));
 
 		setFocusProxy(slider);
 	}
diff --git a/qtjava/javalib/tutorial/t11/Tut11.java b/qtjava/javalib/tutorial/t11/Tut11.java
index 3eb3153f..54effd1f 100644
--- a/qtjava/javalib/tutorial/t11/Tut11.java
+++ b/qtjava/javalib/tutorial/t11/Tut11.java
@@ -5,7 +5,7 @@ public class Tut11 extends TQWidget {
 		TQPushButton quit = new TQPushButton("&Quit", this, "quit");
 		quit.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
+		connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()"));
 
 		LCDRange angle = new LCDRange(this, "angle");
 		angle.setRange(5, 70);
@@ -15,21 +15,21 @@ public class Tut11 extends TQWidget {
 
 		CannonField cannonField = new CannonField(this, "cannonField");
 
-		connect(angle, SIGNAL("valueChanged(int)"),
-						cannonField, SLOT("setAngle(int)"));
-		connect(cannonField, SIGNAL("angleChanged(int)"),
-						angle, SLOT("setValue(int)"));
+		connect(angle, TQ_SIGNAL("valueChanged(int)"),
+						cannonField, TQ_SLOT("setAngle(int)"));
+		connect(cannonField, TQ_SIGNAL("angleChanged(int)"),
+						angle, TQ_SLOT("setValue(int)"));
 
-		connect(force, SIGNAL("valueChanged(int)"),
-						cannonField, SLOT("setForce(int)"));
-		connect(cannonField, SIGNAL("forceChanged(int)"),
-						force, SLOT("setValue(int)"));
+		connect(force, TQ_SIGNAL("valueChanged(int)"),
+						cannonField, TQ_SLOT("setForce(int)"));
+		connect(cannonField, TQ_SIGNAL("forceChanged(int)"),
+						force, TQ_SLOT("setValue(int)"));
 
 
 		TQPushButton shoot = new TQPushButton("&Shoot", this, "shoot");
 		shoot.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(shoot, SIGNAL("clicked()"), cannonField, SLOT("shoot()"));
+		connect(shoot, TQ_SIGNAL("clicked()"), cannonField, TQ_SLOT("shoot()"));
 
 		TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null);
 		grid.addWidget(quit, 0, 0);
diff --git a/qtjava/javalib/tutorial/t12/CannonField.java b/qtjava/javalib/tutorial/t12/CannonField.java
index d5c53ce7..b897b172 100644
--- a/qtjava/javalib/tutorial/t12/CannonField.java
+++ b/qtjava/javalib/tutorial/t12/CannonField.java
@@ -19,8 +19,8 @@ public class CannonField extends TQWidget {
 		f = 0;
 		timerCount = 0;
 		autoShootTimer = new TQTimer(this, "movement handler");
-		connect(autoShootTimer, SIGNAL("timeout()"),
-						this, SLOT("moveShot()"));
+		connect(autoShootTimer, TQ_SIGNAL("timeout()"),
+						this, TQ_SLOT("moveShot()"));
 		shoot_ang = 0;
 		shoot_f = 0;
 		target = new TQPoint(0, 0);
diff --git a/qtjava/javalib/tutorial/t12/LCDRange.java b/qtjava/javalib/tutorial/t12/LCDRange.java
index 7992b586..c0e96890 100644
--- a/qtjava/javalib/tutorial/t12/LCDRange.java
+++ b/qtjava/javalib/tutorial/t12/LCDRange.java
@@ -24,10 +24,10 @@ public class LCDRange extends TQVBox {
 		label = new TQLabel(" ", this, "label", 0);
 		label.setAlignment(AlignCenter);
 		
-		connect(slider, SIGNAL("valueChanged(int)"),
-						lcd, SLOT("display(int)"));
-		connect(slider, SIGNAL("valueChanged(int)"),
-						SIGNAL("valueChanged(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						lcd, TQ_SLOT("display(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						TQ_SIGNAL("valueChanged(int)"));
 
 		setFocusProxy(slider);
 	}
diff --git a/qtjava/javalib/tutorial/t12/Tut12.java b/qtjava/javalib/tutorial/t12/Tut12.java
index 845a206b..40da9321 100644
--- a/qtjava/javalib/tutorial/t12/Tut12.java
+++ b/qtjava/javalib/tutorial/t12/Tut12.java
@@ -5,7 +5,7 @@ public class Tut12 extends TQWidget {
 		TQPushButton quit = new TQPushButton("&Quit", this, "quit");
 		quit.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
+		connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()"));
 
 		LCDRange angle = new LCDRange("ANGLE", this, "angle");
 		angle.setRange(5, 70);
@@ -15,21 +15,21 @@ public class Tut12 extends TQWidget {
 
 		CannonField cannonField = new CannonField(this, "cannonField");
 
-		connect(angle, SIGNAL("valueChanged(int)"),
-						cannonField, SLOT("setAngle(int)"));
-		connect(cannonField, SIGNAL("angleChanged(int)"),
-						angle, SLOT("setValue(int)"));
+		connect(angle, TQ_SIGNAL("valueChanged(int)"),
+						cannonField, TQ_SLOT("setAngle(int)"));
+		connect(cannonField, TQ_SIGNAL("angleChanged(int)"),
+						angle, TQ_SLOT("setValue(int)"));
 
-		connect(force, SIGNAL("valueChanged(int)"),
-						cannonField, SLOT("setForce(int)"));
-		connect(cannonField, SIGNAL("forceChanged(int)"),
-						force, SLOT("setValue(int)"));
+		connect(force, TQ_SIGNAL("valueChanged(int)"),
+						cannonField, TQ_SLOT("setForce(int)"));
+		connect(cannonField, TQ_SIGNAL("forceChanged(int)"),
+						force, TQ_SLOT("setValue(int)"));
 
 
 		TQPushButton shoot = new TQPushButton("&Shoot", this, "shoot");
 		shoot.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(shoot, SIGNAL("clicked()"), cannonField, SLOT("shoot()"));
+		connect(shoot, TQ_SIGNAL("clicked()"), cannonField, TQ_SLOT("shoot()"));
 
 		TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null);
 		grid.addWidget(quit, 0, 0);
diff --git a/qtjava/javalib/tutorial/t13/CannonField.java b/qtjava/javalib/tutorial/t13/CannonField.java
index b53dfed9..db35ce1b 100644
--- a/qtjava/javalib/tutorial/t13/CannonField.java
+++ b/qtjava/javalib/tutorial/t13/CannonField.java
@@ -21,8 +21,8 @@ public class CannonField extends TQWidget {
 		f = 0;
 		timerCount = 0;
 		autoShootTimer = new TQTimer(this, "movement handler");
-		connect(autoShootTimer, SIGNAL("timeout()"),
-						this, SLOT("moveShot()"));
+		connect(autoShootTimer, TQ_SIGNAL("timeout()"),
+						this, TQ_SLOT("moveShot()"));
 		shoot_ang = 0;
 		shoot_f = 0;
 		target = new TQPoint(0, 0);
diff --git a/qtjava/javalib/tutorial/t13/GameBoard.java b/qtjava/javalib/tutorial/t13/GameBoard.java
index 25ff0a1e..c887498f 100644
--- a/qtjava/javalib/tutorial/t13/GameBoard.java
+++ b/qtjava/javalib/tutorial/t13/GameBoard.java
@@ -9,7 +9,7 @@ public class GameBoard extends TQWidget {
 		TQPushButton quit = new TQPushButton("&Quit", this, "quit");
 		quit.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
+		connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()"));
 
 		LCDRange angle = new LCDRange("ANGLE", this, "angle");
 		angle.setRange(5, 70);
@@ -19,32 +19,32 @@ public class GameBoard extends TQWidget {
 
 		cannonField = new CannonField(this, "cannonField");
 
-		connect(angle, SIGNAL("valueChanged(int)"),
-						cannonField, SLOT("setAngle(int)"));
-		connect(cannonField, SIGNAL("angleChanged(int)"),
-						angle, SLOT("setValue(int)"));
+		connect(angle, TQ_SIGNAL("valueChanged(int)"),
+						cannonField, TQ_SLOT("setAngle(int)"));
+		connect(cannonField, TQ_SIGNAL("angleChanged(int)"),
+						angle, TQ_SLOT("setValue(int)"));
 
-		connect(force, SIGNAL("valueChanged(int)"),
-						cannonField, SLOT("setForce(int)"));
-		connect(cannonField, SIGNAL("forceChanged(int)"),
-						force, SLOT("setValue(int)"));
+		connect(force, TQ_SIGNAL("valueChanged(int)"),
+						cannonField, TQ_SLOT("setForce(int)"));
+		connect(cannonField, TQ_SIGNAL("forceChanged(int)"),
+						force, TQ_SLOT("setValue(int)"));
 
-		connect(cannonField, SIGNAL("hit()"),
-						this, SLOT("hit()"));
-		connect(cannonField, SIGNAL("missed()"),
-						this, SLOT("missed()"));
+		connect(cannonField, TQ_SIGNAL("hit()"),
+						this, TQ_SLOT("hit()"));
+		connect(cannonField, TQ_SIGNAL("missed()"),
+						this, TQ_SLOT("missed()"));
 
 		TQPushButton shoot = new TQPushButton("&Shoot", this, "shoot");
 		shoot.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(shoot, SIGNAL("clicked()"), SLOT("fire()"));
-		connect(cannonField, SIGNAL("canShoot(boolean)"),
-						shoot, SLOT("setEnabled(boolean)"));
+		connect(shoot, TQ_SIGNAL("clicked()"), TQ_SLOT("fire()"));
+		connect(cannonField, TQ_SIGNAL("canShoot(boolean)"),
+						shoot, TQ_SLOT("setEnabled(boolean)"));
 
 		TQPushButton restart = new TQPushButton("&New Game", this, "newgame");
 		restart.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(restart, SIGNAL("clicked()"), this, SLOT("newGame()"));
+		connect(restart, TQ_SIGNAL("clicked()"), this, TQ_SLOT("newGame()"));
 
 		hits = new TQLCDNumber(2, this, "hits");
 		shotsLeft = new TQLCDNumber(2, this, "shotsleft");
diff --git a/qtjava/javalib/tutorial/t13/LCDRange.java b/qtjava/javalib/tutorial/t13/LCDRange.java
index 27741f89..794bc72b 100644
--- a/qtjava/javalib/tutorial/t13/LCDRange.java
+++ b/qtjava/javalib/tutorial/t13/LCDRange.java
@@ -24,10 +24,10 @@ public class LCDRange extends TQWidget {
 		label = new TQLabel(" ", this, "label", 0);
 		label.setAlignment(AlignCenter);
 		
-		connect(slider, SIGNAL("valueChanged(int)"),
-						lcd, SLOT("display(int)"));
-		connect(slider, SIGNAL("valueChanged(int)"),
-						SIGNAL("valueChanged(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						lcd, TQ_SLOT("display(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						TQ_SIGNAL("valueChanged(int)"));
 
 		setFocusProxy(slider);
 
diff --git a/qtjava/javalib/tutorial/t14/CannonField.java b/qtjava/javalib/tutorial/t14/CannonField.java
index a38a71a3..e2a3037f 100644
--- a/qtjava/javalib/tutorial/t14/CannonField.java
+++ b/qtjava/javalib/tutorial/t14/CannonField.java
@@ -22,8 +22,8 @@ public class CannonField extends TQWidget {
 		f = 0;
 		timerCount = 0;
 		autoShootTimer = new TQTimer(this, "movement handler");
-		connect(autoShootTimer, SIGNAL("timeout()"),
-						this, SLOT("moveShot()"));
+		connect(autoShootTimer, TQ_SIGNAL("timeout()"),
+						this, TQ_SLOT("moveShot()"));
 		shoot_ang = 0;
 		shoot_f = 0;
 		target = new TQPoint(0, 0);
diff --git a/qtjava/javalib/tutorial/t14/GameBoard.java b/qtjava/javalib/tutorial/t14/GameBoard.java
index f44af538..6bc66b17 100644
--- a/qtjava/javalib/tutorial/t14/GameBoard.java
+++ b/qtjava/javalib/tutorial/t14/GameBoard.java
@@ -10,7 +10,7 @@ public class GameBoard extends TQWidget {
 		TQPushButton quit = new TQPushButton("&Quit", this, "quit");
 		quit.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
+		connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()"));
 
 		LCDRange angle = new LCDRange("ANGLE", this, "angle");
 		angle.setRange(5, 70);
@@ -23,30 +23,30 @@ public class GameBoard extends TQWidget {
 
 		cannonField = new CannonField(box, "cannonField");
 
-		connect(angle, SIGNAL("valueChanged(int)"),
-						cannonField, SLOT("setAngle(int)"));
-		connect(cannonField, SIGNAL("angleChanged(int)"),
-						angle, SLOT("setValue(int)"));
+		connect(angle, TQ_SIGNAL("valueChanged(int)"),
+						cannonField, TQ_SLOT("setAngle(int)"));
+		connect(cannonField, TQ_SIGNAL("angleChanged(int)"),
+						angle, TQ_SLOT("setValue(int)"));
 
-		connect(force, SIGNAL("valueChanged(int)"),
-						cannonField, SLOT("setForce(int)"));
-		connect(cannonField, SIGNAL("forceChanged(int)"),
-						force, SLOT("setValue(int)"));
+		connect(force, TQ_SIGNAL("valueChanged(int)"),
+						cannonField, TQ_SLOT("setForce(int)"));
+		connect(cannonField, TQ_SIGNAL("forceChanged(int)"),
+						force, TQ_SLOT("setValue(int)"));
 
-		connect(cannonField, SIGNAL("hit()"),
-						this, SLOT("hit()"));
-		connect(cannonField, SIGNAL("missed()"),
-						this, SLOT("missed()"));
+		connect(cannonField, TQ_SIGNAL("hit()"),
+						this, TQ_SLOT("hit()"));
+		connect(cannonField, TQ_SIGNAL("missed()"),
+						this, TQ_SLOT("missed()"));
 
 		TQPushButton shoot = new TQPushButton("&Shoot", this, "shoot");
 		shoot.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(shoot, SIGNAL("clicked()"), SLOT("fire()"));
+		connect(shoot, TQ_SIGNAL("clicked()"), TQ_SLOT("fire()"));
 
 		TQPushButton restart = new TQPushButton("&New Game", this, "newgame");
 		restart.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(restart, SIGNAL("clicked()"), this, SLOT("newGame()"));
+		connect(restart, TQ_SIGNAL("clicked()"), this, TQ_SLOT("newGame()"));
 
 		hits = new TQLCDNumber(2, this, "hits");
 		shotsLeft = new TQLCDNumber(2, this, "shotsleft");
@@ -54,13 +54,13 @@ public class GameBoard extends TQWidget {
 		TQLabel shotsLeftL = new TQLabel("SHOTS LEFT", this, "shotsleftLabel", 0);
 
 		TQAccel accel = new TQAccel(this);
-		accel.connectItem(accel.insertItem(new TQKeySequence(Key_Enter)), this, SLOT("fire()"));
-		accel.connectItem(accel.insertItem(new TQKeySequence(Key_Return)), this, SLOT("fire()"));
-		accel.connectItem(accel.insertItem(new TQKeySequence(CTRL+Key_Q)), tqApp(), SLOT("quit()"));
+		accel.connectItem(accel.insertItem(new TQKeySequence(Key_Enter)), this, TQ_SLOT("fire()"));
+		accel.connectItem(accel.insertItem(new TQKeySequence(Key_Return)), this, TQ_SLOT("fire()"));
+		accel.connectItem(accel.insertItem(new TQKeySequence(CTRL+Key_Q)), tqApp(), TQ_SLOT("quit()"));
 /***
-		accel.connectItem(accel.insertItem(Key_Enter), this, SLOT("fire()"));
-		accel.connectItem(accel.insertItem(Key_Return), this, SLOT("fire()"));
-		accel.connectItem(accel.insertItem(CTRL+Key_Q), tqApp(), SLOT("quit()"));
+		accel.connectItem(accel.insertItem(Key_Enter), this, TQ_SLOT("fire()"));
+		accel.connectItem(accel.insertItem(Key_Return), this, TQ_SLOT("fire()"));
+		accel.connectItem(accel.insertItem(CTRL+Key_Q), tqApp(), TQ_SLOT("quit()"));
 ***/
 		TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null);
 		grid.addWidget(quit, 0, 0);
diff --git a/qtjava/javalib/tutorial/t14/LCDRange.java b/qtjava/javalib/tutorial/t14/LCDRange.java
index 27741f89..794bc72b 100644
--- a/qtjava/javalib/tutorial/t14/LCDRange.java
+++ b/qtjava/javalib/tutorial/t14/LCDRange.java
@@ -24,10 +24,10 @@ public class LCDRange extends TQWidget {
 		label = new TQLabel(" ", this, "label", 0);
 		label.setAlignment(AlignCenter);
 		
-		connect(slider, SIGNAL("valueChanged(int)"),
-						lcd, SLOT("display(int)"));
-		connect(slider, SIGNAL("valueChanged(int)"),
-						SIGNAL("valueChanged(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						lcd, TQ_SLOT("display(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						TQ_SIGNAL("valueChanged(int)"));
 
 		setFocusProxy(slider);
 
diff --git a/qtjava/javalib/tutorial/t2/Tut2.java b/qtjava/javalib/tutorial/t2/Tut2.java
index f5a31bb2..7b27ff11 100644
--- a/qtjava/javalib/tutorial/t2/Tut2.java
+++ b/qtjava/javalib/tutorial/t2/Tut2.java
@@ -7,7 +7,7 @@ public class Tut2 extends TQObject {
 		quit.resize( 75, 30 );
 		quit.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(quit, SIGNAL("clicked()"), a, SLOT("quit()"));
+		connect(quit, TQ_SIGNAL("clicked()"), a, TQ_SLOT("quit()"));
 		
 		a.setMainWidget(quit);
 		quit.show();
diff --git a/qtjava/javalib/tutorial/t3/Tut3.java b/qtjava/javalib/tutorial/t3/Tut3.java
index ef6fc013..119eec97 100644
--- a/qtjava/javalib/tutorial/t3/Tut3.java
+++ b/qtjava/javalib/tutorial/t3/Tut3.java
@@ -10,7 +10,7 @@ public class Tut3 extends TQObject {
 		TQPushButton quit = new TQPushButton("Quit", box);
 		quit.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(quit, SIGNAL("clicked()"), a, SLOT("quit()"));
+		connect(quit, TQ_SIGNAL("clicked()"), a, TQ_SLOT("quit()"));
 		
 		a.setMainWidget(box);
 		box.show();
diff --git a/qtjava/javalib/tutorial/t4/Tut4.java b/qtjava/javalib/tutorial/t4/Tut4.java
index 6b14729d..801e7235 100644
--- a/qtjava/javalib/tutorial/t4/Tut4.java
+++ b/qtjava/javalib/tutorial/t4/Tut4.java
@@ -9,7 +9,7 @@ public class Tut4 extends TQWidget {
 		quit.setGeometry(62, 40, 75, 30);
 		quit.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
+		connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()"));
 	}
 	
 	public static void main(String[] args) {
diff --git a/qtjava/javalib/tutorial/t5/Tut5.java b/qtjava/javalib/tutorial/t5/Tut5.java
index 61e02748..74802681 100644
--- a/qtjava/javalib/tutorial/t5/Tut5.java
+++ b/qtjava/javalib/tutorial/t5/Tut5.java
@@ -5,7 +5,7 @@ public class Tut5 extends TQVBox {
 		TQPushButton quit = new TQPushButton("Quit", this, "quit");
 		quit.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
+		connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()"));
 
 		TQLCDNumber lcd = new TQLCDNumber(2, this, "lcd");
 
@@ -13,7 +13,7 @@ public class Tut5 extends TQVBox {
 		slider.setRange(0, 99);
 		slider.setValue(0);
 
-		connect(slider, SIGNAL("valueChanged(int)"), lcd, SLOT("display(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"), lcd, TQ_SLOT("display(int)"));
 	}
 	
 	public static void main(String[] args) {
diff --git a/qtjava/javalib/tutorial/t6/LCDRange.java b/qtjava/javalib/tutorial/t6/LCDRange.java
index a1d45a47..4d8e6c7c 100644
--- a/qtjava/javalib/tutorial/t6/LCDRange.java
+++ b/qtjava/javalib/tutorial/t6/LCDRange.java
@@ -7,7 +7,7 @@ public class LCDRange extends TQVBox {
 		TQSlider slider = new TQSlider(Horizontal, this, "slider");
 		slider.setRange(0, 99);
 		slider.setValue(0);
-		connect(slider, SIGNAL("valueChanged(int)"), lcd, SLOT("display(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"), lcd, TQ_SLOT("display(int)"));
 	}
 	public LCDRange(TQWidget parent) {
 		this(parent, null);
diff --git a/qtjava/javalib/tutorial/t6/Tut6.java b/qtjava/javalib/tutorial/t6/Tut6.java
index 011742c8..4d3da228 100644
--- a/qtjava/javalib/tutorial/t6/Tut6.java
+++ b/qtjava/javalib/tutorial/t6/Tut6.java
@@ -5,7 +5,7 @@ public class Tut6 extends TQVBox {
 		TQPushButton quit = new TQPushButton("Quit", this, "quit");
 		quit.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
+		connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()"));
 
 		TQGrid grid = new TQGrid(4, this, null, 0);
 
diff --git a/qtjava/javalib/tutorial/t7/LCDRange.java b/qtjava/javalib/tutorial/t7/LCDRange.java
index 62590013..2192de7c 100644
--- a/qtjava/javalib/tutorial/t7/LCDRange.java
+++ b/qtjava/javalib/tutorial/t7/LCDRange.java
@@ -10,10 +10,10 @@ public class LCDRange extends TQVBox {
 		slider.setRange(0, 99);
 		slider.setValue(0);
 		
-		connect(slider, SIGNAL("valueChanged(int)"),
-						lcd, SLOT("display(int)"));
-		connect(slider, SIGNAL("valueChanged(int)"),
-						SIGNAL("valueChanged(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						lcd, TQ_SLOT("display(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						TQ_SIGNAL("valueChanged(int)"));
 	}
 	public LCDRange(TQWidget parent) {
 		this(parent, null);
diff --git a/qtjava/javalib/tutorial/t7/Tut7.java b/qtjava/javalib/tutorial/t7/Tut7.java
index b1bd1e87..4e63fdea 100644
--- a/qtjava/javalib/tutorial/t7/Tut7.java
+++ b/qtjava/javalib/tutorial/t7/Tut7.java
@@ -5,7 +5,7 @@ public class Tut7 extends TQVBox {
 		TQPushButton quit = new TQPushButton("Quit", this, "quit");
 		quit.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
+		connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()"));
 
 		TQGrid grid = new TQGrid(4, this, null, 0);
 		
@@ -14,8 +14,8 @@ public class Tut7 extends TQVBox {
 			for(int c = 0; c < 4; c++) {
 				LCDRange lr = new LCDRange(grid);
 				if (previous!=null)
-					connect(lr, SIGNAL("valueChanged(int)"),
-									previous, SLOT("setValue(int)"));
+					connect(lr, TQ_SIGNAL("valueChanged(int)"),
+									previous, TQ_SLOT("setValue(int)"));
 				previous = lr;
 			}
 		}
diff --git a/qtjava/javalib/tutorial/t8/LCDRange.java b/qtjava/javalib/tutorial/t8/LCDRange.java
index 877c65de..71fdd7e0 100644
--- a/qtjava/javalib/tutorial/t8/LCDRange.java
+++ b/qtjava/javalib/tutorial/t8/LCDRange.java
@@ -10,10 +10,10 @@ public class LCDRange extends TQVBox {
 		slider.setRange(0, 99);
 		slider.setValue(0);
 		
-		connect(slider, SIGNAL("valueChanged(int)"),
-						lcd, SLOT("display(int)"));
-		connect(slider, SIGNAL("valueChanged(int)"),
-						SIGNAL("valueChanged(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						lcd, TQ_SLOT("display(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						TQ_SIGNAL("valueChanged(int)"));
 
 		setFocusProxy(slider);
 	}
diff --git a/qtjava/javalib/tutorial/t8/Tut8.java b/qtjava/javalib/tutorial/t8/Tut8.java
index 4159c8e0..4bab948f 100644
--- a/qtjava/javalib/tutorial/t8/Tut8.java
+++ b/qtjava/javalib/tutorial/t8/Tut8.java
@@ -5,17 +5,17 @@ public class Tut8 extends TQWidget {
 		TQPushButton quit = new TQPushButton("Quit", this, "quit");
 		quit.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
+		connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()"));
 
 		LCDRange angle = new LCDRange(this, "angle");
 		angle.setRange(5, 70);
 
 		CannonField cannonField = new CannonField(this, "cannonField");
 
-		connect(angle, SIGNAL("valueChanged(int)"),
-						cannonField, SLOT("setAngle(int)"));
-		connect(cannonField, SIGNAL("angleChanged(int)"),
-						angle, SLOT("setValue(int)"));
+		connect(angle, TQ_SIGNAL("valueChanged(int)"),
+						cannonField, TQ_SLOT("setAngle(int)"));
+		connect(cannonField, TQ_SIGNAL("angleChanged(int)"),
+						angle, TQ_SLOT("setValue(int)"));
 
 		TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null);
 		//2x2, 10 pixel border
diff --git a/qtjava/javalib/tutorial/t9/LCDRange.java b/qtjava/javalib/tutorial/t9/LCDRange.java
index 877c65de..71fdd7e0 100644
--- a/qtjava/javalib/tutorial/t9/LCDRange.java
+++ b/qtjava/javalib/tutorial/t9/LCDRange.java
@@ -10,10 +10,10 @@ public class LCDRange extends TQVBox {
 		slider.setRange(0, 99);
 		slider.setValue(0);
 		
-		connect(slider, SIGNAL("valueChanged(int)"),
-						lcd, SLOT("display(int)"));
-		connect(slider, SIGNAL("valueChanged(int)"),
-						SIGNAL("valueChanged(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						lcd, TQ_SLOT("display(int)"));
+		connect(slider, TQ_SIGNAL("valueChanged(int)"),
+						TQ_SIGNAL("valueChanged(int)"));
 
 		setFocusProxy(slider);
 	}
diff --git a/qtjava/javalib/tutorial/t9/Tut9.java b/qtjava/javalib/tutorial/t9/Tut9.java
index cd8db787..d04c798d 100644
--- a/qtjava/javalib/tutorial/t9/Tut9.java
+++ b/qtjava/javalib/tutorial/t9/Tut9.java
@@ -5,17 +5,17 @@ public class Tut9 extends TQWidget {
 		TQPushButton quit = new TQPushButton("Quit", this, "quit");
 		quit.setFont(new TQFont("Times", 18, TQFont.Bold, false));
 
-		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
+		connect(quit, TQ_SIGNAL("clicked()"), tqApp(), TQ_SLOT("quit()"));
 
 		LCDRange angle = new LCDRange(this, "angle");
 		angle.setRange(5, 70);
 
 		CannonField cannonField = new CannonField(this, "cannonField");
 
-		connect(angle, SIGNAL("valueChanged(int)"),
-						cannonField, SLOT("setAngle(int)"));
-		connect(cannonField, SIGNAL("angleChanged(int)"),
-						angle, SLOT("setValue(int)"));
+		connect(angle, TQ_SIGNAL("valueChanged(int)"),
+						cannonField, TQ_SLOT("setAngle(int)"));
+		connect(cannonField, TQ_SIGNAL("angleChanged(int)"),
+						angle, TQ_SLOT("setValue(int)"));
 
 		TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null);
 		//2x2, 10 pixel border
-- 
cgit v1.2.1