Rename tqt3 color functions

32 files changed, 64 insertions, 64 deletions

diff --git a/qtjava/javalib/examples/addressbook/ABMainWindow.java b/qtjava/javalib/examples/addressbook/ABMainWindow.java
index c4949289..570e6b8b 100644
--- a/qtjava/javalib/examples/addressbook/ABMainWindow.java
+++ b/qtjava/javalib/examples/addressbook/ABMainWindow.java
@@ -39,7 +39,7 @@ public void setupMenuBar()
     file.insertItem( new TQIconSet(new TQPixmap( "fileprint.xpm" )), "Print...", this, SLOT( "filePrint()" ), new TQKeySequence(CTRL + Key_P) );
     file.insertSeparator();
     file.insertItem( "Close", this, SLOT( "closeWindow()" ), new TQKeySequence(CTRL + Key_W) );
-    file.insertItem( "Quit", qApp(), SLOT( "quit()" ), new TQKeySequence(CTRL + Key_Q) );
+    file.insertItem( "Quit", tqApp(), SLOT( "quit()" ), new TQKeySequence(CTRL + Key_Q) );
 }
 
 public void setupFileTools()
diff --git a/qtjava/javalib/examples/application/ApplicationWindow.java b/qtjava/javalib/examples/application/ApplicationWindow.java
index f214d240..a169454d 100644
--- a/qtjava/javalib/examples/application/ApplicationWindow.java
+++ b/qtjava/javalib/examples/application/ApplicationWindow.java
@@ -125,7 +125,7 @@ public class ApplicationWindow extends TQMainWindow {
 		connect(fileCloseAction, SIGNAL("activated()"), this, SLOT("close()"));
 
 		fileQuitAction = new TQAction("Quit", "&Quit", new TQKeySequence(CTRL+Key_Q), this, "quit", false);
-		connect(fileQuitAction, SIGNAL("activated()"), qApp(), SLOT("closeAllWindows()"));
+		connect(fileQuitAction, SIGNAL("activated()"), tqApp(), SLOT("closeAllWindows()"));
 
 
 		// populate a tool bar with some actions
diff --git a/qtjava/javalib/examples/helpviewer/HelpWindow.java b/qtjava/javalib/examples/helpviewer/HelpWindow.java
index d220d35e..d5c6858d 100644
--- a/qtjava/javalib/examples/helpviewer/HelpWindow.java
+++ b/qtjava/javalib/examples/helpviewer/HelpWindow.java
@@ -61,7 +61,7 @@ HelpWindow( String home_, String _path,
     file.insertItem( tr("&Print"), this, 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"), qApp(), SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_X) );
+    file.insertItem( tr("E&xit"), tqApp(), SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_X) );
 
     // The same three icons are used twice each.
     TQIconSet icon_back = new TQIconSet( new TQPixmap("back.xpm") );
diff --git a/qtjava/javalib/examples/layout/ExampleWidget.java b/qtjava/javalib/examples/layout/ExampleWidget.java
index 1bdc8e54..cb6c5408 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", qApp(), SLOT("quit()") );
+    popup.insertItem( "&Quit", tqApp(), SLOT("quit()") );
     menubar.insertItem( "&File", popup );
 
     // ...and tell the layout about it.
diff --git a/qtjava/javalib/examples/mdi/ApplicationWindow.java b/qtjava/javalib/examples/mdi/ApplicationWindow.java
index 624dfa4a..85c3a8ca 100644
--- a/qtjava/javalib/examples/mdi/ApplicationWindow.java
+++ b/qtjava/javalib/examples/mdi/ApplicationWindow.java
@@ -159,7 +159,7 @@ ApplicationWindow()
     file.setWhatsThis( id, filePrintText );
     file.insertSeparator();
     file.insertItem( "&Close", this, SLOT("closeWindow()"), new TQKeySequence(CTRL+Key_W) );
-    file.insertItem( "&Quit", qApp(), SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_Q) );
+    file.insertItem( "&Quit", tqApp(), SLOT(" closeAllWindows()"), new TQKeySequence(CTRL+Key_Q) );
 
     windowsMenu = new TQPopupMenu( this );
     windowsMenu.setCheckable( true );
diff --git a/qtjava/javalib/examples/menu/MenuExample.java b/qtjava/javalib/examples/menu/MenuExample.java
index c7b72ce7..1965efa4 100644
--- a/qtjava/javalib/examples/menu/MenuExample.java
+++ b/qtjava/javalib/examples/menu/MenuExample.java
@@ -149,7 +149,7 @@ MenuExample( TQWidget parent, String name )
     file.insertSeparator();
     file.insertItem( "&Print", print, CTRL+Key_P );
     file.insertSeparator();
-    file.insertItem( "E&xit",  qApp(), SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) );
+    file.insertItem( "E&xit",  tqApp(), SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) );
 
     TQPopupMenu edit = new TQPopupMenu( this );
     int undoID = edit.insertItem( "&Undo", this, SLOT("undo()") );
