diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
commit | f4fae92b6768541e2952173c3d4b09040f95bf7e (patch) | |
tree | d8c5d93232235cd635f3310b4d95490df181ba2d /kalarm/lib | |
parent | 125c0a08265b75a133644d3b55f47e37c919f45d (diff) | |
download | tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip |
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kalarm/lib')
-rw-r--r-- | kalarm/lib/checkbox.h | 2 | ||||
-rw-r--r-- | kalarm/lib/colourcombo.cpp | 4 | ||||
-rw-r--r-- | kalarm/lib/colourlist.h | 4 | ||||
-rw-r--r-- | kalarm/lib/dateedit.cpp | 2 | ||||
-rw-r--r-- | kalarm/lib/dateedit.h | 2 | ||||
-rw-r--r-- | kalarm/lib/label.cpp | 2 | ||||
-rw-r--r-- | kalarm/lib/lineedit.cpp | 8 | ||||
-rw-r--r-- | kalarm/lib/lineedit.h | 6 | ||||
-rw-r--r-- | kalarm/lib/messagebox.cpp | 6 | ||||
-rw-r--r-- | kalarm/lib/radiobutton.h | 2 | ||||
-rw-r--r-- | kalarm/lib/spinbox.cpp | 4 | ||||
-rw-r--r-- | kalarm/lib/spinbox2.cpp | 22 | ||||
-rw-r--r-- | kalarm/lib/spinbox2.h | 24 | ||||
-rw-r--r-- | kalarm/lib/spinbox2private.h | 2 | ||||
-rw-r--r-- | kalarm/lib/synchtimer.cpp | 4 | ||||
-rw-r--r-- | kalarm/lib/timeedit.cpp | 4 | ||||
-rw-r--r-- | kalarm/lib/timeedit.h | 2 | ||||
-rw-r--r-- | kalarm/lib/timeperiod.cpp | 4 | ||||
-rw-r--r-- | kalarm/lib/timespinbox.cpp | 14 | ||||
-rw-r--r-- | kalarm/lib/timespinbox.h | 4 |
20 files changed, 61 insertions, 61 deletions
diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h index fc7f82cbd..389e66231 100644 --- a/kalarm/lib/checkbox.h +++ b/kalarm/lib/checkbox.h @@ -62,7 +62,7 @@ class CheckBox : public QCheckBox */ virtual void setReadOnly(bool readOnly); /** Returns the widget which receives focus when the user selects the check box by clicking on it. */ - TQWidget* focusWidget() const { return mFocusWidget; } + TQWidget* tqfocusWidget() const { return mFocusWidget; } /** Specifies a widget to receive focus when the user selects the check box by clicking on it. * @param widget Widget to receive focus. * @param enable If true, @p widget will be enabled before receiving focus. If diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp index 9cf09ce13..0345104e0 100644 --- a/kalarm/lib/colourcombo.cpp +++ b/kalarm/lib/colourcombo.cpp @@ -57,7 +57,7 @@ void ColourCombo::setColours(const ColourList& colours) { mColourList = colours; if (mSelectedColour != mCustomColour - && !mColourList.contains(mSelectedColour)) + && !mColourList.tqcontains(mSelectedColour)) { // The current colour has been deleted mSelectedColour = mColourList.count() ? mColourList.first() : mCustomColour; @@ -168,7 +168,7 @@ void ColourCombo::addColours() void ColourCombo::drawCustomItem(TQRect& rect, bool insert) { TQPen pen; - if (qGray(mCustomColour.rgb()) < 128) + if (tqGray(mCustomColour.rgb()) < 128) pen.setColor(Qt::white); else pen.setColor(Qt::black); diff --git a/kalarm/lib/colourlist.h b/kalarm/lib/colourlist.h index a20a44d6a..8ec2b2a94 100644 --- a/kalarm/lib/colourlist.h +++ b/kalarm/lib/colourlist.h @@ -82,8 +82,8 @@ class ColourList const_iterator fromLast() const { return mList.fromLast(); } /** Returns an iterator pointing to the colour at position @p i in the list. */ const_iterator at(size_type i) const { return mList.at(i); } - /** Returns true if the list contains the colour @p c. */ - size_type contains(const TQColor& c) const { return mList.contains(c.rgb()); } + /** Returns true if the list tqcontains the colour @p c. */ + size_type tqcontains(const TQColor& c) const { return mList.tqcontains(c.rgb()); } /** Returns an iterator pointing to the first occurrence of colour @p c in the list. * Returns end() if colour @p c is not in the list. */ diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp index 2fef25de5..2cc106982 100644 --- a/kalarm/lib/dateedit.cpp +++ b/kalarm/lib/dateedit.cpp @@ -77,7 +77,7 @@ void DateEdit::pastLimitMessage(const TQDate& limit, const TQString& error, cons TQString errString = error; if (errString.isNull()) { - if (limit == TQDate::currentDate()) + if (limit == TQDate::tqcurrentDate()) errString = i18n("today"); else errString = KGlobal::locale()->formatDate(limit, true); diff --git a/kalarm/lib/dateedit.h b/kalarm/lib/dateedit.h index c7c015785..7ea09e01b 100644 --- a/kalarm/lib/dateedit.h +++ b/kalarm/lib/dateedit.h @@ -43,7 +43,7 @@ class DateEdit : public KDateEdit * @param name The name of this widget. */ explicit DateEdit(TQWidget* parent = 0, const char* name = 0); - /** Returns true if the widget contains a valid date. */ + /** Returns true if the widget tqcontains a valid date. */ bool isValid() const { return date().isValid(); } /** Returns the earliest date which can be entered. * If there is no minimum date, returns an invalid date. diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp index 69cef7544..92f07402a 100644 --- a/kalarm/lib/label.cpp +++ b/kalarm/lib/label.cpp @@ -112,7 +112,7 @@ LabelFocusWidget::LabelFocusWidget(TQWidget* parent, const char* name) void LabelFocusWidget::focusInEvent(TQFocusEvent*) { - Label* parent = (Label*)parentWidget(); + Label* parent = (Label*)tqparentWidget(); parent->activated(); } diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp index 64c79ea7b..4dcdc15f8 100644 --- a/kalarm/lib/lineedit.cpp +++ b/kalarm/lib/lineedit.cpp @@ -122,7 +122,7 @@ void LineEdit::dropEvent(TQDropEvent* e) if (mType == Emails) newText = mailList.first().from(); else - setText(mailList.first().subject()); // replace any existing text + setText(mailList.first().subject()); // tqreplace any existing text } } // This must come before KURLDrag @@ -144,12 +144,12 @@ void LineEdit::dropEvent(TQDropEvent* e) { case Url: // URL entry field - ignore all but the first dropped URL - setText(files.first().prettyURL()); // replace any existing text + setText(files.first().prettyURL()); // tqreplace any existing text break; case Emails: { // Email entry field - ignore all but mailto: URLs - TQString mailto = TQString::fromLatin1("mailto"); + TQString mailto = TQString::tqfromLatin1("mailto"); for (KURL::List::Iterator it = files.begin(); it != files.end(); ++it) { if ((*it).protocol() == mailto) @@ -168,7 +168,7 @@ void LineEdit::dropEvent(TQDropEvent* e) if (mType == Emails) { // Remove newlines from a list of email addresses, and allow an eventual mailto: protocol - TQString mailto = TQString::fromLatin1("mailto:"); + TQString mailto = TQString::tqfromLatin1("mailto:"); newEmails = TQStringList::split(TQRegExp("[\r\n]+"), txt); for (TQStringList::Iterator it = newEmails.begin(); it != newEmails.end(); ++it) { diff --git a/kalarm/lib/lineedit.h b/kalarm/lib/lineedit.h index 612b12a33..5d36de3c5 100644 --- a/kalarm/lib/lineedit.h +++ b/kalarm/lib/lineedit.h @@ -45,14 +45,14 @@ class LineEdit : public KLineEdit Q_OBJECT public: /** Types of drag and drop content which will be accepted. - * @li Text - the line edit contains general text. It accepts text, a URL + * @li Text - the line edit tqcontains general text. It accepts text, a URL * or an email from KMail (the subject line is used). If multiple * URLs or emails are dropped, only the first is used; the * rest are ignored. - * @li Url - the line edit contains a URL. It accepts text or a URL. If + * @li Url - the line edit tqcontains a URL. It accepts text or a URL. If * multiple URLs are dropped, only the first URL is used; the * rest are ignored. - * @li Emails - the line edit contains email addresses. It accepts text, + * @li Emails - the line edit tqcontains email addresses. It accepts text, * mailto: URLs, emails from KMail (the From address is used) * or vcard data (e.g. from KAddressBook). If multiple emails * are dropped, only the first is used; the rest are ignored. diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp index 48c18f1cd..3345c9c4b 100644 --- a/kalarm/lib/messagebox.cpp +++ b/kalarm/lib/messagebox.cpp @@ -109,7 +109,7 @@ bool MessageBox::setDefaultShouldBeShownContinue(const TQString& dontShowAgainNa return false; // First check whether there is an existing setting KConfig* config = mConfig ? mConfig : KGlobal::config(); - config->setGroup(TQString::fromLatin1("Notification Messages")); + config->setGroup(TQString::tqfromLatin1("Notification Messages")); if (config->hasKey(dontShowAgainName)) return false; @@ -168,10 +168,10 @@ void MessageBox::saveDontShowAgain(const TQString& dontShowAgainName, bool yesno if (dontShowAgainName.isEmpty()) return; KConfig* config = mConfig ? mConfig : KGlobal::config(); - config->setGroup(TQString::fromLatin1("Notification Messages")); + config->setGroup(TQString::tqfromLatin1("Notification Messages")); bool global = (dontShowAgainName[0] == ':'); if (yesno) - config->writeEntry(dontShowAgainName, TQString::fromLatin1(dontShow ? yesnoResult : ""), true, global); + config->writeEntry(dontShowAgainName, TQString::tqfromLatin1(dontShow ? yesnoResult : ""), true, global); else config->writeEntry(dontShowAgainName, !dontShow, true, global); config->sync(); diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h index c87ef97b8..d95d13fa5 100644 --- a/kalarm/lib/radiobutton.h +++ b/kalarm/lib/radiobutton.h @@ -62,7 +62,7 @@ class RadioButton : public QRadioButton */ virtual void setReadOnly(bool readOnly); /** Returns the widget which receives focus when the button is clicked. */ - TQWidget* focusWidget() const { return mFocusWidget; } + TQWidget* tqfocusWidget() const { return mFocusWidget; } /** Specifies a widget to receive focus when the button is clicked. * @param widget Widget to receive focus. * @param enable If true, @p widget will be enabled before receiving focus. If diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp index 6145114a3..42d91a914 100644 --- a/kalarm/lib/spinbox.cpp +++ b/kalarm/lib/spinbox.cpp @@ -468,9 +468,9 @@ int SpinBox::shiftStepAdjustment(int oldValue, int shiftStep) */ int SpinBox::whichButton(const TQPoint& pos) { - if (upRect().contains(pos)) + if (upRect().tqcontains(pos)) return UP; - if (downRect().contains(pos)) + if (downRect().tqcontains(pos)) return DOWN; return NO_BUTTON; } diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp index 48b88d51c..db74cc595 100644 --- a/kalarm/lib/spinbox2.cpp +++ b/kalarm/lib/spinbox2.cpp @@ -142,7 +142,7 @@ void SpinBox2::setLineStep(int step) { mLineStep = step; if (reverseButtons()) - mUpdown2->setLineStep(step); // reverse layout, but still set the right buttons + mUpdown2->setLineStep(step); // reverse tqlayout, 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 layout, but still set the right buttons + mUpdown2->setLineStep(line); // reverse tqlayout, 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 layout, but still set the right buttons + mUpdown2->setLineShiftStep(line); // reverse tqlayout, but still set the right buttons mSpinbox->setLineShiftStep(page); } else @@ -225,18 +225,18 @@ void SpinBox2::showEvent(TQShowEvent*) arrange(); } -TQSize SpinBox2::sizeHint() const +TQSize SpinBox2::tqsizeHint() const { getMetrics(); - TQSize size = mSpinbox->sizeHint(); + TQSize size = mSpinbox->tqsizeHint(); size.setWidth(size.width() - xSpinbox + wUpdown2 + wGap); return size; } -TQSize SpinBox2::minimumSizeHint() const +TQSize SpinBox2::tqminimumSizeHint() const { getMetrics(); - TQSize size = mSpinbox->minimumSizeHint(); + TQSize size = mSpinbox->tqminimumSizeHint(); size.setWidth(size.width() - xSpinbox + wUpdown2 + wGap); return size; } @@ -251,7 +251,7 @@ void SpinBox2::styleChange(TQStyle&) } /****************************************************************************** -* Called when the extra pair of spin buttons has repainted after a style change. +* Called when the extra pair of spin buttons has tqrepainted after a style change. * Updates the mirror image of the spin buttons. */ void SpinBox2::updateMirror() @@ -265,14 +265,14 @@ void SpinBox2::updateMirror() void SpinBox2::arrange() { getMetrics(); - TQRect arrowRect = TQStyle::visualRect(TQRect(0, 0, wUpdown2, height()), this); + TQRect arrowRect = TQStyle::tqvisualRect(TQRect(0, 0, wUpdown2, height()), this); mUpdown2Frame->setGeometry(arrowRect); mUpdown2->setGeometry(-xUpdown2, 0, mUpdown2->width(), height()); - mSpinboxFrame->setGeometry(TQStyle::visualRect(TQRect(wUpdown2 + wGap, 0, width() - wUpdown2 - wGap, height()), this)); + mSpinboxFrame->setGeometry(TQStyle::tqvisualRect(TQRect(wUpdown2 + wGap, 0, width() - wUpdown2 - wGap, height()), this)); mSpinbox->setGeometry(-xSpinbox, 0, mSpinboxFrame->width() + xSpinbox, height()); mSpinMirror->resize(wUpdown2, mUpdown2->height()); mSpinMirror->setGeometry(arrowRect); -//mSpinMirror->setGeometry(TQStyle::visualRect(TQRect(0, 11, wUpdown2, height()), this)); +//mSpinMirror->setGeometry(TQStyle::tqvisualRect(TQRect(0, 11, wUpdown2, height()), this)); mSpinMirror->setNormalButtons(TQPixmap::grabWidget(mUpdown2Frame, 0, 0)); } diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h index 06a48d1af..b1d2927d4 100644 --- a/kalarm/lib/spinbox2.h +++ b/kalarm/lib/spinbox2.h @@ -114,8 +114,8 @@ class SpinBox2 : public QFrame */ bool wrapping() const { return mSpinbox->wrapping(); } - /** Set the text alignment of the widget */ - void setAlignment(int a) { mSpinbox->setAlignment(a); } + /** Set the text tqalignment of the widget */ + void tqsetAlignment(int a) { mSpinbox->tqsetAlignment(a); } /** Sets the button symbols to use (arrows or plus/minus). */ virtual void setButtonSymbols(TQSpinBox::ButtonSymbols); /** Returns the button symbols currently in use (arrows or plus/minus). */ @@ -130,8 +130,8 @@ class SpinBox2 : public QFrame */ const TQValidator* validator() const { return mSpinbox->validator(); } - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** Returns the minimum value of the spin box. */ int minValue() const { return mMinValue; } @@ -148,13 +148,13 @@ class SpinBox2 : public QFrame /** Returns the specified value clamped to the range of the spin box. */ int bound(int val) const; - /** Returns the geometry of the right-hand "up" button. */ + /** Returns the tqgeometry of the right-hand "up" button. */ TQRect upRect() const { return mSpinbox->upRect(); } - /** Returns the geometry of the right-hand "down" button. */ + /** Returns the tqgeometry of the right-hand "down" button. */ TQRect downRect() const { return mSpinbox->downRect(); } - /** Returns the geometry of the left-hand "up" button. */ + /** Returns the tqgeometry of the left-hand "up" button. */ TQRect up2Rect() const; - /** Returns the geometry of the left-hand "down" button. */ + /** Returns the tqgeometry of the left-hand "down" button. */ TQRect down2Rect() const; /** Returns the unshifted step increment for the right-hand spin buttons, @@ -285,7 +285,7 @@ class SpinBox2 : public QFrame : SpinBox(parent, name), owner(sb2) { } MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* parent, const char* name = 0) : SpinBox(minValue, maxValue, step, parent, name), owner(sb2) { } - void setAlignment(int a) { editor()->setAlignment(a); } + void tqsetAlignment(int a) { editor()->tqsetAlignment(a); } virtual TQString mapValueToText(int v) { return owner->mapValueToText(v); } virtual int mapTextToValue(bool* ok) { return owner->mapTextToValue(ok); } TQString mapValToText(int v) { return SpinBox::mapValueToText(v); } @@ -298,8 +298,8 @@ class SpinBox2 : public QFrame enum { NO_BUTTON = -1, UP, DOWN, UP2, DOWN2 }; static int mReverseLayout; // widgets are mirrored right to left - TQFrame* mUpdown2Frame; // contains visible part of the extra pair of spin buttons - TQFrame* mSpinboxFrame; // contains the main spin box + TQFrame* mUpdown2Frame; // tqcontains visible part of the extra pair of spin buttons + TQFrame* mSpinboxFrame; // tqcontains the main spin box ExtraSpinBox* mUpdown2; // the extra pair of spin buttons MainSpinBox* mSpinbox; // the visible spin box SpinMirror* mSpinMirror; // image of the extra pair of spin buttons @@ -309,7 +309,7 @@ class SpinBox2 : public QFrame 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 layout (default = true) + bool mReverseWithLayout; // reverse button positions if reverse tqlayout (default = true) friend class MainSpinBox; }; diff --git a/kalarm/lib/spinbox2private.h b/kalarm/lib/spinbox2private.h index 682c84b8d..d25579f9d 100644 --- a/kalarm/lib/spinbox2private.h +++ b/kalarm/lib/spinbox2private.h @@ -45,7 +45,7 @@ class ExtraSpinBox : public SpinBox virtual void paintEvent(TQPaintEvent*); virtual void styleChange(TQStyle&) { mNewStylePending = true; } private: - bool mNewStylePending; // style has changed, but not yet repainted + bool mNewStylePending; // style has changed, but not yet tqrepainted }; diff --git a/kalarm/lib/synchtimer.cpp b/kalarm/lib/synchtimer.cpp index eecef7d4b..caed93d7b 100644 --- a/kalarm/lib/synchtimer.cpp +++ b/kalarm/lib/synchtimer.cpp @@ -196,7 +196,7 @@ void DailyTimer::changeTime(const TQTime& newTimeOfDay, bool triggerMissed) void DailyTimer::start() { // TIMEZONE = local time - TQDateTime now = TQDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); // Find out whether to trigger today or tomorrow. // In preference, use the last trigger date to determine this, since // that will avoid possible errors due to daylight savings time changes. @@ -224,7 +224,7 @@ void DailyTimer::start() void DailyTimer::slotTimer() { // TIMEZONE = local time - TQDateTime now = TQDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); mLastDate = now.date(); TQDateTime next = TQDateTime(mLastDate.addDays(1), mTime); uint interval = next.toTime_t() - now.toTime_t(); diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp index 01152fcee..170914922 100644 --- a/kalarm/lib/timeedit.cpp +++ b/kalarm/lib/timeedit.cpp @@ -37,13 +37,13 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name) { bool use12hour = KGlobal::locale()->use12Clock(); mSpinBox = new TimeSpinBox(!use12hour, this); - mSpinBox->setFixedSize(mSpinBox->sizeHint()); + mSpinBox->setFixedSize(mSpinBox->tqsizeHint()); connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); if (use12hour) { mAmPm = new ComboBox(this); setAmPmCombo(1, 1); // add "am" and "pm" options to the combo box - mAmPm->setFixedSize(mAmPm->sizeHint()); + mAmPm->setFixedSize(mAmPm->tqsizeHint()); connect(mAmPm, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotAmPmChanged(int))); } } diff --git a/kalarm/lib/timeedit.h b/kalarm/lib/timeedit.h index 9cbfb6f8c..45c0abd8e 100644 --- a/kalarm/lib/timeedit.h +++ b/kalarm/lib/timeedit.h @@ -64,7 +64,7 @@ class TimeEdit : public QHBox * @param readOnly True to set the widget read-only, false to set it read-write. */ virtual void setReadOnly(bool readOnly); - /** Returns true if the widget contains a valid value. */ + /** Returns true if the widget tqcontains a valid value. */ bool isValid() const; /** Sets whether the edit value is valid. * If newly invalid, the value is displayed as asterisks. diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp index e372615a7..291ba0872 100644 --- a/kalarm/lib/timeperiod.cpp +++ b/kalarm/lib/timeperiod.cpp @@ -71,7 +71,7 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name) connect(mTimeSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotTimeChanged(int))); mSpinStack->addWidget(mTimeSpinBox, 1); - mSpinStack->setFixedSize(mSpinBox->sizeHint().expandedTo(mTimeSpinBox->sizeHint())); + mSpinStack->setFixedSize(mSpinBox->tqsizeHint().expandedTo(mTimeSpinBox->tqsizeHint())); mHourMinuteRaised = mNoHourMinute; showHourMin(!mNoHourMinute); @@ -87,7 +87,7 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name) mUnitsCombo->insertItem(i18n_days()); mUnitsCombo->insertItem(i18n_weeks()); mMaxUnitShown = WEEKS; - mUnitsCombo->setFixedSize(mUnitsCombo->sizeHint()); + mUnitsCombo->setFixedSize(mUnitsCombo->tqsizeHint()); connect(mUnitsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUnitsSelected(int))); setFocusProxy(mUnitsCombo); diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp index 20073d878..ea10cb1aa 100644 --- a/kalarm/lib/timespinbox.cpp +++ b/kalarm/lib/timespinbox.cpp @@ -69,7 +69,7 @@ TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name) setReverseWithLayout(false); // keep buttons the same way round even if right-to-left language setShiftSteps(5, 360); // shift-left button increments 5 min / 6 hours setSelectOnStep(false); - setAlignment(Qt::AlignHCenter); + tqsetAlignment(Qt::AlignHCenter); connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); } @@ -88,7 +88,7 @@ TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent, const c setReverseWithLayout(false); // keep buttons the same way round even if right-to-left language setShiftSteps(5, 300); // shift-left button increments 5 min / 5 hours setSelectOnStep(false); - setAlignment(TQApplication::reverseLayout() ? Qt::AlignLeft : Qt::AlignRight); + tqsetAlignment(TQApplication::reverseLayout() ? Qt::AlignLeft : Qt::AlignRight); } TQString TimeSpinBox::shiftWhatsThis() @@ -211,7 +211,7 @@ void TimeSpinBox::setValid(bool valid) { mInvalid = true; SpinBox2::setMinValue(mMinimumValue - 1); - setSpecialValueText(TQString::fromLatin1("**:**")); + setSpecialValueText(TQString::tqfromLatin1("**:**")); SpinBox2::setValue(mMinimumValue - 1); } } @@ -280,16 +280,16 @@ void TimeSpinBox::slotValueChanged(int value) mPm = mValidator->mPm = (value >= 720); } -TQSize TimeSpinBox::sizeHint() const +TQSize TimeSpinBox::tqsizeHint() const { - TQSize sz = SpinBox2::sizeHint(); + TQSize sz = SpinBox2::tqsizeHint(); TQFontMetrics fm(font()); return TQSize(sz.width() + fm.width(":"), sz.height()); } -TQSize TimeSpinBox::minimumSizeHint() const +TQSize TimeSpinBox::tqminimumSizeHint() const { - TQSize sz = SpinBox2::minimumSizeHint(); + TQSize sz = SpinBox2::tqminimumSizeHint(); TQFontMetrics fm(font()); return TQSize(sz.width() + fm.width(":"), sz.height()); } diff --git a/kalarm/lib/timespinbox.h b/kalarm/lib/timespinbox.h index 909541ad9..901c97e2e 100644 --- a/kalarm/lib/timespinbox.h +++ b/kalarm/lib/timespinbox.h @@ -90,8 +90,8 @@ class TimeSpinBox : public SpinBox2 */ static TQString shiftWhatsThis(); - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; public slots: /** Sets the value of the spin box. |