diff options
Diffstat (limited to 'kalarm/preferences.cpp')
| -rw-r--r-- | kalarm/preferences.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp index 93e6a60b0..be1e5e6a9 100644 --- a/kalarm/preferences.cpp +++ b/kalarm/preferences.cpp @@ -42,10 +42,10 @@ static TQString translateXTermPath(KConfig*, const TQString& cmdline, bool write Preferences* Preferences::mInstance = 0; // Default config file settings -TQColor defaultMessageColours[] = { Qt::red, Qt::green, Qt::blue, Qt::cyan, Qt::magenta, Qt::yellow, Qt::white, Qt::lightGray, Qt::black, TQColor() }; +TQColor defaultMessageColours[] = { TQt::red, TQt::green, TQt::blue, TQt::cyan, TQt::magenta, TQt::yellow, TQt::white, TQt::lightGray, TQt::black, TQColor() }; const ColourList Preferences::default_messageColours(defaultMessageColours); -const TQColor Preferences::default_defaultBgColour(Qt::red); -const TQColor Preferences::default_defaultFgColour(Qt::black); +const TQColor Preferences::default_defaultBgColour(TQt::red); +const TQColor Preferences::default_defaultFgColour(TQt::black); TQFont Preferences::mDefault_messageFont; // initialised in constructor const TQTime Preferences::default_startOfDay(0, 0); const bool Preferences::default_runInSystemTray = true; @@ -62,10 +62,10 @@ const TQString Preferences::default_tooltipTimeToPrefix = const int Preferences::default_daemonTrayCheckInterval = 10; // (seconds) const bool Preferences::default_emailCopyToKMail = false; const bool Preferences::default_emailQueuedNotify = false; -const TQColor Preferences::default_disabledColour(Qt::lightGray); -const TQColor Preferences::default_expiredColour(Qt::darkRed); +const TQColor Preferences::default_disabledColour(TQt::lightGray); +const TQColor Preferences::default_expiredColour(TQt::darkRed); const int Preferences::default_expiredKeepDays = 7; -const TQString Preferences::default_defaultSoundFile = TQString::null; +const TQString Preferences::default_defaultSoundFile = TQString(); const float Preferences::default_defaultSoundVolume = -1; const int Preferences::default_defaultLateCancel = 0; const bool Preferences::default_defaultAutoClose = false; @@ -76,8 +76,8 @@ const bool Preferences::default_defaultConfirmAck = const bool Preferences::default_defaultCmdScript = false; const EditAlarmDlg::CmdLogType Preferences::default_defaultCmdLogType = EditAlarmDlg::DISCARD_OUTPUT; const bool Preferences::default_defaultEmailBcc = false; -const TQString Preferences::default_emailAddress = TQString::null; -const TQString Preferences::default_emailBccAddress = TQString::null; +const TQString Preferences::default_emailAddress = TQString(); +const TQString Preferences::default_emailBccAddress = TQString(); const Preferences::MailClient Preferences::default_emailClient = KMAIL; const Preferences::MailFrom Preferences::default_emailBccFrom = MAIL_FROM_CONTROL_CENTRE; const RecurrenceEdit::RepeatType Preferences::default_defaultRecurPeriod = RecurrenceEdit::NO_RECUR; @@ -195,9 +195,9 @@ static const TQString FROM_CONTROL_CENTRE = TQString::tqfromLatin1("@Contro static const TQString FROM_KMAIL = TQString::tqfromLatin1("@KMail"); // Config file entry names for notification messages -const TQString Preferences::QUIT_WARN = TQString::tqfromLatin1("QuitWarn"); +const TQString Preferences::TQUIT_WARN = TQString::tqfromLatin1("QuitWarn"); const TQString Preferences::CONFIRM_ALARM_DELETION = TQString::tqfromLatin1("ConfirmAlarmDeletion"); -const TQString Preferences::EMAIL_QUEUED_NOTIFY = TQString::tqfromLatin1("EmailQueuedNotify"); +const TQString Preferences::EMAIL_TQUEUED_NOTIFY = TQString::tqfromLatin1("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(QUIT_WARN, KMessageBox::Cancel); - MessageBox::setDefaultShouldBeShownContinue(QUIT_WARN, default_quitWarn); - MessageBox::setDefaultShouldBeShownContinue(EMAIL_QUEUED_NOTIFY, default_emailQueuedNotify); + MessageBox::setContinueDefault(TQUIT_WARN, KMessageBox::Cancel); + MessageBox::setDefaultShouldBeShownContinue(TQUIT_WARN, default_quitWarn); + MessageBox::setDefaultShouldBeShownContinue(EMAIL_TQUEUED_NOTIFY, default_emailQueuedNotify); MessageBox::setDefaultShouldBeShownContinue(CONFIRM_ALARM_DELETION, default_confirmAlarmDeletion); } } @@ -410,7 +410,7 @@ void Preferences::save(bool syncToDisc) case TimePeriod::HOURS_MINUTES: value = TQString::tqfromLatin1("HoursMinutes"); break; case TimePeriod::DAYS: value = TQString::tqfromLatin1("Days"); break; case TimePeriod::WEEKS: value = TQString::tqfromLatin1("Weeks"); break; - default: value = TQString::null; break; + default: value = TQString(); break; } config->writeEntry(DEF_REMIND_UNITS, value); config->writeEntry(DEF_PRE_ACTION, mDefaultPreAction); @@ -449,9 +449,9 @@ TQString Preferences::emailFrom(Preferences::MailFrom from, bool useAddress, boo case MAIL_FROM_CONTROL_CENTRE: return FROM_CONTROL_CENTRE; case MAIL_FROM_ADDR: - return useAddress ? (bcc ? mEmailBccAddress : mEmailAddress) : TQString::null; + return useAddress ? (bcc ? mEmailBccAddress : mEmailAddress) : TQString(); default: - return TQString::null; + return TQString(); } } @@ -478,7 +478,7 @@ TQString Preferences::emailAddress() case MAIL_FROM_ADDR: return mEmailAddress; default: - return TQString::null; + return TQString(); } } @@ -491,7 +491,7 @@ TQString Preferences::emailBccAddress() case MAIL_FROM_ADDR: return mEmailBccAddress; default: - return TQString::null; + return TQString(); } } @@ -607,8 +607,8 @@ void Preferences::convertOldPrefs() static const TQString EMAIL_USE_CTRL_CENTRE = TQString::tqfromLatin1("EmailUseControlCenter"); static const TQString EMAIL_BCC_USE_CTRL_CENTRE = TQString::tqfromLatin1("EmailBccUseControlCenter"); TQMap<TQString, TQString> entries = config->entryMap(GENERAL_SECTION); - if (entries.find(EMAIL_FROM) == entries.end() - && entries.find(EMAIL_USE_CTRL_CENTRE) != entries.end()) + if (entries.tqfind(EMAIL_FROM) == entries.end() + && entries.tqfind(EMAIL_USE_CTRL_CENTRE) != entries.end()) { // Preferences were written by KAlarm pre-1.2.1 config->setGroup(GENERAL_SECTION); |