Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

3 files changed, 34 insertions, 34 deletions

diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp
index 3dce8cacc..8c44543d9 100644
--- a/tdeprint/tests/drawdemo.cpp
+++ b/tdeprint/tests/drawdemo.cpp
@@ -133,7 +133,7 @@ DrawView::DrawView()
     // Create a button group to contain all buttons
     bgroup = new TQButtonGroup( this );
     bgroup->resize( 200, 200 );
-    connect( bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(updateIt(int)) );
+    connect( bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(updateIt(int)) );
 
     // Calculate the size for the radio buttons
     int maxwidth = 80;
@@ -164,7 +164,7 @@ DrawView::DrawView()
     print = new TQPushButton( "Print...", bgroup );
     print->resize( 80, 30 );
     print->move( maxwidth/2 - print->width()/2, maxindex*30+20 );
-    connect( print, TQT_SIGNAL(clicked()), TQT_SLOT(printIt()) );
+    connect( print, TQ_SIGNAL(clicked()), TQ_SLOT(printIt()) );
 
     bgroup->resize( maxwidth, print->y()+print->height()+10 );
 
diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp
index 2f172acc0..c9188c25f 100644
--- a/tdeprint/tests/helpwindow.cpp
+++ b/tdeprint/tests/helpwindow.cpp
@@ -48,26 +48,26 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path,
     browser = new TQTextBrowser( this );
     browser->mimeSourceFactory()->setFilePath( _path );
     browser->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    connect( browser, TQT_SIGNAL( textChanged() ),
-	     this, TQT_SLOT( textChanged() ) );
+    connect( browser, TQ_SIGNAL( textChanged() ),
+	     this, TQ_SLOT( textChanged() ) );
 
     setCentralWidget( browser );
 
     if ( !home_.isEmpty() )
 	browser->setSource( home_ );
 
-    connect( browser, TQT_SIGNAL( highlighted( const TQString&) ),
-	     statusBar(), TQT_SLOT( message( const TQString&)) );
+    connect( browser, TQ_SIGNAL( highlighted( const TQString&) ),
+	     statusBar(), TQ_SLOT( message( const TQString&)) );
 
     resize( 640,700 );
 
     TQPopupMenu* file = new TQPopupMenu( this );
-    file->insertItem( "&New Window", this, TQT_SLOT( newWindow() ), ALT | Key_N );
-    file->insertItem( "&Open File", this, TQT_SLOT( openFile() ), ALT | Key_O );
-    file->insertItem( "&Print", this, TQT_SLOT( print() ), ALT | Key_P );
+    file->insertItem( "&New Window", this, TQ_SLOT( newWindow() ), ALT | Key_N );
+    file->insertItem( "&Open File", this, TQ_SLOT( openFile() ), ALT | Key_O );
+    file->insertItem( "&Print", this, TQ_SLOT( print() ), ALT | Key_P );
     file->insertSeparator();
-    file->insertItem( "&Close", this, TQT_SLOT( close() ), ALT | Key_Q );
-    file->insertItem( "E&xit", tqApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X );
+    file->insertItem( "&Close", this, TQ_SLOT( close() ), ALT | Key_Q );
+    file->insertItem( "E&xit", tqApp, TQ_SLOT( closeAllWindows() ), ALT | Key_X );
 
     // The same three icons are used twice each.
     TQIconSet icon_back( TQPixmap("back.xpm") );
@@ -76,33 +76,33 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path,
 
     TQPopupMenu* go = new TQPopupMenu( this );
     backwardId = go->insertItem( icon_back,
-				 "&Backward", browser, TQT_SLOT( backward() ),
+				 "&Backward", browser, TQ_SLOT( backward() ),
 				 ALT | Key_Left );
     forwardId = go->insertItem( icon_forward,
-				"&Forward", browser, TQT_SLOT( forward() ),
+				"&Forward", browser, TQ_SLOT( forward() ),
 				ALT | Key_Right );
-    go->insertItem( icon_home, "&Home", browser, TQT_SLOT( home() ) );
+    go->insertItem( icon_home, "&Home", browser, TQ_SLOT( home() ) );
 
     TQPopupMenu* help = new TQPopupMenu( this );
-    help->insertItem( "&About ...", this, TQT_SLOT( about() ) );
-    help->insertItem( "About &Qt ...", this, TQT_SLOT( aboutQt() ) );
+    help->insertItem( "&About ...", this, TQ_SLOT( about() ) );
+    help->insertItem( "About &Qt ...", this, TQ_SLOT( aboutQt() ) );
 
     hist = new TQPopupMenu( this );
     TQStringList::Iterator it = history.begin();
     for ( ; it != history.end(); ++it )
 	mHistory[ hist->insertItem( *it ) ] = *it;