diff --git a/qtjava/javalib/examples/qmag/MagWidget.java b/qtjava/javalib/examples/qmag/MagWidget.java
index cf766570..33637587 100644
--- a/qtjava/javalib/examples/qmag/MagWidget.java
+++ b/qtjava/javalib/examples/qmag/MagWidget.java
@@ -91,7 +91,7 @@ MagWidget( TQWidget parent, String name )
 			     10+multiSaveButton.fontMetrics().width("MultiSave"), 20 );
 
     quitButton = new TQPushButton( this );
-    connect( quitButton, SIGNAL("clicked()"), qApp(), SLOT("quit()") );
+    connect( quitButton, SIGNAL("clicked()"), tqApp(), SLOT("quit()") );
     quitButton.setText( "Quit" );
     quitButton.setGeometry( multiSaveButton.geometry().right() + 2, 2,
 			     10+quitButton.fontMetrics().width("Quit"), 20 );
@@ -296,10 +296,10 @@ protected void mouseMoveEvent( TQMouseEvent e )
 	if ( image.valid(x,y) )
 	{
 	    int px = image.pixel(x,y);
-	    pixelinfo= " " + qRed(px) + "," + qGreen(px) + "," + qBlue(px) + " ";
-	    pixelinfo += "#" + Integer.toHexString(qRed(px))
-		    + Integer.toHexString(qGreen(px))
-			+ Integer.toHexString(qBlue(px)) + " ";
+	    pixelinfo= " " + tqRed(px) + "," + tqGreen(px) + "," + tqBlue(px) + " ";
+	    pixelinfo += "#" + Integer.toHexString(tqRed(px))
+		    + Integer.toHexString(tqGreen(px))
+			+ Integer.toHexString(tqBlue(px)) + " ";
 	}
 	String label = "x=" + (x+grabx) + ",  y=" + (y+graby) + " " + pixelinfo;
 	rgb.setText( label );
diff --git a/qtjava/javalib/examples/qwerty/Editor.java b/qtjava/javalib/examples/qwerty/Editor.java
index 3598c144..ec1423ad 100644
--- a/qtjava/javalib/examples/qwerty/Editor.java
+++ b/qtjava/javalib/examples/qwerty/Editor.java
@@ -59,7 +59,7 @@ Editor( TQWidget  parent , String  name )
     file.insertItem( "&Print...", this, SLOT("print()"),    new TQKeySequence(ALT+Key_P) );
     file.insertSeparator();
     file.insertItem( "&Close", this, SLOT("close()"),new TQKeySequence(ALT+Key_W) );
