diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 13:29:09 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 13:29:09 -0600 |
commit | f2225fc1f936c1d9e6a5570a63ffe12c366176bf (patch) | |
tree | cf0b7f61bb88ea0a2e155d4cffeeb4eaaa8549dd /kalarm | |
parent | 0922423eb834afb70e3323db43062cf4083dc298 (diff) | |
download | tdepim-f2225fc1f936c1d9e6a5570a63ffe12c366176bf.tar.gz tdepim-f2225fc1f936c1d9e6a5570a63ffe12c366176bf.zip |
Rename KStandard for enhanced compatibility with KDE4
Diffstat (limited to 'kalarm')
-rw-r--r-- | kalarm/alarmcalendar.cpp | 2 | ||||
-rw-r--r-- | kalarm/kalarmapp.cpp | 2 | ||||
-rw-r--r-- | kalarm/kalarmd/adconfigdata.cpp | 2 | ||||
-rw-r--r-- | kalarm/kalarmd/alarmdaemon.cpp | 4 | ||||
-rw-r--r-- | kalarm/kamail.cpp | 4 | ||||
-rw-r--r-- | kalarm/prefdlg.cpp | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index 26d2eb700..1f778c868 100644 --- a/kalarm/alarmcalendar.cpp +++ b/kalarm/alarmcalendar.cpp @@ -465,7 +465,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) if (local) { filename = url.path(); - if (!KStandardDirs::exists(filename)) + if (!TDEStandardDirs::exists(filename)) { kdDebug(5950) << "AlarmCalendar::importAlarms(): File '" << url.prettyURL() << "' not found" << endl; KMessageBox::error(parent, i18n("Could not load calendar '%1'.").arg(url.prettyURL())); diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 5fa0d4959..c138656c0 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -140,7 +140,7 @@ KAlarmApp::KAlarmApp() kdDebug(5950) << "KAlarmApp::KAlarmApp(): speech synthesis disabled (KTTSD not found)" << endl; // Check if KOrganizer is installed TQString korg = TQString::fromLatin1("korganizer"); - mKOrganizerEnabled = !locate("exe", korg).isNull() || !KStandardDirs::findExe(korg).isNull(); + mKOrganizerEnabled = !locate("exe", korg).isNull() || !TDEStandardDirs::findExe(korg).isNull(); if (!mKOrganizerEnabled) kdDebug(5950) << "KAlarmApp::KAlarmApp(): KOrganizer options disabled (KOrganizer not found)" << endl; } diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp index 3f728bdb1..b0f7850d8 100644 --- a/kalarm/kalarmd/adconfigdata.cpp +++ b/kalarm/kalarmd/adconfigdata.cpp @@ -63,7 +63,7 @@ void ADConfigData::readConfig() // Verify the configuration bool ok = false; - if (client.isEmpty() || KStandardDirs::findExe(client).isNull()) + if (client.isEmpty() || TDEStandardDirs::findExe(client).isNull()) kdError(5900) << "ADConfigData::readConfig(): group '" << *cl << "' deleted (client app not found)\n"; else if (calendar.isEmpty()) kdError(5900) << "ADConfigData::readConfig(): no calendar specified for '" << client << "'\n"; diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index 4b2ff9022..67c112d18 100644 --- a/kalarm/kalarmd/alarmdaemon.cpp +++ b/kalarm/kalarmd/alarmdaemon.cpp @@ -233,7 +233,7 @@ void AlarmDaemon::registerApp(const TQCString& appName, const TQString& appTitle KAlarmd::RegisterResult result; if (appName.isEmpty()) result = KAlarmd::FAILURE; - else if (startClient && KStandardDirs::findExe(appName).isNull()) + else if (startClient && TDEStandardDirs::findExe(appName).isNull()) { kdError() << "AlarmDaemon::registerApp(): app not found" << endl; result = KAlarmd::NOT_FOUND; @@ -287,7 +287,7 @@ void AlarmDaemon::registerChange(const TQCString& appName, bool startClient) ClientInfo* client = ClientInfo::get(appName); if (!client) return; // can't access client to tell it the result - if (startClient && KStandardDirs::findExe(appName).isNull()) + if (startClient && TDEStandardDirs::findExe(appName).isNull()) { kdError() << "AlarmDaemon::registerChange(): app not found" << endl; result = KAlarmd::NOT_FOUND; diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index cc9c02487..6c0e5e637 100644 --- a/kalarm/kamail.cpp +++ b/kalarm/kamail.cpp @@ -153,7 +153,7 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify) { // Use sendmail to send the message TQString textComplete; - TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"), + TQString command = TDEStandardDirs::findExe(TQString::fromLatin1("sendmail"), TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib")); if (!command.isNull()) { @@ -164,7 +164,7 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify) } else { - command = KStandardDirs::findExe(TQString::fromLatin1("mail")); + command = TDEStandardDirs::findExe(TQString::fromLatin1("mail")); if (command.isNull()) { errmsgs = errors(i18n("%1 not found").arg(TQString::fromLatin1("sendmail"))); // give up diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp index 6f21949a7..0e7450326 100644 --- a/kalarm/prefdlg.cpp +++ b/kalarm/prefdlg.cpp @@ -392,7 +392,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) { TQString cmd = xtermCommands[mXtermCount]; TQStringList args = KShell::splitArgs(cmd); - if (args.isEmpty() || KStandardDirs::findExe(args[0]).isEmpty()) + if (args.isEmpty() || TDEStandardDirs::findExe(args[0]).isEmpty()) continue; TQRadioButton* radio = new TQRadioButton(args[0], group); radio->setMinimumSize(radio->sizeHint()); @@ -467,7 +467,7 @@ void MiscPrefTab::apply(bool syncToDisc) { TQStringList args = KShell::splitArgs(cmd); cmd = args.isEmpty() ? TQString() : args[0]; - if (KStandardDirs::findExe(cmd).isEmpty()) + if (TDEStandardDirs::findExe(cmd).isEmpty()) { mXtermCommand->setFocus(); if (KMessageBox::warningContinueCancel(this, i18n("Command to invoke terminal window not found:\n%1").arg(cmd)) |