Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

4 files changed, 26 insertions, 26 deletions

diff --git a/conduits/docconduit/doc-conduit.cpp b/conduits/docconduit/doc-conduit.cpp
index 7f375d4..fb87c37 100644
--- a/conduits/docconduit/doc-conduit.cpp
+++ b/conduits/docconduit/doc-conduit.cpp
@@ -271,7 +271,7 @@ TQString DOCConduit::constructTXTFileName(TQString name) {
 
 	emit logMessage(i18n("Searching for texts and databases to synchronize"));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
+	TQTimer::singleShot(0, this, TQ_SLOT(syncNextDB()));
 	return true;
 }
 
@@ -336,8 +336,8 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
 
 	if (database && database->isOpen()) {
 		DOCConverter docconverter;
-		connect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &)));
-		connect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &)));
+		connect(&docconverter, TQ_SIGNAL(logError(const TQString &)), TQ_SIGNAL(logError(const TQString &)));
+		connect(&docconverter, TQ_SIGNAL(logMessage(const TQString &)), TQ_SIGNAL(logMessage(const TQString &)));
 
 		docconverter.setTXTpath( DOCConduitSettings::tXTDirectory(), sinfo.txtfilename );
 		docconverter.setPDB(database);
@@ -382,8 +382,8 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
 		if (!res)
 			emit logError(i18n("Conversion of PalmDOC \"%1\" failed.")
 				.arg(TQString::fromLatin1(sinfo.dbinfo.name)));
-//		disconnect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &)));
-//		disconnect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &)));
+//		disconnect(&docconverter, TQ_SIGNAL(logError(const TQString &)), TQ_SIGNAL(logError(const TQString &)));
+//		disconnect(&docconverter, TQ_SIGNAL(logMessage(const TQString &)), TQ_SIGNAL(logMessage(const TQString &)));
 //		KPILOT_DELETE(database);
 	}
 	else
@@ -404,7 +404,7 @@ void DOCConduit::syncNextDB() {
 	if (eSyncDirection==eSyncPCToPDA || fHandle->findDatabase(NULL, &dbinfo, dbnr, dbtype(), dbcreator() /*, cardno */ ) < 0)
 	{
 		// no more databases available, so check for PC->Palm sync
-		TQTimer::singleShot(0, this, TQT_SLOT(syncNextTXT()));
+		TQTimer::singleShot(0, this, TQ_SLOT(syncNextTXT()));
 		return;
 	}
 	dbnr=dbinfo.index+1;
@@ -416,7 +416,7 @@ void DOCConduit::syncNextDB() {
 	if (!isCorrectDBTypeCreator(dbinfo) ||
 		fDBNames.contains(TQString::fromLatin1(dbinfo.name)))
 	{
-		TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
+		TQTimer::singleShot(0, this, TQ_SLOT(syncNextDB()));
 		return;
 	}
 
@@ -430,7 +430,7 @@ void DOCConduit::syncNextDB() {
 	fSyncInfoList.append(syncInfo);
 	fDBNames.append(TQString::fromLatin1(dbinfo.name));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
+	TQTimer::singleShot(0, this, TQ_SLOT(syncNextDB()));
 	return;
 }
 
@@ -444,7 +444,7 @@ void DOCConduit::syncNextTXT()
 	{
 		// We don't sync from PC to PDB, so start the conflict resolution and then the actual sync process
 		docnames.clear();
-		TQTimer::singleShot(0, this, TQT_SLOT(checkPDBFiles()));
+		TQTimer::singleShot(0, this, TQ_SLOT(checkPDBFiles()));
 		return;
 	}
 
@@ -456,7 +456,7 @@ void DOCConduit::syncNextTXT()
 	if (dociterator==docnames.end()) {
 		// no more databases available, so start the conflict resolution and then the actual sync proces
 		docnames.clear();
-		TQTimer::singleShot(0, this, TQT_SLOT(checkPDBFiles()));
+		TQTimer::singleShot(0, this, TQ_SLOT(checkPDBFiles()));
 		return;
 	}
 
@@ -488,7 +488,7 @@ void DOCConduit::syncNextTXT()
 #endif
 	}
 
-	TQTimer::singleShot(0, this, TQT_SLOT(syncNextTXT()));
+	TQTimer::singleShot(0, this, TQ_SLOT(syncNextTXT()));
 	return;
 }
 
@@ -502,7 +502,7 @@ void DOCConduit::checkPDBFiles() {
 	if ( DOCConduitSettings::localSync() || !DOCConduitSettings::keepPDBsLocally() || eSyncDirection==eSyncPCToPDA )
 	{
 		// no more databases available, so check for PC->Palm sync
-		TQTimer::singleShot(0, this, TQT_SLOT(checkDeletedDocs()));
+		TQTimer::singleShot(0, this, TQ_SLOT(checkDeletedDocs()));
 		return;
 	}
 
@@ -515,7 +515,7 @@ void DOCConduit::checkPDBFiles() {
 	if (dociterator==docnames.end()) {
 		// no more databases available, so start the conflict resolution and then the actual sync proces
 		docnames.clear();
-		TQTimer::singleShot(0, this, TQT_SLOT(checkDeletedDocs()));
+		TQTimer::singleShot(0, this, TQ_SLOT(checkDeletedDocs()));
 		return;
 	}
 
@@ -549,7 +549,7 @@ void DOCConduit::checkPDBFiles() {
 		}
 	}
 
-	TQTimer::singleShot(0, this, TQT_SLOT(checkPDBFiles()));
+	TQTimer::singleShot(0, this, TQ_SLOT(checkPDBFiles()));
 }
 
 
