Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 35fbd60457d1e51e6a0df5d181d1a0f00ad75a2c)

2 files changed, 14 insertions, 14 deletions

diff --git a/languages/cpp/app_templates/qmakeapp/main.cpp b/languages/cpp/app_templates/qmakeapp/main.cpp
index 8938adc5..ba45c728 100644
--- a/languages/cpp/app_templates/qmakeapp/main.cpp
+++ b/languages/cpp/app_templates/qmakeapp/main.cpp
@@ -8,6 +8,6 @@ int main( int argc, char ** argv ) {
     %{APPNAME} * mw = new %{APPNAME}();
     mw->setCaption( "%{APPNAME}" );
     mw->show();
-    a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()) );
+    a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()) );
     return a.exec();
 }
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
index 39b6e5af..8ce81310 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp
@@ -37,17 +37,17 @@
     openIcon = TQPixmap( fileopen );
     TQToolButton * fileOpen
 	= new TQToolButton( openIcon, tr("Open File"), TQString(),
-			   this, TQT_SLOT(choose()), fileTools, "open file" );
+			   this, TQ_SLOT(choose()), fileTools, "open file" );
 
     saveIcon = TQPixmap( filesave );
     TQToolButton * fileSave
 	= new TQToolButton( saveIcon, tr("Save File"), TQString(),
-			   this, TQT_SLOT(save()), fileTools, "save file" );
+			   this, TQ_SLOT(save()), fileTools, "save file" );
 
     printIcon = TQPixmap( fileprint );
     TQToolButton * filePrint
 	= new TQToolButton( printIcon, tr("Print File"), TQString(),
-			   this, TQT_SLOT(print()), fileTools, "print file" );
+			   this, TQ_SLOT(print()), fileTools, "print file" );
 
 
     (void)TQWhatsThis::whatsThisButton( fileTools );
@@ -79,41 +79,41 @@
     menuBar()->insertItem( tr("&File"), file );
 
 
-    file->insertItem( tr("&New"), this, TQT_SLOT(newDoc()), CTRL+Key_N );
+    file->insertItem( tr("&New"), this, TQ_SLOT(newDoc()), CTRL+Key_N );
 
     int id;
     id = file->insertItem( openIcon, tr("&Open..."),
-			   this, TQT_SLOT(choose()), CTRL+Key_O );
+			   this, TQ_SLOT(choose()), CTRL+Key_O );
     file->setWhatsThis( id, fileOpenText );
 
     id = file->insertItem( saveIcon, tr("&Save"),
-			   this, TQT_SLOT(save()), CTRL+Key_S );
+			   this, TQ_SLOT(save()), CTRL+Key_S );
     file->setWhatsThis( id, fileSaveText );
 
-    id = file->insertItem( tr("Save &As..."), this, TQT_SLOT(saveAs()) );
+    id = file->insertItem( tr("Save &As..."), this, TQ_SLOT(saveAs()) );
     file->setWhatsThis( id, fileSaveText );
 
     file->insertSeparator();
 
     id = file->insertItem( printIcon, tr("&Print..."),
-			   this, TQT_SLOT(print()), CTRL+Key_P );
+			   this, TQ_SLOT(print()), CTRL+Key_P );
     file->setWhatsThis( id, filePrintText );
 
     file->insertSeparator();
 
-    file->insertItem( tr("&Close"), this, TQT_SLOT(close()), CTRL+Key_W );
+    file->insertItem( tr("&Close"), this, TQ_SLOT(close()), CTRL+Key_W );
 
-    file->insertItem( tr("&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q );
+    file->insertItem( tr("&Quit"), tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q );
 
     menuBar()->insertSeparator();
 
     TQPopupMenu * help = new TQPopupMenu( this );
     menuBar()->insertItem( tr("&Help"), help );
 
-    help->insertItem( tr("&About"), this, TQT_SLOT(about()), Key_F1 );
-    help->insertItem( tr("About &TQt"), this, TQT_SLOT(aboutTQt()) );
+    help->insertItem( tr("&About"), this, TQ_SLOT(about()), Key_F1 );
+    help->insertItem( tr("About &TQt"), this, TQ_SLOT(aboutTQt()) );
     help->insertSeparator();
-    help->insertItem( tr("What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 );
+    help->insertItem( tr("What's &This"), this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 );
 
     e = new TQTextEdit( this, "editor" );
     e->setFocus();