-    file.insertItem( "&Quit",  qApp(), SLOT("closeAllWindows()"),     new TQKeySequence(ALT+Key_Q) );
+    file.insertItem( "&Quit",  tqApp(), 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)") );
@@ -128,8 +128,8 @@ void rebuildCodecList()
 void newDoc()
 {
     Editor ed = new Editor();
-    if ( qApp().desktop().size().width() < 450
-	 || qApp().desktop().size().height() < 450 ) {
+    if ( tqApp().desktop().size().width() < 450
+	 || tqApp().desktop().size().height() < 450 ) {
 	ed.showMaximized();
     } else {
 	ed.resize( 400, 400 );
diff --git a/qtjava/javalib/examples/richtext/MyRichText.java b/qtjava/javalib/examples/richtext/MyRichText.java
index 79f6ac1e..1b6b299b 100644
--- a/qtjava/javalib/examples/richtext/MyRichText.java
+++ b/qtjava/javalib/examples/richtext/MyRichText.java
@@ -108,7 +108,7 @@ MyRichText( TQWidget parent, String name )
 
     bPrev.setEnabled( false );
 
-    connect( bClose, SIGNAL(" clicked()"), qApp(), SLOT(" quit()") );
+    connect( bClose, SIGNAL(" clicked()"), tqApp(), SLOT(" quit()") );
     connect( bPrev, SIGNAL(" clicked()"), this, SLOT(" prev()") );
     connect( bNext, SIGNAL(" clicked()"), this, SLOT(" next()") );
 
diff --git a/qtjava/javalib/examples/rot13/Rot13.java b/qtjava/javalib/examples/rot13/Rot13.java
index 67c2ee7f..8d5c1315 100644
--- a/qtjava/javalib/examples/rot13/Rot13.java
+++ b/qtjava/javalib/examples/rot13/Rot13.java
@@ -29,7 +29,7 @@ Rot13()
 
     TQPushButton  quit = new TQPushButton( "&Quit", this );
     quit.setFocusPolicy( NoFocus );
-    connect( quit, SIGNAL("clicked()"), qApp(), SLOT("quit()") );
+    connect( quit, SIGNAL("clicked()"), tqApp(), 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 e9ecda9e..1f7b8408 100644
--- a/qtjava/javalib/examples/scribble/Scribble.java
+++ b/qtjava/javalib/examples/scribble/Scribble.java
@@ -57,7 +57,7 @@ Canvas( TQWidget parent, String name )
 	pen = new TQPen( Qt.red(), 3 );
 	polyline = new TQPointArray(3);
 
-    if ((qApp().args().length > 0) && !buffer.load(qApp().args()[0]))
+    if ((tqApp().args().length > 0) && !buffer.load(tqApp().args()[0]))
 	buffer.fill( colorGroup().base() );
     setBackgroundMode( TQWidget.PaletteBase );
     setCursor( Qt.crossCursor() );
diff --git a/qtjava/javalib/examples/showimg/ImageViewer.java b/qtjava/javalib/examples/showimg/ImageViewer.java
index c902e413..bb7ae395 100644
--- a/qtjava/javalib/examples/showimg/ImageViewer.java
+++ b/qtjava/javalib/examples/showimg/ImageViewer.java
@@ -83,7 +83,7 @@ ImageViewer( TQWidget parent, String name, int wFlags )
     si = file.insertItem( "Save image", saveimage );
     sp = file.insertItem( "Save pixmap", savepixmap );
     file.insertSeparator();
-    file.insertItem( "E&xit", qApp(),  SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) );
+    file.insertItem( "E&xit", tqApp(),  SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) );
 
     edit =  new TQPopupMenu( menubar );
     menubar.insertItem( "&Edit", edit );
diff --git a/qtjava/javalib/examples/sound/SoundPlayer.java b/qtjava/javalib/examples/sound/SoundPlayer.java
index 81b7a932..cf546a16 100644
--- a/qtjava/javalib/examples/sound/SoundPlayer.java
+++ b/qtjava/javalib/examples/sound/SoundPlayer.java
@@ -57,7 +57,7 @@ SoundPlayer()
     file.insertItem("Play 3 and 4 together",  this, SLOT("doPlay34()"));
     file.insertItem("Play all together",  this, SLOT("doPlay1234()"));
     file.insertSeparator();
-    file.insertItem("E&xit",  qApp(), SLOT("quit()"));
+    file.insertItem("E&xit",  tqApp(), SLOT("quit()"));
     menuBar().insertItem("&File", file);
 }
 
diff --git a/qtjava/javalib/examples/tabdialog/TabDialog.java b/qtjava/javalib/examples/tabdialog/TabDialog.java
index bbfeb0ff..f529509a 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()"), qApp(), SLOT(" quit()") );
+    connect( this, SIGNAL(" applyButtonPressed()"), tqApp(), SLOT(" quit()") );
 }
 
 void setupTab1()
