From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kalarm/lib/dateedit.cpp | 2 +- kalarm/lib/datetime.cpp | 4 ++-- kalarm/lib/lineedit.cpp | 4 ++-- kalarm/lib/messagebox.cpp | 4 ++-- kalarm/lib/shellprocess.cpp | 12 ++++++------ kalarm/lib/shellprocess.h | 4 ++-- kalarm/lib/timeedit.cpp | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kalarm/lib') diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp index 2fef25de5..09712beda 100644 --- a/kalarm/lib/dateedit.cpp +++ b/kalarm/lib/dateedit.cpp @@ -80,7 +80,7 @@ void DateEdit::pastLimitMessage(const TQDate& limit, const TQString& error, cons if (limit == TQDate::currentDate()) errString = i18n("today"); else - errString = KGlobal::locale()->formatDate(limit, true); + errString = TDEGlobal::locale()->formatDate(limit, true); errString = defaultError.arg(errString); } KMessageBox::sorry(this, errString); diff --git a/kalarm/lib/datetime.cpp b/kalarm/lib/datetime.cpp index e9dae4140..bc6e64394 100644 --- a/kalarm/lib/datetime.cpp +++ b/kalarm/lib/datetime.cpp @@ -39,9 +39,9 @@ TQDateTime DateTime::dateTime() const TQString DateTime::formatLocale(bool shortFormat) const { if (mDateOnly) - return KGlobal::locale()->formatDate(mDateTime.date(), shortFormat); + return TDEGlobal::locale()->formatDate(mDateTime.date(), shortFormat); else if (mTimeValid) - return KGlobal::locale()->formatDateTime(mDateTime, shortFormat); + return TDEGlobal::locale()->formatDateTime(mDateTime, shortFormat); else return TQString(); } diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp index 6b5787ebf..1db384d3c 100644 --- a/kalarm/lib/lineedit.cpp +++ b/kalarm/lib/lineedit.cpp @@ -61,14 +61,14 @@ void LineEdit::init() { if (mType == Url) { - setCompletionMode(KGlobalSettings::CompletionShell); + setCompletionMode(TDEGlobalSettings::CompletionShell); KURLCompletion* comp = new KURLCompletion(KURLCompletion::FileCompletion); comp->setReplaceHome(true); setCompletionObject(comp); setAutoDeleteCompletionObject(true); } else - setCompletionMode(KGlobalSettings::CompletionNone); + setCompletionMode(TDEGlobalSettings::CompletionNone); } /****************************************************************************** diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp index 48c18f1cd..c58287bec 100644 --- a/kalarm/lib/messagebox.cpp +++ b/kalarm/lib/messagebox.cpp @@ -108,7 +108,7 @@ bool MessageBox::setDefaultShouldBeShownContinue(const TQString& dontShowAgainNa if (dontShowAgainName.isEmpty()) return false; // First check whether there is an existing setting - KConfig* config = mConfig ? mConfig : KGlobal::config(); + KConfig* config = mConfig ? mConfig : TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Notification Messages")); if (config->hasKey(dontShowAgainName)) return false; @@ -167,7 +167,7 @@ void MessageBox::saveDontShowAgain(const TQString& dontShowAgainName, bool yesno { if (dontShowAgainName.isEmpty()) return; - KConfig* config = mConfig ? mConfig : KGlobal::config(); + KConfig* config = mConfig ? mConfig : TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Notification Messages")); bool global = (dontShowAgainName[0] == ':'); if (yesno) diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp index b3df822e8..94666d532 100644 --- a/kalarm/lib/shellprocess.cpp +++ b/kalarm/lib/shellprocess.cpp @@ -56,9 +56,9 @@ bool ShellProcess::start(Communication comm) return false; } KShellProcess::operator<<(mCommand); - connect(this, TQT_SIGNAL(wroteStdin(KProcess*)), TQT_SLOT(writtenStdin(KProcess*))); - connect(this, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotExited(KProcess*))); - if (!KShellProcess::start(KProcess::NotifyOnExit, comm)) + connect(this, TQT_SIGNAL(wroteStdin(TDEProcess*)), TQT_SLOT(writtenStdin(TDEProcess*))); + connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotExited(TDEProcess*))); + if (!KShellProcess::start(TDEProcess::NotifyOnExit, comm)) { mStatus = START_FAIL; return false; @@ -72,7 +72,7 @@ bool ShellProcess::start(Communication comm) * Interprets the exit status according to which shell was called, and emits * a shellExited() signal. */ -void ShellProcess::slotExited(KProcess* proc) +void ShellProcess::slotExited(TDEProcess* proc) { kdDebug(5950) << "ShellProcess::slotExited()\n"; mStdinQueue.clear(); @@ -105,7 +105,7 @@ void ShellProcess::writeStdin(const char* buffer, int bufflen) bool write = mStdinQueue.isEmpty(); mStdinQueue.append(scopy); if (write) - KProcess::writeStdin(mStdinQueue.first(), mStdinQueue.first().length()); + TDEProcess::writeStdin(mStdinQueue.first(), mStdinQueue.first().length()); } /****************************************************************************** @@ -114,7 +114,7 @@ void ShellProcess::writeStdin(const char* buffer, int bufflen) * Note that buffers written to STDIN must not be freed until the writtenStdin() * signal has been processed. */ -void ShellProcess::writtenStdin(KProcess* proc) +void ShellProcess::writtenStdin(TDEProcess* proc) { mStdinQueue.pop_front(); // free the buffer which has now been written if (!mStdinQueue.isEmpty()) diff --git a/kalarm/lib/shellprocess.h b/kalarm/lib/shellprocess.h index 8c577d85b..3b198028d 100644 --- a/kalarm/lib/shellprocess.h +++ b/kalarm/lib/shellprocess.h @@ -116,8 +116,8 @@ class ShellProcess : public KShellProcess void shellExited(ShellProcess*); private slots: - void writtenStdin(KProcess*); - void slotExited(KProcess*); + void writtenStdin(TDEProcess*); + void slotExited(TDEProcess*); private: // Prohibit the following inherited methods diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp index 01152fcee..67a846d7a 100644 --- a/kalarm/lib/timeedit.cpp +++ b/kalarm/lib/timeedit.cpp @@ -35,7 +35,7 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name) mPmIndex(-1), mReadOnly(false) { - bool use12hour = KGlobal::locale()->use12Clock(); + bool use12hour = TDEGlobal::locale()->use12Clock(); mSpinBox = new TimeSpinBox(!use12hour, this); mSpinBox->setFixedSize(mSpinBox->sizeHint()); connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); @@ -174,7 +174,7 @@ void TimeEdit::setAmPmCombo(int am, int pm) { // Insert "am" mAmIndex = 0; - mAmPm->insertItem(KGlobal::locale()->translate("am"), mAmIndex); + mAmPm->insertItem(TDEGlobal::locale()->translate("am"), mAmIndex); if (mPmIndex >= 0) mPmIndex = 1; mAmPm->setCurrentItem(mPmIndex >= 0 ? mPmIndex : mAmIndex); @@ -193,7 +193,7 @@ void TimeEdit::setAmPmCombo(int am, int pm) { // Insert "pm" mPmIndex = mAmIndex + 1; - mAmPm->insertItem(KGlobal::locale()->translate("pm"), mPmIndex); + mAmPm->insertItem(TDEGlobal::locale()->translate("pm"), mPmIndex); if (mAmIndex < 0) mAmPm->setCurrentItem(mPmIndex); } -- cgit v1.2.1