diff options
Diffstat (limited to 'kalarm')
-rw-r--r-- | kalarm/Changelog | 4 | ||||
-rw-r--r-- | kalarm/alarmlistview.cpp | 2 | ||||
-rw-r--r-- | kalarm/alarmtimewidget.cpp | 10 | ||||
-rw-r--r-- | kalarm/birthdaydlg.cpp | 18 | ||||
-rw-r--r-- | kalarm/deferdlg.cpp | 6 | ||||
-rw-r--r-- | kalarm/editdlg.cpp | 66 | ||||
-rw-r--r-- | kalarm/find.cpp | 4 | ||||
-rw-r--r-- | kalarm/fontcolour.cpp | 18 | ||||
-rw-r--r-- | kalarm/fontcolourbutton.cpp | 12 | ||||
-rw-r--r-- | kalarm/functions.cpp | 2 | ||||
-rw-r--r-- | kalarm/latecancel.cpp | 16 | ||||
-rw-r--r-- | kalarm/latecancel.h | 2 | ||||
-rw-r--r-- | kalarm/lib/spinbox2.cpp | 18 | ||||
-rw-r--r-- | kalarm/lib/spinbox2.h | 2 | ||||
-rw-r--r-- | kalarm/messagewin.cpp | 30 | ||||
-rw-r--r-- | kalarm/prefdlg.cpp | 50 | ||||
-rw-r--r-- | kalarm/recurrenceedit.cpp | 94 | ||||
-rw-r--r-- | kalarm/recurrenceeditprivate.h | 2 | ||||
-rw-r--r-- | kalarm/reminder.cpp | 8 | ||||
-rw-r--r-- | kalarm/repetition.cpp | 18 | ||||
-rw-r--r-- | kalarm/sounddlg.cpp | 8 | ||||
-rw-r--r-- | kalarm/specialactions.cpp | 6 | ||||
-rw-r--r-- | kalarm/templatedlg.cpp | 14 | ||||
-rw-r--r-- | kalarm/timeselector.cpp | 6 |
24 files changed, 208 insertions, 208 deletions
diff --git a/kalarm/Changelog b/kalarm/Changelog index 2671941a5..a3a1c6590 100644 --- a/kalarm/Changelog +++ b/kalarm/Changelog @@ -142,7 +142,7 @@ KAlarm Change Log - Add context help for sound file fade options. === Version 1.4.5 (KDE 3.5.5) --- 29 September 2006 === -- Improve alarm edit dialogue tqlayout (Reminder controls moved to below Time box). +- Improve alarm edit dialogue layout (Reminder controls moved to below Time box). === Version 1.4.4 --- 11 July 2006 === - Use an alarm's previous deferral time interval as default for its next deferral. @@ -261,7 +261,7 @@ KAlarm Change Log - Fix crash when the last recurrence of an alarm is reached. - Fix random limit on expired alarm discard time if stepping with spinbox buttons. - Fix dialog layouts for right-to-left languages. -- Fix time spin box tqlayout for right-to-left languages. +- Fix time spin box layout for right-to-left languages. === Version 1.2.2 --- 27 November 2004 === - Make alarm daemon (kalarmd) exclusive to KAlarm. diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index 3e3db18d4..ed509816f 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -652,7 +652,7 @@ void AlarmListViewItem::paintCell(TQPainter* painter, const TQColorGroup& cg, in */ int AlarmListViewItem::typeIconWidth(AlarmListView* v) { - return iconWidth() + 2 * v->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth); + return iconWidth() + 2 * v->style().pixelMetric(TQStyle::PM_DefaultFrameWidth); } /****************************************************************************** diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp index ffda682c2..45abca7c6 100644 --- a/kalarm/alarmtimewidget.cpp +++ b/kalarm/alarmtimewidget.cpp @@ -151,7 +151,7 @@ void AlarmTimeWidget::init(int mode) : TQString("%1\n%2\n\n%3").arg(i18n_TimeAfterPeriod()).arg(recurText).arg(TimeSpinBox::shiftWhatsThis()))); mAfterTimeRadio->setFocusWidget(mDelayTimeEdit); - // Set up the tqlayout, either narrow or wide + // Set up the layout, either narrow or wide if (mode & NARROW) { TQGridLayout* grid = new TQGridLayout(topLayout, 2, 2, KDialog::spacingHint()); @@ -160,10 +160,10 @@ void AlarmTimeWidget::init(int mode) grid->addWidget(timeBox, 1, 1, TQt::AlignAuto); grid->setColStretch(2, 1); topLayout->addStretch(); - TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); - tqlayout->addWidget(mAfterTimeRadio); - tqlayout->addWidget(mDelayTimeEdit); - tqlayout->addStretch(); + TQBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + layout->addWidget(mAfterTimeRadio); + layout->addWidget(mDelayTimeEdit); + layout->addStretch(); } else { diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index dd4ab50f6..60430a632 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -148,30 +148,30 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) groupLayout->addWidget(mReminder, 0, TQt::AlignAuto); // Acknowledgement confirmation required - default = no confirmation - TQHBoxLayout* tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint()); + TQHBoxLayout* layout = new TQHBoxLayout(groupLayout, 2*spacingHint()); mConfirmAck = EditAlarmDlg::createConfirmAckCheckbox(group); - tqlayout->addWidget(mConfirmAck); - tqlayout->addSpacing(2*spacingHint()); - tqlayout->addStretch(); + layout->addWidget(mConfirmAck); + layout->addSpacing(2*spacingHint()); + layout->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); - tqlayout->addWidget(mSpecialActionsButton); + layout->addWidget(mSpecialActionsButton); } // Late display checkbox - default = allow late display - tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint()); + layout = new TQHBoxLayout(groupLayout, 2*spacingHint()); mLateCancel = new LateCancelSelector(false, group); - tqlayout->addWidget(mLateCancel); - tqlayout->addStretch(); + layout->addWidget(mLateCancel); + layout->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")); - tqlayout->addWidget(mSubRepetition); + layout->addWidget(mSubRepetition); // Set the values to their defaults mFontColourButton->setDefaultFont(); diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp index b2120f9de..7ea2f2160 100644 --- a/kalarm/deferdlg.cpp +++ b/kalarm/deferdlg.cpp @@ -48,14 +48,14 @@ DeferAlarmDlg::DeferAlarmDlg(const TQString& caption, const DateTime& initialDT, TQWidget* page = new TQWidget(this); setMainWidget(page); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); mTimeWidget = new AlarmTimeWidget(AlarmTimeWidget::DEFER_TIME, page, "timeGroup"); mTimeWidget->setDateTime(initialDT); mTimeWidget->setMinDateTimeIsCurrent(); connect(mTimeWidget, TQT_SIGNAL(pastMax()), TQT_SLOT(slotPastLimit())); - tqlayout->addWidget(mTimeWidget); - tqlayout->addSpacing(spacingHint()); + layout->addWidget(mTimeWidget); + layout->addSpacing(spacingHint()); setButtonWhatsThis(Ok, i18n("Defer the alarm until the specified time.")); setButtonWhatsThis(User1, i18n("Cancel the deferred alarm. This does not affect future recurrences.")); diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index 7df529564..b0da44714 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -230,9 +230,9 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mActionGroup = new ButtonGroup(i18n("Action"), mainPage, "actionGroup"); connect(mActionGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotAlarmTypeChanged(int))); topLayout->addWidget(mActionGroup, 1); - TQBoxLayout* tqlayout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint()); - tqlayout->addSpacing(fontMetrics().lineSpacing()/2); - TQGridLayout* grid = new TQGridLayout(tqlayout, 1, 5); + TQBoxLayout* layout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint()); + layout->addSpacing(fontMetrics().lineSpacing()/2); + TQGridLayout* grid = new TQGridLayout(layout, 1, 5); // Message radio button mMessageRadio = new RadioButton(i18n("Te&xt"), mActionGroup, "messageButton"); @@ -266,11 +266,11 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par grid->addWidget(mEmailRadio, 1, 6); initDisplayAlarms(mActionGroup); - tqlayout->addWidget(mDisplayAlarmsFrame); + layout->addWidget(mDisplayAlarmsFrame); initCommand(mActionGroup); - tqlayout->addWidget(mCommandFrame); + layout->addWidget(mCommandFrame); initEmail(mActionGroup); - tqlayout->addWidget(mEmailFrame); + layout->addWidget(mEmailFrame); // Deferred date/time: visible only for a deferred recurring event. mDeferGroup = new TQGroupBox(1, Qt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup"); @@ -285,14 +285,14 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par TQWhatsThis::add(mDeferChangeButton, i18n("Change the alarm's deferred time, or cancel the deferral")); mDeferGroup->addSpace(0); - tqlayout = new TQHBoxLayout(topLayout); + layout = new TQHBoxLayout(topLayout); // Date and time entry if (mTemplate) { mTemplateTimeGroup = new ButtonGroup(i18n("Time"), mainPage, "templateGroup"); connect(mTemplateTimeGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotTemplateTimeType(int))); - tqlayout->addWidget(mTemplateTimeGroup); + layout->addWidget(mTemplateTimeGroup); grid = new TQGridLayout(mTemplateTimeGroup, 2, 2, marginHint(), spacingHint()); grid->addRowSpacing(0, fontMetrics().lineSpacing()/2); // Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there) @@ -350,7 +350,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par box->setFixedHeight(box->sizeHint().height()); grid->addWidget(box, 1, 1, alignment); - tqlayout->addStretch(); + layout->addStretch(); } else { @@ -373,12 +373,12 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par topLayout->addWidget(mLateCancel, 0, TQt::AlignAuto); // Acknowledgement confirmation required - default = no confirmation - tqlayout = new TQHBoxLayout(topLayout, 0); + layout = new TQHBoxLayout(topLayout, 0); mConfirmAck = createConfirmAckCheckbox(mainPage); mConfirmAck->setFixedSize(mConfirmAck->sizeHint()); - tqlayout->addWidget(mConfirmAck); - tqlayout->addSpacing(2*spacingHint()); - tqlayout->addStretch(); + layout->addWidget(mConfirmAck); + layout->addSpacing(2*spacingHint()); + layout->addStretch(); if (theApp()->korganizerEnabled()) { @@ -386,7 +386,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mShowInKorganizer = new CheckBox(i18n_ShowInKOrganizer(), mainPage); mShowInKorganizer->setFixedSize(mShowInKorganizer->sizeHint()); TQWhatsThis::add(mShowInKorganizer, i18n("Check to copy the alarm into KOrganizer's calendar")); - tqlayout->addWidget(mShowInKorganizer); + layout->addWidget(mShowInKorganizer); } setButtonWhatsThis(Ok, i18n("Schedule the alarm at the specified time.")); @@ -446,30 +446,30 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* parent) mFontColourButton->setMaximumHeight(mFontColourButton->sizeHint().height()); frameLayout->addWidget(mFontColourButton); - TQHBoxLayout* tqlayout = new TQHBoxLayout(frameLayout, 0, 0); + TQHBoxLayout* layout = new TQHBoxLayout(frameLayout, 0, 0); mBgColourBox = new TQHBox(mDisplayAlarmsFrame); mBgColourBox->setSpacing(spacingHint()); - tqlayout->addWidget(mBgColourBox); - tqlayout->addStretch(); + layout->addWidget(mBgColourBox); + layout->addStretch(); TQLabel* label = new TQLabel(i18n("&Background color:"), mBgColourBox); mBgColourButton = new ColourCombo(mBgColourBox); label->setBuddy(mBgColourButton); TQWhatsThis::add(mBgColourBox, i18n("Select the alarm message background color")); // Sound checkbox and file selector - tqlayout = new TQHBoxLayout(frameLayout); + layout = new TQHBoxLayout(frameLayout); mSoundPicker = new SoundPicker(mDisplayAlarmsFrame); mSoundPicker->setFixedSize(mSoundPicker->sizeHint()); - tqlayout->addWidget(mSoundPicker); - tqlayout->addSpacing(2*spacingHint()); - tqlayout->addStretch(); + layout->addWidget(mSoundPicker); + layout->addSpacing(2*spacingHint()); + layout->addStretch(); if (ShellProcess::authorised()) // don't display if shell commands not allowed (e.g. kiosk mode) { // Special actions button mSpecialActionsButton = new SpecialActionsButton(i18n_SpecialActions(), mDisplayAlarmsFrame); mSpecialActionsButton->setFixedSize(mSpecialActionsButton->sizeHint()); - tqlayout->addWidget(mSpecialActionsButton); + layout->addWidget(mSpecialActionsButton); } // Top-adjust the controls @@ -505,19 +505,19 @@ void EditAlarmDlg::initCommand(TQWidget* parent) mCmdOutputGroup = new ButtonGroup(i18n("Command Output"), mCommandFrame); frameLayout->addWidget(mCmdOutputGroup); - TQBoxLayout* tqlayout = new TQVBoxLayout(mCmdOutputGroup, marginHint(), spacingHint()); - tqlayout->addSpacing(fontMetrics().lineSpacing()/2); + TQBoxLayout* layout = new TQVBoxLayout(mCmdOutputGroup, marginHint(), spacingHint()); + layout->addSpacing(fontMetrics().lineSpacing()/2); // Execute in terminal window RadioButton* button = new RadioButton(i18n_u_ExecInTermWindow(), mCmdOutputGroup, "execInTerm"); button->setFixedSize(button->sizeHint()); TQWhatsThis::add(button, i18n("Check to execute the command in a terminal window")); mCmdOutputGroup->insert(button, EXEC_IN_TERMINAL); - tqlayout->addWidget(button, 0, TQt::AlignAuto); + layout->addWidget(button, 0, TQt::AlignAuto); // Log file name edit box TQHBox* box = new TQHBox(mCmdOutputGroup); - (new TQWidget(box))->setFixedWidth(button->tqstyle().subRect(TQStyle::SR_RadioButtonIndicator, button).width()); // indent the edit box + (new TQWidget(box))->setFixedWidth(button->style().subRect(TQStyle::SR_RadioButtonIndicator, button).width()); // indent the edit box // (new TQWidget(box))->setFixedWidth(button->style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth)); // indent the edit box mCmdLogFileEdit = new LineEdit(LineEdit::Url, box); mCmdLogFileEdit->setAcceptDrops(true); @@ -537,15 +537,15 @@ void EditAlarmDlg::initCommand(TQWidget* parent) TQWhatsThis::add(button, i18n("Check to log the command output to a local file. The output will be appended to any existing contents of the file.")); mCmdOutputGroup->insert(button, LOG_TO_FILE); - tqlayout->addWidget(button, 0, TQt::AlignAuto); - tqlayout->addWidget(box); + layout->addWidget(button, 0, TQt::AlignAuto); + layout->addWidget(box); // Discard output button = new RadioButton(i18n("Discard"), mCmdOutputGroup, "cmdDiscard"); button->setFixedSize(button->sizeHint()); TQWhatsThis::add(button, i18n("Check to discard command output.")); mCmdOutputGroup->insert(button, DISCARD_OUTPUT); - tqlayout->addWidget(button, 0, TQt::AlignAuto); + layout->addWidget(button, 0, TQt::AlignAuto); // Top-adjust the controls mCmdPadding = new TQHBox(mCommandFrame); @@ -560,8 +560,8 @@ void EditAlarmDlg::initEmail(TQWidget* parent) { mEmailFrame = new TQFrame(parent); mEmailFrame->setFrameStyle(TQFrame::NoFrame); - TQBoxLayout* tqlayout = new TQVBoxLayout(mEmailFrame, 0, spacingHint()); - TQGridLayout* grid = new TQGridLayout(tqlayout, 3, 3, spacingHint()); + TQBoxLayout* layout = new TQVBoxLayout(mEmailFrame, 0, spacingHint()); + TQGridLayout* grid = new TQGridLayout(layout, 3, 3, spacingHint()); grid->setColStretch(1, 1); mEmailFromList = 0; @@ -614,10 +614,10 @@ void EditAlarmDlg::initEmail(TQWidget* parent) // Email body mEmailMessageEdit = new TextEdit(mEmailFrame); TQWhatsThis::add(mEmailMessageEdit, i18n("Enter the email message.")); - tqlayout->addWidget(mEmailMessageEdit); + layout->addWidget(mEmailMessageEdit); // Email attachments - grid = new TQGridLayout(tqlayout, 2, 3, spacingHint()); + grid = new TQGridLayout(layout, 2, 3, spacingHint()); label = new TQLabel(i18n("Attachment&s:"), mEmailFrame); label->setFixedSize(label->sizeHint()); grid->addWidget(label, 0, 0); diff --git a/kalarm/find.cpp b/kalarm/find.cpp index 08bcce54c..f75d5f6f3 100644 --- a/kalarm/find.cpp +++ b/kalarm/find.cpp @@ -93,9 +93,9 @@ void Find::display() TQWidget* kalarmWidgets = mDialog->findExtension(); // Alarm types - TQBoxLayout* tqlayout = new TQVBoxLayout(kalarmWidgets, 0, KDialog::spacingHint()); + TQBoxLayout* layout = new TQVBoxLayout(kalarmWidgets, 0, KDialog::spacingHint()); TQGroupBox* group = new TQGroupBox(i18n("Alarm Type"), kalarmWidgets); - tqlayout->addWidget(group); + layout->addWidget(group); TQGridLayout* grid = new TQGridLayout(group, 2, 2, KDialog::marginHint(), KDialog::spacingHint()); grid->addRowSpacing(0, mDialog->fontMetrics().lineSpacing()/2); grid->setColStretch(1, 1); diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp index a59785c1a..4273125a3 100644 --- a/kalarm/fontcolour.cpp +++ b/kalarm/fontcolour.cpp @@ -57,8 +57,8 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, topLayout = new TQVBoxLayout(page, KDialog::marginHint(), KDialog::spacingHint()); topLayout->addSpacing(fontMetrics().height() - KDialog::marginHint() + KDialog::spacingHint()); } - TQHBoxLayout* htqlayout = new TQHBoxLayout(topLayout); - TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout); + TQHBoxLayout* hlayout = new TQHBoxLayout(topLayout); + TQVBoxLayout* colourLayout = new TQVBoxLayout(hlayout); if (fg) { TQHBox* box = new TQHBox(page); // to group widgets for TQWhatsThis text @@ -83,35 +83,35 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, connect(mBgColourButton, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setSampleColour())); label->setBuddy(mBgColourButton); TQWhatsThis::add(box, i18n("Select the alarm message background color")); - htqlayout->addStretch(); + hlayout->addStretch(); if (editColours) { - TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout); + TQHBoxLayout* layout = new TQHBoxLayout(topLayout); TQPushButton* button = new TQPushButton(i18n("Add Co&lor..."), page); button->setFixedSize(button->sizeHint()); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddColour())); TQWhatsThis::add(button, i18n("Choose a new color to add to the color selection list.")); - tqlayout->addWidget(button); + layout->addWidget(button); mRemoveColourButton = new TQPushButton(i18n("&Remove Color"), page); mRemoveColourButton->setFixedSize(mRemoveColourButton->sizeHint()); connect(mRemoveColourButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveColour())); TQWhatsThis::add(mRemoveColourButton, i18n("Remove the color currently shown in the background color chooser, from the color selection list.")); - tqlayout->addWidget(mRemoveColourButton); + layout->addWidget(mRemoveColourButton); } if (defaultFont) { - TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout); + TQHBoxLayout* layout = new TQHBoxLayout(topLayout); mDefaultFont = new CheckBox(i18n("Use &default font"), page); mDefaultFont->setMinimumSize(mDefaultFont->sizeHint()); connect(mDefaultFont, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDefaultFontToggled(bool))); TQWhatsThis::add(mDefaultFont, i18n("Check to use the default font current at the time the alarm is displayed.")); - tqlayout->addWidget(mDefaultFont); - tqlayout->addWidget(new TQWidget(page)); // left adjust the widget + layout->addWidget(mDefaultFont); + layout->addWidget(new TQWidget(page)); // left adjust the widget } else mDefaultFont = 0; diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp index 37fe5c99d..6299049c6 100644 --- a/kalarm/fontcolourbutton.cpp +++ b/kalarm/fontcolourbutton.cpp @@ -43,14 +43,14 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name) mReadOnly(false) { setFrameStyle(NoFrame); - TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout* layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); mButton = new PushButton(i18n("Font && Co&lor..."), this); mButton->setFixedSize(mButton->sizeHint()); connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonPressed())); TQWhatsThis::add(mButton, i18n("Choose the font, and foreground and background color, for the alarm message.")); - tqlayout->addWidget(mButton); + layout->addWidget(mButton); // Font and colour sample display mSample = new TQLineEdit(this); @@ -62,7 +62,7 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name) TQWhatsThis::add(mSample, i18n("This sample text illustrates the current font and color settings. " "You may edit it to test special characters.")); - tqlayout->addWidget(mSample); + layout->addWidget(mSample); } void FontColourButton::setDefaultFont() @@ -125,7 +125,7 @@ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, c { TQWidget* page = new TQWidget(this); setMainWidget(page); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); mChooser = new FontColourChooser(page, 0, false, TQStringList(), TQString(), false, true, true); mChooser->setBgColour(bgColour); mChooser->setFgColour(fgColour); @@ -133,8 +133,8 @@ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, c mChooser->setDefaultFont(); else mChooser->setFont(font); - tqlayout->addWidget(mChooser); - tqlayout->addSpacing(KDialog::spacingHint()); + layout->addWidget(mChooser); + layout->addSpacing(KDialog::spacingHint()); } /****************************************************************************** diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 9fb76f21f..0221ea86b 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -905,7 +905,7 @@ TQString stripAccel(const TQString& text) { unsigned len = text.length(); TQString out = TQDeepCopy<TQString>(text); - TQChar *corig = (TQChar*)out.tqunicode(); + TQChar *corig = (TQChar*)out.unicode(); TQChar *cout = corig; TQChar *cin = cout; while (len) diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp index da5cfe784..fa317c395 100644 --- a/kalarm/latecancel.cpp +++ b/kalarm/latecancel.cpp @@ -58,31 +58,31 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c mCheckboxFrame = new TQFrame(mStack); mCheckboxFrame->setFrameStyle(TQFrame::NoFrame); mStack->addWidget(mCheckboxFrame, 1); - TQBoxLayout* tqlayout = new TQVBoxLayout(mCheckboxFrame, 0, 0); + TQBoxLayout* layout = new TQVBoxLayout(mCheckboxFrame, 0, 0); mCheckbox = new CheckBox(i18n_n_CancelIfLate(), mCheckboxFrame); mCheckbox->setFixedSize(mCheckbox->sizeHint()); connect(mCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); TQWhatsThis::add(mCheckbox, whatsThis); - tqlayout->addWidget(mCheckbox, 0, TQt::AlignAuto); + layout->addWidget(mCheckbox, 0, TQt::AlignAuto); mTimeSelectorFrame = new TQFrame(mStack); mTimeSelectorFrame->setFrameStyle(TQFrame::NoFrame); mStack->addWidget(mTimeSelectorFrame, 2); - tqlayout = new TQVBoxLayout(mTimeSelectorFrame, 0, 0); + layout = new TQVBoxLayout(mTimeSelectorFrame, 0, 0); mTimeSelector = new TimeSelector(i18n("Cancel if late by 10 minutes", "Ca&ncel if late by"), TQString(), whatsThis, i18n("Enter how late will cause the alarm to be canceled"), allowHourMinute, mTimeSelectorFrame); connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); - tqlayout->addWidget(mTimeSelector); + layout->addWidget(mTimeSelector); mLayout->addWidget(mStack); - tqlayout = new TQHBoxLayout(mLayout, KDialog::spacingHint()); - tqlayout->addSpacing(3*KDialog::spacingHint()); + layout = new TQHBoxLayout(mLayout, KDialog::spacingHint()); + layout->addSpacing(3*KDialog::spacingHint()); mAutoClose = new CheckBox(i18n_AutoCloseWin(), this); mAutoClose->setFixedSize(mAutoClose->sizeHint()); TQWhatsThis::add(mAutoClose, i18n("Automatically close the alarm window after the expiry of the late-cancelation period")); - tqlayout->addWidget(mAutoClose); - tqlayout->addStretch(); + layout->addWidget(mAutoClose); + layout->addStretch(); mAutoClose->hide(); mAutoClose->setEnabled(false); diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h index ba03d07d7..08fcf2c3e 100644 --- a/kalarm/latecancel.h +++ b/kalarm/latecancel.h @@ -55,7 +55,7 @@ class LateCancelSelector : public TQFrame void slotToggled(bool); private: - TQBoxLayout* mLayout; // overall tqlayout for the widget + TQBoxLayout* mLayout; // overall layout for the widget TQWidgetStack* mStack; // contains mCheckboxFrame and mTimeSelectorFrame TQFrame* mCheckboxFrame; CheckBox* mCheckbox; // displayed when late cancellation is not selected diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp index 2eceec29c..360d2a2a5 100644 --- a/kalarm/lib/spinbox2.cpp +++ b/kalarm/lib/spinbox2.cpp @@ -87,7 +87,7 @@ void SpinBox2::init() setFocusProxy(mSpinbox); mUpdown2->setFocusPolicy(TQ_NoFocus); mSpinMirror = new SpinMirror(mUpdown2, mUpdown2Frame, this); - if (!mirrorStyle(tqstyle())) + if (!mirrorStyle(style())) mSpinMirror->hide(); // hide mirrored spin buttons when they are inappropriate connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(valueChange())); connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(valueChanged(int))); @@ -142,7 +142,7 @@ void SpinBox2::setLineStep(int step) { mLineStep = step; if (reverseButtons()) - mUpdown2->setLineStep(step); // reverse tqlayout, but still set the right buttons + mUpdown2->setLineStep(step); // reverse layout, but still set the right buttons else mSpinbox->setLineStep(step); } @@ -153,7 +153,7 @@ void SpinBox2::setSteps(int line, int page) mPageStep = page; if (reverseButtons()) { - mUpdown2->setLineStep(line); // reverse tqlayout, but still set the right buttons + mUpdown2->setLineStep(line); // reverse layout, but still set the right buttons mSpinbox->setLineStep(page); } else @@ -169,7 +169,7 @@ void SpinBox2::setShiftSteps(int line, int page) mPageShiftStep = page; if (reverseButtons()) { - mUpdown2->setLineShiftStep(line); // reverse tqlayout, but still set the right buttons + mUpdown2->setLineShiftStep(line); // reverse layout, but still set the right buttons mSpinbox->setLineShiftStep(page); } else @@ -243,7 +243,7 @@ TQSize SpinBox2::minimumSizeHint() const void SpinBox2::styleChange(TQStyle&) { - if (mirrorStyle(tqstyle())) + if (mirrorStyle(style())) mSpinMirror->show(); // show rounded corners with Plastik etc. else mSpinMirror->hide(); // keep normal shading with other styles @@ -282,16 +282,16 @@ void SpinBox2::arrange() */ void SpinBox2::getMetrics() const { - TQRect rect = mUpdown2->tqstyle().querySubControlMetrics(TQStyle::CC_SpinWidget, mUpdown2, TQStyle::SC_SpinWidgetButtonField); - if (tqstyle().inherits("PlastikStyle")) + TQRect rect = mUpdown2->style().querySubControlMetrics(TQStyle::CC_SpinWidget, mUpdown2, TQStyle::SC_SpinWidgetButtonField); + if (style().inherits("PlastikStyle")) rect.setLeft(rect.left() - 1); // Plastik excludes left border from spin widget rectangle xUpdown2 = mReverseLayout ? 0 : rect.left(); wUpdown2 = mUpdown2->width() - rect.left(); - xSpinbox = mSpinbox->tqstyle().querySubControlMetrics(TQStyle::CC_SpinWidget, mSpinbox, TQStyle::SC_SpinWidgetEditField).left(); + xSpinbox = mSpinbox->style().querySubControlMetrics(TQStyle::CC_SpinWidget, mSpinbox, TQStyle::SC_SpinWidgetEditField).left(); wGap = 0; // Make style-specific adjustments for a better appearance - if (tqstyle().inherits(TQMOTIFPLUSSTYLE_OBJECT_NAME_STRING)) + if (style().inherits(TQMOTIFPLUSSTYLE_OBJECT_NAME_STRING)) { xSpinbox = 0; // show the edit control left border wGap = 2; // leave a space to the right of the left-hand pair of spin buttons diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h index 188cba526..14c2f16e1 100644 --- a/kalarm/lib/spinbox2.h +++ b/kalarm/lib/spinbox2.h @@ -310,7 +310,7 @@ class SpinBox2 : public TQFrame int mLineShiftStep; // right button increment with shift pressed int mPageStep; // left button increment int mPageShiftStep; // left button increment with shift pressed - bool mReverseWithLayout; // reverse button positions if reverse tqlayout (default = true) + bool mReverseWithLayout; // reverse button positions if reverse layout (default = true) friend class MainSpinBox; }; diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index c1109b9d1..2c9ac63e4 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -298,13 +298,13 @@ void MessageWin::initView() { // Show the alarm date/time, together with an "Advance reminder" text where appropriate TQFrame* frame = 0; - TQVBoxLayout* tqlayout = topLayout; + TQVBoxLayout* layout = topLayout; if (reminder) { frame = new TQFrame(topWidget); frame->setFrameStyle(TQFrame::Box | TQFrame::Raised); topLayout->addWidget(frame, 0, TQt::AlignHCenter); - tqlayout = new TQVBoxLayout(frame, leading + frame->frameWidth(), leading); + layout = new TQVBoxLayout(frame, leading + frame->frameWidth(), leading); } // Alarm date/time @@ -315,7 +315,7 @@ void MessageWin::initView() if (!frame) label->setFrameStyle(TQFrame::Box | TQFrame::Raised); label->setFixedSize(label->sizeHint()); - tqlayout->addWidget(label, 0, TQt::AlignHCenter); + layout->addWidget(label, 0, TQt::AlignHCenter); TQWhatsThis::add(label, i18n("The scheduled date/time for the message (as opposed to the actual time of display).")); @@ -324,7 +324,7 @@ void MessageWin::initView() label = new TQLabel(frame); label->setText(i18n("Reminder")); label->setFixedSize(label->sizeHint()); - tqlayout->addWidget(label, 0, TQt::AlignHCenter); + layout->addWidget(label, 0, TQt::AlignHCenter); frame->setFixedSize(frame->sizeHint()); } } @@ -405,10 +405,10 @@ void MessageWin::initView() topLayout->addWidget(text, 1, TQt::AlignHCenter); else { - TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout); - tqlayout->addSpacing(hspace); - tqlayout->addWidget(text, 1, TQt::AlignHCenter); - tqlayout->addSpacing(hspace); + TQBoxLayout* layout = new TQHBoxLayout(topLayout); + layout->addSpacing(hspace); + layout->addWidget(text, 1, TQt::AlignHCenter); + layout->addSpacing(hspace); } if (!reminder) topLayout->addStretch(); @@ -484,21 +484,21 @@ void MessageWin::initView() else { setCaption(i18n("Error")); - TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout); - tqlayout->setMargin(2*KDialog::marginHint()); - tqlayout->addStretch(); + TQBoxLayout* layout = new TQHBoxLayout(topLayout); + layout->setMargin(2*KDialog::marginHint()); + layout->addStretch(); TQLabel* label = new TQLabel(topWidget); label->setPixmap(DesktopIcon("error")); label->setFixedSize(label->sizeHint()); - tqlayout->addWidget(label, 0, TQt::AlignRight); - TQBoxLayout* vtqlayout = new TQVBoxLayout(tqlayout); + layout->addWidget(label, 0, TQt::AlignRight); + TQBoxLayout* vlayout = new TQVBoxLayout(layout); for (TQStringList::Iterator it = mErrorMsgs.begin(); it != mErrorMsgs.end(); ++it) { label = new TQLabel(*it, topWidget); label->setFixedSize(label->sizeHint()); - vtqlayout->addWidget(label, 0, TQt::AlignLeft); + vlayout->addWidget(label, 0, TQt::AlignLeft); } - tqlayout->addStretch(); + layout->addStretch(); } TQGridLayout* grid = new TQGridLayout(1, 4); diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp index 3cde076b7..b41740941 100644 --- a/kalarm/prefdlg.cpp +++ b/kalarm/prefdlg.cpp @@ -233,7 +233,7 @@ PrefsTabBase::PrefsTabBase(TQVBox* frame) mPage(frame) { if (!mIndentWidth) - mIndentWidth = tqstyle().subRect(TQStyle::SR_RadioButtonIndicator, this).width(); + mIndentWidth = style().subRect(TQStyle::SR_RadioButtonIndicator, this).width(); } void PrefsTabBase::apply(bool syncToDisc) @@ -826,9 +826,9 @@ FontColourPrefTab::FontColourPrefTab(TQVBox* frame) mPage->setStretchFactor(mFontChooser, 1); TQFrame* layoutBox = new TQFrame(mPage); - TQHBoxLayout* htqlayout = new TQHBoxLayout(layoutBox); - TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); - htqlayout->addStretch(); + TQHBoxLayout* hlayout = new TQHBoxLayout(layoutBox); + TQVBoxLayout* colourLayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); + hlayout->addStretch(); TQHBox* box = new TQHBox(layoutBox); // to group widgets for TQWhatsThis text box->setSpacing(KDialog::spacingHint()/2); @@ -897,22 +897,22 @@ EditPrefTab::EditPrefTab(TQVBox* frame) // DISPLAY ALARMS TQGroupBox* group = new TQGroupBox(i18n("Display Alarms"), mPage); - TQBoxLayout* tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addSpacing(groupTopMargin); + TQBoxLayout* layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); + layout->addSpacing(groupTopMargin); mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck"); mConfirmAck->setMinimumSize(mConfirmAck->sizeHint()); TQWhatsThis::add(mConfirmAck, defsetting.arg(EditAlarmDlg::i18n_ConfirmAck())); - tqlayout->addWidget(mConfirmAck, 0, TQt::AlignAuto); + layout->addWidget(mConfirmAck, 0, TQt::AlignAuto); mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose"); mAutoClose->setMinimumSize(mAutoClose->sizeHint()); TQWhatsThis::add(mAutoClose, defsetting.arg(LateCancelSelector::i18n_AutoCloseWin())); - tqlayout->addWidget(mAutoClose, 0, TQt::AlignAuto); + layout->addWidget(mAutoClose, 0, TQt::AlignAuto); TQHBox* box = new TQHBox(group); box->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + layout->addWidget(box); TQLabel* label = new TQLabel(i18n("Reminder &units:"), box); label->setFixedSize(label->sizeHint()); mReminderUnits = new TQComboBox(box, "defWarnUnits"); @@ -931,10 +931,10 @@ EditPrefTab::EditPrefTab(TQVBox* frame) // SOUND TQButtonGroup* bgroup = new TQButtonGroup(SoundPicker::i18n_Sound(), mPage, "soundGroup"); - tqlayout = new TQVBoxLayout(bgroup, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addSpacing(groupTopMargin); + layout = new TQVBoxLayout(bgroup, KDialog::marginHint(), KDialog::spacingHint()); + layout->addSpacing(groupTopMargin); - TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + TQBoxLayout* hlayout = new TQHBoxLayout(layout, KDialog::spacingHint()); mSound = new TQComboBox(false, bgroup, "defSound"); mSound->insertItem(SoundPicker::i18n_None()); // index 0 mSound->insertItem(SoundPicker::i18n_Beep()); // index 1 @@ -943,14 +943,14 @@ EditPrefTab::EditPrefTab(TQVBox* frame) mSound->insertItem(SoundPicker::i18n_Speak()); // index 3 mSound->setMinimumSize(mSound->sizeHint()); TQWhatsThis::add(mSound, defsetting.arg(SoundPicker::i18n_Sound())); - htqlayout->addWidget(mSound); - htqlayout->addStretch(1); + hlayout->addWidget(mSound); + hlayout->addStretch(1); #ifndef WITHOUT_ARTS mSoundRepeat = new TQCheckBox(i18n("Repea&t sound file"), bgroup, "defRepeatSound"); mSoundRepeat->setMinimumSize(mSoundRepeat->sizeHint()); TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").arg(SoundDlg::i18n_Repeat())); - htqlayout->addWidget(mSoundRepeat); + hlayout->addWidget(mSoundRepeat); #endif box = new TQHBox(bgroup); // this is to control the TQWhatsThis text display area @@ -967,36 +967,36 @@ EditPrefTab::EditPrefTab(TQVBox* frame) TQWhatsThis::add(box, i18n("Enter the default sound file to use in the alarm edit dialog.")); box->setFixedHeight(box->sizeHint().height()); - tqlayout->addWidget(box); + layout->addWidget(box); bgroup->setFixedHeight(bgroup->sizeHint().height()); // COMMAND ALARMS group = new TQGroupBox(i18n("Command Alarms"), mPage); - tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addSpacing(groupTopMargin); - tqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); + layout->addSpacing(groupTopMargin); + layout = new TQHBoxLayout(layout, KDialog::spacingHint()); mCmdScript = new TQCheckBox(EditAlarmDlg::i18n_p_EnterScript(), group, "defCmdScript"); mCmdScript->setMinimumSize(mCmdScript->sizeHint()); TQWhatsThis::add(mCmdScript, defsetting.arg(EditAlarmDlg::i18n_EnterScript())); - tqlayout->addWidget(mCmdScript); - tqlayout->addStretch(); + layout->addWidget(mCmdScript); + layout->addStretch(); mCmdXterm = new TQCheckBox(EditAlarmDlg::i18n_w_ExecInTermWindow(), group, "defCmdXterm"); mCmdXterm->setMinimumSize(mCmdXterm->sizeHint()); TQWhatsThis::add(mCmdXterm, defsetting.arg(EditAlarmDlg::i18n_ExecInTermWindow())); - tqlayout->addWidget(mCmdXterm); + layout->addWidget(mCmdXterm); // EMAIL ALARMS group = new TQGroupBox(i18n("Email Alarms"), mPage); - tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addSpacing(groupTopMargin); + layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint()); + layout->addSpacing(groupTopMargin); // BCC email to sender mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc"); mEmailBcc->setMinimumSize(mEmailBcc->sizeHint()); TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf())); - tqlayout->addWidget(mEmailBcc, 0, TQt::AlignAuto); + layout->addWidget(mEmailBcc, 0, TQt::AlignAuto); // MISCELLANEOUS // Show in KOrganizer diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index 0e8727047..216c1f478 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); diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h index 68dd429b9..94472c379 100644 --- a/kalarm/recurrenceeditprivate.h +++ b/kalarm/recurrenceeditprivate.h @@ -54,7 +54,7 @@ class Rule : public NoRule int frequency() const; void setFrequency(int); virtual void setFrequencyFocus() { mSpinBox->setFocus(); } - TQVBoxLayout* tqlayout() const { return mLayout; } + TQVBoxLayout* layout() const { return mLayout; } virtual TQWidget* validate(TQString&) { return 0; } virtual void saveState(); virtual bool stateChanged() const; diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp index 2fd2ff79c..60c603368 100644 --- a/kalarm/reminder.cpp +++ b/kalarm/reminder.cpp @@ -57,13 +57,13 @@ Reminder::Reminder(const TQString& caption, const TQString& reminderWhatsThis, c if (showOnceOnly) { - TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); - tqlayout->addSpacing(3*KDialog::spacingHint()); + TQBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + layout->addSpacing(3*KDialog::spacingHint()); mOnceOnly = new CheckBox(i18n_u_first_recurrence_only(), this); mOnceOnly->setFixedSize(mOnceOnly->sizeHint()); TQWhatsThis::add(mOnceOnly, i18n("Display the reminder only before the first time the alarm is scheduled")); - tqlayout->addWidget(mOnceOnly); - tqlayout->addStretch(); + layout->addWidget(mOnceOnly); + layout->addStretch(); } else mOnceOnly = 0; diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp index d5eae1a89..45de81cbf 100644 --- a/kalarm/repetition.cpp +++ b/kalarm/repetition.cpp @@ -174,13 +174,13 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(typeClicked())); topLayout->addWidget(mButtonGroup); - TQBoxLayout* vtqlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing); - TQBoxLayout* tqlayout = new TQHBoxLayout(vtqlayout, spacing); + TQBoxLayout* vlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing); + TQBoxLayout* layout = new TQHBoxLayout(vlayout, spacing); mCountButton = new RadioButton(i18n("&Number of repetitions:"), mButtonGroup); mCountButton->setFixedSize(mCountButton->sizeHint()); TQWhatsThis::add(mCountButton, i18n("Check to specify the number of times the alarm should repeat after each recurrence")); - tqlayout->addWidget(mCountButton); + layout->addWidget(mCountButton); mCount = new SpinBox(1, MAX_COUNT, 1, mButtonGroup); mCount->setFixedSize(mCount->sizeHint()); mCount->setLineShiftStep(10); @@ -188,24 +188,24 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p connect(mCount, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(countChanged(int))); TQWhatsThis::add(mCount, i18n("Enter the number of times to trigger the alarm after its initial occurrence")); - tqlayout->addWidget(mCount); + layout->addWidget(mCount); mCountButton->setFocusWidget(mCount); - tqlayout->addStretch(); + layout->addStretch(); - tqlayout = new TQHBoxLayout(vtqlayout, spacing); + layout = new TQHBoxLayout(vlayout, spacing); mDurationButton = new RadioButton(i18n("&Duration:"), mButtonGroup); mDurationButton->setFixedSize(mDurationButton->sizeHint()); TQWhatsThis::add(mDurationButton, i18n("Check to specify how long the alarm is to be repeated")); - tqlayout->addWidget(mDurationButton); + layout->addWidget(mDurationButton); mDuration = new TimePeriod(true, mButtonGroup); mDuration->setFixedSize(mDuration->sizeHint()); connect(mDuration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(durationChanged(int))); TQWhatsThis::add(mDuration, i18n("Enter the length of time to repeat the alarm")); - tqlayout->addWidget(mDuration); + layout->addWidget(mDuration); mDurationButton->setFocusWidget(mDuration); - tqlayout->addStretch(); + layout->addStretch(); mCountButton->setChecked(true); repetitionToggled(false); diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index 77894b7a7..b02e9fc2a 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -78,11 +78,11 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad { TQWidget* page = new TQWidget(this); setMainWidget(page); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); // File play button TQHBox* box = new TQHBox(page); - tqlayout->addWidget(box); + layout->addWidget(box); mFilePlay = new TQPushButton(box); mFilePlay->setPixmap(SmallIcon("player_play")); mFilePlay->setFixedSize(mFilePlay->sizeHint()); @@ -108,11 +108,11 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad mRepeatCheckbox->setFixedSize(mRepeatCheckbox->sizeHint()); TQWhatsThis::add(mRepeatCheckbox, i18n("If checked, the sound file will be played repeatedly for as long as the message is displayed.")); - tqlayout->addWidget(mRepeatCheckbox); + layout->addWidget(mRepeatCheckbox); // Volume TQGroupBox* group = new TQGroupBox(i18n("Volume"), page); - tqlayout->addWidget(group); + layout->addWidget(group); TQGridLayout* grid = new TQGridLayout(group, 4, 3, marginHint(), spacingHint()); grid->addRowSpacing(0, fontMetrics().height() - marginHint() + spacingHint()); grid->setColStretch(2, 1); diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp index d4271d16d..bb6322523 100644 --- a/kalarm/specialactions.cpp +++ b/kalarm/specialactions.cpp @@ -95,12 +95,12 @@ SpecialActionsDlg::SpecialActionsDlg(const TQString& preAction, const TQString& { TQWidget* page = new TQWidget(this); setMainWidget(page); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); mActions = new SpecialActions(page); mActions->setActions(preAction, postAction); - tqlayout->addWidget(mActions); - tqlayout->addSpacing(KDialog::spacingHint()); + layout->addWidget(mActions); + layout->addSpacing(KDialog::spacingHint()); TQSize s; if (KAlarm::readConfigWindowSize(SPEC_ACT_DIALOG_NAME, s)) diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp index 698077bf6..2841ce61b 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -50,34 +50,34 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name) TQBoxLayout* topLayout = new TQHBoxLayout(topWidget); topLayout->setSpacing(spacingHint()); - TQBoxLayout* tqlayout = new TQVBoxLayout(topLayout); + TQBoxLayout* layout = new TQVBoxLayout(topLayout); mTemplateList = new TemplateListView(true, i18n("The list of alarm templates"), topWidget); mTemplateList->setSelectionMode(TQListView::Extended); mTemplateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); connect(mTemplateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); - tqlayout->addWidget(mTemplateList); + layout->addWidget(mTemplateList); - tqlayout = new TQVBoxLayout(topLayout); + layout = new TQVBoxLayout(topLayout); TQPushButton* button = new TQPushButton(i18n("&New..."), topWidget); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotNew())); TQWhatsThis::add(button, i18n("Create a new alarm template")); - tqlayout->addWidget(button); + layout->addWidget(button); mEditButton = new TQPushButton(i18n("&Edit..."), topWidget); connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit())); TQWhatsThis::add(mEditButton, i18n("Edit the currently highlighted alarm template")); - tqlayout->addWidget(mEditButton); + layout->addWidget(mEditButton); mCopyButton = new TQPushButton(i18n("Co&py"), topWidget); connect(mCopyButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCopy())); TQWhatsThis::add(mCopyButton, i18n("Create a new alarm template based on a copy of the currently highlighted template")); - tqlayout->addWidget(mCopyButton); + layout->addWidget(mCopyButton); mDeleteButton = new TQPushButton(i18n("&Delete"), topWidget); connect(mDeleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete())); TQWhatsThis::add(mDeleteButton, i18n("Delete the currently highlighted alarm template")); - tqlayout->addWidget(mDeleteButton); + layout->addWidget(mDeleteButton); KAccel* accel = new KAccel(this); accel->insert(KStdAccel::SelectAll, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotSelectAll())); diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp index 1ca20bc10..9ec5c9813 100644 --- a/kalarm/timeselector.cpp +++ b/kalarm/timeselector.cpp @@ -41,16 +41,16 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix, { setFrameStyle(TQFrame::NoFrame); TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + TQHBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); mSelect = new CheckBox(selectText, this); mSelect->setFixedSize(mSelect->sizeHint()); connect(mSelect, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectToggled(bool))); TQWhatsThis::add(mSelect, selectWhatsThis); - tqlayout->addWidget(mSelect); + layout->addWidget(mSelect); TQHBox* box = new TQHBox(this); // to group widgets for TQWhatsThis text box->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + layout->addWidget(box); mPeriod = new TimePeriod(allowHourMinute, box); mPeriod->setFixedSize(mPeriod->sizeHint()); mPeriod->setSelectOnStep(false); |