Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

2 files changed, 14 insertions, 14 deletions

diff --git a/example/application.cpp b/example/application.cpp
index b832def..3352d8b 100644
--- a/example/application.cpp
+++ b/example/application.cpp
@@ -48,17 +48,17 @@ ApplicationWindow::ApplicationWindow()
     openIcon = TQPixmap( fileopen );
     TQToolButton * fileOpen
 	= new TQToolButton( openIcon, "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, "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, "Print File", TQString(),
-			   this, TQT_SLOT(print()), fileTools, "print file" );
+			   this, TQ_SLOT(print()), fileTools, "print file" );
 
 
     (void)TQWhatsThis::whatsThisButton( fileTools );
@@ -91,41 +91,41 @@ ApplicationWindow::ApplicationWindow()
     menuBar()->insertItem( "&File", file );
 
 
-    file->insertItem( "&New", this, TQT_SLOT(newDoc()), CTRL+Key_N );
+    file->insertItem( "&New", this, TQ_SLOT(newDoc()), CTRL+Key_N );
 
     int id;
     id = file->insertItem( openIcon, "&Open...",
-			   this, TQT_SLOT(choose()), CTRL+Key_O );
+			   this, TQ_SLOT(choose()), CTRL+Key_O );
     file->setWhatsThis( id, fileOpenText );
 
     id = file->insertItem( saveIcon, "&Save",
-			   this, TQT_SLOT(save()), CTRL+Key_S );
+			   this, TQ_SLOT(save()), CTRL+Key_S );
     file->setWhatsThis( id, fileSaveText );
 
-    id = file->insertItem( "Save &As...", this, TQT_SLOT(saveAs()) );
+    id = file->insertItem( "Save &As...", this, TQ_SLOT(saveAs()) );
     file->setWhatsThis( id, fileSaveText );
 
     file->insertSeparator();
 
     id = file->insertItem( printIcon, "&Print...",
-			   this, TQT_SLOT(print()), CTRL+Key_P );
+			   this, TQ_SLOT(print()), CTRL+Key_P );
     file->setWhatsThis( id, filePrintText );
 
     file->insertSeparator();
 
-    file->insertItem( "&Close", this, TQT_SLOT(close()), CTRL+Key_W );
+    file->insertItem( "&Close", this, TQ_SLOT(close()), CTRL+Key_W );
 
-    file->insertItem( "&Quit", tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q );
+    file->insertItem( "&Quit", tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q );
 
     menuBar()->insertSeparator();
 
     TQPopupMenu * help = new TQPopupMenu( this );
     menuBar()->insertItem( "&Help", help );
 
-    help->insertItem( "&About", this, TQT_SLOT(about()), Key_F1 );
-    help->insertItem( "About &TQt", this, TQT_SLOT(aboutTQt()) );
+    help->insertItem( "&About", this, TQ_SLOT(about()), Key_F1 );
+    help->insertItem( "About &TQt", this, TQ_SLOT(aboutTQt()) );
     help->insertSeparator();
-    help->insertItem( "What's &This", this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 );
+    help->insertItem( "What's &This", this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 );
 
     e = new TQextScintilla( this, "editor" );
     e->setFocus();
diff --git a/example/main.cpp b/example/main.cpp
index a24a49f..5c7af61 100644
--- a/example/main.cpp
+++ b/example/main.cpp
@@ -16,6 +16,6 @@ int main( int argc, char ** argv ) {
     ApplicationWindow *mw = new ApplicationWindow();
     mw->setCaption( "TQScintilla Example - Application" );
     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();
 }