diff --git a/qtjava/javalib/examples/textedit/TextEdit.java b/qtjava/javalib/examples/textedit/TextEdit.java
index 7135f0e6..560ebc32 100644
--- a/qtjava/javalib/examples/textedit/TextEdit.java
+++ b/qtjava/javalib/examples/textedit/TextEdit.java
@@ -48,11 +48,11 @@ TextEdit( TQWidget parent, String name )
 	     this, SLOT(" editorChanged( TQWidget  )") );
     setCentralWidget( tabWidget );
 
-    if ( qApp().args().length == 0 ) {
+    if ( tqApp().args().length == 0 ) {
 	load( "example.html" );
     } else {
-	for ( int i = 0; i < qApp().args().length; ++i )
-	    load( qApp().args()[ i ] );
+	for ( int i = 0; i < tqApp().args().length; ++i )
+	    load( tqApp().args()[ i ] );
     }
 }
 
@@ -332,7 +332,7 @@ void fileClose()
 
 void fileExit()
 {
-    qApp().quit();
+    tqApp().quit();
 }
 
 void editUndo()
diff --git a/qtjava/javalib/examples/widgets/MyWidgetView.java b/qtjava/javalib/examples/widgets/MyWidgetView.java
index 968a13ea..948de601 100644
--- a/qtjava/javalib/examples/widgets/MyWidgetView.java
+++ b/qtjava/javalib/examples/widgets/MyWidgetView.java
@@ -31,7 +31,7 @@ public    MyWidgetView( TQWidget parent, String name )
 	ArrayList styles = TQStyleFactory.keys();
 
 	s = (++s)%styles.size();
-	qApp().setStyle( (String) styles.get(s) );
+	tqApp().setStyle( (String) styles.get(s) );
 	super.button1Clicked();
     }
 
diff --git a/qtjava/javalib/examples/widgets/WidgetView.java b/qtjava/javalib/examples/widgets/WidgetView.java
index 2907f49c..77382908 100644
--- a/qtjava/javalib/examples/widgets/WidgetView.java
+++ b/qtjava/javalib/examples/widgets/WidgetView.java
@@ -243,7 +243,7 @@ WidgetView( TQWidget parent, String name )
 		     + "about widgets on the screen.");
 
     // Install an application-global event filter to catch control+leftbutton
-    qApp().installEventFilter( this );
+    tqApp().installEventFilter( this );
 
     //make a central widget to contain the other widgets
     central = new TQWidget( this );
@@ -268,7 +268,7 @@ WidgetView( TQWidget parent, String name )
     id = popup.insertItem( new TQIconSet(openIcon), "&Open", this, SLOT(" open()") );
 
     popup.insertSeparator();
-    popup.insertItem( "&Quit", qApp(), SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) );
+    popup.insertItem( "&Quit", tqApp(), SLOT("quit()"), new TQKeySequence(CTRL+Key_Q) );
 
 
     textStylePopup = popup = new TQPopupMenu( this );
