Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

8 files changed, 51 insertions, 51 deletions

diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index 2588b06e..c05ad1ae 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -245,12 +245,12 @@ KWClassicMailMergeEditorList::KWClassicMailMergeEditorList( TQWidget *parent, KW
     addColumn( i18n( "Name" ) );
     addColumn( i18n( "Value" ) );
     header()->setMovingEnabled( FALSE );
-    connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ),
-             this, TQT_SLOT( columnSizeChange( int, int, int ) ) );
-//     connect( header(), TQT_SIGNAL( sectionClicked( int ) ),
-//           this, TQT_SLOT( sectionClicked( int ) ) );
-    disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ),
-                this, TQT_SLOT( changeSortColumn( int ) ) );
+    connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ),
+             this, TQ_SLOT( columnSizeChange( int, int, int ) ) );
+//     connect( header(), TQ_SIGNAL( sectionClicked( int ) ),
+//           this, TQ_SLOT( sectionClicked( int ) ) );
+    disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ),
+                this, TQ_SLOT( changeSortColumn( int ) ) );
 
     currentRecord = -1;
 }
@@ -343,27 +343,27 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS
     first = new TQToolButton( toolbar );
     first->setIconSet( SmallIconSet( "go-first" ) );
     first->setFixedSize( first->sizeHint() );
-    connect(first, TQT_SIGNAL(clicked()), this, TQT_SLOT(firstRecord()));
+    connect(first, TQ_SIGNAL(clicked()), this, TQ_SLOT(firstRecord()));
 
     back_ = new TQToolButton( toolbar );
     back_->setIconSet( SmallIconSet( "back" ) );
     back_->setFixedSize( back_->sizeHint() );
-    connect(back_, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevRecord()));
+    connect(back_, TQ_SIGNAL(clicked()), this, TQ_SLOT(prevRecord()));
 
     records = new TQSpinBox( 1, db->getNumRecords(), 1, toolbar );
     records->setMaximumHeight( records->sizeHint().height() );
-    connect( records, TQT_SIGNAL( valueChanged( int ) ),
-             this, TQT_SLOT( changeRecord( int ) ) );
+    connect( records, TQ_SIGNAL( valueChanged( int ) ),
+             this, TQ_SLOT( changeRecord( int ) ) );
 
     forward = new TQToolButton( toolbar );
     forward->setIconSet( SmallIconSet( "forward" ) );
     forward->setFixedSize( forward->sizeHint() );
-    connect(forward, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextRecord()));
+    connect(forward, TQ_SIGNAL(clicked()), this, TQ_SLOT(nextRecord()));
 
     finish = new TQToolButton( toolbar );
     finish->setIconSet( SmallIconSet( "go-last" ) );
     finish->setFixedSize( finish->sizeHint() );
-    connect(finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(lastRecord()));
+    connect(finish, TQ_SIGNAL(clicked()), this, TQ_SLOT(lastRecord()));
 
     TQWidget *sep = new TQWidget( toolbar );
     sep->setMaximumWidth( 10 );
@@ -371,29 +371,29 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS
     newRecord = new TQToolButton( toolbar );
     newRecord->setIconSet( SmallIconSet( "sl_addrecord" ) );
     newRecord->setFixedSize( newRecord->sizeHint() );
-    connect( newRecord, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( addRecord() ) );
+    connect( newRecord, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( addRecord() ) );
     TQToolTip::add( newRecord, i18n( "Add record" ) );
 
     newEntry = new TQToolButton( toolbar );
     newEntry->setIconSet( SmallIconSet( "sl_addentry" ) );
     newEntry->setFixedSize( newEntry->sizeHint() );
-    connect( newEntry, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( addEntry() ) );
+    connect( newEntry, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( addEntry() ) );
     TQToolTip::add( newEntry, i18n( "Add entry" ) );
 
     deleteRecord = new TQToolButton( toolbar );
     deleteRecord->setIconSet( SmallIconSet( "sl_delrecord" ) );
     deleteRecord->setFixedSize( deleteRecord->sizeHint() );
-    connect( deleteRecord, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( removeRecord() ) );
+    connect( deleteRecord, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( removeRecord() ) );
     TQToolTip::add( deleteRecord, i18n( "Remove record" ) );
 
     deleteEntry = new TQToolButton( toolbar );
     deleteEntry->setIconSet( SmallIconSet( "sl_delentry" ) );
     deleteEntry->setFixedSize( deleteEntry->sizeHint() );
