diff options
Diffstat (limited to 'kalarm')
-rw-r--r-- | kalarm/alarmlistview.cpp | 2 | ||||
-rw-r--r-- | kalarm/birthdaydlg.cpp | 4 | ||||
-rw-r--r-- | kalarm/dcophandler.cpp | 10 | ||||
-rw-r--r-- | kalarm/editdlg.cpp | 2 | ||||
-rw-r--r-- | kalarm/emailidcombo.cpp | 2 | ||||
-rw-r--r-- | kalarm/find.cpp | 2 | ||||
-rw-r--r-- | kalarm/lib/buttongroup.cpp | 4 | ||||
-rw-r--r-- | kalarm/lib/buttongroup.h | 4 | ||||
-rw-r--r-- | kalarm/lib/checkbox.cpp | 4 | ||||
-rw-r--r-- | kalarm/lib/colourcombo.cpp | 2 | ||||
-rw-r--r-- | kalarm/lib/combobox.cpp | 2 | ||||
-rw-r--r-- | kalarm/lib/dateedit.cpp | 2 | ||||
-rw-r--r-- | kalarm/lib/datetime.h | 2 | ||||
-rw-r--r-- | kalarm/lib/pushbutton.cpp | 4 | ||||
-rw-r--r-- | kalarm/lib/radiobutton.cpp | 4 | ||||
-rw-r--r-- | kalarm/lib/slider.cpp | 6 | ||||
-rw-r--r-- | kalarm/lib/slider.h | 4 | ||||
-rw-r--r-- | kalarm/lib/spinbox.cpp | 8 | ||||
-rw-r--r-- | kalarm/mainwindow.cpp | 2 | ||||
-rw-r--r-- | kalarm/recurrenceedit.cpp | 4 | ||||
-rw-r--r-- | kalarm/sounddlg.cpp | 4 | ||||
-rw-r--r-- | kalarm/traywindow.cpp | 6 |
22 files changed, 42 insertions, 42 deletions
diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index 6d7e5f9e..a436e3d0 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -348,7 +348,7 @@ TQString AlarmListView::whatsThisText(int column) const void AlarmListView::contentsMousePressEvent(TQMouseEvent* e) { TQListView::contentsMousePressEvent(e); - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { TQPoint p(contentsToViewport(e->pos())); if (itemAt(p)) diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index c98a9987..322d6fb3 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -85,7 +85,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) mPrefixText = config->readEntry(TQString::fromLatin1("BirthdayPrefix"), i18n("Birthday: ")); mSuffixText = config->readEntry(TQString::fromLatin1("BirthdaySuffix")); - TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Alarm Text"), topWidget); + TQGroupBox* textGroup = new TQGroupBox(2, TQt::Horizontal, i18n("Alarm Text"), topWidget); topLayout->addWidget(textGroup); TQLabel* label = new TQLabel(i18n("Pre&fix:"), textGroup); mPrefix = new BLineEdit(mPrefixText, textGroup); @@ -105,7 +105,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) i18n("Enter text to appear after the person's name in the alarm message, " "including any necessary leading spaces.")); - TQGroupBox* group = new TQGroupBox(1, Qt::Horizontal, i18n("Select Birthdays"), topWidget); + TQGroupBox* group = new TQGroupBox(1, TQt::Horizontal, i18n("Select Birthdays"), topWidget); topLayout->addWidget(group); mAddresseeList = new BListView(group); mAddresseeList->setMultiSelection(true); diff --git a/kalarm/dcophandler.cpp b/kalarm/dcophandler.cpp index 5fa716e1..45eddac6 100644 --- a/kalarm/dcophandler.cpp +++ b/kalarm/dcophandler.cpp @@ -323,7 +323,7 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime) if (startDateTime.length() > 10) { // Both a date and a time are specified - start = TQDateTime::fromString(startDateTime, Qt::ISODate); + start = TQDateTime::fromString(startDateTime, TQt::ISODate); } else { @@ -337,12 +337,12 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime) if (t.isEmpty()) { // It's a date - start = TQDate::fromString(startDateTime, Qt::ISODate); + start = TQDate::fromString(startDateTime, TQt::ISODate); } else { // It's a time, so use today as the date - start.set(TQDate::currentDate(), TQTime::fromString(t, Qt::ISODate)); + start.set(TQDate::currentDate(), TQTime::fromString(t, TQt::ISODate)); } } if (!start.isValid()) @@ -424,7 +424,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c kdError(5950) << "DCOP call: alarm is date-only, but recurrence end is date/time" << endl; return false; } - end.setDate(TQDate::fromString(endDateTime, Qt::ISODate)); + end.setDate(TQDate::fromString(endDateTime, TQt::ISODate)); } else { @@ -433,7 +433,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c kdError(5950) << "DCOP call: alarm is timed, but recurrence end is date-only" << endl; return false; } - end = TQDateTime::fromString(endDateTime, Qt::ISODate); + end = TQDateTime::fromString(endDateTime, TQt::ISODate); } if (!end.isValid()) { diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index ff35e918..5ceb16e1 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -273,7 +273,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par layout->addWidget(mEmailFrame); // Deferred date/time: visible only for a deferred recurring event. - mDeferGroup = new TQGroupBox(1, Qt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup"); + mDeferGroup = new TQGroupBox(1, TQt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup"); topLayout->addWidget(mDeferGroup); TQLabel* label = new TQLabel(i18n("Deferred to:"), mDeferGroup); label->setFixedSize(label->sizeHint()); diff --git a/kalarm/emailidcombo.cpp b/kalarm/emailidcombo.cpp index 99f754c8..88cf3900 100644 --- a/kalarm/emailidcombo.cpp +++ b/kalarm/emailidcombo.cpp @@ -31,7 +31,7 @@ void EmailIdCombo::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } KPIM::IdentityCombo::mousePressEvent(e); diff --git a/kalarm/find.cpp b/kalarm/find.cpp index 8e35cbe9..8882b6b2 100644 --- a/kalarm/find.cpp +++ b/kalarm/find.cpp @@ -113,7 +113,7 @@ void Find::display() "This option is only available if expired alarms are currently being displayed.")); grid->addWidget(mExpired, 1, 2, TQt::AlignAuto); - mActiveExpiredSep = new KSeparator(Qt::Horizontal, kalarmWidgets); + mActiveExpiredSep = new KSeparator(TQt::Horizontal, kalarmWidgets); grid->addMultiCellWidget(mActiveExpiredSep, 2, 2, 0, 2); // Alarm actions diff --git a/kalarm/lib/buttongroup.cpp b/kalarm/lib/buttongroup.cpp index 01864012..e3d47e41 100644 --- a/kalarm/lib/buttongroup.cpp +++ b/kalarm/lib/buttongroup.cpp @@ -38,13 +38,13 @@ ButtonGroup::ButtonGroup(const TQString& title, TQWidget* parent, const char* na connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); } -ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name) +ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, TQWidget* parent, const char* name) : TQButtonGroup(strips, orient, parent, name) { connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); } -ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name) +ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, const TQString& title, TQWidget* parent, const char* name) : TQButtonGroup(strips, orient, title, parent, name) { connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); diff --git a/kalarm/lib/buttongroup.h b/kalarm/lib/buttongroup.h index 1f72bda7..f26ab26d 100644 --- a/kalarm/lib/buttongroup.h +++ b/kalarm/lib/buttongroup.h @@ -57,7 +57,7 @@ class ButtonGroup : public TQButtonGroup * @param parent The parent object of this widget. * @param name The name of this widget. */ - ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name = 0); + ButtonGroup(int strips, TQt::Orientation orient, TQWidget* parent, const char* name = 0); /** Constructor. * @param strips The number of rows or columns of buttons. * @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group. @@ -65,7 +65,7 @@ class ButtonGroup : public TQButtonGroup * @param parent The parent object of this widget. * @param name The name of this widget. */ - ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = 0); + ButtonGroup(int strips, TQt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = 0); /** Inserts a button in the group. * This overrides the insert() method of TQButtonGroup, which should really be a virtual method... * @param button The button to insert. diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp index b4b56bc1..a1f594bc 100644 --- a/kalarm/lib/checkbox.cpp +++ b/kalarm/lib/checkbox.cpp @@ -86,7 +86,7 @@ void CheckBox::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQCheckBox::mousePressEvent(e); @@ -97,7 +97,7 @@ void CheckBox::mouseReleaseEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQCheckBox::mouseReleaseEvent(e); diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp index 625933c7..c859ac6c 100644 --- a/kalarm/lib/colourcombo.cpp +++ b/kalarm/lib/colourcombo.cpp @@ -208,7 +208,7 @@ void ColourCombo::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQComboBox::mousePressEvent(e); diff --git a/kalarm/lib/combobox.cpp b/kalarm/lib/combobox.cpp index 99577506..253881f5 100644 --- a/kalarm/lib/combobox.cpp +++ b/kalarm/lib/combobox.cpp @@ -47,7 +47,7 @@ void ComboBox::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQComboBox::mousePressEvent(e); diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp index 29475f71..051e3a64 100644 --- a/kalarm/lib/dateedit.cpp +++ b/kalarm/lib/dateedit.cpp @@ -91,7 +91,7 @@ void DateEdit::mousePressEvent(TQMouseEvent *e) if (isReadOnly()) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } KDateEdit::mousePressEvent(e); diff --git a/kalarm/lib/datetime.h b/kalarm/lib/datetime.h index d75aa94d..6b620494 100644 --- a/kalarm/lib/datetime.h +++ b/kalarm/lib/datetime.h @@ -169,7 +169,7 @@ class DateTime * If it is a date-time, both time and date are included in the output. * If it is date-only, only the date is included in the output. */ - TQString toString(Qt::DateFormat f = Qt::TextDate) const + TQString toString(TQt::DateFormat f = TQt::TextDate) const { if (mDateOnly) return mDateTime.date().toString(f); diff --git a/kalarm/lib/pushbutton.cpp b/kalarm/lib/pushbutton.cpp index be39e801..d47c1d9f 100644 --- a/kalarm/lib/pushbutton.cpp +++ b/kalarm/lib/pushbutton.cpp @@ -55,7 +55,7 @@ void PushButton::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQPushButton::mousePressEvent(e); @@ -66,7 +66,7 @@ void PushButton::mouseReleaseEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQPushButton::mouseReleaseEvent(e); diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp index 8eae0825..e9f60430 100644 --- a/kalarm/lib/radiobutton.cpp +++ b/kalarm/lib/radiobutton.cpp @@ -86,7 +86,7 @@ void RadioButton::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQRadioButton::mousePressEvent(e); @@ -97,7 +97,7 @@ void RadioButton::mouseReleaseEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQRadioButton::mouseReleaseEvent(e); diff --git a/kalarm/lib/slider.cpp b/kalarm/lib/slider.cpp index 189c8941..5ee7a65a 100644 --- a/kalarm/lib/slider.cpp +++ b/kalarm/lib/slider.cpp @@ -26,12 +26,12 @@ Slider::Slider(TQWidget* parent, const char* name) mReadOnly(false) { } -Slider::Slider(Qt::Orientation o, TQWidget* parent, const char* name) +Slider::Slider(TQt::Orientation o, TQWidget* parent, const char* name) : TQSlider(o, parent, name), mReadOnly(false) { } -Slider::Slider(int minval, int maxval, int pageStep, int value, Qt::Orientation o, TQWidget* parent, const char* name) +Slider::Slider(int minval, int maxval, int pageStep, int value, TQt::Orientation o, TQWidget* parent, const char* name) : TQSlider(minval, maxval, pageStep, value, o, parent, name), mReadOnly(false) { } @@ -54,7 +54,7 @@ void Slider::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQSlider::mousePressEvent(e); diff --git a/kalarm/lib/slider.h b/kalarm/lib/slider.h index bb13dc76..dc36e3ce 100644 --- a/kalarm/lib/slider.h +++ b/kalarm/lib/slider.h @@ -50,7 +50,7 @@ class Slider : public TQSlider * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit Slider(Qt::Orientation orient, TQWidget* parent = 0, const char* name = 0); + explicit Slider(TQt::Orientation orient, TQWidget* parent = 0, const char* name = 0); /** Constructor. * @param minValue The minimum value which the slider can have. * @param maxValue The maximum value which the slider can have. @@ -60,7 +60,7 @@ class Slider : public TQSlider * @param parent The parent object of this widget. * @param name The name of this widget. */ - Slider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orient, + Slider(int minValue, int maxValue, int pageStep, int value, TQt::Orientation orient, TQWidget* parent = 0, const char* name = 0); /** Returns true if the slider is read only. */ bool isReadOnly() const { return mReadOnly; } diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp index b250b9aa..80adc6d8 100644 --- a/kalarm/lib/spinbox.cpp +++ b/kalarm/lib/spinbox.cpp @@ -263,7 +263,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) case TQEvent::MouseButtonDblClick: { TQMouseEvent* me = (TQMouseEvent*)e; - if (me->button() == Qt::LeftButton) + if (me->button() == TQt::LeftButton) { // It's a left button press. Set normal or shift stepping as appropriate. if (mReadOnly) @@ -281,7 +281,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) case TQEvent::MouseButtonRelease: { TQMouseEvent* me = (TQMouseEvent*)e; - if (me->button() == Qt::LeftButton && mShiftMouse) + if (me->button() == TQt::LeftButton && mShiftMouse) { setShiftStepping(false, mCurrentButton); // cancel shift stepping return false; // forward event to the destination widget @@ -291,7 +291,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) case TQEvent::MouseMove: { TQMouseEvent* me = (TQMouseEvent*)e; - if (me->state() & Qt::LeftButton) + if (me->state() & TQt::LeftButton) { // The left button is down. Track which spin button it's in. if (mReadOnly) @@ -325,7 +325,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) TQKeyEvent* ke = (TQKeyEvent*)e; int key = ke->key(); int state = ke->state(); - if ((state & Qt::LeftButton) + if ((state & TQt::LeftButton) && (key == TQt::Key_Shift || key == TQt::Key_Alt)) { // The left mouse button is down, and the Shift or Alt key has changed diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index d0791216..b2f6d420 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -1350,7 +1350,7 @@ void MainWindow::slotContextMenuRequested(TQListViewItem* item, const TQPoint& p */ void MainWindow::slotMouseClicked(int button, TQListViewItem* item, const TQPoint& pt, int) { - if (button != Qt::RightButton && !item) + if (button != TQt::RightButton && !item) { kdDebug(5950) << "MainWindow::slotMouseClicked(left)" << endl; mListView->clearSelection(); diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index 11133253..7c04c1db 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -103,7 +103,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name * selection of its corresponding radio button. */ - TQGroupBox* recurGroup = new TQGroupBox(1, Qt::Vertical, i18n("Recurrence Rule"), this, "recurGroup"); + TQGroupBox* recurGroup = new TQGroupBox(1, TQt::Vertical, i18n("Recurrence Rule"), this, "recurGroup"); topLayout->addWidget(recurGroup); TQFrame* ruleFrame = new TQFrame(recurGroup, "ruleFrame"); layout = new TQVBoxLayout(ruleFrame, 0); @@ -111,7 +111,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name layout = new TQHBoxLayout(layout, 0); TQBoxLayout* lay = new TQVBoxLayout(layout, 0); - mRuleButtonGroup = new ButtonGroup(1, Qt::Horizontal, ruleFrame); + mRuleButtonGroup = new ButtonGroup(1, TQt::Horizontal, ruleFrame); mRuleButtonGroup->setInsideMargin(0); mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame); lay->addWidget(mRuleButtonGroup); diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index cb539512..d7dc7738 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -133,7 +133,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad i18n("Select to choose the volume for playing the sound file.")); // Volume slider - mVolumeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, box); + mVolumeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, box); mVolumeSlider->setTickmarks(TQSlider::Below); mVolumeSlider->setTickInterval(10); mVolumeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); @@ -168,7 +168,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad grid->addWidget(mFadeVolumeBox, 4, 2); label = new TQLabel(i18n("Initial volume:"), mFadeVolumeBox); label->setFixedSize(label->sizeHint()); - mFadeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, mFadeVolumeBox); + mFadeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, mFadeVolumeBox); mFadeSlider->setTickmarks(TQSlider::Below); mFadeSlider->setTickInterval(10); mFadeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 93afa2e5..9e06c44c 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -173,12 +173,12 @@ void TrayWindow::setEnabledStatus(bool status) */ void TrayWindow::mousePressEvent(TQMouseEvent* e) { - if (e->button() == Qt::LeftButton && !theApp()->wantRunInSystemTray()) + if (e->button() == TQt::LeftButton && !theApp()->wantRunInSystemTray()) { // Left click: display/hide the first main window mAssocMainWindow = MainWindow::toggleWindow(mAssocMainWindow); } - else if (e->button() == Qt::MidButton) + else if (e->button() == TQt::MidButton) MainWindow::executeNew(); // display a New Alarm dialog else KSystemTray::mousePressEvent(e); @@ -191,7 +191,7 @@ void TrayWindow::mousePressEvent(TQMouseEvent* e) */ void TrayWindow::mouseReleaseEvent(TQMouseEvent* e) { - if (e->button() == Qt::LeftButton && mAssocMainWindow && mAssocMainWindow->isVisible()) + if (e->button() == TQt::LeftButton && mAssocMainWindow && mAssocMainWindow->isVisible()) { mAssocMainWindow->raise(); mAssocMainWindow->setActiveWindow(); |