diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-04 10:31:06 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-04 10:31:06 +0900 |
| commit | 7c95b68b3568737a10901c3e12d316e06dc4015f (patch) | |
| tree | f9e52f0ee62e755155aedfe6fb4a99e590d9d055 | |
| parent | bdb5acdfbfe8973f2b45fe54193ad543064c1ac5 (diff) | |
| download | kpilot-7c95b68b3568737a10901c3e12d316e06dc4015f.tar.gz kpilot-7c95b68b3568737a10901c3e12d316e06dc4015f.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
46 files changed, 417 insertions, 417 deletions
diff --git a/Documentation/ConduitProgrammingTutorial/index.tex b/Documentation/ConduitProgrammingTutorial/index.tex index c50d6e4..d334c15 100644 --- a/Documentation/ConduitProgrammingTutorial/index.tex +++ b/Documentation/ConduitProgrammingTutorial/index.tex @@ -1012,7 +1012,7 @@ The conduit has to find out \item if a local copy is kept, if the local copy of a database has been changed or added (again using the modified flat of the records inside the database). \end{itemize} -To assure a responsive user interface, we will once again use \texttt{QTimer::singleShot(this, 0, SLOT(whatever()));} for each of these steps. +To assure a responsive user interface, we will once again use \texttt{QTimer::singleShot(this, 0, TQ_SLOT(whatever()));} for each of these steps. The \code{DOCConduit::exec()} function is just the entry point and calls syncNextDB, which will go through all PalmDOC databases on the handheld and determine if any of them has been changed: @@ -1022,7 +1022,7 @@ The \code{DOCConduit::exec()} function is just the entry point and calls syncNex FUNCTIONSETUP; readConfig(); dbnr=0; - QTimer::singleShot(0, this, SLOT(syncNextDB())); + QTimer::singleShot(0, this, TQ_SLOT(syncNextDB())); return true; } \end{verbatim} @@ -1040,7 +1040,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 - QTimer::singleShot(0, this, SLOT(syncNextDOC())); + QTimer::singleShot(0, this, TQ_SLOT(syncNextDOC())); return; } dbnr=dbinfo.index+1; @@ -1048,7 +1048,7 @@ void DOCConduit::syncNextDB() { // if creator and/or type don't match, go to next db if (!isCorrectDBTypeCreator(dbinfo) || fDBNames.contains(dbinfo.name)) { - QTimer::singleShot(0, this, SLOT(syncNextDB())); + QTimer::singleShot(0, this, TQ_SLOT(syncNextDB())); return; } @@ -1061,7 +1061,7 @@ void DOCConduit::syncNextDB() { fSyncInfoList.append(syncInfo); fDBNames.append(dbinfo.name); - QTimer::singleShot(0, this, SLOT(syncNextDB())); + QTimer::singleShot(0, this, TQ_SLOT(syncNextDB())); return; } \end{verbatim} @@ -1077,7 +1077,7 @@ void DOCConduit::syncNextDOC() { if (eSyncDirection==eSyncPDAToPC ) { // We don't sync from PC to PDB, so start the conflict resolution and then the actual sync process docnames.clear(); - QTimer::singleShot(0, this, SLOT(checkPDBFiles())); + QTimer::singleShot(0, this, TQ_SLOT(checkPDBFiles())); return; } @@ -1089,7 +1089,7 @@ void DOCConduit::syncNextDOC() { if (dociterator==docnames.end()) { // no more databases available, so start the conflict resolution and then the actual sync proces docnames.clear(); - QTimer::singleShot(0, this, SLOT(checkPDBFiles())); + QTimer::singleShot(0, this, TQ_SLOT(checkPDBFiles())); return; } @@ -1116,7 +1116,7 @@ void DOCConduit::syncNextDOC() { fDBNames.append(dbinfo.name); } - QTimer::singleShot(0, this, SLOT(syncNextDOC())); + QTimer::singleShot(0, this, TQ_SLOT(syncNextDOC())); return; } @@ -1129,7 +1129,7 @@ void DOCConduit::checkPDBFiles() { if (fLocalSync || !fKeepPDBLocally || eSyncDirection==eSyncPCToPDA ) { // no more databases available, so check for PC->Palm sync - QTimer::singleShot(0, this, SLOT(resolve())); + QTimer::singleShot(0, this, TQ_SLOT(resolve())); return; } @@ -1142,7 +1142,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(); - QTimer::singleShot(0, this, SLOT(resolve())); + QTimer::singleShot(0, this, TQ_SLOT(resolve())); return; } @@ -1174,7 +1174,7 @@ void DOCConduit::checkPDBFiles() { } } - QTimer::singleShot(0, this, SLOT(checkPDBFiles())); + QTimer::singleShot(0, this, TQ_SLOT(checkPDBFiles())); } \end{verbatim} } @@ -1221,7 +1221,7 @@ void DOCConduit::resolve() { if (!dlg || !dlg->exec() ) { KPILOT_DELETE(dlg) emit logMessage(i18n("Sync aborted by user.")); - QTimer::singleShot(0, this, SLOT(cleanup())); + QTimer::singleShot(0, this, TQ_SLOT(cleanup())); return; } } @@ -1231,7 +1231,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(); - QTimer::singleShot(0,this, SLOT(syncDatabases())); + QTimer::singleShot(0,this, TQ_SLOT(syncDatabases())); return; } \end{verbatim} @@ -1245,7 +1245,7 @@ Finally, the actual sync of the databases is done again with \code{QTimer::singl void DOCConduit::syncDatabases() { FUNCTIONSETUP; if (fSyncInfoListIterator==fSyncInfoList.end()) { - QTimer::singleShot(0, this, SLOT(cleanup())); + QTimer::singleShot(0, this, TQ_SLOT(cleanup())); return; } @@ -1272,7 +1272,7 @@ void DOCConduit::syncDatabases() { } if (sinfo.direction != eSyncDelete) fDBNames.append(sinfo.handheldDB); - QTimer::singleShot(0,this, SLOT(syncDatabases())); + QTimer::singleShot(0,this, TQ_SLOT(syncDatabases())); return; } \end{verbatim} @@ -1331,8 +1331,8 @@ bool DOCConduit::doSync(docSyncInfo &sinfo) { if (database && database->isOpen()) { DOCConverter docconverter; - connect(&docconverter, SIGNAL(logError(const TQString &)), SIGNAL(logError(const TQString &))); - connect(&docconverter, SIGNAL(logMessage(const TQString &)), 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.setDOCpath(fDOCDir, sinfo.docfilename); docconverter.setPDB(database); @@ -1370,8 +1370,8 @@ bool DOCConduit::doSync(docSyncInfo &sinfo) { emit logError(i18n("Unable to install the locally created PalmDOC %1 to the handheld.").arg(sinfo.dbinfo.name)); if (!res) emit logError(i18n("Conversion of PalmDOC \"%1\" failed.").arg(sinfo.dbinfo.name)); -// disconnect(&docconverter, SIGNAL(logError(const TQString &)), SIGNAL(logError(const TQString &))); -// disconnect(&docconverter, SIGNAL(logMessage(const TQString &)), 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 diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cpp b/conduits/abbrowserconduit/abbrowser-conduit.cpp index c4441b1..6e63596 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.cpp +++ b/conduits/abbrowserconduit/abbrowser-conduit.cpp @@ -530,7 +530,7 @@ void AbbrowserConduit::showAddresses( if ( syncMode().isTest() ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotTestRecord())); + TQTimer::singleShot(0, this, TQ_SLOT(slotTestRecord())); return true; } @@ -580,7 +580,7 @@ void AbbrowserConduit::showAddresses( for this, and no longer purge the whole addressbook before the sync to prevent data loss in case of connection loss. */ - TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPalmRecToPC())); return true; } @@ -596,7 +596,7 @@ void AbbrowserConduit::slotPalmRecToPC() { DEBUGKPILOT << fname << ": Done; change to PCtoHH phase." << endl; abiter = aBook->begin(); - TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPCRecToPalm())); return; } @@ -614,7 +614,7 @@ void AbbrowserConduit::slotPalmRecToPC() if(!palmRec) { abiter = aBook->begin(); - TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPCRecToPalm())); return; } @@ -622,7 +622,7 @@ void AbbrowserConduit::slotPalmRecToPC() if(syncedIds.contains(palmRec->id())) { KPILOT_DELETE(palmRec); - TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPalmRecToPC())); return; } @@ -650,7 +650,7 @@ void AbbrowserConduit::slotPalmRecToPC() KPILOT_DELETE(palmRec); KPILOT_DELETE(backupRec); - TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPalmRecToPC())); } @@ -664,7 +664,7 @@ void AbbrowserConduit::slotPCRecToPalm() { DEBUGKPILOT << fname << ": Done; change to delete records." << endl; pilotindex = 0; - TQTimer::singleShot(0, this, TQT_SLOT(slotDeletedRecord())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDeletedRecord())); return; } @@ -678,7 +678,7 @@ void AbbrowserConduit::slotPCRecToPalm() { DEBUGKPILOT << fname << ": address with id " << ad.uid() << " marked archived, so don't sync." << endl; - TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPCRecToPalm())); return; } @@ -691,7 +691,7 @@ void AbbrowserConduit::slotPCRecToPalm() DEBUGKPILOT << fname << ": This is a new record." << endl; // it's a new item(no record ID and not inserted by the Palm -> PC sync), so add it syncAddressee(ad, 0L, 0L); - TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPCRecToPalm())); return; } @@ -699,7 +699,7 @@ void AbbrowserConduit::slotPCRecToPalm() if (syncedIds.contains(rid)) { DEBUGKPILOT << ": address with id " << rid << " already synced." << endl; - TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPCRecToPalm())); return; } @@ -742,7 +742,7 @@ void AbbrowserConduit::slotPCRecToPalm() syncedIds.append(rid); // done with the sync process, go on with the next one: - TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPCRecToPalm())); } @@ -755,7 +755,7 @@ void AbbrowserConduit::slotDeletedRecord() if(!backupRec || isFirstSync() ) { KPILOT_DELETE(backupRec); - TQTimer::singleShot(0, this, TQT_SLOT(slotDeleteUnsyncedPCRecords())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDeleteUnsyncedPCRecords())); return; } @@ -796,7 +796,7 @@ void AbbrowserConduit::slotDeletedRecord() KPILOT_DELETE(palmRec); KPILOT_DELETE(backupAddr); KPILOT_DELETE(backupRec); - TQTimer::singleShot(0, this, TQT_SLOT(slotDeletedRecord())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDeletedRecord())); } @@ -829,7 +829,7 @@ void AbbrowserConduit::slotDeleteUnsyncedPCRecords() } } } - TQTimer::singleShot(0, this, TQT_SLOT(slotDeleteUnsyncedHHRecords())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDeleteUnsyncedHHRecords())); } @@ -852,7 +852,7 @@ void AbbrowserConduit::slotDeleteUnsyncedHHRecords() } } } - TQTimer::singleShot(0, this, TQT_SLOT(slotCleanup())); + TQTimer::singleShot(0, this, TQ_SLOT(slotCleanup())); } @@ -1893,5 +1893,5 @@ void AbbrowserConduit::slotTestRecord() // Schedule more work. ++pilotindex; - TQTimer::singleShot(0, this, TQT_SLOT(slotTestRecord())); + TQTimer::singleShot(0, this, TQ_SLOT(slotTestRecord())); } diff --git a/conduits/abbrowserconduit/abbrowser-setup.cpp b/conduits/abbrowserconduit/abbrowser-setup.cpp index a33632e..92f4a8c 100644 --- a/conduits/abbrowserconduit/abbrowser-setup.cpp +++ b/conduits/abbrowserconduit/abbrowser-setup.cpp @@ -73,20 +73,20 @@ AbbrowserWidgetSetup::AbbrowserWidgetSetup(TQWidget *w, const char *n) : ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout); fWidget=fConfigWidget; fConfigWidget->fAbookFile->setMode(KFile::File); -#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); - CM(fSyncDestination,TQT_SIGNAL(clicked(int))); - CM(fAbookFile,TQT_SIGNAL(textChanged(const TQString &))); - CM(fArchive,TQT_SIGNAL(toggled(bool))); - CM(fConflictResolution,TQT_SIGNAL(activated(int))); - CM(fOtherPhone,TQT_SIGNAL(activated(int))); - CM(fAddress,TQT_SIGNAL(activated(int))); - CM(fFax,TQT_SIGNAL(activated(int))); - CM(fCustom0,TQT_SIGNAL(activated(int))); - CM(fCustom1,TQT_SIGNAL(activated(int))); - CM(fCustom2,TQT_SIGNAL(activated(int))); - CM(fCustom3,TQT_SIGNAL(activated(int))); - CM(fCustomDate, TQT_SIGNAL(activated(int))); - CM(fCustomDate, TQT_SIGNAL(textChanged(const TQString&))); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQ_SLOT(modified())); + CM(fSyncDestination,TQ_SIGNAL(clicked(int))); + CM(fAbookFile,TQ_SIGNAL(textChanged(const TQString &))); + CM(fArchive,TQ_SIGNAL(toggled(bool))); + CM(fConflictResolution,TQ_SIGNAL(activated(int))); + CM(fOtherPhone,TQ_SIGNAL(activated(int))); + CM(fAddress,TQ_SIGNAL(activated(int))); + CM(fFax,TQ_SIGNAL(activated(int))); + CM(fCustom0,TQ_SIGNAL(activated(int))); + CM(fCustom1,TQ_SIGNAL(activated(int))); + CM(fCustom2,TQ_SIGNAL(activated(int))); + CM(fCustom3,TQ_SIGNAL(activated(int))); + CM(fCustomDate, TQ_SIGNAL(activated(int))); + CM(fCustomDate, TQ_SIGNAL(textChanged(const TQString&))); #undef CM } diff --git a/conduits/abbrowserconduit/resolutionDialog.cpp b/conduits/abbrowserconduit/resolutionDialog.cpp index dea368b..1dd4e65 100644 --- a/conduits/abbrowserconduit/resolutionDialog.cpp +++ b/conduits/abbrowserconduit/resolutionDialog.cpp @@ -193,16 +193,16 @@ ResolutionDlg::ResolutionDlg( TQWidget* parent, KPilotLink*fH, if (tickleTimer) { - connect( tickleTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(_tickle())); + connect( tickleTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(_tickle())); // tickle the palm every 10 seconds to prevent a timeout until the // sync is really finished. tickleTimer->start( 10000 ); } - connect(fWidget->fKeepBoth, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepBoth())); - connect(fWidget->fBackupValues, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseBackup())); - connect(fWidget->fPalmValues, TQT_SIGNAL(clicked()), TQT_SLOT(slotUsePalm())); - connect(fWidget->fPCValues, TQT_SIGNAL(clicked()), TQT_SLOT(slotUsePC())); + connect(fWidget->fKeepBoth, TQ_SIGNAL(clicked()), TQ_SLOT(slotKeepBoth())); + connect(fWidget->fBackupValues, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseBackup())); + connect(fWidget->fPalmValues, TQ_SIGNAL(clicked()), TQ_SLOT(slotUsePalm())); + connect(fWidget->fPCValues, TQ_SIGNAL(clicked()), TQ_SLOT(slotUsePC())); } void ResolutionDlg::adjustButtons(ResolutionTable*tab) 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()); } diff --git a/conduits/knotes/knotes-action.cpp b/conduits/knotes/knotes-action.cpp index 84fe5cc..29a9a50 100644 --- a/conduits/knotes/knotes-action.cpp +++ b/conduits/knotes/knotes-action.cpp @@ -239,7 +239,7 @@ KNotesAction::KNotesAction(KPilotLink *o, // this is not needed. As it is done in the initstate in process(); // resetIndexes(); - connect(fP->fTimer,TQT_SIGNAL(timeout()),TQT_SLOT(process())); + connect(fP->fTimer,TQ_SIGNAL(timeout()),TQ_SLOT(process())); fP->fTimer->start(0,false); return true; diff --git a/conduits/knotes/knotes-setup.cpp b/conduits/knotes/knotes-setup.cpp index 0bdf41a..003efff 100644 --- a/conduits/knotes/knotes-setup.cpp +++ b/conduits/knotes/knotes-setup.cpp @@ -50,12 +50,12 @@ KNotesConfigBase::KNotesConfigBase(TQWidget *w, const char *n) : fConfigWidget = new KNotesWidget(w); ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,KNotesConduitFactory::about()); fWidget = fConfigWidget; - TQObject::connect(fConfigWidget->fDeleteNoteForMemo,TQT_SIGNAL(clicked()), - this,TQT_SLOT(modified())); - TQObject::connect(fConfigWidget->fSuppressConfirm,TQT_SIGNAL(clicked()), - this,TQT_SLOT(modified())); - TQObject::connect(fConfigWidget->fDeleteNoteForMemo,TQT_SIGNAL(toggled(bool)), - fConfigWidget->fSuppressConfirm,TQT_SLOT(setEnabled(bool))); + TQObject::connect(fConfigWidget->fDeleteNoteForMemo,TQ_SIGNAL(clicked()), + this,TQ_SLOT(modified())); + TQObject::connect(fConfigWidget->fSuppressConfirm,TQ_SIGNAL(clicked()), + this,TQ_SLOT(modified())); + TQObject::connect(fConfigWidget->fDeleteNoteForMemo,TQ_SIGNAL(toggled(bool)), + fConfigWidget->fSuppressConfirm,TQ_SLOT(setEnabled(bool))); fConduitName=i18n("KNotes"); } diff --git a/conduits/malconduit/mal-setup.cpp b/conduits/malconduit/mal-setup.cpp index e9a1e9c..80a97cc 100644 --- a/conduits/malconduit/mal-setup.cpp +++ b/conduits/malconduit/mal-setup.cpp @@ -65,21 +65,21 @@ MALWidgetSetup::MALWidgetSetup(TQWidget *w, const char *n) : fConfigWidget->tabWidget->adjustSize(); fConfigWidget->resize(fConfigWidget->tabWidget->size()); -#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); - CM( syncTime, TQT_SIGNAL(clicked(int)) ); - CM( proxyType, TQT_SIGNAL(clicked(int)) ); - - CM( proxyServerName, TQT_SIGNAL(textChanged(const TQString &)) ); - CM( proxyCustomPortCheck, TQT_SIGNAL(clicked()) ); - CM( proxyCustomPort, TQT_SIGNAL(valueChanged(int)) ); - CM( proxyUserName, TQT_SIGNAL(textChanged(const TQString &)) ); - CM( proxyPassword, TQT_SIGNAL(textChanged(const TQString &)) ); - - CM( malServerName, TQT_SIGNAL(textChanged(const TQString &)) ); - CM( malCustomPortCheck, TQT_SIGNAL(clicked()) ); - CM( malCustomPort, TQT_SIGNAL(valueChanged(int)) ); - CM( malUserName, TQT_SIGNAL(textChanged(const TQString &)) ); - CM( malPassword, TQT_SIGNAL(textChanged(const TQString &)) ); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQ_SLOT(modified())); + CM( syncTime, TQ_SIGNAL(clicked(int)) ); + CM( proxyType, TQ_SIGNAL(clicked(int)) ); + + CM( proxyServerName, TQ_SIGNAL(textChanged(const TQString &)) ); + CM( proxyCustomPortCheck, TQ_SIGNAL(clicked()) ); + CM( proxyCustomPort, TQ_SIGNAL(valueChanged(int)) ); + CM( proxyUserName, TQ_SIGNAL(textChanged(const TQString &)) ); + CM( proxyPassword, TQ_SIGNAL(textChanged(const TQString &)) ); + + CM( malServerName, TQ_SIGNAL(textChanged(const TQString &)) ); + CM( malCustomPortCheck, TQ_SIGNAL(clicked()) ); + CM( malCustomPort, TQ_SIGNAL(valueChanged(int)) ); + CM( malUserName, TQ_SIGNAL(textChanged(const TQString &)) ); + CM( malPassword, TQ_SIGNAL(textChanged(const TQString &)) ); #undef CM } diff --git a/conduits/memofileconduit/memofile-factory.cpp b/conduits/memofileconduit/memofile-factory.cpp index bfaf43b..97589bf 100644 --- a/conduits/memofileconduit/memofile-factory.cpp +++ b/conduits/memofileconduit/memofile-factory.cpp @@ -72,10 +72,10 @@ MemofileConduitConfig::MemofileConduitConfig(TQWidget *p, const char *n) : ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,about); fWidget=fConfigWidget; - TQObject::connect(fConfigWidget->fDirectory,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(modified())); - TQObject::connect(fConfigWidget->fSyncPrivate,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(modified())); + TQObject::connect(fConfigWidget->fDirectory,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(modified())); + TQObject::connect(fConfigWidget->fSyncPrivate,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(modified())); } diff --git a/conduits/notepadconduit/notepad-factory.cpp b/conduits/notepadconduit/notepad-factory.cpp index 2f81414..41fb298 100644 --- a/conduits/notepadconduit/notepad-factory.cpp +++ b/conduits/notepadconduit/notepad-factory.cpp @@ -89,8 +89,8 @@ NotepadConduitConfig::NotepadConduitConfig(TQWidget *p, const char *n) : fConduitName = i18n("Notepad"); ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget, createAbout()); fWidget=fConfigWidget; - TQObject::connect(fConfigWidget->fOutputDirectory, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(modified())); + TQObject::connect(fConfigWidget->fOutputDirectory, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(modified())); fConfigWidget->fOutputDirectory->setMode(KFile::Directory | KFile::LocalOnly); } diff --git a/conduits/null/null-factory.cpp b/conduits/null/null-factory.cpp index 68e7c56..b2c67b3 100644 --- a/conduits/null/null-factory.cpp +++ b/conduits/null/null-factory.cpp @@ -74,8 +74,8 @@ NullConduitConfig::NullConduitConfig(TQWidget *p, const char *n) : ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout); fWidget=fConfigWidget; - TQObject::connect(fConfigWidget->fLogMessage,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(modified())); + TQObject::connect(fConfigWidget->fLogMessage,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(modified())); } /* virtual */ void NullConduitConfig::commit() diff --git a/conduits/popmail/setupDialog.cpp b/conduits/popmail/setupDialog.cpp index ea23c90..3fe8be6 100644 --- a/conduits/popmail/setupDialog.cpp +++ b/conduits/popmail/setupDialog.cpp @@ -86,14 +86,14 @@ PopMailWidgetConfig::PopMailWidgetConfig(TQWidget *p,const char *n) : ConduitConfigBase::addAboutPage(fConfigWidget->fTabWidget,fAbout); fWidget=fConfigWidget; -#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); - CM(fSendMode,TQT_SIGNAL(activated(int))); - CM(fEmailFrom,TQT_SIGNAL(textChanged(const TQString &))); - CM(fSignature,TQT_SIGNAL(textChanged(const TQString &))); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQ_SLOT(modified())); + CM(fSendMode,TQ_SIGNAL(activated(int))); + CM(fEmailFrom,TQ_SIGNAL(textChanged(const TQString &))); + CM(fSignature,TQ_SIGNAL(textChanged(const TQString &))); #undef CM - connect(fConfigWidget->fSendMode,TQT_SIGNAL(activated(int)), - this,TQT_SLOT(toggleSendMode(int))); + connect(fConfigWidget->fSendMode,TQ_SIGNAL(activated(int)), + this,TQ_SLOT(toggleSendMode(int))); } diff --git a/conduits/recordconduit/factory.cpp b/conduits/recordconduit/factory.cpp index 66bf0e0..950fb9c 100644 --- a/conduits/recordconduit/factory.cpp +++ b/conduits/recordconduit/factory.cpp @@ -75,12 +75,12 @@ ConduitConfig::ConduitConfig(TQWidget *p, const char *n) : ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout); fWidget=fConfigWidget; - TQObject::connect(fConfigWidget->fLogMessage,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(modified())); - TQObject::connect(fConfigWidget->fDatabases,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(modified())); - TQObject::connect(fConfigWidget->fFailImmediately,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(modified())); + TQObject::connect(fConfigWidget->fLogMessage,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(modified())); + TQObject::connect(fConfigWidget->fDatabases,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(modified())); + TQObject::connect(fConfigWidget->fFailImmediately,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(modified())); } /* virtual */ void ConduitConfig::commit() diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cpp b/conduits/sysinfoconduit/sysinfo-conduit.cpp index 68511b7..71e1310 100644 --- a/conduits/sysinfoconduit/sysinfo-conduit.cpp +++ b/conduits/sysinfoconduit/sysinfo-conduit.cpp @@ -196,7 +196,7 @@ void SysInfoConduit::readConfig() readConfig(); - TQTimer::singleShot(0, this, TQT_SLOT(hardwareInfo())); + TQTimer::singleShot(0, this, TQ_SLOT(hardwareInfo())); return true; } @@ -235,7 +235,7 @@ void SysInfoConduit::hardwareInfo() KPILOT_DELETE(device); keepParts.append(CSL1("hardware")); } else removeParts.append(CSL1("hardware")); - TQTimer::singleShot(0, this, TQT_SLOT(userInfo())); + TQTimer::singleShot(0, this, TQ_SLOT(userInfo())); } void SysInfoConduit::userInfo() @@ -265,7 +265,7 @@ void SysInfoConduit::userInfo() { removeParts.append(CSL1("user")); } - TQTimer::singleShot(0, this, TQT_SLOT(memoryInfo())); + TQTimer::singleShot(0, this, TQ_SLOT(memoryInfo())); } void SysInfoConduit::memoryInfo() @@ -286,7 +286,7 @@ void SysInfoConduit::memoryInfo() } keepParts.append(CSL1("memory")); } else removeParts.append(CSL1("memory")); - TQTimer::singleShot(0, this, TQT_SLOT(storageInfo())); + TQTimer::singleShot(0, this, TQ_SLOT(storageInfo())); } void SysInfoConduit::storageInfo() @@ -309,7 +309,7 @@ void SysInfoConduit::storageInfo() } keepParts.append(CSL1("storage")); } else removeParts.append(CSL1("storage")); - TQTimer::singleShot(0, this, TQT_SLOT(dbListInfo())); + TQTimer::singleShot(0, this, TQ_SLOT(dbListInfo())); } void SysInfoConduit::dbListInfo() @@ -322,7 +322,7 @@ void SysInfoConduit::dbListInfo() dblist=deviceLink()->getDBList(); keepParts.append(CSL1("dblist")); } else removeParts.append(CSL1("dblist")); - TQTimer::singleShot(0, this, TQT_SLOT(recNumberInfo())); + TQTimer::singleShot(0, this, TQ_SLOT(recNumberInfo())); } void SysInfoConduit::recNumberInfo() @@ -363,7 +363,7 @@ void SysInfoConduit::recNumberInfo() } keepParts.append(CSL1("records")); } else removeParts.append(CSL1("records")); - TQTimer::singleShot(0, this, TQT_SLOT(syncInfo())); + TQTimer::singleShot(0, this, TQ_SLOT(syncInfo())); } void SysInfoConduit::syncInfo() @@ -386,7 +386,7 @@ void SysInfoConduit::syncInfo() fValues[CSL1("lastsyncpc")] = TQString::number(user.getLastSyncPC()); keepParts.append(CSL1("sync")); } else removeParts.append(CSL1("sync")); - TQTimer::singleShot(0, this, TQT_SLOT(pcVersionInfo())); + TQTimer::singleShot(0, this, TQ_SLOT(pcVersionInfo())); } void SysInfoConduit::pcVersionInfo() @@ -430,7 +430,7 @@ void SysInfoConduit::pcVersionInfo() #endif keepParts.append(CSL1("pcversion")); } else removeParts.append(CSL1("pcversion")); - TQTimer::singleShot(0, this, TQT_SLOT(palmVersionInfo())); + TQTimer::singleShot(0, this, TQ_SLOT(palmVersionInfo())); } void SysInfoConduit::palmVersionInfo() @@ -450,7 +450,7 @@ void SysInfoConduit::palmVersionInfo() keepParts.append(CSL1("palmversion")); } else removeParts.append(CSL1("palmversion")); - TQTimer::singleShot(0, this, TQT_SLOT(debugInfo())); + TQTimer::singleShot(0, this, TQ_SLOT(debugInfo())); } void SysInfoConduit::debugInfo() @@ -463,7 +463,7 @@ void SysInfoConduit::debugInfo() fValues[CSL1("debug")] = i18n("No debug data"); keepParts.append(CSL1("debug")); } else removeParts.append(CSL1("debug")); - TQTimer::singleShot(0, this, TQT_SLOT(writeFile())); + TQTimer::singleShot(0, this, TQ_SLOT(writeFile())); } void SysInfoConduit::writeFile() @@ -589,7 +589,7 @@ void SysInfoConduit::writeFile() if (!outfile.open(IO_WriteOnly)) { WARNINGKPILOT<< "Unable to open " << fOutputFile << endl; emit logError(i18n("Unable to open %1").arg(fOutputFile)); - TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); + TQTimer::singleShot(0, this, TQ_SLOT(cleanup())); return; } } @@ -600,7 +600,7 @@ void SysInfoConduit::writeFile() outfile.close(); emit logMessage(i18n("Handheld system information written to the file %1").arg(fOutputFile)); - TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); + TQTimer::singleShot(0, this, TQ_SLOT(cleanup())); } void SysInfoConduit::cleanup() diff --git a/conduits/sysinfoconduit/sysinfo-setup.cpp b/conduits/sysinfoconduit/sysinfo-setup.cpp index 70676e4..534c834 100644 --- a/conduits/sysinfoconduit/sysinfo-setup.cpp +++ b/conduits/sysinfoconduit/sysinfo-setup.cpp @@ -103,12 +103,12 @@ SysInfoWidgetConfig::SysInfoWidgetConfig(TQWidget *w, const char *n) : ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout); fWidget=fConfigWidget; - TQObject::connect(fConfigWidget->fOutputFile,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(modified())); - TQObject::connect(fConfigWidget->fTemplateFile,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(modified())); - TQObject::connect(fConfigWidget->fOutputType,TQT_SIGNAL(clicked(int)), - this,TQT_SLOT(modified())); + TQObject::connect(fConfigWidget->fOutputFile,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(modified())); + TQObject::connect(fConfigWidget->fTemplateFile,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(modified())); + TQObject::connect(fConfigWidget->fOutputType,TQ_SIGNAL(clicked(int)), + this,TQ_SLOT(modified())); fConduitName=i18n("System Information"); } diff --git a/conduits/vcalconduit/hhtopcstate.cpp b/conduits/vcalconduit/hhtopcstate.cpp index 82024f1..7f53586 100644 --- a/conduits/vcalconduit/hhtopcstate.cpp +++ b/conduits/vcalconduit/hhtopcstate.cpp @@ -186,13 +186,13 @@ void VCalConduitBase::slotPalmRecToPC() if ( syncMode()==SyncMode::eCopyHHToPC ) { emit logMessage(i18n("Cleaning up ...")); - TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); + TQTimer::singleShot(0, this, TQ_SLOT(cleanup())); return; } else { emit logMessage(i18n("Copying records to Pilot ...")); - TQTimer::singleShot(0 ,this,TQT_SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0 ,this,TQ_SLOT(slotPCRecToPalm())); return; } } @@ -244,6 +244,6 @@ void VCalConduitBase::slotPalmRecToPC() KPILOT_DELETE(r); KPILOT_DELETE(s); - TQTimer::singleShot(0,this,TQT_SLOT(slotPalmRecToPC())); + TQTimer::singleShot(0,this,TQ_SLOT(slotPalmRecToPC())); } */ diff --git a/conduits/vcalconduit/vcal-conduitbase.cpp b/conduits/vcalconduit/vcal-conduitbase.cpp index 15cfcdc..a720fc5 100644 --- a/conduits/vcalconduit/vcal-conduitbase.cpp +++ b/conduits/vcalconduit/vcal-conduitbase.cpp @@ -176,7 +176,7 @@ VCalConduitBase::~VCalConduitBase() if (!syncMode().isTest() && !openCalendar() ) goto error; // Start processing the sync - TQTimer::singleShot(0, this, TQT_SLOT(slotProcess())); + TQTimer::singleShot(0, this, TQ_SLOT(slotProcess())); return true; error: @@ -200,13 +200,13 @@ void VCalConduitBase::slotProcess() { if( hasNextRecord ) { fState->handleRecord( this ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotProcess() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotProcess() ) ); } // Else finish the current state if there is one else if( fState ) { fState->finishSync( this ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotProcess() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotProcess() ) ); } // No state so sync is finished else diff --git a/conduits/vcalconduit/vcal-setupbase.cpp b/conduits/vcalconduit/vcal-setupbase.cpp index 51a188c..d66883d 100644 --- a/conduits/vcalconduit/vcal-setupbase.cpp +++ b/conduits/vcalconduit/vcal-setupbase.cpp @@ -49,11 +49,11 @@ VCalWidgetSetupBase::VCalWidgetSetupBase(TQWidget *w, const char *n) : fConfigWidget->fCalendarFile->setMode(KFile::File); fConfigWidget->fCalendarFile->setFilter(CSL1("*.vcs *.ics|ICalendars\n*.*|All Files (*.*)")); -#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); - CM(fSyncDestination,TQT_SIGNAL(clicked(int))); - CM(fCalendarFile,TQT_SIGNAL(textChanged(const TQString &))); - CM(fArchive,TQT_SIGNAL(toggled(bool))); - CM(fConflictResolution,TQT_SIGNAL(activated(int))); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQ_SLOT(modified())); + CM(fSyncDestination,TQ_SIGNAL(clicked(int))); + CM(fCalendarFile,TQ_SIGNAL(textChanged(const TQString &))); + CM(fArchive,TQ_SIGNAL(toggled(bool))); + CM(fConflictResolution,TQ_SIGNAL(activated(int))); #undef CM } diff --git a/kpilot/addressEditor.cpp b/kpilot/addressEditor.cpp index c9e4f9b..d92624c 100644 --- a/kpilot/addressEditor.cpp +++ b/kpilot/addressEditor.cpp @@ -68,8 +68,8 @@ AddressEditor::AddressEditor(PilotAddress * p, initLayout(); fillFields(); - connect(parent, TQT_SIGNAL(recordChanged(PilotAddress *)), - this, TQT_SLOT(updateRecord(PilotAddress *))); + connect(parent, TQ_SIGNAL(recordChanged(PilotAddress *)), + this, TQ_SLOT(updateRecord(PilotAddress *))); } diff --git a/kpilot/addressWidget.cpp b/kpilot/addressWidget.cpp index f8bd65d..2b418c4 100644 --- a/kpilot/addressWidget.cpp +++ b/kpilot/addressWidget.cpp @@ -218,8 +218,8 @@ void AddressWidget::setupWidget() fCatList = new TQComboBox(this); grid->addWidget(fCatList, 0, 1); - connect(fCatList, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSetCategory(int))); + connect(fCatList, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSetCategory(int))); TQWhatsThis::add(fCatList, i18n("<qt>Select the category of addresses to display here.</qt>")); @@ -229,10 +229,10 @@ void AddressWidget::setupWidget() fListBox = new TQListBox(this); grid->addMultiCellWidget(fListBox, 1, 1, 0, 1); - connect(fListBox, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotShowAddress(int))); - connect(fListBox, TQT_SIGNAL(selected(int)), - this, TQT_SLOT(slotEditRecord())); + connect(fListBox, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotShowAddress(int))); + connect(fListBox, TQ_SIGNAL(selected(int)), + this, TQ_SLOT(slotEditRecord())); TQWhatsThis::add(fListBox, i18n("<qt>This list displays all the addresses " "in the selected category. Click on " @@ -250,7 +250,7 @@ void AddressWidget::setupWidget() fEditButton = new TQPushButton(i18n("Edit Record..."), this); grid->addWidget(fEditButton, 2, 0); - connect(fEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditRecord())); + connect(fEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditRecord())); wt = KPilotSettings::internalEditors() ? i18n("<qt>You can edit an address when it is selected.</qt>") : i18n("<qt><i>Editing is disabled by the 'internal editors' setting.</i></qt>"); @@ -258,7 +258,7 @@ void AddressWidget::setupWidget() button = new TQPushButton(i18n("New Record..."), this); grid->addWidget(button, 2, 1); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateNewRecord())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCreateNewRecord())); wt = KPilotSettings::internalEditors() ? i18n("<qt>Add a new address to the address book.</qt>") : i18n("<qt><i>Adding is disabled by the 'internal editors' setting.</i></qt>") ; @@ -268,15 +268,15 @@ void AddressWidget::setupWidget() fDeleteButton = new TQPushButton(i18n("Delete Record"), this); grid->addWidget(fDeleteButton, 3, 0); - connect(fDeleteButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDeleteRecord())); + connect(fDeleteButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDeleteRecord())); wt = KPilotSettings::internalEditors() ? i18n("<qt>Delete the selected address from the address book.</qt>") : i18n("<qt><i>Deleting is disabled by the 'internal editors' setting.</i></qt>") ; button = new TQPushButton(i18n("Export addresses to file","Export..."), this); grid->addWidget(button, 3,1); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExport())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExport())); TQWhatsThis::add(button, i18n("<qt>Export all addresses in the selected category to CSV format.</qt>") ); @@ -441,10 +441,10 @@ void AddressWidget::slotEditRecord() AddressEditor *editor = new AddressEditor(selectedRecord, fAddressAppInfo, this); - connect(editor, TQT_SIGNAL(recordChangeComplete(PilotAddress *)), - this, TQT_SLOT(slotUpdateRecord(PilotAddress *))); - connect(editor, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotEditCancelled())); + connect(editor, TQ_SIGNAL(recordChangeComplete(PilotAddress *)), + this, TQ_SLOT(slotUpdateRecord(PilotAddress *))); + connect(editor, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotEditCancelled())); editor->show(); fPendingAddresses++; @@ -491,10 +491,10 @@ void AddressWidget::slotCreateNewRecord() AddressEditor *editor = new AddressEditor(0L, fAddressAppInfo, this); - connect(editor, TQT_SIGNAL(recordChangeComplete(PilotAddress *)), - this, TQT_SLOT(slotAddRecord(PilotAddress *))); - connect(editor, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotEditCancelled())); + connect(editor, TQ_SIGNAL(recordChangeComplete(PilotAddress *)), + this, TQ_SLOT(slotAddRecord(PilotAddress *))); + connect(editor, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotEditCancelled())); editor->show(); fPendingAddresses++; diff --git a/kpilot/conduitConfigDialog.cpp b/kpilot/conduitConfigDialog.cpp index 5d07e25..b39ba01 100644 --- a/kpilot/conduitConfigDialog.cpp +++ b/kpilot/conduitConfigDialog.cpp @@ -325,19 +325,19 @@ ConduitConfigWidget::ConduitConfigWidget(TQWidget *parent, const char *n, fStack->setMinimumSize(fStack->sizeHint()+TQSize(10,40)); TQObject::connect(fConduitList, - TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this,TQT_SLOT(selected(TQListViewItem *))); + TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this,TQ_SLOT(selected(TQListViewItem *))); TQObject::connect(fConduitList, - TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(conduitsChanged(TQListViewItem*))); + TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(conduitsChanged(TQListViewItem*))); // Deprecated? TQObject::connect(fConfigureButton, - TQT_SIGNAL(clicked()), - this,TQT_SLOT(configure())); + TQ_SIGNAL(clicked()), + this,TQ_SLOT(configure())); - TQObject::connect(fConfigureWizard,TQT_SIGNAL(clicked()), - this,TQT_SLOT(configureWizard())); + TQObject::connect(fConfigureWizard,TQ_SIGNAL(clicked()), + this,TQ_SLOT(configureWizard())); fGeneralPage->setSelected(true); fConduitList->setCurrentItem(fGeneralPage); @@ -651,7 +651,7 @@ void ConduitConfigWidget::loadAndConfigure(TQListViewItem *p) // ,bool exec) fCurrentConfig=d; // make sure the changed signal is propagated to the KCM*Dialog // and the apply button is enabled correspondingly. - connect(d, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect(d, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); } } @@ -694,7 +694,7 @@ void ConduitConfigWidget::selected(TQListViewItem *p) if (!release()) { fConduitList->blockSignals(true); - TQTimer::singleShot(1,this,TQT_SLOT(unselect())); + TQTimer::singleShot(1,this,TQ_SLOT(unselect())); return; } } diff --git a/kpilot/datebookWidget.cpp b/kpilot/datebookWidget.cpp index fedfd6d..895c8ad 100644 --- a/kpilot/datebookWidget.cpp +++ b/kpilot/datebookWidget.cpp @@ -77,10 +77,10 @@ DatebookWidget::DatebookWidget(TQWidget *parent, const TQString &dbpath) : // fEventList->setAlternateBackground( TQColor( 221, 146, 240 ) ); g->addMultiCellWidget(fEventList, 0, 2, 3, 3); - connect(fDatePicker, TQT_SIGNAL(dateChanged()), TQT_SLOT(slotDayChanged())); - connect(fAddButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddEvent())); - connect(fEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditEvent())); - connect(fDeleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteEvent())); + connect(fDatePicker, TQ_SIGNAL(dateChanged()), TQ_SLOT(slotDayChanged())); + connect(fAddButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddEvent())); + connect(fEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditEvent())); + connect(fDeleteButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteEvent())); } DatebookWidget::~DatebookWidget() diff --git a/kpilot/dbSelectionDialog.cpp b/kpilot/dbSelectionDialog.cpp index ed99c9b..e4ed9f7 100644 --- a/kpilot/dbSelectionDialog.cpp +++ b/kpilot/dbSelectionDialog.cpp @@ -70,12 +70,12 @@ KPilotDBSelectionDialog::KPilotDBSelectionDialog(TQStringList &selectedDBs, TQSt if (fSelectedDBs.contains(*it)) checkitem->setOn(true); } - connect(fSelectionWidget->fNameEdit, TQT_SIGNAL(textChanged( const TQString & )), - this, TQT_SLOT(slotTextChanged( const TQString &))); - connect(fSelectionWidget->fAddButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(addDB())); - connect(fSelectionWidget->fRemoveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(removeDB())); + connect(fSelectionWidget->fNameEdit, TQ_SIGNAL(textChanged( const TQString & )), + this, TQ_SLOT(slotTextChanged( const TQString &))); + connect(fSelectionWidget->fAddButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(addDB())); + connect(fSelectionWidget->fRemoveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(removeDB())); } KPilotDBSelectionDialog::~KPilotDBSelectionDialog() diff --git a/kpilot/dbviewerWidget.cpp b/kpilot/dbviewerWidget.cpp index c1dcbd2..050735e 100644 --- a/kpilot/dbviewerWidget.cpp +++ b/kpilot/dbviewerWidget.cpp @@ -119,22 +119,22 @@ void GenericDBWidget::setupWidget() g->addMultiCellLayout( g1, 0, 1, 1, 1 ); resize( TQSize(682, 661).expandedTo(minimumSizeHint()) ); - connect(fDBList, TQT_SIGNAL(highlighted(const TQString &)), - this, TQT_SLOT(slotSelected(const TQString &))); - connect(fDBType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotDBType(int))); - connect(fDBInfoButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotShowDBInfo())); - connect(fAppInfoButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotShowAppInfo())); - connect(fAddRecord, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddRecord())); - connect(fEditRecord, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditRecord())); - connect(fDeleteRecord, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDeleteRecord())); - connect(fRecordList, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotEditRecord(TQListViewItem*))); + connect(fDBList, TQ_SIGNAL(highlighted(const TQString &)), + this, TQ_SLOT(slotSelected(const TQString &))); + connect(fDBType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotDBType(int))); + connect(fDBInfoButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotShowDBInfo())); + connect(fAppInfoButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotShowAppInfo())); + connect(fAddRecord, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddRecord())); + connect(fEditRecord, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditRecord())); + connect(fDeleteRecord, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDeleteRecord())); + connect(fRecordList, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotEditRecord(TQListViewItem*))); } diff --git a/kpilot/fileInstallWidget.cpp b/kpilot/fileInstallWidget.cpp index 4f60d0a..b32e005 100644 --- a/kpilot/fileInstallWidget.cpp +++ b/kpilot/fileInstallWidget.cpp @@ -75,20 +75,20 @@ FileInstallWidget::FileInstallWidget(TQWidget * parent, TQPushButton *abutton; abutton = addButton = new TQPushButton(i18n("Add File..."), this); - connect(abutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddFile())); + connect(abutton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddFile())); grid->addWidget(abutton, 3, 1); TQWhatsThis::add(abutton, i18n("<qt>Choose a file to add to the list of files to install.</qt>")); abutton = clearButton= new TQPushButton(i18n("Clear List"), this); - connect(abutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClearButton())); + connect(abutton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClearButton())); grid->addWidget(abutton, 4, 1); TQWhatsThis::add(abutton, i18n("<qt>Clear the list of files to install. No files will be installed.</qt>")); fIconView = new TDEIconView(this); - connect(fIconView, TQT_SIGNAL(dropped(TQDropEvent *, const TQValueList<TQIconDragItem> &)), - this, TQT_SLOT(slotDropEvent(TQDropEvent *, const TQValueList<TQIconDragItem> &))); + connect(fIconView, TQ_SIGNAL(dropped(TQDropEvent *, const TQValueList<TQIconDragItem> &)), + this, TQ_SLOT(slotDropEvent(TQDropEvent *, const TQValueList<TQIconDragItem> &))); grid->addMultiCellWidget(fIconView, 1, 4, 2, 3); TQWhatsThis::add(fIconView, i18n @@ -104,8 +104,8 @@ FileInstallWidget::FileInstallWidget(TQWidget * parent, grid->addRowSpacing(5, SPACING); fInstaller = new FileInstaller; - connect(fInstaller, TQT_SIGNAL(filesChanged()), - this, TQT_SLOT(refreshFileInstallList())); + connect(fInstaller, TQ_SIGNAL(filesChanged()), + this, TQ_SLOT(refreshFileInstallList())); } diff --git a/kpilot/hotSync.cpp b/kpilot/hotSync.cpp index 81625e9..9c95697 100644 --- a/kpilot/hotSync.cpp +++ b/kpilot/hotSync.cpp @@ -369,7 +369,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir ) initNoBackup( fP->fNoBackupDBs, fP->fNoBackupCreators ); fP->fDBIndex = 0; - TQTimer::singleShot(0,this,TQT_SLOT(backupOneDB())); + TQTimer::singleShot(0,this,TQ_SLOT(backupOneDB())); return true; } @@ -448,7 +448,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir ) .arg(Pilot::fromPilot(info.name)); addSyncLogEntry(s); } - TQTimer::singleShot(0,this,TQT_SLOT(backupOneDB())); + TQTimer::singleShot(0,this,TQ_SLOT(backupOneDB())); } /** @@ -538,7 +538,7 @@ bool BackupAction::startBackupThread(DBInfo *info) KPILOT_DELETE(fBackupThread); // This was a successful termination. addSyncLogEntry( i18n("... OK.\n"), false ); - TQTimer::singleShot(0,this,TQT_SLOT(backupOneDB())); + TQTimer::singleShot(0,this,TQ_SLOT(backupOneDB())); return true; } if (e->type() == (TQEvent::Type)Thread::TerminateFailure) @@ -546,7 +546,7 @@ bool BackupAction::startBackupThread(DBInfo *info) KPILOT_DELETE(fBackupThread); // Unsuccessful termination. addSyncLogEntry( i18n("Backup failed.") ); - TQTimer::singleShot(0,this,TQT_SLOT(backupOneDB())); + TQTimer::singleShot(0,this,TQ_SLOT(backupOneDB())); return true; } return SyncAction::event(e); @@ -615,8 +615,8 @@ FileInstallAction::~FileInstallAction() } fTimer = new TQTimer(this); - TQObject::connect(fTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(installNextFile())); + TQObject::connect(fTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(installNextFile())); fTimer->start(0, false); @@ -1049,8 +1049,8 @@ void RestoreAction::setDirectory( const TQString &path ) fP->fDBIterator = fP->fDBList.begin(); fActionStatus = InstallingFiles; - TQObject::connect(&(fP->fTimer), TQT_SIGNAL(timeout()), - this, TQT_SLOT(installNextFile())); + TQObject::connect(&(fP->fTimer), TQ_SIGNAL(timeout()), + this, TQ_SLOT(installNextFile())); fP->fTimer.start(0, false); return true; diff --git a/kpilot/internalEditorAction.cpp b/kpilot/internalEditorAction.cpp index 5660ba7..0c57c61 100644 --- a/kpilot/internalEditorAction.cpp +++ b/kpilot/internalEditorAction.cpp @@ -61,7 +61,7 @@ bool InternalEditorAction::exec() FUNCTIONSETUP; emit logMessage(i18n("[Internal Editors]")); fInternalEditorSyncStatus=eSyncStarted; - TQTimer::singleShot(0, this, TQT_SLOT(syncDirtyDB())); + TQTimer::singleShot(0, this, TQ_SLOT(syncDirtyDB())); return true; } @@ -84,7 +84,7 @@ void InternalEditorAction::syncDirtyDB() { KPilotSettings::setDirtyDatabases(TQStringList()); KPilotConfig::sync(); - TQTimer::singleShot(0, this, TQT_SLOT(syncFlagsChangedDB())); + TQTimer::singleShot(0, this, TQ_SLOT(syncFlagsChangedDB())); return; } #ifdef DEBUG @@ -146,7 +146,7 @@ nextDB: localDB->resetSyncFlags(); KPILOT_DELETE(localDB); KPILOT_DELETE(serialDB); - TQTimer::singleShot(0, this, TQT_SLOT(syncDirtyDB())); + TQTimer::singleShot(0, this, TQ_SLOT(syncDirtyDB())); } bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, PilotRecord*localrec, PilotRecord*serialrec, PilotDatabase*db) @@ -323,7 +323,7 @@ void InternalEditorAction::syncFlagsChangedDB() { KPilotSettings::setFlagsChangedDatabases(TQStringList()); KPilotConfig::sync(); - TQTimer::singleShot(0, this, TQT_SLOT(syncAppBlockChangedDB())); + TQTimer::singleShot(0, this, TQ_SLOT(syncAppBlockChangedDB())); return; } @@ -331,7 +331,7 @@ void InternalEditorAction::syncFlagsChangedDB() DEBUGKPILOT<<"syncFlagsChangedDB for DB "<<(*dbIter)<<endl; #endif emit logError(i18n("Setting the database flags on the handheld is not yet supported.")); -TQTimer::singleShot(0, this, TQT_SLOT(syncAppBlockChangedDB())); +TQTimer::singleShot(0, this, TQ_SLOT(syncAppBlockChangedDB())); return; PilotLocalDatabase*localDB=new PilotLocalDatabase(*dbIter); @@ -343,7 +343,7 @@ return; KPILOT_DELETE(localDB); KPILOT_DELETE(serialDB); - TQTimer::singleShot(0, this, TQT_SLOT(syncAppBlockChangedDB())); + TQTimer::singleShot(0, this, TQ_SLOT(syncAppBlockChangedDB())); } void InternalEditorAction::syncAppBlockChangedDB() @@ -364,7 +364,7 @@ void InternalEditorAction::syncAppBlockChangedDB() { KPilotSettings::setAppBlockChangedDatabases(TQStringList()); KPilotConfig::sync(); - TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); + TQTimer::singleShot(0, this, TQ_SLOT(cleanup())); return; } #ifdef DEBUG @@ -381,7 +381,7 @@ void InternalEditorAction::syncAppBlockChangedDB() KPILOT_DELETE(localDB); KPILOT_DELETE(serialDB); - TQTimer::singleShot(0, this, TQT_SLOT(syncAppBlockChangedDB())); + TQTimer::singleShot(0, this, TQ_SLOT(syncAppBlockChangedDB())); } void InternalEditorAction::cleanup() diff --git a/kpilot/kpilot.cpp b/kpilot/kpilot.cpp index 736fabb..9221627 100644 --- a/kpilot/kpilot.cpp +++ b/kpilot/kpilot.cpp @@ -231,8 +231,8 @@ void KPilotInstaller::setupWidget() fManagingWidget->setMinimumSize(fManagingWidget->sizeHint()); fManagingWidget->show(); setCentralWidget(fManagingWidget); - connect( fManagingWidget, TQT_SIGNAL( aboutToShowPage ( TQWidget* ) ), - this, TQT_SLOT( slotAboutToShowComponent( TQWidget* ) ) ); + connect( fManagingWidget, TQ_SIGNAL( aboutToShowPage ( TQWidget* ) ), + this, TQ_SLOT( slotAboutToShowComponent( TQWidget* ) ) ); initIcons(); initMenu(); @@ -286,7 +286,7 @@ void KPilotInstaller::initComponents() #undef ADDICONPAGE - TQTimer::singleShot(500,this,TQT_SLOT(initializeComponents())); + TQTimer::singleShot(500,this,TQ_SLOT(initializeComponents())); } @@ -518,12 +518,12 @@ void KPilotInstaller::initMenu() syncPopup->setWhatsThis(i18n("Select the kind of HotSync to perform next. " "This applies only to the next HotSync; to change the default, use " "the configuration dialog.")); - connect(syncPopup, TQT_SIGNAL(activated()), - this, TQT_SLOT(slotHotSyncRequested())); + connect(syncPopup, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotHotSyncRequested())); // File actions, keep this list synced with kpilotui.rc and pilotDaemon.cpp a = new TDEAction(i18n("&HotSync"), CSL1("hotsync"), 0, - this, TQT_SLOT(slotHotSyncRequested()), + this, TQ_SLOT(slotHotSyncRequested()), actionCollection(), "file_hotsync"); a->setToolTip(i18n("Next HotSync will be normal HotSync.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -531,7 +531,7 @@ void KPilotInstaller::initMenu() syncPopup->insert(a); a = new TDEAction(i18n("Full&Sync"), CSL1("fullsync"), 0, - this, TQT_SLOT(slotFullSyncRequested()), + this, TQ_SLOT(slotFullSyncRequested()), actionCollection(), "file_fullsync"); a->setToolTip(i18n("Next HotSync will be a FullSync.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -539,7 +539,7 @@ void KPilotInstaller::initMenu() syncPopup->insert(a); a = new TDEAction(i18n("&Backup"), CSL1("backup"), 0, - this, TQT_SLOT(slotBackupRequested()), + this, TQ_SLOT(slotBackupRequested()), actionCollection(), "file_backup"); a->setToolTip(i18n("Next HotSync will be backup.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -547,7 +547,7 @@ void KPilotInstaller::initMenu() syncPopup->insert(a); a = new TDEAction(i18n("&Restore"), CSL1("restore"), 0, - this, TQT_SLOT(slotRestoreRequested()), + this, TQ_SLOT(slotRestoreRequested()), actionCollection(), "file_restore"); a->setToolTip(i18n("Next HotSync will be restore.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -555,7 +555,7 @@ void KPilotInstaller::initMenu() syncPopup->insert(a); a = new TDEAction(i18n("Copy Handheld to PC"), TQString(), 0, - this, TQT_SLOT(slotHHtoPCRequested()), + this, TQ_SLOT(slotHHtoPCRequested()), actionCollection(), "file_HHtoPC"); a->setToolTip(i18n("Next HotSync will be backup.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -564,7 +564,7 @@ void KPilotInstaller::initMenu() syncPopup->insert(a); a = new TDEAction(i18n("Copy PC to Handheld"), TQString(), 0, - this, TQT_SLOT(slotPCtoHHRequested()), + this, TQ_SLOT(slotPCtoHHRequested()), actionCollection(), "file_PCtoHH"); a->setToolTip(i18n("Next HotSync will copy PC to Handheld.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -575,7 +575,7 @@ void KPilotInstaller::initMenu() #if 0 a = new TDEAction(i18n("&List Only"),CSL1("listsync"),0, - this,TQT_SLOT(slotTestSyncRequested()), + this,TQ_SLOT(slotTestSyncRequested()), actionCollection(), "file_list"); a->setToolTip(i18n("Next HotSync will list databases.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -586,14 +586,14 @@ void KPilotInstaller::initMenu() a = new TDEAction(i18n("Rese&t Link"),CSL1("reload"), 0, - this, TQT_SLOT(slotResetLink()), + this, TQ_SLOT(slotResetLink()), actionCollection(),"file_reload"); a->setToolTip(i18n("Reset the device connection.")); a->setWhatsThis(i18n("Try to reset the daemon and its connection " "to the Handheld.")); - a = KStdAction::quit(this, TQT_SLOT(quit()), actionCollection()); + a = KStdAction::quit(this, TQ_SLOT(quit()), actionCollection()); a->setWhatsThis(i18n("Quit KPilot, (and stop the daemon " "if configured that way).")); @@ -603,15 +603,15 @@ void KPilotInstaller::initMenu() createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - (void) KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), + (void) KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); - (void) KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), + (void) KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); - (void) KStdAction::preferences(this, TQT_SLOT(configure()), + (void) KStdAction::preferences(this, TQ_SLOT(configure()), actionCollection()); a = new TDEAction(i18n("Configuration &Wizard..."), CSL1("wizard"), 0, - this, TQT_SLOT(configureWizard()), + this, TQ_SLOT(configureWizard()), actionCollection(), "options_configure_wizard"); a->setWhatsThis(i18n("Configure KPilot using the configuration wizard.")); @@ -685,13 +685,13 @@ void KPilotInstaller::addComponentPage(PilotComponent * p, TDEToggleAction *pt = new TDEToggleAction(name, /* "kpilot" -- component icon, */ 0, - p, TQT_SLOT(slotShowComponent()), + p, TQ_SLOT(slotShowComponent()), actionCollection(), actionname); pt->setExclusiveGroup(CSL1("view_menu")); - connect(p, TQT_SIGNAL(showComponent(PilotComponent *)), - this, TQT_SLOT(slotSelectComponent(PilotComponent *))); + connect(p, TQ_SIGNAL(showComponent(PilotComponent *)), + this, TQ_SLOT(slotSelectComponent(PilotComponent *))); } /* slot */ void KPilotInstaller::initializeComponents() @@ -719,7 +719,7 @@ void KPilotInstaller::optionsConfigureToolbars() // This was added in KDE 3.1 saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -1124,7 +1124,7 @@ int main(int argc, char **argv) return 1; } - TQTimer::singleShot(0,tp,TQT_SLOT(startDaemonIfNeeded())); + TQTimer::singleShot(0,tp,TQ_SLOT(startDaemonIfNeeded())); TDEGlobal::dirs()->addResourceType("pilotdbs", CSL1("share/apps/kpilot/DBBackup")); diff --git a/kpilot/kpilotConfigDialog.cpp b/kpilot/kpilotConfigDialog.cpp index 9223f37..a28d120 100644 --- a/kpilot/kpilotConfigDialog.cpp +++ b/kpilot/kpilotConfigDialog.cpp @@ -91,12 +91,12 @@ DeviceConfigPage::DeviceConfigPage(TQWidget * w, const char *n ) : ConfigPage( w #endif -#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); - CM(fPilotDevice, TQT_SIGNAL(textChanged(const TQString &))); - CM(fPilotSpeed, TQT_SIGNAL(activated(int))); - CM(fPilotEncoding, TQT_SIGNAL(textChanged(const TQString &))); - CM(fUserName, TQT_SIGNAL(textChanged(const TQString &))); - CM(fWorkaround, TQT_SIGNAL(activated(int))); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQ_SLOT(modified())); + CM(fPilotDevice, TQ_SIGNAL(textChanged(const TQString &))); + CM(fPilotSpeed, TQ_SIGNAL(activated(int))); + CM(fPilotEncoding, TQ_SIGNAL(textChanged(const TQString &))); + CM(fUserName, TQ_SIGNAL(textChanged(const TQString &))); + CM(fWorkaround, TQ_SIGNAL(activated(int))); #undef CM fConduitName = i18n("Device"); @@ -232,11 +232,11 @@ SyncConfigPage::SyncConfigPage(TQWidget * w, const char *n ) : ConfigPage( w, n fConfigWidget->resize(fConfigWidget->size()); fWidget = fConfigWidget; -#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); - CM(fSpecialSync, TQT_SIGNAL(activated(int))); - CM(fFullSyncCheck, TQT_SIGNAL(toggled(bool))); - CM(fScreenlockSecure, TQT_SIGNAL(toggled(bool))); - CM(fConflictResolution, TQT_SIGNAL(activated(int))); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQ_SLOT(modified())); + CM(fSpecialSync, TQ_SIGNAL(activated(int))); + CM(fFullSyncCheck, TQ_SIGNAL(toggled(bool))); + CM(fScreenlockSecure, TQ_SIGNAL(toggled(bool))); + CM(fConflictResolution, TQ_SIGNAL(activated(int))); #undef CM fConduitName = i18n("HotSync"); @@ -314,15 +314,15 @@ BackupConfigPage::BackupConfigPage(TQWidget * w, const char *n ) : ConfigPage( w fConfigWidget->resize(fConfigWidget->size()); fWidget = fConfigWidget; - connect(fConfigWidget->fBackupOnlyChooser, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotSelectNoBackupDBs() ) ); - connect(fConfigWidget->fSkipDBChooser, TQT_SIGNAL(clicked()), - TQT_SLOT(slotSelectNoRestoreDBs())); + connect(fConfigWidget->fBackupOnlyChooser, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotSelectNoBackupDBs() ) ); + connect(fConfigWidget->fSkipDBChooser, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSelectNoRestoreDBs())); -#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); - CM(fBackupOnly, TQT_SIGNAL(textChanged(const TQString &))); - CM(fSkipDB, TQT_SIGNAL(textChanged(const TQString &))); - CM(fBackupFrequency, TQT_SIGNAL(activated(int))); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQ_SLOT(modified())); + CM(fBackupOnly, TQ_SIGNAL(textChanged(const TQString &))); + CM(fSkipDB, TQ_SIGNAL(textChanged(const TQString &))); + CM(fBackupFrequency, TQ_SIGNAL(activated(int))); #undef CM fConduitName = i18n("Backup"); @@ -408,11 +408,11 @@ ViewersConfigPage::ViewersConfigPage(TQWidget * w, const char *n ) : ConfigPage( fConfigWidget->resize(fConfigWidget->size()); fWidget = fConfigWidget; -#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); - CM(fInternalEditors, TQT_SIGNAL(toggled(bool))); - CM(fUseSecret, TQT_SIGNAL(toggled(bool))); - CM(fAddressGroup, TQT_SIGNAL(clicked(int))); - CM(fUseKeyField, TQT_SIGNAL(toggled(bool))); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQ_SLOT(modified())); + CM(fInternalEditors, TQ_SIGNAL(toggled(bool))); + CM(fUseSecret, TQ_SIGNAL(toggled(bool))); + CM(fAddressGroup, TQ_SIGNAL(clicked(int))); + CM(fUseKeyField, TQ_SIGNAL(toggled(bool))); #undef CM fConduitName = i18n("Viewers"); @@ -460,11 +460,11 @@ StartExitConfigPage::StartExitConfigPage(TQWidget * w, const char *n ) : ConfigP fConfigWidget->resize(fConfigWidget->size()); fWidget = fConfigWidget; -#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); - CM(fStartDaemonAtLogin, TQT_SIGNAL(toggled(bool))); - CM(fKillDaemonOnExit, TQT_SIGNAL(toggled(bool))); - CM(fDockDaemon, TQT_SIGNAL(toggled(bool))); - CM(fQuitAfterSync, TQT_SIGNAL(toggled(bool))); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQ_SLOT(modified())); + CM(fStartDaemonAtLogin, TQ_SIGNAL(toggled(bool))); + CM(fKillDaemonOnExit, TQ_SIGNAL(toggled(bool))); + CM(fDockDaemon, TQ_SIGNAL(toggled(bool))); + CM(fQuitAfterSync, TQ_SIGNAL(toggled(bool))); #undef CM fConduitName = i18n("Startup and Exit"); diff --git a/kpilot/kpilotConfigWizard.cpp b/kpilot/kpilotConfigWizard.cpp index fa5fd09..9c62a8f 100644 --- a/kpilot/kpilotConfigWizard.cpp +++ b/kpilot/kpilotConfigWizard.cpp @@ -67,8 +67,8 @@ ConfigWizard::ConfigWizard(TQWidget *parent, const char *n, int m) : setHelpEnabled( page2, false ); setHelpEnabled( page3, false ); - connect( page2->fProbeButton, TQT_SIGNAL( pressed() ), - this, TQT_SLOT( probeHandheld() ) ); + connect( page2->fProbeButton, TQ_SIGNAL( pressed() ), + this, TQ_SLOT( probeHandheld() ) ); KPilotSettings::self()->readConfig(); page2->fUserName->setText( KPilotSettings::userName() ); diff --git a/kpilot/kpilotProbeDialog.cpp b/kpilot/kpilotProbeDialog.cpp index 97960ea..e78367b 100644 --- a/kpilot/kpilotProbeDialog.cpp +++ b/kpilot/kpilotProbeDialog.cpp @@ -154,11 +154,11 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) : fTimeoutTimer = new TQTimer( this ); fProgressTimer = new TQTimer( this ); fRotateLinksTimer = new TQTimer( this ); - connect( fProcessEventsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processEvents()) ); - connect( fTimeoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) ); - connect( fProgressTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( progress()) ); - connect( fRotateLinksTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( detect()) ); - connect( this, TQT_SIGNAL(finished()), this, TQT_SLOT(disconnectDevices()) ); + connect( fProcessEventsTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processEvents()) ); + connect( fTimeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) ); + connect( fProgressTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( progress()) ); + connect( fRotateLinksTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( detect()) ); + connect( this, TQ_SIGNAL(finished()), this, TQ_SLOT(disconnectDevices()) ); } ProbeDialog::~ProbeDialog() @@ -182,7 +182,7 @@ int ProbeDialog::exec() mDetected = false; mUserName = TQString(); mDevice = TQString(); - TQTimer::singleShot( 0, this, TQT_SLOT( startDetection() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( startDetection() ) ); return KDialogBase::exec(); } @@ -193,7 +193,7 @@ void ProbeDialog::startDetection() disconnectDevices(); fProgress->setProgress(0); fStatus->setText( i18n("Starting detection...") ); - TQTimer::singleShot(0, this, TQT_SLOT(processEvents()) ); + TQTimer::singleShot(0, this, TQ_SLOT(processEvents()) ); processEvents(); PilotDaemonDCOP_stub *daemonStub = new PilotDaemonDCOP_stub("kpilotDaemon", "KPilotDaemonIface"); if (daemonStub) { @@ -226,7 +226,7 @@ void ProbeDialog::startDetection() DEBUGKPILOT<<"new kpilotDeviceLink for "<<(*it)<<endl; #endif mDeviceLinks[i].append( link ); - connect( link, TQT_SIGNAL(deviceReady(KPilotDeviceLink*)), this, TQT_SLOT(connection(KPilotDeviceLink*)) ); + connect( link, TQ_SIGNAL(deviceReady(KPilotDeviceLink*)), this, TQ_SLOT(connection(KPilotDeviceLink*)) ); processEvents(); } } @@ -293,7 +293,7 @@ void ProbeDialog::connection( KPilotDeviceLink*lnk) fResultsGroup->setEnabled( true ); enableButtonOK(true); - TQTimer::singleShot(0, this, TQT_SLOT(retrieveDBList())); + TQTimer::singleShot(0, this, TQ_SLOT(retrieveDBList())); } void ProbeDialog::retrieveDBList() @@ -329,7 +329,7 @@ void ProbeDialog::retrieveDBList() // End sync gracefully, but don't change settings on the handheld. mActiveLink->endSync( KPilotLink::NoUpdate ); - TQTimer::singleShot(0, this, TQT_SLOT(disconnectDevices())); + TQTimer::singleShot(0, this, TQ_SLOT(disconnectDevices())); } void ProbeDialog::disconnectDevices() { diff --git a/kpilot/logWidget.cpp b/kpilot/logWidget.cpp index 55db96a..30184b3 100644 --- a/kpilot/logWidget.cpp +++ b/kpilot/logWidget.cpp @@ -135,13 +135,13 @@ LogWidget::LogWidget(TQWidget * parent) : h); TQWhatsThis::add(b,i18n("<qt>Clears the list of messages from the " "current HotSync.</qt>")); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearLog())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(clearLog())); b = new TQPushButton(i18n("Save Log..."),h); TQWhatsThis::add(b,i18n("<qt>You can save the list of messages received " "during this HotSync to a file (for example for use in a " "bug report) by clicking here.</qt>")); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(saveLog())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(saveLog())); fButtonBox = h; @@ -193,7 +193,7 @@ LogWidget::LogWidget(TQWidget * parent) : fSplash = new TQLabel(this); fSplash->setPixmap(splash); fSplash->setAlignment(AlignCenter); - TQTimer::singleShot(3000,this,TQT_SLOT(hideSplash())); + TQTimer::singleShot(3000,this,TQ_SLOT(hideSplash())); grid->addMultiCellWidget(fSplash,1,3,1,2); grid->addColSpacing(0,10); grid->setColStretch(1,50); diff --git a/kpilot/main-test.cpp b/kpilot/main-test.cpp index 68e6588..77ff7c7 100644 --- a/kpilot/main-test.cpp +++ b/kpilot/main-test.cpp @@ -137,20 +137,20 @@ void connectStack( KPilotLink *l, ActionQueue *a, bool loop = false ) if (l && a) { - TQObject::connect(a, TQT_SIGNAL(syncDone(SyncAction *)), - l, TQT_SLOT(close())); + TQObject::connect(a, TQ_SIGNAL(syncDone(SyncAction *)), + l, TQ_SLOT(close())); if (!loop) { - TQObject::connect(a, TQT_SIGNAL(syncDone(SyncAction *)), - kapp, TQT_SLOT(quit())); + TQObject::connect(a, TQ_SIGNAL(syncDone(SyncAction *)), + kapp, TQ_SLOT(quit())); } else { - TQObject::connect(a, TQT_SIGNAL(syncDone(SyncAction *)), - l, TQT_SLOT(reset())); + TQObject::connect(a, TQ_SIGNAL(syncDone(SyncAction *)), + l, TQ_SLOT(reset())); } - TQObject::connect(l, TQT_SIGNAL(deviceReady(KPilotLink*)), - a, TQT_SLOT(execConduit())); + TQObject::connect(l, TQ_SIGNAL(deviceReady(KPilotLink*)), + a, TQ_SLOT(execConduit())); } } diff --git a/kpilot/memoWidget.cpp b/kpilot/memoWidget.cpp index 951a422..8e3f5f0 100644 --- a/kpilot/memoWidget.cpp +++ b/kpilot/memoWidget.cpp @@ -228,8 +228,8 @@ void MemoWidget::setupWidget() fCatList = new TQComboBox(this); grid->addWidget(fCatList, 0, 1); - connect(fCatList, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSetCategory(int))); + connect(fCatList, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSetCategory(int))); TQWhatsThis::add(fCatList, i18n("Select the category of addresses\n" "to display here.")); @@ -241,10 +241,10 @@ void MemoWidget::setupWidget() fListBox = new TQListBox(this); grid->addMultiCellWidget(fListBox, 1, 1, 0, 1); - connect(fListBox, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotShowMemo(int))); - connect(fListBox, TQT_SIGNAL(selectionChanged()), - this,TQT_SLOT(slotUpdateButtons())); + connect(fListBox, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotShowMemo(int))); + connect(fListBox, TQ_SIGNAL(selectionChanged()), + this,TQ_SLOT(slotUpdateButtons())); TQWhatsThis::add(fListBox, i18n("This list displays all the memos\n" "in the selected category. Click on\n" @@ -263,7 +263,7 @@ void MemoWidget::setupWidget() button = new TQPushButton(i18n("Import Memo..."), this); grid->addWidget(button, 2, 0); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotImportMemo())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotImportMemo())); wt = KPilotSettings::internalEditors() ? i18n ("Read a text file and add it to the Pilot's memo database.") : i18n("<qt><i>Import is disabled by the 'internal editors' setting.</i></qt>"); @@ -271,15 +271,15 @@ void MemoWidget::setupWidget() fExportButton = new TQPushButton(i18n("Export Memo..."), this); grid->addWidget(fExportButton, 2, 1); - connect(fExportButton, TQT_SIGNAL(clicked()), this, - TQT_SLOT(slotExportMemo())); + connect(fExportButton, TQ_SIGNAL(clicked()), this, + TQ_SLOT(slotExportMemo())); TQWhatsThis::add(fExportButton, i18n("Write the selected memo to a file.")); fDeleteButton = new TQPushButton(i18n("Delete Memo"), this); grid->addWidget(fDeleteButton, 3, 1); - connect(fDeleteButton, TQT_SIGNAL(clicked()), this, - TQT_SLOT(slotDeleteMemo())); + connect(fDeleteButton, TQ_SIGNAL(clicked()), this, + TQ_SLOT(slotDeleteMemo())); wt = KPilotSettings::internalEditors() ? i18n("Delete the selected memo.") : i18n("<qt><i>Deleting is disabled by the 'internal editors' setting.</i></qt>") ; @@ -287,7 +287,7 @@ void MemoWidget::setupWidget() button = new TQPushButton(i18n("Add Memo"), this); grid->addWidget(button, 3, 0); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddMemo())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddMemo())); TQWhatsThis::add(button,i18n("Add a new memo to the database.")); } diff --git a/kpilot/pilotDaemon.cpp b/kpilot/pilotDaemon.cpp index 32d854a..0493553 100644 --- a/kpilot/pilotDaemon.cpp +++ b/kpilot/pilotDaemon.cpp @@ -150,14 +150,14 @@ void PilotDaemonTray::setupWidget() icons[NotListening] = loadIcon( CSL1("nosync") ); slotShowNotListening(); - TQTimer::singleShot(2000,this,TQT_SLOT(slotShowNormal())); + TQTimer::singleShot(2000,this,TQ_SLOT(slotShowNormal())); TDEPopupMenu *menu = contextMenu(); menuKPilotItem = menu->insertItem(i18n("Start &KPilot"), daemon, - TQT_SLOT(slotRunKPilot())); + TQ_SLOT(slotRunKPilot())); menuConfigureConduitsItem = menu->insertItem(i18n("&Configure KPilot..."), - daemon, TQT_SLOT(slotRunConfig())); + daemon, TQ_SLOT(slotRunConfig())); menu->insertSeparator(); fSyncTypeMenu = new TDEPopupMenu(menu,"sync_type_menu"); @@ -181,7 +181,7 @@ void PilotDaemonTray::setupWidget() fSyncTypeMenu->setCheckable(true); fSyncTypeMenu->setItemChecked(0,true); #undef MI - connect(fSyncTypeMenu,TQT_SIGNAL(activated(int)),daemon,TQT_SLOT(requestSync(int))); + connect(fSyncTypeMenu,TQ_SIGNAL(activated(int)),daemon,TQ_SLOT(requestSync(int))); menu->insertItem(i18n("Next &Sync"),fSyncTypeMenu); KHelpMenu *help = new KHelpMenu(menu,aboutData); @@ -261,8 +261,8 @@ void PilotDaemonTray::startHotSync() } if (fBlinkTimer) { - connect(fBlinkTimer,TQT_SIGNAL(timeout()), - this,TQT_SLOT(slotBusyTimer())); + connect(fBlinkTimer,TQ_SIGNAL(timeout()), + this,TQ_SLOT(slotBusyTimer())); fBlinkTimer->start(750,false); } } @@ -305,8 +305,8 @@ PilotDaemon::PilotDaemon() : fInstaller = new FileInstaller; fLogFile = new LogFile; - connect(fInstaller, TQT_SIGNAL(filesChanged()), - this, TQT_SLOT(slotFilesChanged())); + connect(fInstaller, TQ_SIGNAL(filesChanged()), + this, TQ_SLOT(slotFilesChanged())); fNextSyncType.setMode( KPilotSettings::syncType() ); @@ -594,16 +594,16 @@ bool PilotDaemon::setupPilotLink() return false; } - TQObject::connect(fPilotLink, TQT_SIGNAL(deviceReady(KPilotLink*)), - this, TQT_SLOT(startHotSync(KPilotLink*))); + TQObject::connect(fPilotLink, TQ_SIGNAL(deviceReady(KPilotLink*)), + this, TQ_SLOT(startHotSync(KPilotLink*))); // connect the signals emitted by the pilotDeviceLink - TQObject::connect(fPilotLink, TQT_SIGNAL(logError(const TQString &)), - this, TQT_SLOT(logError(const TQString &))); - TQObject::connect(fPilotLink, TQT_SIGNAL(logMessage(const TQString &)), - this, TQT_SLOT(logMessage(const TQString &))); + TQObject::connect(fPilotLink, TQ_SIGNAL(logError(const TQString &)), + this, TQ_SLOT(logError(const TQString &))); + TQObject::connect(fPilotLink, TQ_SIGNAL(logMessage(const TQString &)), + this, TQ_SLOT(logMessage(const TQString &))); TQObject::connect(fPilotLink, - TQT_SIGNAL(logProgress(const TQString &,int)), - this, TQT_SLOT(logProgress(const TQString &,int))); + TQ_SIGNAL(logProgress(const TQString &,int)), + this, TQ_SLOT(logProgress(const TQString &,int))); return true; @@ -1107,18 +1107,18 @@ bool PilotDaemon::shouldBackup() launch: fSyncStack->queueCleanup(); - TQObject::connect(fSyncStack, TQT_SIGNAL(logError(const TQString &)), - this, TQT_SLOT(logError(const TQString &))); - TQObject::connect(fSyncStack, TQT_SIGNAL(logMessage(const TQString &)), - this, TQT_SLOT(logMessage(const TQString &))); + TQObject::connect(fSyncStack, TQ_SIGNAL(logError(const TQString &)), + this, TQ_SLOT(logError(const TQString &))); + TQObject::connect(fSyncStack, TQ_SIGNAL(logMessage(const TQString &)), + this, TQ_SLOT(logMessage(const TQString &))); TQObject::connect(fSyncStack, - TQT_SIGNAL(logProgress(const TQString &,int)), - this, TQT_SLOT(logProgress(const TQString &,int))); + TQ_SIGNAL(logProgress(const TQString &,int)), + this, TQ_SLOT(logProgress(const TQString &,int))); - TQObject::connect(fSyncStack, TQT_SIGNAL(syncDone(SyncAction *)), - this, TQT_SLOT(endHotSync())); + TQObject::connect(fSyncStack, TQ_SIGNAL(syncDone(SyncAction *)), + this, TQ_SLOT(endHotSync())); - TQTimer::singleShot(0,fSyncStack,TQT_SLOT(execConduit())); + TQTimer::singleShot(0,fSyncStack,TQ_SLOT(execConduit())); updateTrayStatus(); } @@ -1183,7 +1183,7 @@ launch: } else { - TQTimer::singleShot(10000,fPilotLink,TQT_SLOT(reset())); + TQTimer::singleShot(10000,fPilotLink,TQ_SLOT(reset())); } fPostSyncAction = None; diff --git a/kpilot/todoEditor.cpp b/kpilot/todoEditor.cpp index 00f5c45..adab19b 100644 --- a/kpilot/todoEditor.cpp +++ b/kpilot/todoEditor.cpp @@ -56,8 +56,8 @@ TodoEditor::TodoEditor(PilotTodoEntry * p, struct ToDoAppInfo *appInfo, setMainWidget(fWidget); fillFields(); - connect(parent, TQT_SIGNAL(recordChanged(PilotTodoEntry *)), - this, TQT_SLOT(updateRecord(PilotTodoEntry *))); + connect(parent, TQ_SIGNAL(recordChanged(PilotTodoEntry *)), + this, TQ_SLOT(updateRecord(PilotTodoEntry *))); } diff --git a/kpilot/todoWidget.cpp b/kpilot/todoWidget.cpp index 1fbbaa9..90ab873 100644 --- a/kpilot/todoWidget.cpp +++ b/kpilot/todoWidget.cpp @@ -212,8 +212,8 @@ void TodoWidget::setupWidget() fCatList = new TQComboBox(this); grid->addWidget(fCatList, 0, 1); - connect(fCatList, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSetCategory(int))); + connect(fCatList, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSetCategory(int))); TQWhatsThis::add(fCatList, i18n("<qt>Select the category of to-dos to display here.</qt>")); @@ -229,16 +229,16 @@ void TodoWidget::setupWidget() fListBox->setItemsMovable( FALSE ); fListBox->setItemsRenameable (TRUE); grid->addMultiCellWidget(fListBox, 1, 1, 0, 1); - connect(fListBox, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotShowTodo(TQListViewItem*))); - connect(fListBox, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(slotEditRecord(TQListViewItem*))); - connect(fListBox, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotEditRecord(TQListViewItem*))); - connect(fListBox, TQT_SIGNAL(itemChecked(TQCheckListItem*, bool)), - this, TQT_SLOT(slotItemChecked(TQCheckListItem*, bool))); - connect(fListBox, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); + connect(fListBox, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotShowTodo(TQListViewItem*))); + connect(fListBox, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(slotEditRecord(TQListViewItem*))); + connect(fListBox, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotEditRecord(TQListViewItem*))); + connect(fListBox, TQ_SIGNAL(itemChecked(TQCheckListItem*, bool)), + this, TQ_SLOT(slotItemChecked(TQCheckListItem*, bool))); + connect(fListBox, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); TQWhatsThis::add(fListBox, i18n("<qt>This list displays all the to-dos " "in the selected category. Click on " @@ -256,7 +256,7 @@ void TodoWidget::setupWidget() fEditButton = new TQPushButton(i18n("Edit Record..."), this); grid->addWidget(fEditButton, 2, 0); - connect(fEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditRecord())); + connect(fEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditRecord())); wt = KPilotSettings::internalEditors() ? i18n("<qt>You can edit a to-do when it is selected.</qt>") : @@ -265,7 +265,7 @@ void TodoWidget::setupWidget() button = new TQPushButton(i18n("New Record..."), this); grid->addWidget(button, 2, 1); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateNewRecord())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCreateNewRecord())); wt = KPilotSettings::internalEditors() ? i18n("<qt>Add a new to-do to the to-do list.</qt>") : i18n("<qt><i>Adding new to-dos is disabled by the 'internal editors' setting.</i></qt>"); @@ -274,8 +274,8 @@ void TodoWidget::setupWidget() fDeleteButton = new TQPushButton(i18n("Delete Record"), this); grid->addWidget(fDeleteButton, 3, 0); - connect(fDeleteButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDeleteRecord())); + connect(fDeleteButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDeleteRecord())); wt = KPilotSettings::internalEditors() ? i18n("<qt>Delete the selected to-do from the to-do list.</qt>") : i18n("<qt><i>Deleting is disabled by the 'internal editors' setting.</i></qt>") ; @@ -369,10 +369,10 @@ void TodoWidget::slotEditRecord(TQListViewItem*item) TodoEditor *editor = new TodoEditor(selectedRecord, fTodoAppInfo->info(), this); - connect(editor, TQT_SIGNAL(recordChangeComplete(PilotTodoEntry *)), - this, TQT_SLOT(slotUpdateRecord(PilotTodoEntry *))); - connect(editor, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotEditCancelled())); + connect(editor, TQ_SIGNAL(recordChangeComplete(PilotTodoEntry *)), + this, TQ_SLOT(slotUpdateRecord(PilotTodoEntry *))); + connect(editor, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotEditCancelled())); editor->show(); fPendingTodos++; @@ -419,10 +419,10 @@ void TodoWidget::slotCreateNewRecord() TodoEditor *editor = new TodoEditor(0L, fTodoAppInfo->info(), this); - connect(editor, TQT_SIGNAL(recordChangeComplete(PilotTodoEntry *)), - this, TQT_SLOT(slotAddRecord(PilotTodoEntry *))); - connect(editor, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotEditCancelled())); + connect(editor, TQ_SIGNAL(recordChangeComplete(PilotTodoEntry *)), + this, TQ_SLOT(slotAddRecord(PilotTodoEntry *))); + connect(editor, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotEditCancelled())); editor->show(); fPendingTodos++; diff --git a/lib/actionQueue.cpp b/lib/actionQueue.cpp index 6936297..7b99aea 100644 --- a/lib/actionQueue.cpp +++ b/lib/actionQueue.cpp @@ -156,17 +156,17 @@ void ActionQueue::actionCompleted(SyncAction *b) << endl; #endif - TQObject::connect(a, TQT_SIGNAL(logMessage(const TQString &)), - this, TQT_SIGNAL(logMessage(const TQString &))); - TQObject::connect(a, TQT_SIGNAL(logError(const TQString &)), - this, TQT_SIGNAL(logMessage(const TQString &))); - TQObject::connect(a, TQT_SIGNAL(logProgress(const TQString &, int)), - this, TQT_SIGNAL(logProgress(const TQString &, int))); - TQObject::connect(a, TQT_SIGNAL(syncDone(SyncAction *)), - this, TQT_SLOT(actionCompleted(SyncAction *))); + TQObject::connect(a, TQ_SIGNAL(logMessage(const TQString &)), + this, TQ_SIGNAL(logMessage(const TQString &))); + TQObject::connect(a, TQ_SIGNAL(logError(const TQString &)), + this, TQ_SIGNAL(logMessage(const TQString &))); + TQObject::connect(a, TQ_SIGNAL(logProgress(const TQString &, int)), + this, TQ_SIGNAL(logProgress(const TQString &, int))); + TQObject::connect(a, TQ_SIGNAL(syncDone(SyncAction *)), + this, TQ_SLOT(actionCompleted(SyncAction *))); // Run the action picked from the queue when we get back // to the event loop. - TQTimer::singleShot(0,a,TQT_SLOT(execConduit())); + TQTimer::singleShot(0,a,TQ_SLOT(execConduit())); } diff --git a/lib/kpilotdevicelink.cpp b/lib/kpilotdevicelink.cpp index ecad02a..05edf14 100644 --- a/lib/kpilotdevicelink.cpp +++ b/lib/kpilotdevicelink.cpp @@ -76,7 +76,7 @@ static inline void startOpenTimer(DeviceCommThread *dev, TQTimer *&t) if ( !t) { t = new TQTimer(dev); - TQObject::connect(t, TQT_SIGNAL(timeout()), dev, TQT_SLOT(openDevice())); + TQObject::connect(t, TQ_SIGNAL(timeout()), dev, TQ_SLOT(openDevice())); } // just a single-shot timer. we'll know when to start it again... t->start(1000, true); @@ -306,8 +306,8 @@ bool DeviceCommThread::open(const TQString &device) fSocketNotifier = new TQSocketNotifier(fTempSocket, TQSocketNotifier::Read, this); - TQObject::connect(fSocketNotifier, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(acceptDevice())); + TQObject::connect(fSocketNotifier, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(acceptDevice())); fSocketNotifierActive=true; /** @@ -323,7 +323,7 @@ bool DeviceCommThread::open(const TQString &device) } fWorkaroundUSBTimer = new TQTimer(this); - connect(fWorkaroundUSBTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(workaroundUSB())); + connect(fWorkaroundUSBTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(workaroundUSB())); fWorkaroundUSBTimer->start(timeout, true); return true; diff --git a/lib/kpilotlocallink.cpp b/lib/kpilotlocallink.cpp index b5ec450..c85dfed 100644 --- a/lib/kpilotlocallink.cpp +++ b/lib/kpilotlocallink.cpp @@ -157,7 +157,7 @@ KPilotLocalLink::~KPilotLocalLink() if (fReady) { findAvailableDatabases(*d, fPath); - TQTimer::singleShot(500,this,TQT_SLOT(ready())); + TQTimer::singleShot(500,this,TQ_SLOT(ready())); } else { diff --git a/lib/plugin.cpp b/lib/plugin.cpp index 1013a34..c208598 100644 --- a/lib/plugin.cpp +++ b/lib/plugin.cpp @@ -607,17 +607,17 @@ ConduitProxy::ConduitProxy(KPilotLink *p, addSyncLogEntry(i18n("[Conduit %1]").arg(fDesktopName)); // Handle the syncDone signal properly & unload the conduit. - TQObject::connect(fConduit,TQT_SIGNAL(syncDone(SyncAction *)), - this,TQT_SLOT(execDone(SyncAction *))); + TQObject::connect(fConduit,TQ_SIGNAL(syncDone(SyncAction *)), + this,TQ_SLOT(execDone(SyncAction *))); // Proxy all the log and error messages. - TQObject::connect(fConduit,TQT_SIGNAL(logMessage(const TQString &)), - this,TQT_SIGNAL(logMessage(const TQString &))); - TQObject::connect(fConduit,TQT_SIGNAL(logError(const TQString &)), - this,TQT_SIGNAL(logError(const TQString &))); - TQObject::connect(fConduit,TQT_SIGNAL(logProgress(const TQString &,int)), - this,TQT_SIGNAL(logProgress(const TQString &,int))); - - TQTimer::singleShot(0,fConduit,TQT_SLOT(execConduit())); + TQObject::connect(fConduit,TQ_SIGNAL(logMessage(const TQString &)), + this,TQ_SIGNAL(logMessage(const TQString &))); + TQObject::connect(fConduit,TQ_SIGNAL(logError(const TQString &)), + this,TQ_SIGNAL(logError(const TQString &))); + TQObject::connect(fConduit,TQ_SIGNAL(logProgress(const TQString &,int)), + this,TQ_SIGNAL(logProgress(const TQString &,int))); + + TQTimer::singleShot(0,fConduit,TQ_SLOT(execConduit())); return true; } diff --git a/lib/recordConduit.cpp b/lib/recordConduit.cpp index 7c92152..31aab7a 100644 --- a/lib/recordConduit.cpp +++ b/lib/recordConduit.cpp @@ -76,7 +76,7 @@ long version_record_conduit = Pilot::PLUGIN_API; fIDListIterator = fIDList.begin(); fTimer = new TQTimer(this); - connect(fTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(process())); + connect(fTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(process())); fTimer->start(0,false); // Fire as often as possible to prompt processing return true; } @@ -327,7 +327,7 @@ RecordConduit::~RecordConduit() for this, and no longer purge the whole addressbook before the sync to prevent data loss in case of connection loss. */ - TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPalmRecToPC())); return true; } @@ -342,7 +342,7 @@ void RecordConduit::slotPalmRecToPC() if ( getSyncDirection() == SyncAction::eCopyPCToHH ) { mPCIter = mPCData->begin(); - TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPCRecToPalm())); return; } @@ -354,7 +354,7 @@ void RecordConduit::slotPalmRecToPC() if ( !palmRec ) { mPCIter = mPCData->begin(); - TQTimer::singleShot( 0, this, TQT_SLOT( slotPCRecToPalm() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotPCRecToPalm() ) ); return; } @@ -362,7 +362,7 @@ void RecordConduit::slotPalmRecToPC() if ( mSyncedIds.contains( palmRec->id() ) ) { KPILOT_DELETE( palmRec ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotPalmRecToPC() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotPalmRecToPC() ) ); return; } @@ -389,7 +389,7 @@ void RecordConduit::slotPalmRecToPC() KPILOT_DELETE( palmRec ); KPILOT_DELETE( backupRec ); - TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPalmRecToPC())); } @@ -402,7 +402,7 @@ void RecordConduit::slotPCRecToPalm() mPCData->atEnd( mPCIter ) ) { mPalmIndex = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( slotDeletedRecord() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDeletedRecord() ) ); return; } @@ -418,7 +418,7 @@ void RecordConduit::slotPCRecToPalm() " marked archived, so don't sync." << endl; #endif KPILOT_DELETE( pcEntry ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotPCRecToPalm() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotPCRecToPalm() ) ); return; } @@ -428,7 +428,7 @@ void RecordConduit::slotPCRecToPalm() // it's a new item(no record ID and not inserted by the Palm -> PC sync), so add it syncEntry( pcEntry, 0L, 0L ); KPILOT_DELETE( pcEntry ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotPCRecToPalm() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotPCRecToPalm() ) ); return; } @@ -439,7 +439,7 @@ void RecordConduit::slotPCRecToPalm() DEBUGKPILOT << ": address with id " << recID << " already synced." << endl; #endif KPILOT_DELETE( pcEntry ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotPCRecToPalm() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotPCRecToPalm() ) ); return; } @@ -470,7 +470,7 @@ void RecordConduit::slotPCRecToPalm() mSyncedIds.append( recID ); // done with the sync process, go on with the next one: - TQTimer::singleShot( 0, this, TQT_SLOT( slotPCRecToPalm() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotPCRecToPalm() ) ); } @@ -483,7 +483,7 @@ void RecordConduit::slotDeletedRecord() if( !backupRec || isFirstSync() ) { KPILOT_DELETE(backupRec); - TQTimer::singleShot( 0, this, TQT_SLOT( slotDeleteUnsyncedPCRecords() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDeleteUnsyncedPCRecords() ) ); return; } @@ -491,7 +491,7 @@ void RecordConduit::slotDeletedRecord() if ( mSyncedIds.contains( backupRec->id() ) ) { KPILOT_DELETE( backupRec ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotDeletedRecord() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDeletedRecord() ) ); return; } @@ -513,7 +513,7 @@ void RecordConduit::slotDeletedRecord() KPILOT_DELETE( backupEntry ); KPILOT_DELETE( palmRec ); KPILOT_DELETE( backupRec ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotDeletedRecord() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDeletedRecord() ) ); } @@ -546,7 +546,7 @@ void RecordConduit::slotDeleteUnsyncedPCRecords() } } } - TQTimer::singleShot(0, this, TQT_SLOT(slotDeleteUnsyncedHHRecords())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDeleteUnsyncedHHRecords())); } @@ -570,7 +570,7 @@ void RecordConduit::slotDeleteUnsyncedHHRecords() } } } - TQTimer::singleShot( 0, this, TQT_SLOT( slotCleanup() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotCleanup() ) ); } diff --git a/lib/syncAction.cpp b/lib/syncAction.cpp index 30951ad..ee0ff5e 100644 --- a/lib/syncAction.cpp +++ b/lib/syncAction.cpp @@ -113,7 +113,7 @@ SyncAction::~SyncAction() bool SyncAction::delayDone() { - TQTimer::singleShot(0,this,TQT_SLOT(delayedDoneSlot())); + TQTimer::singleShot(0,this,TQ_SLOT(delayedDoneSlot())); return true; } @@ -272,7 +272,7 @@ void SyncAction::startTickle(unsigned timeout) } else { - connect(deviceLink(),TQT_SIGNAL(timeout()),this,TQT_SIGNAL(timeout())); + connect(deviceLink(),TQ_SIGNAL(timeout()),this,TQ_SIGNAL(timeout())); deviceLink()->startTickle(timeout); } } @@ -286,7 +286,7 @@ void SyncAction::stopTickle() } else { - disconnect(deviceLink(),TQT_SIGNAL(timeout()),this,TQT_SIGNAL(timeout())); + disconnect(deviceLink(),TQ_SIGNAL(timeout()),this,TQ_SIGNAL(timeout())); deviceLink()->stopTickle(); } } @@ -322,8 +322,8 @@ int SyncAction::questionYesNo(const TQString & text, if ( (timeout > 0) && ( deviceLink() ) ) { - TQObject::connect(deviceLink(), TQT_SIGNAL(timeout()), - dialog, TQT_SLOT(slotCancel())); + TQObject::connect(deviceLink(), TQ_SIGNAL(timeout()), + dialog, TQ_SLOT(slotCancel())); startTickle(timeout); } @@ -435,8 +435,8 @@ int SyncAction::questionYesNoCancel(const TQString & text, if ( (timeout > 0) && (deviceLink()) ) { - TQObject::connect(deviceLink(), TQT_SIGNAL(timeout()), - dialog, TQT_SLOT(slotCancel())); + TQObject::connect(deviceLink(), TQ_SIGNAL(timeout()), + dialog, TQ_SLOT(slotCancel())); startTickle(timeout); } |