@@ -813,13 +813,13 @@ void mySelectionChanged( TQListViewItem item )
 
 void showProperties()
 {
-    if ( qApp().focusWidget() == null )
+    if ( tqApp().focusWidget() == null )
 	return;
-    String output = "Properties for class '" + qApp().focusWidget().className() + "'";
+    String output = "Properties for class '" + tqApp().focusWidget().className() + "'";
     int i = 0;
-    while( i < (int) qApp().focusWidget().metaObject().numProperties( true ) ) {
+    while( i < (int) tqApp().focusWidget().metaObject().numProperties( true ) ) {
 	TQMetaProperty p
-	    = qApp().focusWidget().metaObject().property( i, true );
+	    = tqApp().focusWidget().metaObject().property( i, true );
 	String tmp = "\n " + (++i) + ": " + p.name() 
 	             + " (read-" + (p.writable() ? "write" : "only") + ", " + p.type() + ")";
 	output += tmp;
diff --git a/qtjava/javalib/examples/wizard/Wizard.java b/qtjava/javalib/examples/wizard/Wizard.java
index 22a3cb28..c2b140fb 100644
--- a/qtjava/javalib/examples/wizard/Wizard.java
+++ b/qtjava/javalib/examples/wizard/Wizard.java
@@ -31,7 +31,7 @@ Wizard( TQWidget parent, String name )
     setupPage2();
     setupPage3();
     connect(this, SIGNAL("selected(String)"), this, SLOT("doShowPage(String)"));
-    connect(finishButton(), SIGNAL("clicked()"), qApp(), SLOT("quit()"));
+    connect(finishButton(), SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
     key.setFocus();
 }
 
diff --git a/qtjava/javalib/org/kde/qt/Qt.java b/qtjava/javalib/org/kde/qt/Qt.java
index 24652c64..3c8c8115 100644
--- a/qtjava/javalib/org/kde/qt/Qt.java
+++ b/qtjava/javalib/org/kde/qt/Qt.java
@@ -926,14 +926,14 @@ public class Qt implements QtSupport {
 	*/
 	public static native TQDataStream op_write(TQDataStream arg1, TQPen arg2);
 	public static native TQDataStream op_read(TQDataStream arg1, TQPen arg2);
-	public static native int qRed(int rgb);
-	public static native int qGreen(int rgb);
-	public static native int qBlue(int rgb);
-	public static native int qAlpha(int rgb);
-	public static native int qRgb(int r, int g, int b);
-	public static native int qRgba(int r, int g, int b, int a);
-	public static native int qGray(int r, int g, int b);
-	public static native int qGray(int rgb);
+	public static native int tqRed(int rgb);
+	public static native int tqGreen(int rgb);
+	public static native int tqBlue(int rgb);
+	public static native int tqAlpha(int rgb);
+	public static native int tqRgb(int r, int g, int b);
+	public static native int tqRgba(int r, int g, int b, int a);
+	public static native int tqGray(int r, int g, int b);
+	public static native int tqGray(int rgb);
 	/**	**************************************************
 		  TQColor stream functions
 		**************************************************		@short                                                                                TQColor stream functions
@@ -1083,7 +1083,7 @@ public class Qt implements QtSupport {
 	public static native TQCursor forbiddenCursor();	// forbidden cursor (slashed circle)
 	public static native TQCursor whatsThisCursor();	// arrow with a question mark
 	
-	public static native TQApplication qApp();
+	public static native TQApplication tqApp();
 	
 	public static native void qDebug(String message);
 	public static void qDebug(String pattern, Object[] arguments) {
diff --git a/qtjava/javalib/qtjava/Qt.cpp b/qtjava/javalib/qtjava/Qt.cpp
index 5dca1c96..86c6b1df 100644
--- a/qtjava/javalib/qtjava/Qt.cpp
+++ b/qtjava/javalib/qtjava/Qt.cpp
@@ -996,7 +996,7 @@ Java_org_kde_qt_Qt_qAlpha(JNIEnv* env, jclass cls, jint rgb)
 {
 	(void) cls;
 	(void) env;
-	jint xret = (jint) ::qAlpha((TQRgb) rgb);
+	jint xret = (jint) ::tqAlpha((TQRgb) rgb);
 	return xret;
 }
 
@@ -1014,7 +1014,7 @@ Java_org_kde_qt_Qt_qBlue(JNIEnv* env, jclass cls, jint rgb)
 {
 	(void) cls;
 	(void) env;
-	jint xret = (jint) ::qBlue((TQRgb) rgb);
+	jint xret = (jint) ::tqBlue((TQRgb) rgb);
 	return xret;
 }
 
@@ -1439,7 +1439,7 @@ Java_org_kde_qt_Qt_qGray__I(JNIEnv* env, jclass cls, jint rgb)
 {
 	(void) cls;
 	(void) env;
-	jint xret = (jint) ::qGray((TQRgb) rgb);
+	jint xret = (jint) ::tqGray((TQRgb) rgb);
 	return xret;
 }
 
@@ -1448,7 +1448,7 @@ Java_org_kde_qt_Qt_qGray__III(JNIEnv* env, jclass cls, jint r, jint g, jint b)
 {
 	(void) cls;
 	(void) env;
-	jint xret = (jint) ::qGray((int) r, (int) g, (int) b);
+	jint xret = (jint) ::tqGray((int) r, (int) g, (int) b);
 	return xret;
 }
 
@@ -1457,7 +1457,7 @@ Java_org_kde_qt_Qt_qGreen(JNIEnv* env, jclass cls, jint rgb)
 {
 	(void) cls;
 	(void) env;
-	jint xret = (jint) ::qGreen((TQRgb) rgb);
+	jint xret = (jint) ::tqGreen((TQRgb) rgb);
 	return xret;
 }
 
@@ -1604,7 +1604,7 @@ Java_org_kde_qt_Qt_qRed(JNIEnv* env, jclass cls, jint rgb)
 {
 	(void) cls;
 	(void) env;
-	jint xret = (jint) ::qRed((TQRgb) rgb);
+	jint xret = (jint) ::tqRed((TQRgb) rgb);
 	return xret;
 }
 
@@ -1613,7 +1613,7 @@ Java_org_kde_qt_Qt_qRgb(JNIEnv* env, jclass cls, jint r, jint g, jint b)
 {
 	(void) cls;
 	(void) env;
-	jint xret = (jint) ::qRgb((int) r, (int) g, (int) b);
+	jint xret = (jint) ::tqRgb((int) r, (int) g, (int) b);
 	return xret;
 }
 
@@ -1622,7 +1622,7 @@ Java_org_kde_qt_Qt_qRgba(JNIEnv* env, jclass cls, jint r, jint g, jint b, jint a
 {
 	(void) cls;
 	(void) env;
-	jint xret = (jint) ::qRgba((int) r, (int) g, (int) b, (int) a);
+	jint xret = (jint) ::tqRgba((int) r, (int) g, (int) b, (int) a);
 	return xret;
 }
 
@@ -1990,7 +1990,7 @@ JNIEXPORT jobject JNICALL
 Java_org_kde_qt_Qt_qApp(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, qApp, "org.kde.qt.TQApplication");
+	return (jobject) QtSupport::objectForQtKey(env, tqApp, "org.kde.qt.TQApplication");
 }
 
 JNIEXPORT void JNICALL
diff --git a/qtjava/javalib/test/ScribbleWindow.java b/qtjava/javalib/test/ScribbleWindow.java
index abad9d30..61806b42 100644
--- a/qtjava/javalib/test/ScribbleWindow.java
+++ b/qtjava/javalib/test/ScribbleWindow.java
@@ -170,7 +170,7 @@ public class ScribbleWindow extends TQWidget {
 		_filemenu.insertItem( "&Load", this, SLOT( "slotLoad()" ) );
 		_filemenu.insertItem( "&Save", this, SLOT( "slotSave()" ) );
 		_filemenu.insertSeparator();
-		_filemenu.insertItem( "&Quit", qApp(), SLOT( "quit()" ) );
+		_filemenu.insertItem( "&Quit", tqApp(), SLOT( "quit()" ) );
 		
 		_colormenu = new TQPopupMenu(); // create a color menu
 		_colormenu.insertItem( "B&lack", COLOR_MENU_ID_BLACK);
diff --git a/qtjava/javalib/tutorial/t10/Tut10.java b/qtjava/javalib/tutorial/t10/Tut10.java
index e85ef731..beecacc2 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()"), qApp(), SLOT("quit()"));
+		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
 
 		LCDRange angle = new LCDRange(this, "angle");
 		angle.setRange(5, 70);
diff --git a/qtjava/javalib/tutorial/t11/Tut11.java b/qtjava/javalib/tutorial/t11/Tut11.java
index 854a5b0f..1f7b3451 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()"), qApp(), SLOT("quit()"));
+		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
 
 		LCDRange angle = new LCDRange(this, "angle");
 		angle.setRange(5, 70);
diff --git a/qtjava/javalib/tutorial/t12/Tut12.java b/qtjava/javalib/tutorial/t12/Tut12.java
index 4bf347fd..f0044836 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()"), qApp(), SLOT("quit()"));
+		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
 
 		LCDRange angle = new LCDRange("ANGLE", this, "angle");
 		angle.setRange(5, 70);
diff --git a/qtjava/javalib/tutorial/t13/GameBoard.java b/qtjava/javalib/tutorial/t13/GameBoard.java
index 5ba2579e..efde663c 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()"), qApp(), SLOT("quit()"));
+		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
 
 		LCDRange angle = new LCDRange("ANGLE", this, "angle");
 		angle.setRange(5, 70);
diff --git a/qtjava/javalib/tutorial/t14/GameBoard.java b/qtjava/javalib/tutorial/t14/GameBoard.java
index 571e902e..95783df5 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()"), qApp(), SLOT("quit()"));
+		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
 
 		LCDRange angle = new LCDRange("ANGLE", this, "angle");
 		angle.setRange(5, 70);
@@ -56,11 +56,11 @@ public class GameBoard extends TQWidget {
 		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)), qApp(), SLOT("quit()"));
+		accel.connectItem(accel.insertItem(new TQKeySequence(CTRL+Key_Q)), tqApp(), 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), qApp(), SLOT("quit()"));
+		accel.connectItem(accel.insertItem(CTRL+Key_Q), tqApp(), SLOT("quit()"));
 ***/
 		TQGridLayout grid = new TQGridLayout(this, 2, 2, 10, -1, null);
 		grid.addWidget(quit, 0, 0);
diff --git a/qtjava/javalib/tutorial/t4/Tut4.java b/qtjava/javalib/tutorial/t4/Tut4.java
index 3cb9393c..a8cb1f01 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()"), qApp(), SLOT("quit()"));
+		connect(quit, SIGNAL("clicked()"), tqApp(), 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 7b3fa60a..335a03fc 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()"), qApp(), SLOT("quit()"));
+		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
 
 		TQLCDNumber lcd = new TQLCDNumber(2, this, "lcd");
 
diff --git a/qtjava/javalib/tutorial/t6/Tut6.java b/qtjava/javalib/tutorial/t6/Tut6.java
index b93807cc..7945012b 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()"), qApp(), SLOT("quit()"));
+		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
 
 		TQGrid grid = new TQGrid(4, this, null, 0);
 
diff --git a/qtjava/javalib/tutorial/t7/Tut7.java b/qtjava/javalib/tutorial/t7/Tut7.java
index dbcf653c..657b5398 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()"), qApp(), SLOT("quit()"));
+		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
 
 		TQGrid grid = new TQGrid(4, this, null, 0);
 		
diff --git a/qtjava/javalib/tutorial/t8/Tut8.java b/qtjava/javalib/tutorial/t8/Tut8.java
index 9cc4fa9f..f51cccd0 100644
--- a/qtjava/javalib/tutorial/t8/Tut8.java
+++ b/qtjava/javalib/tutorial/t8/Tut8.java
@@ -5,7 +5,7 @@ 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()"), qApp(), SLOT("quit()"));
+		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
 
 		LCDRange angle = new LCDRange(this, "angle");
 		angle.setRange(5, 70);
diff --git a/qtjava/javalib/tutorial/t9/Tut9.java b/qtjava/javalib/tutorial/t9/Tut9.java
index 71531698..19219c29 100644
--- a/qtjava/javalib/tutorial/t9/Tut9.java
+++ b/qtjava/javalib/tutorial/t9/Tut9.java
@@ -5,7 +5,7 @@ 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()"), qApp(), SLOT("quit()"));
+		connect(quit, SIGNAL("clicked()"), tqApp(), SLOT("quit()"));
 
 		LCDRange angle = new LCDRange(this, "angle");
 		angle.setRange(5, 70);