From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kalarm/functions.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'kalarm/functions.cpp') diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 28f73499..db0ff7d3 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -174,7 +174,7 @@ bool addExpiredEvent(KAEvent& event) return false; bool archiving = (KAEvent::uidStatus(event.id()) == KAEvent::ACTIVE); if (archiving) - event.setSaveDateTime(TQDateTime::currentDateTime()); // time stamp to control purging + event.setSaveDateTime(TQDateTime::tqcurrentDateTime()); // time stamp to control purging KCal::Event* kcalEvent = cal->addEvent(event); cal->save(); @@ -429,7 +429,7 @@ UpdateStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool // Delete the event from the expired calendar file if (KAEvent::uidStatus(id) == KAEvent::EXPIRED) { - TQDateTime now = TQDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); if (event.occursAfter(now, true)) { if (event.recurs() || event.repeatCount()) @@ -639,7 +639,7 @@ void outputAlarmWarnings(TQWidget* parent, const KAEvent* event) { if (KMessageBox::warningYesNo(parent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"), TQString::null, i18n("Enable"), i18n("Keep Disabled"), - TQString::fromLatin1("EditEnableAlarms")) + TQString::tqfromLatin1("EditEnableAlarms")) == KMessageBox::Yes) Daemon::setAlarmsEnabled(); } @@ -712,8 +712,8 @@ TQString runKMail(bool minimise) /****************************************************************************** * Start another program for DCOP access if it isn't already running. * If 'windowName' is not empty, the program's window of that name is iconised. -* On exit, 'dcopName' contains the DCOP name to access the application, and -* 'errorMessage' contains an error message if failure. +* On exit, 'dcopName' tqcontains the DCOP name to access the application, and +* 'errorMessage' tqcontains an error message if failure. * Reply = true if the program is now running. */ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage) @@ -721,7 +721,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString if (!kapp->dcopClient()->isApplicationRegistered(program)) { // KOrganizer is not already running, so start it - if (KApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString::null, &errorMessage, &dcopName)) + if (KApplication::startServiceByDesktopName(TQString::tqfromLatin1(program), TQString::null, &errorMessage, &dcopName)) { kdError(5950) << "runProgram(): couldn't start " << program << " (" << errorMessage << ")\n"; return false; @@ -746,10 +746,10 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString bool readConfigWindowSize(const char* window, TQSize& result) { KConfig* config = KGlobal::config(); - config->setGroup(TQString::fromLatin1(window)); + config->setGroup(TQString::tqfromLatin1(window)); TQWidget* desktop = KApplication::desktop(); - TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0), - config->readNumEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), 0)); + TQSize s = TQSize(config->readNumEntry(TQString::tqfromLatin1("Width %1").arg(desktop->width()), 0), + config->readNumEntry(TQString::tqfromLatin1("Height %1").arg(desktop->height()), 0)); if (s.isEmpty()) return false; result = s; @@ -763,10 +763,10 @@ bool readConfigWindowSize(const char* window, TQSize& result) void writeConfigWindowSize(const char* window, const TQSize& size) { KConfig* config = KGlobal::config(); - config->setGroup(TQString::fromLatin1(window)); + config->setGroup(TQString::tqfromLatin1(window)); TQWidget* desktop = KApplication::desktop(); - config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width()); - config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height()); + config->writeEntry(TQString::tqfromLatin1("Width %1").arg(desktop->width()), size.width()); + config->writeEntry(TQString::tqfromLatin1("Height %1").arg(desktop->height()), size.height()); config->sync(); } @@ -793,7 +793,7 @@ int getVersionNumber(const TQString& version, TQString* subVersion) // if the representation returned by this method changes. if (subVersion) *subVersion = TQString::null; - int count = version.contains('.') + 1; + int count = version.tqcontains('.') + 1; if (count < 2) return 0; bool ok; @@ -834,20 +834,20 @@ FileType fileType(const TQString& mimetype) static const char* formattedTextTypes[] = { "html", "xml", 0 }; - if (mimetype.startsWith(TQString::fromLatin1("image/"))) + if (mimetype.startsWith(TQString::tqfromLatin1("image/"))) return Image; int slash = mimetype.find('/'); if (slash < 0) return Unknown; TQString type = mimetype.mid(slash + 1); const char* typel = type.latin1(); - if (mimetype.startsWith(TQString::fromLatin1("application"))) + if (mimetype.startsWith(TQString::tqfromLatin1("application"))) { for (int i = 0; applicationTypes[i]; ++i) if (!strcmp(typel, applicationTypes[i])) return TextApplication; } - else if (mimetype.startsWith(TQString::fromLatin1("text"))) + else if (mimetype.startsWith(TQString::tqfromLatin1("text"))) { for (int i = 0; formattedTextTypes[i]; ++i) if (!strcmp(typel, formattedTextTypes[i])) @@ -905,7 +905,7 @@ TQString stripAccel(const TQString& text) { unsigned len = text.length(); TQString out = TQDeepCopy(text); - TQChar *corig = (TQChar*)out.unicode(); + TQChar *corig = (TQChar*)out.tqunicode(); TQChar *cout = corig; TQChar *cin = cout; while (len) @@ -1032,7 +1032,7 @@ bool runKOrganizer() { TQString error; TQCString dcopService; - int result = KDCOPServiceStarter::self()->findServiceFor("DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService); + int result = KDCOPServiceStarter::self()->tqfindServiceFor("DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService); if (result) { kdDebug(5950) << "Unable to start DCOP/Organizer: " << dcopService << " " << error << endl; @@ -1042,7 +1042,7 @@ bool runKOrganizer() // to load KOrganizer into Kontact. But if KOrganizer is running independently, // the load() method doesn't exist. TQCString dummy; - if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) + if (!kapp->dcopClient()->tqfindObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) { DCOPRef ref(dcopService, dcopService); // talk to the KUniqueApplication or its Kontact wrapper DCOPReply reply = ref.call("load()"); @@ -1051,7 +1051,7 @@ bool runKOrganizer() kdWarning(5950) << "Error loading " << dcopService << endl; return false; } - if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) + if (!kapp->dcopClient()->tqfindObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) { kdWarning(5950) << "Unable to access KOrganizer's "KORG_DCOP_OBJECT" DCOP object" << endl; return false; -- cgit v1.2.3