From ba2a3ce341c0c71bbbcf350fcbcd60c552220b31 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:23:13 -0600 Subject: Rename obsolete tq methods to standard names --- kalarm/recurrenceedit.cpp | 94 +++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'kalarm/recurrenceedit.cpp') diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index 0e872704..216c1f47 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -93,7 +93,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mNoEmitTypeChanged(true), mReadOnly(readOnly) { - TQBoxLayout* tqlayout; + TQBoxLayout* layout; TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); /* Create the recurrence rule Group box which holds the recurrence period @@ -106,11 +106,11 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name TQGroupBox* recurGroup = new TQGroupBox(1, Qt::Vertical, i18n("Recurrence Rule"), this, "recurGroup"); topLayout->addWidget(recurGroup); TQFrame* ruleFrame = new TQFrame(recurGroup, "ruleFrame"); - tqlayout = new TQVBoxLayout(ruleFrame, 0); - tqlayout->addSpacing(KDialog::spacingHint()/2); + layout = new TQVBoxLayout(ruleFrame, 0); + layout->addSpacing(KDialog::spacingHint()/2); - tqlayout = new TQHBoxLayout(tqlayout, 0); - TQBoxLayout* lay = new TQVBoxLayout(tqlayout, 0); + layout = new TQHBoxLayout(layout, 0); + TQBoxLayout* lay = new TQVBoxLayout(layout, 0); mRuleButtonGroup = new ButtonGroup(1, Qt::Horizontal, ruleFrame); mRuleButtonGroup->setInsideMargin(0); mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame); @@ -178,16 +178,16 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name lay->addSpacing(KDialog::spacingHint()); lay->addWidget(mSubRepetition); - lay = new TQVBoxLayout(tqlayout); + lay = new TQVBoxLayout(layout); lay->addStretch(); - tqlayout = new TQHBoxLayout(lay); + layout = new TQHBoxLayout(lay); - tqlayout->addSpacing(KDialog::marginHint()); + layout->addSpacing(KDialog::marginHint()); TQFrame* divider = new TQFrame(ruleFrame); divider->setFrameStyle(TQFrame::VLine | TQFrame::Sunken); - tqlayout->addWidget(divider); - tqlayout->addSpacing(KDialog::marginHint()); + layout->addWidget(divider); + layout->addSpacing(KDialog::marginHint()); mNoRule = new NoRule(ruleFrame, "noFrame"); mSubDailyRule = new SubDailyRule(mReadOnly, ruleFrame, "subdayFrame"); @@ -203,15 +203,15 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name connect(mYearlyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged())); mRuleStack = new TQWidgetStack(ruleFrame); - tqlayout->addWidget(mRuleStack); - tqlayout->addStretch(1); + layout->addWidget(mRuleStack); + layout->addStretch(1); mRuleStack->addWidget(mNoRule, 0); mRuleStack->addWidget(mSubDailyRule, 1); mRuleStack->addWidget(mDailyRule, 2); mRuleStack->addWidget(mWeeklyRule, 3); mRuleStack->addWidget(mMonthlyRule, 4); mRuleStack->addWidget(mYearlyRule, 5); - tqlayout->addSpacing(KDialog::marginHint()); + layout->addSpacing(KDialog::marginHint()); // Create the recurrence range group which contains the controls // which specify how long the recurrence is to last. @@ -220,16 +220,16 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name connect(mRangeButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(rangeTypeClicked())); topLayout->addWidget(mRangeButtonGroup); - TQVBoxLayout* vtqlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint()); - vtqlayout->addSpacing(fontMetrics().lineSpacing()/2); + TQVBoxLayout* vlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint()); + vlayout->addSpacing(fontMetrics().lineSpacing()/2); mNoEndDateButton = new RadioButton(i18n("No &end"), mRangeButtonGroup); mNoEndDateButton->setFixedSize(mNoEndDateButton->sizeHint()); mNoEndDateButton->setReadOnly(mReadOnly); TQWhatsThis::add(mNoEndDateButton, i18n("Repeat the alarm indefinitely")); - vtqlayout->addWidget(mNoEndDateButton, 1, TQt::AlignAuto); + vlayout->addWidget(mNoEndDateButton, 1, TQt::AlignAuto); TQSize size = mNoEndDateButton->size(); - tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); + layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); mRepeatCountButton = new RadioButton(i18n("End a&fter:"), mRangeButtonGroup); mRepeatCountButton->setReadOnly(mReadOnly); TQWhatsThis::add(mRepeatCountButton, @@ -245,14 +245,14 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mRepeatCountButton->setFocusWidget(mRepeatCountEntry); mRepeatCountLabel = new TQLabel(i18n("occurrence(s)"), mRangeButtonGroup); mRepeatCountLabel->setFixedSize(mRepeatCountLabel->sizeHint()); - tqlayout->addWidget(mRepeatCountButton); - tqlayout->addSpacing(KDialog::spacingHint()); - tqlayout->addWidget(mRepeatCountEntry); - tqlayout->addWidget(mRepeatCountLabel); - tqlayout->addStretch(); + layout->addWidget(mRepeatCountButton); + layout->addSpacing(KDialog::spacingHint()); + layout->addWidget(mRepeatCountEntry); + layout->addWidget(mRepeatCountLabel); + layout->addStretch(); size = size.expandedTo(mRepeatCountButton->sizeHint()); - tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); + layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); mEndDateButton = new RadioButton(i18n("End &by:"), mRangeButtonGroup); mEndDateButton->setReadOnly(mReadOnly); TQWhatsThis::add(mEndDateButton, @@ -275,12 +275,12 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name connect(mEndAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool))); TQWhatsThis::add(mEndAnyTimeCheckBox, i18n("Stop repeating the alarm after your first login on or after the specified end date")); - tqlayout->addWidget(mEndDateButton); - tqlayout->addSpacing(KDialog::spacingHint()); - tqlayout->addWidget(mEndDateEdit); - tqlayout->addWidget(mEndTimeEdit); - tqlayout->addWidget(mEndAnyTimeCheckBox); - tqlayout->addStretch(); + layout->addWidget(mEndDateButton); + layout->addSpacing(KDialog::spacingHint()); + layout->addWidget(mEndDateEdit); + layout->addWidget(mEndTimeEdit); + layout->addWidget(mEndAnyTimeCheckBox); + layout->addStretch(); size = size.expandedTo(mEndDateButton->sizeHint()); // Line up the widgets to the right of the radio buttons @@ -293,17 +293,17 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mExceptionGroup = new TQGroupBox(i18n("E&xceptions"), this, "mExceptionGroup"); topLayout->addWidget(mExceptionGroup); topLayout->setStretchFactor(mExceptionGroup, 2); - vtqlayout = new TQVBoxLayout(mExceptionGroup, KDialog::marginHint(), KDialog::spacingHint()); - vtqlayout->addSpacing(fontMetrics().lineSpacing()/2); - tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); - vtqlayout = new TQVBoxLayout(tqlayout); + vlayout = new TQVBoxLayout(mExceptionGroup, KDialog::marginHint(), KDialog::spacingHint()); + vlayout->addSpacing(fontMetrics().lineSpacing()/2); + layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); + vlayout = new TQVBoxLayout(layout); mExceptionDateList = new TQListBox(mExceptionGroup); mExceptionDateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); connect(mExceptionDateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(enableExceptionButtons())); TQWhatsThis::add(mExceptionDateList, i18n("The list of exceptions, i.e. dates/times excluded from the recurrence")); - vtqlayout->addWidget(mExceptionDateList); + vlayout->addWidget(mExceptionDateList); if (mReadOnly) { @@ -313,36 +313,36 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name } else { - vtqlayout = new TQVBoxLayout(tqlayout); + vlayout = new TQVBoxLayout(layout); mExceptionDateEdit = new DateEdit(mExceptionGroup); mExceptionDateEdit->setFixedSize(mExceptionDateEdit->sizeHint()); mExceptionDateEdit->setDate(TQDate::currentDate()); TQWhatsThis::add(mExceptionDateEdit, i18n("Enter a date to insert in the exceptions list. " "Use in conjunction with the Add or Change button below.")); - vtqlayout->addWidget(mExceptionDateEdit); + vlayout->addWidget(mExceptionDateEdit); - tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); + layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); TQPushButton* button = new TQPushButton(i18n("Add"), mExceptionGroup); button->setFixedSize(button->sizeHint()); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addException())); TQWhatsThis::add(button, i18n("Add the date entered above to the exceptions list")); - tqlayout->addWidget(button); + layout->addWidget(button); mChangeExceptionButton = new TQPushButton(i18n("Change"), mExceptionGroup); mChangeExceptionButton->setFixedSize(mChangeExceptionButton->sizeHint()); connect(mChangeExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(changeException())); TQWhatsThis::add(mChangeExceptionButton, i18n("Replace the currently highlighted item in the exceptions list with the date entered above")); - tqlayout->addWidget(mChangeExceptionButton); + layout->addWidget(mChangeExceptionButton); mDeleteExceptionButton = new TQPushButton(i18n("Delete"), mExceptionGroup); mDeleteExceptionButton->setFixedSize(mDeleteExceptionButton->sizeHint()); connect(mDeleteExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteException())); TQWhatsThis::add(mDeleteExceptionButton, i18n("Remove the currently highlighted item from the exceptions list")); - tqlayout->addWidget(mDeleteExceptionButton); + layout->addWidget(mDeleteExceptionButton); } mNoEmitTypeChanged = false; @@ -1112,7 +1112,7 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis : Rule(freqText, freqWhatsThis, false, readOnly, parent, name), mSavedDays(7) { - TQGridLayout* grid = new TQGridLayout(tqlayout(), 1, 4, KDialog::spacingHint()); + TQGridLayout* grid = new TQGridLayout(layout(), 1, 4, KDialog::spacingHint()); grid->setRowStretch(0, 1); TQLabel* label = new TQLabel(i18n("On: Tuesday", "O&n:"), this); @@ -1258,7 +1258,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats // Month day selector TQHBox* box = new TQHBox(this); box->setSpacing(KDialog::spacingHint()); - tqlayout()->addWidget(box); + layout()->addWidget(box); mDayButton = new RadioButton(i18n("On day number in the month", "O&n day"), box); mDayButton->setFixedSize(mDayButton->sizeHint()); @@ -1283,7 +1283,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats // Month position selector box = new TQHBox(this); box->setSpacing(KDialog::spacingHint()); - tqlayout()->addWidget(box); + layout()->addWidget(box); mPosButton = new RadioButton(i18n("On the 1st Tuesday", "On t&he"), box); mPosButton->setFixedSize(mPosButton->sizeHint()); @@ -1456,14 +1456,14 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) true, readOnly, parent, name) { // Set up the month selection widgets - TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout(), KDialog::spacingHint()); + TQBoxLayout* hlayout = new TQHBoxLayout(layout(), KDialog::spacingHint()); TQLabel* label = new TQLabel(i18n("List of months to select", "Months:"), this); label->setFixedSize(label->sizeHint()); - htqlayout->addWidget(label, 0, TQt::AlignAuto | TQt::AlignTop); + hlayout->addWidget(label, 0, TQt::AlignAuto | TQt::AlignTop); // List the months of the year. TQWidget* w = new TQWidget(this); // this is to control the TQWhatsThis text display area - htqlayout->addWidget(w, 1, TQt::AlignAuto); + hlayout->addWidget(w, 1, TQt::AlignAuto); TQGridLayout* grid = new TQGridLayout(w, 4, 3, 0, KDialog::spacingHint()); const KCalendarSystem* calendar = KGlobal::locale()->calendar(); int year = TQDate::currentDate().year(); @@ -1480,7 +1480,7 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) // February 29th handling option TQHBox* f29box = new TQHBox(this); - tqlayout()->addWidget(f29box); + layout()->addWidget(f29box); TQHBox* box = new TQHBox(f29box); // this is to control the TQWhatsThis text display area box->setSpacing(KDialog::spacingHint()); mFeb29Label = new TQLabel(i18n("February 2&9th alarm in non-leap years:"), box); -- cgit v1.2.3