summaryrefslogtreecommitdiffstats
path: root/kalarm
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-01-13 15:08:46 -0600
committerTimothy Pearson <[email protected]>2012-01-13 15:08:46 -0600
commitd497b1b0373d758ede3d877ab68c8d7c8ab29062 (patch)
tree00ebfc47087a5fd82949fc1abf08dd7e03c1c631 /kalarm
parent639f34ef2efdec6ff0d1f47d919ca070d027fb80 (diff)
downloadtdepim-d497b1b0373d758ede3d877ab68c8d7c8ab29062.tar.gz
tdepim-d497b1b0373d758ede3d877ab68c8d7c8ab29062.zip
Fix inadvertent TQt changes
This closes Bug 752
Diffstat (limited to 'kalarm')
-rw-r--r--kalarm/kalarmapp.cpp2
-rw-r--r--kalarm/kamail.cpp2
-rw-r--r--kalarm/preferences.cpp10
-rw-r--r--kalarm/preferences.h12
4 files changed, 13 insertions, 13 deletions
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 25dd60f49..658919a63 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -822,7 +822,7 @@ void KAlarmApp::doQuit(TQWidget* parent)
if (mDisableAlarmsIfStopped
&& MessageBox::warningContinueCancel(parent, KMessageBox::Cancel,
i18n("Quitting will disable alarms\n(once any alarm message windows are closed)."),
- TQString(), KStdGuiItem::quit(), Preferences::TQUIT_WARN
+ TQString(), KStdGuiItem::quit(), Preferences::QUIT_WARN
) != KMessageBox::Yes)
return;
quitIf(0, true);
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index 383d03caf..2f32bd00d 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -539,7 +539,7 @@ void KAMail::notifyQueued(const KAEvent& event)
TQString text = (Preferences::emailClient() == Preferences::KMAIL)
? i18n("An email has been queued to be sent by KMail")
: i18n("An email has been queued to be sent");
- KMessageBox::information(0, text, TQString(), Preferences::EMAIL_TQUEUED_NOTIFY);
+ KMessageBox::information(0, text, TQString(), Preferences::EMAIL_QUEUED_NOTIFY);
return;
}
}
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index 6488c60c7..3daf433fe 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -195,9 +195,9 @@ static const TQString FROM_CONTROL_CENTRE = TQString::fromLatin1("@ControlC
static const TQString FROM_KMAIL = TQString::fromLatin1("@KMail");
// Config file entry names for notification messages
-const TQString Preferences::TQUIT_WARN = TQString::fromLatin1("QuitWarn");
+const TQString Preferences::QUIT_WARN = TQString::fromLatin1("QuitWarn");
const TQString Preferences::CONFIRM_ALARM_DELETION = TQString::fromLatin1("ConfirmAlarmDeletion");
-const TQString Preferences::EMAIL_TQUEUED_NOTIFY = TQString::fromLatin1("EmailQueuedNotify");
+const TQString Preferences::EMAIL_QUEUED_NOTIFY = TQString::fromLatin1("EmailQueuedNotify");
static const int SODxor = 0x82451630;
inline int Preferences::startOfDayCheck()
@@ -222,9 +222,9 @@ void Preferences::initialise()
read();
// Set the default button for the Quit warning message box to Cancel
- MessageBox::setContinueDefault(TQUIT_WARN, KMessageBox::Cancel);
- MessageBox::setDefaultShouldBeShownContinue(TQUIT_WARN, default_quitWarn);
- MessageBox::setDefaultShouldBeShownContinue(EMAIL_TQUEUED_NOTIFY, default_emailQueuedNotify);
+ MessageBox::setContinueDefault(QUIT_WARN, KMessageBox::Cancel);
+ MessageBox::setDefaultShouldBeShownContinue(QUIT_WARN, default_quitWarn);
+ MessageBox::setDefaultShouldBeShownContinue(EMAIL_QUEUED_NOTIFY, default_emailQueuedNotify);
MessageBox::setDefaultShouldBeShownContinue(CONFIRM_ALARM_DELETION, default_confirmAlarmDeletion);
}
}
diff --git a/kalarm/preferences.h b/kalarm/preferences.h
index 4b3042d25..e7e3e90a1 100644
--- a/kalarm/preferences.h
+++ b/kalarm/preferences.h
@@ -63,8 +63,8 @@ class Preferences : public TQObject
static bool hasStartOfDayChanged() { return mStartOfDayChanged; }
static bool runInSystemTray() { return mRunInSystemTray; }
static bool disableAlarmsIfStopped() { return mDisableAlarmsIfStopped; }
- static bool quitWarn() { return notifying(TQUIT_WARN); }
- static void setQuitWarn(bool yes) { setNotify(TQUIT_WARN, yes); }
+ static bool quitWarn() { return notifying(QUIT_WARN); }
+ static void setQuitWarn(bool yes) { setNotify(QUIT_WARN, yes); }
static bool autostartTrayIcon() { return mAutostartTrayIcon; }
static bool confirmAlarmDeletion() { return notifying(CONFIRM_ALARM_DELETION); }
static void setConfirmAlarmDeletion(bool yes){ setNotify(CONFIRM_ALARM_DELETION, yes); }
@@ -77,8 +77,8 @@ class Preferences : public TQObject
static int daemonTrayCheckInterval() { return mDaemonTrayCheckInterval; }
static MailClient emailClient() { return mEmailClient; }
static bool emailCopyToKMail() { return mEmailCopyToKMail && mEmailClient == SENDMAIL; }
- static bool emailQueuedNotify() { return notifying(EMAIL_TQUEUED_NOTIFY); }
- static void setEmailQueuedNotify(bool yes) { setNotify(EMAIL_TQUEUED_NOTIFY, yes); }
+ static bool emailQueuedNotify() { return notifying(EMAIL_QUEUED_NOTIFY); }
+ static void setEmailQueuedNotify(bool yes) { setNotify(EMAIL_QUEUED_NOTIFY, yes); }
static MailFrom emailFrom() { return mEmailFrom; }
static bool emailBccUseControlCentre() { return mEmailBccFrom == MAIL_FROM_CONTROL_CENTRE; }
static TQString emailAddress();
@@ -109,9 +109,9 @@ class Preferences : public TQObject
static const TQString& defaultPostAction() { return mDefaultPostAction; }
// Config file entry names for notification messages
- static const TQString TQUIT_WARN;
+ static const TQString QUIT_WARN;
static const TQString CONFIRM_ALARM_DELETION;
- static const TQString EMAIL_TQUEUED_NOTIFY;
+ static const TQString EMAIL_QUEUED_NOTIFY;
// Default values for settings
static const ColourList default_messageColours;