-    connect( hist, TQT_SIGNAL( activated( int ) ),
-	     this, TQT_SLOT( histChosen( int ) ) );
+    connect( hist, TQ_SIGNAL( activated( int ) ),
+	     this, TQ_SLOT( histChosen( int ) ) );
 
     bookm = new TQPopupMenu( this );
-    bookm->insertItem( tr( "Add Bookmark" ), this, TQT_SLOT( addBookmark() ) );
+    bookm->insertItem( tr( "Add Bookmark" ), this, TQ_SLOT( addBookmark() ) );
     bookm->insertSeparator();
 
     TQStringList::Iterator it2 = bookmarks.begin();
     for ( ; it2 != bookmarks.end(); ++it2 )
 	mBookmarks[ bookm->insertItem( *it2 ) ] = *it2;
-    connect( bookm, TQT_SIGNAL( activated( int ) ),
-	     this, TQT_SLOT( bookmChosen( int ) ) );
+    connect( bookm, TQ_SIGNAL( activated( int ) ),
+	     this, TQ_SLOT( bookmChosen( int ) ) );
 
     menuBar()->insertItem( tr("&File"), file );
     menuBar()->insertItem( tr("&Go"), go );
@@ -113,29 +113,29 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path,
 
     menuBar()->setItemEnabled( forwardId, false);
     menuBar()->setItemEnabled( backwardId, false);
-    connect( browser, TQT_SIGNAL( backwardAvailable( bool ) ),
-	     this, TQT_SLOT( setBackwardAvailable( bool ) ) );
-    connect( browser, TQT_SIGNAL( forwardAvailable( bool ) ),
-	     this, TQT_SLOT( setForwardAvailable( bool ) ) );
+    connect( browser, TQ_SIGNAL( backwardAvailable( bool ) ),
+	     this, TQ_SLOT( setBackwardAvailable( bool ) ) );
+    connect( browser, TQ_SIGNAL( forwardAvailable( bool ) ),
+	     this, TQ_SLOT( setForwardAvailable( bool ) ) );
 
 
     TQToolBar* toolbar = new TQToolBar( this );
     addToolBar( toolbar, "Toolbar");
     TQToolButton* button;
 
-    button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQT_SLOT(backward()), toolbar );
-    connect( browser, TQT_SIGNAL( backwardAvailable(bool) ), button, TQT_SLOT( setEnabled(bool) ) );
+    button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQ_SLOT(backward()), toolbar );
+    connect( browser, TQ_SIGNAL( backwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) );
     button->setEnabled( false );
-    button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQT_SLOT(forward()), toolbar );
-    connect( browser, TQT_SIGNAL( forwardAvailable(bool) ), button, TQT_SLOT( setEnabled(bool) ) );
+    button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQ_SLOT(forward()), toolbar );
+    connect( browser, TQ_SIGNAL( forwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) );
     button->setEnabled( false );
-    button = new TQToolButton( icon_home, tr("Home"), "", browser, TQT_SLOT(home()), toolbar );
+    button = new TQToolButton( icon_home, tr("Home"), "", browser, TQ_SLOT(home()), toolbar );
 
     toolbar->addSeparator();
 
     pathCombo = new TQComboBox( true, toolbar );
-    connect( pathCombo, TQT_SIGNAL( activated( const TQString & ) ),
-	     this, TQT_SLOT( pathSelected( const TQString & ) ) );
+    connect( pathCombo, TQ_SIGNAL( activated( const TQString & ) ),
+	     this, TQ_SLOT( pathSelected( const TQString & ) ) );
     toolbar->setStretchableWidget( pathCombo );
     setRightJustification( true );
     setDockEnabled( DockLeft, false );
diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp
index c91cd23a7..0405fafe3 100644
--- a/tdeprint/tests/main.cpp
+++ b/tdeprint/tests/main.cpp
@@ -34,8 +34,8 @@ int main( int argc, char ** argv )
     else
 	help->showMaximized();
 
-    TQObject::connect( &a, TQT_SIGNAL(lastWindowClosed()),
-                      &a, TQT_SLOT(quit()) );
+    TQObject::connect( &a, TQ_SIGNAL(lastWindowClosed()),
+                      &a, TQ_SLOT(quit()) );
 
     return a.exec();
 }