summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/actions.cc2
-rw-r--r--lib/kpilotdevicelink.cc38
-rw-r--r--lib/kpilotdevicelink.h12
-rw-r--r--lib/options.h4
-rw-r--r--lib/pilot.cc2
-rw-r--r--lib/pilotLocalDatabase.cc6
-rw-r--r--lib/plugin.cc6
-rw-r--r--lib/syncAction.cc12
-rw-r--r--lib/syncAction.h6
9 files changed, 44 insertions, 44 deletions
diff --git a/lib/actions.cc b/lib/actions.cc
index 03138a6..eed9a3a 100644
--- a/lib/actions.cc
+++ b/lib/actions.cc
@@ -52,7 +52,7 @@ WelcomeAction::WelcomeAction(KPilotLink *p) :
FUNCTIONSETUP;
addSyncLogEntry(i18n("KPilot %1 HotSync starting...\n")
- .tqarg(TQString::tqfromLatin1(KPILOT_VERSION)));
+ .tqarg(TQString::fromLatin1(KPILOT_VERSION)));
emit logMessage( i18n("Using encoding %1 on the handheld.").tqarg(Pilot::codecName()) );
emit syncDone(this);
return true;
diff --git a/lib/kpilotdevicelink.cc b/lib/kpilotdevicelink.cc
index 0cea610..9f661cd 100644
--- a/lib/kpilotdevicelink.cc
+++ b/lib/kpilotdevicelink.cc
@@ -155,7 +155,7 @@ void DeviceCommThread::reset()
// Timer already deleted by close() call.
startOpenTimer(this,fOpenTimer);
- link()->fLinktqStatus = WaitingForDevice;
+ link()->fLinkStatus = WaitingForDevice;
}
/**
@@ -176,9 +176,9 @@ void DeviceCommThread::openDevice()
// This transition (from Waiting to Found) can only be
// taken once.
//
- if (link()->fLinktqStatus == WaitingForDevice)
+ if (link()->fLinkStatus == WaitingForDevice)
{
- link()->fLinktqStatus = FoundDevice;
+ link()->fLinkStatus = FoundDevice;
}
if (link()->fMessages->shouldPrint(Messages::OpenMessage))
@@ -244,7 +244,7 @@ bool DeviceCommThread::open(const TQString &device)
<< link()->fRealPilotPath << "] already connected." << endl;
WARNINGKPILOT << msg << endl;
- link()->fLinktqStatus = PilotLinkError;
+ link()->fLinkStatus = PilotLinkError;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg));
@@ -263,7 +263,7 @@ bool DeviceCommThread::open(const TQString &device)
DEBUGKPILOT << msg << endl;
DEBUGKPILOT << "(" << strerror(e) << ")" << endl;
- link()->fLinktqStatus = PilotLinkError;
+ link()->fLinkStatus = PilotLinkError;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg));
@@ -272,7 +272,7 @@ bool DeviceCommThread::open(const TQString &device)
DEBUGKPILOT << fname << ": Got socket: [" << fTempSocket << "]" << endl;
- link()->fLinktqStatus = CreatedSocket;
+ link()->fLinkStatus = CreatedSocket;
DEBUGKPILOT << fname << ": Binding to path: ["
<< link()->fRealPilotPath << "]" << endl;
@@ -291,7 +291,7 @@ bool DeviceCommThread::open(const TQString &device)
DEBUGKPILOT << msg << endl;
DEBUGKPILOT << "(" << strerror(e) << ")" << endl;
- link()->fLinktqStatus = PilotLinkError;
+ link()->fLinkStatus = PilotLinkError;
if (link()->fMessages->shouldPrint(Messages::OpenFailMessage))
{
@@ -301,7 +301,7 @@ bool DeviceCommThread::open(const TQString &device)
return false;
}
- link()->fLinktqStatus = DeviceOpen;
+ link()->fLinkStatus = DeviceOpen;
DeviceMap::self()->bindDevice(link()->fRealPilotPath);
fSocketNotifier = new TQSocketNotifier(fTempSocket,
@@ -411,16 +411,16 @@ void DeviceCommThread::acceptDevice()
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)")
.tqarg(TQString::fromLocal8Bit(s))));
- link()->fLinktqStatus = PilotLinkError;
+ link()->fLinkStatus = PilotLinkError;
reset();
return;
}
DEBUGKPILOT << fname << ": Link accept done." << endl;
- if ((link()->fLinktqStatus != DeviceOpen) || (fPilotSocket == -1))
+ if ((link()->fLinkStatus != DeviceOpen) || (fPilotSocket == -1))
{
- link()->fLinktqStatus = PilotLinkError;
+ link()->fLinkStatus = PilotLinkError;
WARNINGKPILOT << "Already connected or unable to connect!" << endl;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)")
@@ -440,7 +440,7 @@ void DeviceCommThread::acceptDevice()
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError,
i18n("Unable to read system information from Pilot")));
- link()->fLinktqStatus=PilotLinkError;
+ link()->fLinkStatus=PilotLinkError;
reset();
return;
}
@@ -488,7 +488,7 @@ void DeviceCommThread::acceptDevice()
"Perhaps you have a password set on the device?")));
}
- link()->fLinktqStatus = AcceptedDevice;
+ link()->fLinkStatus = AcceptedDevice;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString(), 100));
@@ -529,7 +529,7 @@ void DeviceCommThread::run()
KPilotDeviceLink::KPilotDeviceLink(TQObject * parent, const char *name,
const TQString &tempDevice) :
- KPilotLink(parent, name), fLinktqStatus(Init), fWorkaroundUSB(false),
+ KPilotLink(parent, name), fLinkStatus(Init), fWorkaroundUSB(false),
fPilotSocket(-1), fTempDevice(tempDevice), fMessages(new Messages(this)), fDeviceCommThread(0L)
{
FUNCTIONSETUP;
@@ -550,7 +550,7 @@ KPilotDeviceLink::~KPilotDeviceLink()
/* virtual */bool KPilotDeviceLink::isConnected() const
{
- return fLinktqStatus == AcceptedDevice;
+ return fLinkStatus == AcceptedDevice;
}
/* virtual */bool KPilotDeviceLink::event(TQEvent *e)
@@ -640,7 +640,7 @@ void KPilotDeviceLink::reset(const TQString & dP)
{
FUNCTIONSETUP;
- fLinktqStatus = Init;
+ fLinkStatus = Init;
// Release all resources
//
@@ -670,7 +670,7 @@ void KPilotDeviceLink::startCommThread()
TQString msg = i18n("The Pilot device is not configured yet.");
WARNINGKPILOT << msg << endl;
- fLinktqStatus = PilotLinkError;
+ fLinkStatus = PilotLinkError;
emit logError(msg);
return;
@@ -689,7 +689,7 @@ void KPilotDeviceLink::reset()
checkDevice();
- fLinktqStatus = WaitingForDevice;
+ fLinkStatus = WaitingForDevice;
startCommThread();
}
@@ -788,7 +788,7 @@ int KPilotDeviceLink::openConduit()
return dlp_OpenConduit(fPilotSocket);
}
-TQString KPilotDeviceLink::statusString(LinktqStatus l)
+TQString KPilotDeviceLink::statusString(LinkStatus l)
{
TQString s= CSL1("KPilotDeviceLink=");
diff --git a/lib/kpilotdevicelink.h b/lib/kpilotdevicelink.h
index c4fb9f3..6fe02ef 100644
--- a/lib/kpilotdevicelink.h
+++ b/lib/kpilotdevicelink.h
@@ -42,7 +42,7 @@ class DeviceCommThread; ///< Thread for doing all palm device communications
* it waits for the actual device to become available, and
* then becomes ready to handle syncing.
*/
-enum LinktqStatus {
+enum LinkStatus {
Init,
WaitingForDevice,
FoundDevice,
@@ -100,15 +100,15 @@ public:
/**
* Get the status (state enum) of this link.
- * @return The LinktqStatus enum for the link's current state.
+ * @return The LinkStatus enum for the link's current state.
*/
- LinktqStatus status() const
+ LinkStatus status() const
{
- return fLinktqStatus;
+ return fLinkStatus;
}
/** Get a human-readable string for the given status @p l. */
- static TQString statusString(LinktqStatus l);
+ static TQString statusString(LinkStatus l);
// The following API is the actual implementation of
// the KPilotLink API, for documentation see that file.
@@ -141,7 +141,7 @@ protected:
private:
- LinktqStatus fLinktqStatus;
+ LinkStatus fLinkStatus;
public:
diff --git a/lib/options.h b/lib/options.h
index ae2c4be..6a643e9 100644
--- a/lib/options.h
+++ b/lib/options.h
@@ -176,7 +176,7 @@ KDE_EXPORT struct tm writeTm(const TQDate &dt);
// variant is to handle plurals and is wrong, but unavoidable.
//
//
-#define TODO_I18N(a) TQString::tqfromLatin1(a)
+#define TODO_I18N(a) TQString::fromLatin1(a)
#define TODO_I18N_P(a,b,c) ((c>1) ? a : b)
// Handle some cases for TQT_NO_CAST_ASCII and NO_ASCII_CAST.
@@ -190,6 +190,6 @@ KDE_EXPORT struct tm writeTm(const TQDate &dt);
// with constant strings.
//
//
-#define CSL1(a) TQString::tqfromLatin1(a "")
+#define CSL1(a) TQString::fromLatin1(a "")
#endif
diff --git a/lib/pilot.cc b/lib/pilot.cc
index 18e61f6..2abfb7b 100644
--- a/lib/pilot.cc
+++ b/lib/pilot.cc
@@ -137,7 +137,7 @@ bool setupPilotCodec(const TQString &s)
TQString codecName()
{
- return TQString::tqfromLatin1(codec->name());
+ return TQString::fromLatin1(codec->name());
}
TQString category(const struct CategoryAppInfo *info, unsigned int i)
diff --git a/lib/pilotLocalDatabase.cc b/lib/pilotLocalDatabase.cc
index 9c3bbc0..91e0047 100644
--- a/lib/pilotLocalDatabase.cc
+++ b/lib/pilotLocalDatabase.cc
@@ -182,9 +182,9 @@ bool PilotLocalDatabase::createDatabase(long creator, long type, int, int flags,
fDBInfo.version=version;
fDBInfo.modnum=0;
fDBInfo.index=0;
- fDBInfo.createDate=(TQDateTime::tqcurrentDateTime()).toTime_t();
- fDBInfo.modifyDate=(TQDateTime::tqcurrentDateTime()).toTime_t();
- fDBInfo.backupDate=(TQDateTime::tqcurrentDateTime()).toTime_t();
+ fDBInfo.createDate=(TQDateTime::currentDateTime()).toTime_t();
+ fDBInfo.modifyDate=(TQDateTime::currentDateTime()).toTime_t();
+ fDBInfo.backupDate=(TQDateTime::currentDateTime()).toTime_t();
delete[] fAppInfo;
fAppInfo=0L;
diff --git a/lib/plugin.cc b/lib/plugin.cc
index fc24e9f..b573695 100644
--- a/lib/plugin.cc
+++ b/lib/plugin.cc
@@ -126,14 +126,14 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
TQPixmap applicationIcon =
- l->loadIcon(TQString::tqfromLatin1(p->appName()),
+ l->loadIcon(TQString::fromLatin1(p->appName()),
KIcon::Desktop,
64, KIcon::DefaultState, 0L,
true);
if (applicationIcon.isNull())
{
- applicationIcon = l->loadIcon(TQString::tqfromLatin1("kpilot"),
+ applicationIcon = l->loadIcon(TQString::fromLatin1("kpilot"),
KIcon::Desktop);
}
@@ -706,7 +706,7 @@ TQString findArgument(const TQStringList &a, const TQString &arg)
if (!lib->hasSymbol(symbol.latin1())) return TQString();
- return TQString::tqfromLatin1(*((const char **)(lib->symbol(symbol.latin1()))));
+ return TQString::fromLatin1(*((const char **)(lib->symbol(symbol.latin1()))));
}
diff --git a/lib/syncAction.cc b/lib/syncAction.cc
index 55278a1..404498b 100644
--- a/lib/syncAction.cc
+++ b/lib/syncAction.cc
@@ -101,7 +101,7 @@ SyncAction::~SyncAction()
if (!r)
{
emit logError(i18n("The conduit %1 could not be executed.")
- .tqarg(TQString::tqfromLatin1(name())));
+ .tqarg(TQString::fromLatin1(name())));
delayDone();
}
}
@@ -142,7 +142,7 @@ SyncAction::SyncMode::SyncMode(const TQStringList &args) :
int i = 0;
while(maps[i].name)
{
- if (args.contains(TQString::tqfromLatin1(maps[i].name)))
+ if (args.contains(TQString::fromLatin1(maps[i].name)))
{
fMode = maps[i].mode;
break;
@@ -181,7 +181,7 @@ TQStringList SyncAction::SyncMode::list() const
{
if ( fMode == maps[i].mode )
{
- l.append(TQString::tqfromLatin1(maps[i].name));
+ l.append(TQString::fromLatin1(maps[i].name));
break;
}
i++;
@@ -189,7 +189,7 @@ TQStringList SyncAction::SyncMode::list() const
if ( !maps[i].name )
{
WARNINGKPILOT << "Mode " << fMode << " does not have a name." << endl;
- l.append(TQString::tqfromLatin1(maps[0].name));
+ l.append(TQString::fromLatin1(maps[0].name));
}
if (isTest()) l.append(CSL1("--test"));
@@ -357,7 +357,7 @@ int SyncAction::questionYesNo(const TQString & text,
label1->setPixmap(TQMessageBox::standardIcon(TQMessageBox::Information));
lay->add( label1 );
TQLabel *label2 = new TQLabel( text, contents);
- label2->setMinimumSize(label2->tqsizeHint());
+ label2->setMinimumSize(label2->sizeHint());
lay->add(label2);
lay->addStretch(1);
@@ -469,7 +469,7 @@ int SyncAction::questionYesNoCancel(const TQString & text,
label1->setPixmap(TQMessageBox::standardIcon(TQMessageBox::Information));
lay->add( label1 );
TQLabel *label2 = new TQLabel( text, contents);
- label2->setMinimumSize(label2->tqsizeHint());
+ label2->setMinimumSize(label2->sizeHint());
lay->add(label2);
lay->addStretch(1);
diff --git a/lib/syncAction.h b/lib/syncAction.h
index 42b1854..8636731 100644
--- a/lib/syncAction.h
+++ b/lib/syncAction.h
@@ -60,7 +60,7 @@ public:
const char *name=0L);
~SyncAction();
- typedef enum { Error=-1 } tqStatus;
+ typedef enum { Error=-1 } Status;
/** A syncaction has a status, which can be expressed as an
* integer. Subclasses are expected to define their own status
@@ -68,7 +68,7 @@ public:
*/
int status() const
{
- return fActiontqStatus;
+ return fActionStatus;
}
/** Return a human-readable representation of the status. */
virtual TQString statusString() const;
@@ -156,7 +156,7 @@ public:
protected:
/** Connection to the device. @todo make private. */
KPilotLink *fHandle;
- int fActiontqStatus;
+ int fActionStatus;
/** Returns a pointer to the connection to the device. */
inline KPilotLink *deviceLink() const
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 10:36:58 +0000