@@ -574,7 +574,7 @@ void DOCConduit::checkDeletedDocs()
 			fSyncInfoList.append(syncInfo);
 		}
 	}
-	TQTimer::singleShot(0, this, TQT_SLOT(resolve()));
+	TQTimer::singleShot(0, this, TQ_SLOT(resolve()));
 	return;
 }
 
@@ -628,7 +628,7 @@ void DOCConduit::resolve() {
 		if (!dlg || !dlg->exec() ) {
 			KPILOT_DELETE(dlg)
 			emit logMessage(i18n("Sync aborted by user."));
-			TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
+			TQTimer::singleShot(0, this, TQ_SLOT(cleanup()));
 			return;
 		}
 	}
@@ -638,7 +638,7 @@ void DOCConduit::resolve() {
 	// fDBNames will be filled with the names of the databases that are actually synced (not deleted), so I can write the list to the config file
 	fDBNames.clear();
 	fSyncInfoListIterator=fSyncInfoList.begin();
-	TQTimer::singleShot(0,this, TQT_SLOT(syncDatabases()));
+	TQTimer::singleShot(0,this, TQ_SLOT(syncDatabases()));
 	return;
 }
 
@@ -648,7 +648,7 @@ void DOCConduit::syncDatabases() {
 	FUNCTIONSETUP;
 	if (fSyncInfoListIterator==fSyncInfoList.end()) {
 		// We're done, so clean up
-		TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
+		TQTimer::singleShot(0, this, TQ_SLOT(cleanup()));
 		return;
 	}
 
@@ -679,7 +679,7 @@ void DOCConduit::syncDatabases() {
 	}
 	if (sinfo.direction != eSyncDelete) fDBNames.append(sinfo.handheldDB);
 
-	TQTimer::singleShot(0,this, TQT_SLOT(syncDatabases()));
+	TQTimer::singleShot(0,this, TQ_SLOT(syncDatabases()));
 	return;
 }
 
diff --git a/conduits/docconduit/doc-conflictdialog.cpp b/conduits/docconduit/doc-conflictdialog.cpp
index 59df40b..c22c58b 100644
--- a/conduits/docconduit/doc-conflictdialog.cpp
+++ b/conduits/docconduit/doc-conflictdialog.cpp
@@ -75,7 +75,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
 	// Invisible button group for the information buttons to use the same slot for all of them (see Dallheimer's book, page 309f)
 	TQButtonGroup *bgroup = new TQButtonGroup( this );
 	bgroup->hide();
-	TQObject::connect(bgroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotInfo(int)));
+	TQObject::connect(bgroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotInfo(int)));
 
 	if (syncInfo) {
 		DEBUGKPILOT<<"Adding resolution options for the databases "<<endl;
@@ -127,7 +127,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
 
 	if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer");
 	if (tickleTimer) {
-		connect( tickleTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(_tickle()) );
+		connect( tickleTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(_tickle()) );
 		tickleTimer->start( 10000 ); // tickle the palm every 10 seconds to prevent a timeout until the sync is really finished.
 	}
 
diff --git a/conduits/docconduit/doc-setup.cpp b/conduits/docconduit/doc-setup.cpp
index d0951c5..be0f989 100644
--- a/conduits/docconduit/doc-setup.cpp
+++ b/conduits/docconduit/doc-setup.cpp
@@ -63,7 +63,7 @@ DOCWidgetConfig::DOCWidgetConfig(TQWidget * w, const char *n):
 
 	fConduitName=i18n("Palm DOC");
 
-#define CMOD(a,b) connect(fConfigWidget->a,TQT_SIGNAL(b),this,TQT_SLOT(modified()))
+#define CMOD(a,b) connect(fConfigWidget->a,TQ_SIGNAL(b),this,TQ_SLOT(modified()))
 	CMOD(fTXTDir,textChanged(const TQString &));
 	CMOD(fPDBDir,textChanged(const TQString &));
 	CMOD(fkeepPDBLocally,clicked());
diff --git a/conduits/docconduit/kpalmdoc_dlg.cpp b/conduits/docconduit/kpalmdoc_dlg.cpp
index fe2ec89..3685e45 100644
--- a/conduits/docconduit/kpalmdoc_dlg.cpp
+++ b/conduits/docconduit/kpalmdoc_dlg.cpp
@@ -70,10 +70,10 @@ ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption)
 
 	readSettings();
 
-	connect(dlg->fDirectories, TQT_SIGNAL(toggled(bool)),
-		this, TQT_SLOT(slotDirectories(bool)));
-	connect(dlg->fTextToPDB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToPDB()));
-	connect(dlg->fPDBToText, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToText()));
+	connect(dlg->fDirectories, TQ_SIGNAL(toggled(bool)),
+		this, TQ_SLOT(slotDirectories(bool)));
+	connect(dlg->fTextToPDB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotToPDB()));
+	connect(dlg->fPDBToText, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotToText()));
 
 	resize(minimumSize());
 }