-    connect( deleteEntry, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( removeEntry() ) );
+    connect( deleteEntry, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( removeEntry() ) );
     TQToolTip::add( deleteEntry, i18n( "Remove entry" ) );
 
     dbList = new KWClassicMailMergeEditorList( back, db );
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index 527d1e68..6b93e3d3 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
@@ -100,7 +100,7 @@ void KWMailMergeKSpread::initDocument()
 {
   _document = new Doc();
 
-  connect( _document, TQT_SIGNAL( completed() ), TQT_SLOT( initSpreadSheets() ) );
+  connect( _document, TQ_SIGNAL( completed() ), TQ_SLOT( initSpreadSheets() ) );
 
   _document->openURL( _url );
 }
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
index 441c3207..00554625 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
@@ -46,8 +46,8 @@ KWMailMergeKSpreadConfig::KWMailMergeKSpreadConfig( TQWidget *parent, KWMailMerg
   _urlRequester->setURL( _object->url().url() );
   _initialPage = _object->spreadSheetNumber();
 
-  connect( _urlRequester, TQT_SIGNAL( urlSelected( const TQString& ) ),
-           TQT_SLOT( loadDocument() ) );
+  connect( _urlRequester, TQ_SIGNAL( urlSelected( const TQString& ) ),
+           TQ_SLOT( loadDocument() ) );
 
   loadDocument();
   slotTextChanged( _urlRequester->lineEdit()->text() );
@@ -75,7 +75,7 @@ void KWMailMergeKSpreadConfig::loadDocument()
 
   if ( !_urlRequester->url().isEmpty() ) {
     _document = new Doc();
-    connect( _document, TQT_SIGNAL( completed() ), TQT_SLOT( documentLoaded() ) );
+    connect( _document, TQ_SIGNAL( completed() ), TQ_SLOT( documentLoaded() ) );
 
     _document->openURL( _urlRequester->url() );
   }
@@ -114,7 +114,7 @@ void KWMailMergeKSpreadConfig::initGUI()
   _pageNumber = new KComboBox( page );
   _pageNumber->setEnabled( false );
   layout->addWidget( _pageNumber, 1, 1 );
-  connect( _urlRequester->lineEdit() , TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
+  connect( _urlRequester->lineEdit() , TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) );
 }
 
 void KWMailMergeKSpreadConfig::slotTextChanged( const TQString & _text )
diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
index 08def7cd..ad692ddc 100644
--- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
+++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
@@ -40,7 +40,7 @@ KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent)
 	for (int i=0;i<3;i++) w+=m_table->columnWidth(i);
 	w+=m_table->verticalHeader()->headerWidth();
 	m_table->setMinimumWidth(w);
-	connect(m_table,TQT_SIGNAL(valueChanged ( int, int)),this,TQT_SLOT(slotValueChanged ( int, int)));
+	connect(m_table,TQ_SIGNAL(valueChanged ( int, int)),this,TQ_SLOT(slotValueChanged ( int, int)));
 }
 
 void KWQtSqlEasyFilter::createColumn(int i)
diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
index 538e36a6..951944b2 100644
--- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
+++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
@@ -47,11 +47,11 @@ KWQtSqlMailMergeOpen::KWQtSqlMailMergeOpen( TQWidget *parent, KWQtSqlSerialDataS
         widget->port->setText(db->port);
         widget->databasename->setText(db->databasename);
         fillSavedProperties();
-	connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(handleOk()));
-	connect(widget->savedProperties,TQT_SIGNAL(activated(const TQString&)),
-		this, TQT_SLOT(savedPropertiesChanged(const TQString&)));
-	connect(widget->rememberButton,TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotSave()));
+	connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(handleOk()));
+	connect(widget->savedProperties,TQ_SIGNAL(activated(const TQString&)),
+		this, TQ_SLOT(savedPropertiesChanged(const TQString&)));
+	connect(widget->rememberButton,TQ_SIGNAL(clicked()),
+		this, TQ_SLOT(slotSave()));
 }
 
 KWQtSqlMailMergeOpen::~KWQtSqlMailMergeOpen(){;}
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index a30340ad..afc464ed 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -180,10 +180,10 @@ KWQtSqlPowerMailMergeEditor::KWQtSqlPowerMailMergeEditor( TQWidget *parent, KWQt
 {
         (new TQVBoxLayout(plainPage()))->setAutoAdd(true);
         setMainWidget(widget=new KWQtSqlPowerWidget(plainPage()));
-	connect(widget->setup,TQT_SIGNAL(clicked()),this,TQT_SLOT(openSetup()));
-	connect(widget->tables,TQT_SIGNAL(currentChanged(TQListBoxItem*)),this,TQT_SLOT(slotTableChanged(TQListBoxItem*)));
-	connect(widget->execute,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotExecute()));
-	connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotSetQuery()));
+	connect(widget->setup,TQ_SIGNAL(clicked()),this,TQ_SLOT(openSetup()));
+	connect(widget->tables,TQ_SIGNAL(currentChanged(TQListBoxItem*)),this,TQ_SLOT(slotTableChanged(TQListBoxItem*)));
+	connect(widget->execute,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotExecute()));
+	connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotSetQuery()));
 	widget->query->setText(db->query);
 	updateDBViews();
 }
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 04bd1830..5549128f 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -169,11 +169,11 @@ KWQtSqlDataSourceEditor::KWQtSqlDataSourceEditor( TQWidget *parent, KWQtSqlSeria
 	filter=db->filter;
         (new TQVBoxLayout(plainPage()))->setAutoAdd(true);
         setMainWidget(widget=new QtSqlDataSourceEditor(plainPage()));
-	connect(widget->tableCombo,TQT_SIGNAL(activated(int)),this,TQT_SLOT(tableChanged(int)));
-	connect(widget->editFilter,TQT_SIGNAL(clicked()),this,TQT_SLOT(editFilter()));
+	connect(widget->tableCombo,TQ_SIGNAL(activated(int)),this,TQ_SLOT(tableChanged(int)));
+	connect(widget->editFilter,TQ_SIGNAL(clicked()),this,TQ_SLOT(editFilter()));
 	updateTableCombo();
 
-//        connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotSetQuery()));
+//        connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotSetQuery()));
 }
 
 void KWQtSqlDataSourceEditor::tableChanged(int item)
diff --git a/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp
index 440e208a..bb183a74 100644
--- a/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp
+++ b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp
@@ -267,19 +267,19 @@ void KWMailMergeTDEABCConfig::initSelectedLists()
 
 void KWMailMergeTDEABCConfig::initSlotSignalConnections()
 {
-    connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( acceptSelection() ) );
-    connect( _ui->mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addSelectedContacts() ) );
-    connect( _ui->mAddressBook, TQT_SIGNAL( clicked() ), TQT_SLOT( launchAddressbook() ) );
-
-    connect( _ui->mAvailableView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ),
-             TQT_SLOT( addSelectedContacts() ) );
-
-    connect( _ui->mFilterEdit, TQT_SIGNAL( textChanged(const TQString &) ),
-             TQT_SLOT( filterChanged(const TQString &) ) );
-    connect( _ui->mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSelectedContacts() ) );
-    connect( _ui->mSaveList, TQT_SIGNAL( clicked() ), TQT_SLOT( saveDistributionList() ) );
-    connect( _ui->mSelectedView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ),
-             TQT_SLOT( removeSelectedContacts() ) );
+    connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( acceptSelection() ) );
+    connect( _ui->mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addSelectedContacts() ) );
+    connect( _ui->mAddressBook, TQ_SIGNAL( clicked() ), TQ_SLOT( launchAddressbook() ) );
+
+    connect( _ui->mAvailableView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ),
+             TQ_SLOT( addSelectedContacts() ) );
+
+    connect( _ui->mFilterEdit, TQ_SIGNAL( textChanged(const TQString &) ),
+             TQ_SLOT( filterChanged(const TQString &) ) );
+    connect( _ui->mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSelectedContacts() ) );
+    connect( _ui->mSaveList, TQ_SIGNAL( clicked() ), TQ_SLOT( saveDistributionList() ) );
+    connect( _ui->mSelectedView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ),
+             TQ_SLOT( removeSelectedContacts() ) );
 }