summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/actionQueue.cpp18
-rw-r--r--lib/kpilotdevicelink.cpp8
-rw-r--r--lib/kpilotlocallink.cpp2
-rw-r--r--lib/plugin.cpp20
-rw-r--r--lib/recordConduit.cpp32
-rw-r--r--lib/syncAction.cpp14
6 files changed, 47 insertions, 47 deletions
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);
}