From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kalarm/preferences.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'kalarm/preferences.h') diff --git a/kalarm/preferences.h b/kalarm/preferences.h index de3e04911..4b3042d25 100644 --- a/kalarm/preferences.h +++ b/kalarm/preferences.h @@ -39,9 +39,10 @@ class TQWidget; // Settings configured in the Preferences dialog -class Preferences : public QObject +class Preferences : public TQObject { Q_OBJECT + TQ_OBJECT public: enum MailClient { SENDMAIL, KMAIL }; enum MailFrom { MAIL_FROM_KMAIL, MAIL_FROM_CONTROL_CENTRE, MAIL_FROM_ADDR }; @@ -62,8 +63,8 @@ class Preferences : public QObject static bool hasStartOfDayChanged() { return mStartOfDayChanged; } static bool runInSystemTray() { return mRunInSystemTray; } static bool disableAlarmsIfStopped() { return mDisableAlarmsIfStopped; } - static bool quitWarn() { return notifying(QUIT_WARN); } - static void setQuitWarn(bool yes) { setNotify(QUIT_WARN, yes); } + static bool quitWarn() { return notifying(TQUIT_WARN); } + static void setQuitWarn(bool yes) { setNotify(TQUIT_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); } @@ -76,8 +77,8 @@ class Preferences : public QObject static int daemonTrayCheckInterval() { return mDaemonTrayCheckInterval; } static MailClient emailClient() { return mEmailClient; } static bool emailCopyToKMail() { return mEmailCopyToKMail && mEmailClient == SENDMAIL; } - static bool emailQueuedNotify() { return notifying(EMAIL_QUEUED_NOTIFY); } - static void setEmailQueuedNotify(bool yes) { setNotify(EMAIL_QUEUED_NOTIFY, yes); } + static bool emailQueuedNotify() { return notifying(EMAIL_TQUEUED_NOTIFY); } + static void setEmailQueuedNotify(bool yes) { setNotify(EMAIL_TQUEUED_NOTIFY, yes); } static MailFrom emailFrom() { return mEmailFrom; } static bool emailBccUseControlCentre() { return mEmailBccFrom == MAIL_FROM_CONTROL_CENTRE; } static TQString emailAddress(); @@ -108,9 +109,9 @@ class Preferences : public QObject static const TQString& defaultPostAction() { return mDefaultPostAction; } // Config file entry names for notification messages - static const TQString QUIT_WARN; + static const TQString TQUIT_WARN; static const TQString CONFIRM_ALARM_DELETION; - static const TQString EMAIL_QUEUED_NOTIFY; + static const TQString EMAIL_TQUEUED_NOTIFY; // Default values for settings static const ColourList default_messageColours; @@ -169,7 +170,7 @@ class Preferences : public QObject static void read(); static void convertOldPrefs(); static int startOfDayCheck(); - static QString emailFrom(MailFrom, bool useAddress, bool bcc); + static TQString emailFrom(MailFrom, bool useAddress, bool bcc); static MailFrom emailFrom(const TQString&); static void setNotify(const TQString& messageID, bool notify); static bool notifying(const TQString& messageID); -- cgit v1.2.1