diff options
author | Michele Calgaro <[email protected]> | 2023-12-21 11:50:26 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2023-12-27 11:42:03 +0900 |
commit | 3b25eb314a3cc15e6643b8467d0e6345c10e7415 (patch) | |
tree | 450bb13c8e440007bd6a80d0ad09b212539431bb /kalarm | |
parent | f26a304e63a25d11fec3f7896de72fccd64527a5 (diff) | |
download | tdepim-3b25eb314a3cc15e6643b8467d0e6345c10e7415.tar.gz tdepim-3b25eb314a3cc15e6643b8467d0e6345c10e7415.zip |
Replace various '#define' strings - part 6
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 762dc98fa6b143629c75b3bbe277228fb04e8324)
Diffstat (limited to 'kalarm')
-rw-r--r-- | kalarm/alarmtimewidget.cpp | 2 | ||||
-rw-r--r-- | kalarm/birthdaydlg.cpp | 4 | ||||
-rw-r--r-- | kalarm/functions.cpp | 4 | ||||
-rw-r--r-- | kalarm/kalarmapp.cpp | 2 | ||||
-rw-r--r-- | kalarm/lib/colourcombo.cpp | 2 | ||||
-rw-r--r-- | kalarm/lib/label.cpp | 2 | ||||
-rw-r--r-- | kalarm/lib/timespinbox.cpp | 2 | ||||
-rw-r--r-- | kalarm/mainwindow.cpp | 70 | ||||
-rw-r--r-- | kalarm/messagewin.cpp | 12 | ||||
-rw-r--r-- | kalarm/templatedlg.cpp | 4 | ||||
-rw-r--r-- | kalarm/traywindow.cpp | 8 | ||||
-rw-r--r-- | kalarm/undo.cpp | 2 |
12 files changed, 57 insertions, 57 deletions
diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp index 615696cfb..fc2d1635a 100644 --- a/kalarm/alarmtimewidget.cpp +++ b/kalarm/alarmtimewidget.cpp @@ -182,7 +182,7 @@ void AlarmTimeWidget::init(int mode) setButton(id(mAtTimeRadio)); // Timeout every minute to update alarm time fields. - MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(slotTimer())); + MinuteTimer::connect(this, TQT_SLOT(slotTimer())); } /****************************************************************************** diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 322d6fb3d..51a86e945 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -421,7 +421,7 @@ BListView::BListView(TQWidget* parent, const char* name) : TDEListView(parent, name) { TDEAccel* accel = new TDEAccel(this); - accel->insert(TDEStdAccel::SelectAll, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll())); - accel->insert(TDEStdAccel::Deselect, TQT_TQOBJECT(this), TQT_SLOT(slotDeselect())); + accel->insert(TDEStdAccel::SelectAll, this, TQT_SLOT(slotSelectAll())); + accel->insert(TDEStdAccel::Deselect, this, TQT_SLOT(slotDeselect())); accel->readSettings(); } diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 9ae287405..455c27a2c 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -747,7 +747,7 @@ bool readConfigWindowSize(const char* window, TQSize& result) { TDEConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1(window)); - TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop()); + TQWidget* desktop = TDEApplication::desktop(); TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0), config->readNumEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), 0)); if (s.isEmpty()) @@ -764,7 +764,7 @@ void writeConfigWindowSize(const char* window, const TQSize& size) { TDEConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1(window)); - TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop()); + TQWidget* desktop = TDEApplication::desktop(); config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width()); config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height()); config->sync(); diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 476a8c1f8..16186355d 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -109,7 +109,7 @@ KAlarmApp::KAlarmApp() mSpeechEnabled(false) { Preferences::initialise(); - Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferencesChanged())); + Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPreferencesChanged())); KCal::CalFormat::setApplication(aboutData()->programName(), AlarmCalendar::icalProductId()); KARecurrence::setDefaultFeb29Type(Preferences::defaultFeb29Type()); diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp index c859ac6c0..e52501eec 100644 --- a/kalarm/lib/colourcombo.cpp +++ b/kalarm/lib/colourcombo.cpp @@ -41,7 +41,7 @@ ColourCombo::ColourCombo(TQWidget* parent, const char* name, const TQColor& defa addColours(); connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); connect(this, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotHighlighted(int))); - Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferencesChanged())); + Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPreferencesChanged())); } void ColourCombo::setColour(const TQColor& colour) diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp index f2aa91b53..49c176955 100644 --- a/kalarm/lib/label.cpp +++ b/kalarm/lib/label.cpp @@ -55,7 +55,7 @@ void Label::setBuddy(TQWidget* bud) if (w) { while (w->focusProxy()) - w = TQT_TQWIDGET(w->focusProxy()); + w = w->focusProxy(); if (!w->inherits("TQRadioButton")) w = 0; } diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp index 0ac932e69..4bc161fda 100644 --- a/kalarm/lib/timespinbox.cpp +++ b/kalarm/lib/timespinbox.cpp @@ -31,7 +31,7 @@ class TimeSpinBox::TimeValidator : public TQValidator { public: TimeValidator(int minMin, int maxMin, TQWidget* parent, const char* name = 0) - : TQValidator(TQT_TQOBJECT(parent), name), + : TQValidator(parent, name), minMinute(minMin), maxMinute(maxMin), m12Hour(false), mPm(false) { } virtual State validate(TQString&, int&) const; int minMinute, maxMinute; diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index b2f6d4209..0a7a25984 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -182,7 +182,7 @@ MainWindow::~MainWindow() else theApp()->trayWindow()->removeWindow(this); } - MinuteTimer::disconnect(TQT_TQOBJECT(this)); + MinuteTimer::disconnect(this); mMinuteTimerActive = false; // to ensure that setUpdateTimer() works correctly setUpdateTimer(); MainWindow* main = mainMainWindow(); @@ -326,55 +326,55 @@ void MainWindow::columnsReordered() void MainWindow::initActions() { TDEActionCollection* actions = actionCollection(); - mActionTemplates = new TDEAction(i18n("&Templates..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTemplates()), actions, "templates"); - mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actions, "new"); - mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl"); - mActionCreateTemplate = new TDEAction(i18n("Create Tem&plate..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTemplate()), actions, "createTemplate"); - mActionCopy = new TDEAction(i18n("&Copy..."), "edit-copy", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions, "copy"); - mActionModify = new TDEAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotModify()), actions, "modify"); - mActionDelete = new TDEAction(i18n("&Delete"), "edit-delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDelete()), actions, "delete"); - mActionReactivate = new TDEAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReactivate()), actions, "undelete"); - mActionEnable = new TDEAction(TQString(), 0, TQt::CTRL+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotEnable()), actions, "disable"); - mActionView = new TDEAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actions, "view"); - mActionShowTime = new TDEToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotShowTime()), actions, "showAlarmTimes"); + mActionTemplates = new TDEAction(i18n("&Templates..."), 0, this, TQT_SLOT(slotTemplates()), actions, "templates"); + mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), this, TQT_SLOT(slotNew()), actions, "new"); + mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl"); + mActionCreateTemplate = new TDEAction(i18n("Create Tem&plate..."), 0, this, TQT_SLOT(slotNewTemplate()), actions, "createTemplate"); + mActionCopy = new TDEAction(i18n("&Copy..."), "edit-copy", TQt::SHIFT+TQt::Key_Insert, this, TQT_SLOT(slotCopy()), actions, "copy"); + mActionModify = new TDEAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, this, TQT_SLOT(slotModify()), actions, "modify"); + mActionDelete = new TDEAction(i18n("&Delete"), "edit-delete", TQt::Key_Delete, this, TQT_SLOT(slotDelete()), actions, "delete"); + mActionReactivate = new TDEAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, this, TQT_SLOT(slotReactivate()), actions, "undelete"); + mActionEnable = new TDEAction(TQString(), 0, TQt::CTRL+TQt::Key_B, this, TQT_SLOT(slotEnable()), actions, "disable"); + mActionView = new TDEAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, this, TQT_SLOT(slotView()), actions, "view"); + mActionShowTime = new TDEToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, this, TQT_SLOT(slotShowTime()), actions, "showAlarmTimes"); mActionShowTime->setCheckedState(i18n("Hide &Alarm Times")); - mActionShowTimeTo = new TDEToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms"); + mActionShowTimeTo = new TDEToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, this, TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms"); mActionShowTimeTo->setCheckedState(i18n("Hide Time t&o Alarms")); - mActionShowExpired = new TDEToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms"); + mActionShowExpired = new TDEToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, this, TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms"); mActionShowExpired->setCheckedState(i18n_e_HideExpiredAlarms()); - mActionToggleTrayIcon = new TDEToggleAction(i18n("Show in System &Tray"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray"); + mActionToggleTrayIcon = new TDEToggleAction(i18n("Show in System &Tray"), 0, this, TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray"); mActionToggleTrayIcon->setCheckedState(i18n("Hide From System &Tray")); - new TDEAction(i18n("Import &Alarms..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportAlarms()), actions, "importAlarms"); - new TDEAction(i18n("Import &Birthdays..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBirthdays()), actions, "importBirthdays"); - new TDEAction(i18n("&Refresh Alarms"), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResetDaemon()), actions, "refreshAlarms"); + new TDEAction(i18n("Import &Alarms..."), 0, this, TQT_SLOT(slotImportAlarms()), actions, "importAlarms"); + new TDEAction(i18n("Import &Birthdays..."), 0, this, TQT_SLOT(slotBirthdays()), actions, "importBirthdays"); + new TDEAction(i18n("&Refresh Alarms"), "reload", 0, this, TQT_SLOT(slotResetDaemon()), actions, "refreshAlarms"); Daemon::createAlarmEnableAction(actions, "alarmEnable"); if (undoText.isNull()) { // Get standard texts, etc., for Undo and Redo actions - TDEAction* act = KStdAction::undo(TQT_TQOBJECT(this), 0, actions); + TDEAction* act = KStdAction::undo(this, 0, actions); undoIcon = act->icon(); undoShortcut = act->shortcut(); undoText = act->text(); undoTextStripped = KAlarm::stripAccel(undoText); delete act; - act = KStdAction::redo(TQT_TQOBJECT(this), 0, actions); + act = KStdAction::redo(this, 0, actions); redoIcon = act->icon(); redoShortcut = act->shortcut(); redoText = act->text(); redoTextStripped = KAlarm::stripAccel(redoText); delete act; } - mActionUndo = new TDEToolBarPopupAction(undoText, undoIcon, undoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actions, "edit_undo"); - mActionRedo = new TDEToolBarPopupAction(redoText, redoIcon, redoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actions, "edit_redo"); - KStdAction::find(TQT_TQOBJECT(mListView), TQT_SLOT(slotFind()), actions); - mActionFindNext = KStdAction::findNext(TQT_TQOBJECT(mListView), TQT_SLOT(slotFindNext()), actions); - mActionFindPrev = KStdAction::findPrev(TQT_TQOBJECT(mListView), TQT_SLOT(slotFindPrev()), actions); - KStdAction::selectAll(TQT_TQOBJECT(mListView), TQT_SLOT(slotSelectAll()), actions); - KStdAction::deselect(TQT_TQOBJECT(mListView), TQT_SLOT(slotDeselect()), actions); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actions); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actions); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbar()), actions); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actions); + mActionUndo = new TDEToolBarPopupAction(undoText, undoIcon, undoShortcut, this, TQT_SLOT(slotUndo()), actions, "edit_undo"); + mActionRedo = new TDEToolBarPopupAction(redoText, redoIcon, redoShortcut, this, TQT_SLOT(slotRedo()), actions, "edit_redo"); + KStdAction::find(mListView, TQT_SLOT(slotFind()), actions); + mActionFindNext = KStdAction::findNext(mListView, TQT_SLOT(slotFindNext()), actions); + mActionFindPrev = KStdAction::findPrev(mListView, TQT_SLOT(slotFindPrev()), actions); + KStdAction::selectAll(mListView, TQT_SLOT(slotSelectAll()), actions); + KStdAction::deselect(mListView, TQT_SLOT(slotDeselect()), actions); + KStdAction::quit(this, TQT_SLOT(slotQuit()), actions); + KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actions); + KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbar()), actions); + KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actions); setStandardToolBarMenuEnabled(true); createGUI(UI_FILE); @@ -388,7 +388,7 @@ void MainWindow::initActions() connect(mActionRedo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotRedoItem(int))); connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndoStatus(const TQString&, const TQString&))); connect(mListView, TQT_SIGNAL(findActive(bool)), TQT_SLOT(slotFindActive(bool))); - Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPrefsChanged())); + Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPrefsChanged())); connect(theApp(), TQT_SIGNAL(trayIconToggled()), TQT_SLOT(updateTrayIconAction())); // Set menu item states @@ -485,13 +485,13 @@ void MainWindow::setUpdateTimer() { // Timeout every minute. needTimer->mMinuteTimerActive = true; - MinuteTimer::connect(TQT_TQOBJECT(needTimer), TQT_SLOT(slotUpdateTimeTo())); + MinuteTimer::connect(needTimer, TQT_SLOT(slotUpdateTimeTo())); kdDebug(5950) << "MainWindow::setUpdateTimer(): started timer" << endl; } else if (!needTimer && timerWindow) { timerWindow->mMinuteTimerActive = false; - MinuteTimer::disconnect(TQT_TQOBJECT(timerWindow)); + MinuteTimer::disconnect(timerWindow); kdDebug(5950) << "MainWindow::setUpdateTimer(): stopped timer" << endl; } } @@ -1088,7 +1088,7 @@ void MainWindow::slotConfigureToolbar() { saveMainWindowSettings(TDEGlobal::config(), WINDOW_NAME); KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); dlg.exec(); } diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index 3082c449e..f05770d05 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -429,12 +429,12 @@ void MessageWin::initView() if (mDateTime.isDateOnly() || TQDate::currentDate().daysTo(mDateTime.date()) > 0) { setRemainingTextDay(); - MidnightTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextDay())); // update every day + MidnightTimer::connect(this, TQT_SLOT(setRemainingTextDay())); // update every day } else { setRemainingTextMinute(); - MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextMinute())); // update every minute + MinuteTimer::connect(this, TQT_SLOT(setRemainingTextMinute())); // update every minute } topLayout->addWidget(mRemainingText, 0, TQt::AlignHCenter); topLayout->addSpacing(KDialog::spacingHint()); @@ -619,9 +619,9 @@ void MessageWin::setRemainingTextDay() if (days <= 0 && !mDateTime.isDateOnly()) { // The alarm is due today, so start refreshing every minute - MidnightTimer::disconnect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextDay())); + MidnightTimer::disconnect(this, TQT_SLOT(setRemainingTextDay())); setRemainingTextMinute(); - MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextMinute())); // update every minute + MinuteTimer::connect(this, TQT_SLOT(setRemainingTextMinute())); // update every minute } else { @@ -1497,7 +1497,7 @@ void MessageWin::setDeferralLimit(const KAEvent& event) if (mDeferButton) { mDeferLimit = event.deferralLimit().dateTime(); - MidnightTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(checkDeferralLimit())); // check every day + MidnightTimer::connect(this, TQT_SLOT(checkDeferralLimit())); // check every day mDisableDeferral = false; checkDeferralLimit(); } @@ -1519,7 +1519,7 @@ void MessageWin::checkDeferralLimit() int n = TQDate::currentDate().daysTo(mDeferLimit.date()); if (n > 0) return; - MidnightTimer::disconnect(TQT_TQOBJECT(this), TQT_SLOT(checkDeferralLimit())); + MidnightTimer::disconnect(this, TQT_SLOT(checkDeferralLimit())); if (n == 0) { // The deferral limit will be reached today diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp index 3754487a2..7627b8d1e 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -80,8 +80,8 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name) layout->addWidget(mDeleteButton); TDEAccel* accel = new TDEAccel(this); - accel->insert(TDEStdAccel::SelectAll, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotSelectAll())); - accel->insert(TDEStdAccel::Deselect, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotDeselect())); + accel->insert(TDEStdAccel::SelectAll, mTemplateList, TQT_SLOT(slotSelectAll())); + accel->insert(TDEStdAccel::Deselect, mTemplateList, TQT_SLOT(slotDeselect())); accel->readSettings(); mTemplateList->refresh(); diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 9e06c44c8..81eb4a066 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -88,15 +88,15 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name) AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable"); a->plug(contextMenu()); connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledStatus(bool))); - KAlarm::createNewAlarmAction(i18n("&New Alarm..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu()); - KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu()); + KAlarm::createNewAlarmAction(i18n("&New Alarm..."), this, TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu()); + KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu()); + KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu()); // Replace the default handler for the Quit context menu item const char* quitName = KStdAction::name(KStdAction::Quit); actcol->remove(actcol->action(quitName)); actcol->tdeaccel()->remove(quitName); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actcol); + KStdAction::quit(this, TQT_SLOT(slotQuit()), actcol); // Set icon to correspond with the alarms enabled menu status Daemon::checkStatus(); diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp index d1d3602f2..38d152c79 100644 --- a/kalarm/undo.cpp +++ b/kalarm/undo.cpp @@ -207,7 +207,7 @@ Undo::List Undo::mRedoList; Undo* Undo::instance() { if (!mInstance) - mInstance = new Undo(TQT_TQOBJECT(kapp)); + mInstance = new Undo(kapp); return mInstance; } |