From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- kalarm/birthdaydlg.cpp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'kalarm/birthdaydlg.cpp') diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index a9364967c..97e7bc6f7 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -20,7 +20,7 @@ #include "kalarm.h" -#include +#include #include #include #include @@ -81,15 +81,15 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) // Prefix and suffix to the name in the alarm text // Get default prefix and suffix texts from config file KConfig* config = kapp->config(); - config->setGroup(TQString::fromLatin1("General")); - mPrefixText = config->readEntry(TQString::fromLatin1("BirthdayPrefix"), i18n("Birthday: ")); - mSuffixText = config->readEntry(TQString::fromLatin1("BirthdaySuffix")); + config->setGroup(TQString::tqfromLatin1("General")); + mPrefixText = config->readEntry(TQString::tqfromLatin1("BirthdayPrefix"), i18n("Birthday: ")); + mSuffixText = config->readEntry(TQString::tqfromLatin1("BirthdaySuffix")); TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Alarm Text"), topWidget); topLayout->addWidget(textGroup); TQLabel* label = new TQLabel(i18n("Pre&fix:"), textGroup); mPrefix = new BLineEdit(mPrefixText, textGroup); - mPrefix->setMinimumSize(mPrefix->sizeHint()); + mPrefix->setMinimumSize(mPrefix->tqsizeHint()); label->setBuddy(mPrefix); connect(mPrefix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus())); TQWhatsThis::add(mPrefix, @@ -98,7 +98,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) label = new TQLabel(i18n("S&uffix:"), textGroup); mSuffix = new BLineEdit(mSuffixText, textGroup); - mSuffix->setMinimumSize(mSuffix->sizeHint()); + mSuffix->setMinimumSize(mSuffix->tqsizeHint()); label->setBuddy(mSuffix); connect(mSuffix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus())); TQWhatsThis::add(mSuffix, @@ -128,12 +128,12 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) // Font and colour choice button and sample text mFontColourButton = new FontColourButton(group); - mFontColourButton->setMaximumHeight(mFontColourButton->sizeHint().height() * 3/2); + mFontColourButton->setMaximumHeight(mFontColourButton->tqsizeHint().height() * 3/2); groupLayout->addWidget(mFontColourButton); // Sound checkbox and file selector mSoundPicker = new SoundPicker(group); - mSoundPicker->setFixedSize(mSoundPicker->sizeHint()); + mSoundPicker->setFixedSize(mSoundPicker->tqsizeHint()); groupLayout->addWidget(mSoundPicker, 0, TQt::AlignAuto); // How much to advance warning to give @@ -142,36 +142,36 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) i18n("Enter the number of days before each birthday to display a reminder. " "This is in addition to the alarm which is displayed on the birthday."), false, false, group); - mReminder->setFixedSize(mReminder->sizeHint()); + mReminder->setFixedSize(mReminder->tqsizeHint()); mReminder->setMaximum(0, 364); mReminder->setMinutes(0, true); groupLayout->addWidget(mReminder, 0, TQt::AlignAuto); // Acknowledgement confirmation required - default = no confirmation - TQHBoxLayout* layout = new TQHBoxLayout(groupLayout, 2*spacingHint()); + TQHBoxLayout* tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint()); mConfirmAck = EditAlarmDlg::createConfirmAckCheckbox(group); - layout->addWidget(mConfirmAck); - layout->addSpacing(2*spacingHint()); - layout->addStretch(); + tqlayout->addWidget(mConfirmAck); + tqlayout->addSpacing(2*spacingHint()); + tqlayout->addStretch(); if (ShellProcess::authorised()) // don't display if shell commands not allowed (e.g. kiosk mode) { // Special actions button mSpecialActionsButton = new SpecialActionsButton(i18n("Special Actions..."), group); - layout->addWidget(mSpecialActionsButton); + tqlayout->addWidget(mSpecialActionsButton); } // Late display checkbox - default = allow late display - layout = new TQHBoxLayout(groupLayout, 2*spacingHint()); + tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint()); mLateCancel = new LateCancelSelector(false, group); - layout->addWidget(mLateCancel); - layout->addStretch(); + tqlayout->addWidget(mLateCancel); + tqlayout->addStretch(); // Sub-repetition button mSubRepetition = new RepetitionButton(i18n("Sub-Repetition"), false, group); mSubRepetition->set(0, 0, true, 364*24*60); TQWhatsThis::add(mSubRepetition, i18n("Set up an additional alarm repetition")); - layout->addWidget(mSubRepetition); + tqlayout->addWidget(mSubRepetition); // Set the values to their defaults mFontColourButton->setDefaultFont(); @@ -295,7 +295,7 @@ void BirthdayDlg::updateSelectionList() TQValueList BirthdayDlg::events() const { TQValueList list; - TQDate today = TQDate::currentDate(); + TQDate today = TQDate::tqcurrentDate(); TQDateTime todayNoon(today, TQTime(12, 0, 0)); int thisYear = today.year(); int reminder = mReminder->minutes(); @@ -344,9 +344,9 @@ void BirthdayDlg::slotOk() { // Save prefix and suffix texts to use as future defaults KConfig* config = kapp->config(); - config->setGroup(TQString::fromLatin1("General")); - config->writeEntry(TQString::fromLatin1("BirthdayPrefix"), mPrefix->text()); - config->writeEntry(TQString::fromLatin1("BirthdaySuffix"), mSuffix->text()); + config->setGroup(TQString::tqfromLatin1("General")); + config->writeEntry(TQString::tqfromLatin1("BirthdayPrefix"), mPrefix->text()); + config->writeEntry(TQString::tqfromLatin1("BirthdaySuffix"), mSuffix->text()); config->sync(); mFlags = (mSoundPicker->sound() == SoundPicker::BEEP ? KAEvent::BEEP : 0) -- cgit v1.2.1