From fd5d099065a748cac49e20a13481f85666c53c71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:12 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kalarm/birthdaydlg.cpp | 8 +++---- kalarm/birthdaydlg.h | 4 ++-- kalarm/daemon.cpp | 6 ++--- kalarm/daemon.h | 8 +++---- kalarm/eventlistviewbase.cpp | 10 ++++----- kalarm/eventlistviewbase.h | 6 ++--- kalarm/fontcolour.cpp | 2 +- kalarm/fontcolour.h | 2 +- kalarm/functions.cpp | 10 ++++----- kalarm/functions.h | 12 +++++----- kalarm/kalarmapp.cpp | 4 ++-- kalarm/mainwindow.cpp | 52 +++++++++++++++++++++---------------------- kalarm/mainwindow.h | 48 +++++++++++++++++++-------------------- kalarm/mainwindowbase.cpp | 4 ++-- kalarm/mainwindowbase.h | 4 ++-- kalarm/templatedlg.cpp | 6 ++--- kalarm/templatemenuaction.cpp | 8 +++---- kalarm/templatemenuaction.h | 4 ++-- kalarm/traywindow.cpp | 4 ++-- kalarm/traywindow.h | 4 ++-- 20 files changed, 103 insertions(+), 103 deletions(-) (limited to 'kalarm') diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 76b040da..6928cc60 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -418,10 +418,10 @@ TQString AddresseeItem::key(int column, bool) const =============================================================================*/ BListView::BListView(TQWidget* parent, const char* name) - : KListView(parent, name) + : TDEListView(parent, name) { - KAccel* accel = new KAccel(this); - accel->insert(KStdAccel::SelectAll, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll())); - accel->insert(KStdAccel::Deselect, TQT_TQOBJECT(this), TQT_SLOT(slotDeselect())); + 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->readSettings(); } diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h index c8851f1b..e680880e 100644 --- a/kalarm/birthdaydlg.h +++ b/kalarm/birthdaydlg.h @@ -27,7 +27,7 @@ #include "alarmevent.h" class TQCheckBox; -class KListView; +class TDEListView; class CheckBox; class FontColourButton; class SoundPicker; @@ -92,7 +92,7 @@ class BLineEdit : public TQLineEdit virtual void focusOutEvent(TQFocusEvent*) { emit focusLost(); } }; -class BListView : public KListView +class BListView : public TDEListView { Q_OBJECT diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index 1c37f974..db9b3b04 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -566,7 +566,7 @@ void Daemon::slotPreferencesChanged() /****************************************************************************** * Create an "Alarms Enabled/Enable Alarms" action. */ -AlarmEnableAction* Daemon::createAlarmEnableAction(KActionCollection* actions, const char* name) +AlarmEnableAction* Daemon::createAlarmEnableAction(TDEActionCollection* actions, const char* name) { AlarmEnableAction* a = new AlarmEnableAction(0, actions, name); connect(a, TQT_SIGNAL(userClicked(bool)), mInstance, TQT_SLOT(setAlarmsEnabled(bool))); @@ -724,7 +724,7 @@ void NotificationHandler::registered(bool reregister, int result, int version) =============================================================================*/ AlarmEnableAction::AlarmEnableAction(int accel, TQObject* parent, const char* name) - : KToggleAction(i18n("Enable &Alarms"), accel, parent, name), + : TDEToggleAction(i18n("Enable &Alarms"), accel, parent, name), mInitialised(false) { setCheckedState(i18n("Disable &Alarms")); @@ -740,7 +740,7 @@ void AlarmEnableAction::setCheckedActual(bool running) kdDebug(5950) << "AlarmEnableAction::setCheckedActual(" << running << ")\n"; if (running != isChecked() || !mInitialised) { - KToggleAction::setChecked(running); + TDEToggleAction::setChecked(running); emit switched(running); } } diff --git a/kalarm/daemon.h b/kalarm/daemon.h index 775833d3..80afd273 100644 --- a/kalarm/daemon.h +++ b/kalarm/daemon.h @@ -28,7 +28,7 @@ #include #include -class KActionCollection; +class TDEActionCollection; class AlarmCalendar; class AlarmEnableAction; class NotificationHandler; @@ -42,7 +42,7 @@ class Daemon : public TQObject static void initialise(); static void createDcopHandler(); static bool isDcopHandlerReady() { return mDcopHandler; } - static AlarmEnableAction* createAlarmEnableAction(KActionCollection*, const char* name); + static AlarmEnableAction* createAlarmEnableAction(TDEActionCollection*, const char* name); static bool start(); static bool reregister() { return registerWith(true); } static bool reset(); @@ -117,7 +117,7 @@ class Daemon : public TQObject = Class: AlarmEnableAction =============================================================================*/ -class AlarmEnableAction : public KToggleAction +class AlarmEnableAction : public TDEToggleAction { Q_OBJECT @@ -127,7 +127,7 @@ class AlarmEnableAction : public KToggleAction void setCheckedActual(bool); // set state and emit switched() signal virtual void setChecked(bool); // request state change and emit userClicked() signal signals: - void switched(bool); // state has changed (KToggleAction::toggled() is only emitted when clicked by user) + void switched(bool); // state has changed (TDEToggleAction::toggled() is only emitted when clicked by user) void userClicked(bool); // user has clicked the control (param = desired state) private: bool mInitialised; diff --git a/kalarm/eventlistviewbase.cpp b/kalarm/eventlistviewbase.cpp index a8f5b4d1..f093fa87 100644 --- a/kalarm/eventlistviewbase.cpp +++ b/kalarm/eventlistviewbase.cpp @@ -46,7 +46,7 @@ class EventListWhatsThisBase : public TQWhatsThis =============================================================================*/ EventListViewBase::EventListViewBase(TQWidget* parent, const char* name) - : KListView(parent, name), + : TDEListView(parent, name), mFind(0), mLastColumn(-1), mLastColumnHeaderWidth(0) @@ -237,7 +237,7 @@ void EventListViewBase::slotDeselect() */ bool EventListViewBase::anySelected() const { - for (TQListViewItem* item = KListView::firstChild(); item; item = item->nextSibling()) + for (TQListViewItem* item = TDEListView::firstChild(); item; item = item->nextSibling()) if (isSelected(item)) return true; return false; @@ -263,7 +263,7 @@ const KAEvent* EventListViewBase::selectedEvent() const EventListViewItemBase* EventListViewBase::selectedItem() const { if (selectionMode() == TQListView::Single) - return (EventListViewItemBase*)KListView::selectedItem(); + return (EventListViewItemBase*)TDEListView::selectedItem(); TQListViewItem* item = 0; for (TQListViewItem* it = firstChild(); it; it = it->nextSibling()) @@ -346,7 +346,7 @@ void EventListViewBase::resizeLastColumn() */ void EventListViewBase::resizeEvent(TQResizeEvent* re) { - KListView::resizeEvent(re); + TDEListView::resizeEvent(re); resizeLastColumn(); } @@ -357,7 +357,7 @@ void EventListViewBase::resizeEvent(TQResizeEvent* re) */ void EventListViewBase::showEvent(TQShowEvent* se) { - KListView::showEvent(se); + TDEListView::showEvent(se); resizeLastColumn(); } diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h index 6024a4b5..d733e19b 100644 --- a/kalarm/eventlistviewbase.h +++ b/kalarm/eventlistviewbase.h @@ -33,7 +33,7 @@ class EventListViewItemBase; class Find; -class EventListViewBase : public KListView +class EventListViewBase : public TDEListView { Q_OBJECT @@ -60,8 +60,8 @@ class EventListViewBase : public KListView { modifyEvent(oldEventID, event, list, selectionView); } void resizeLastColumn(); int itemHeight(); - EventListViewItemBase* currentItem() const { return (EventListViewItemBase*)KListView::currentItem(); } - EventListViewItemBase* firstChild() const { return (EventListViewItemBase*)KListView::firstChild(); } + EventListViewItemBase* currentItem() const { return (EventListViewItemBase*)TDEListView::currentItem(); } + EventListViewItemBase* firstChild() const { return (EventListViewItemBase*)TDEListView::firstChild(); } bool anySelected() const; // are any items selected? const KAEvent* selectedEvent() const; EventListViewItemBase* selectedItem() const; diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp index 4273125a..e4b92243 100644 --- a/kalarm/fontcolour.cpp +++ b/kalarm/fontcolour.cpp @@ -116,7 +116,7 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, else mDefaultFont = 0; - mFontChooser = new KFontChooser(page, name, onlyFixed, fontList, false, visibleListSize); + mFontChooser = new TDEFontChooser(page, name, onlyFixed, fontList, false, visibleListSize); mFontChooser->installEventFilter(this); // for read-only mode const TQObjectList* kids = mFontChooser->queryList(); for (TQObjectList::ConstIterator it = kids->constBegin(); it != kids->constEnd(); ++it) diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h index 4c36113c..188324d6 100644 --- a/kalarm/fontcolour.h +++ b/kalarm/fontcolour.h @@ -70,7 +70,7 @@ private: ColourCombo* mFgColourButton; // or null ColourCombo* mBgColourButton; TQPushButton* mRemoveColourButton; - KFontChooser* mFontChooser; + TDEFontChooser* mFontChooser; CheckBox* mDefaultFont; // or null ColourList mColourList; bool mReadOnly; diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index e637f22f..1177d23c 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -107,17 +107,17 @@ MainWindow* displayMainWindowSelected(const TQString& eventID) } /****************************************************************************** -* Create a New Alarm KAction. +* Create a New Alarm TDEAction. */ -KAction* createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, KActionCollection* actions, const char* name) +TDEAction* createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, TDEActionCollection* actions, const char* name) { - return new KAction(label, "filenew", KStdAccel::openNew(), receiver, slot, actions, name); + return new TDEAction(label, "filenew", TDEStdAccel::openNew(), receiver, slot, actions, name); } /****************************************************************************** -* Create a New From Template KAction. +* Create a New From Template TDEAction. */ -TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* receiver, const char* slot, KActionCollection* actions, const char* name) +TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* receiver, const char* slot, TDEActionCollection* actions, const char* name) { return new TemplateMenuAction(label, "new_from_template", receiver, slot, actions, name); } diff --git a/kalarm/functions.h b/kalarm/functions.h index 9d5b1900..ab97c6ec 100644 --- a/kalarm/functions.h +++ b/kalarm/functions.h @@ -31,8 +31,8 @@ class TQObject; class TQWidget; class TQString; -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; namespace KCal { class Event; } class KAEvent; class MainWindow; @@ -80,10 +80,10 @@ TQString browseFile(const TQString& caption, TQString& defaultDir, c const TQString& filter = TQString(), int mode = 0, TQWidget* parent = 0, const char* name = 0); bool edit(const TQString& eventID); bool editNew(const TQString& templateName = TQString()); -/** Create a "New Alarm" KAction */ -KAction* createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, KActionCollection*, const char* name); -/** Create a "New From Template" KAction */ -TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* receiver, const char* slot, KActionCollection*, const char* name); +/** Create a "New Alarm" TDEAction */ +TDEAction* createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, TDEActionCollection*, const char* name); +/** Create a "New From Template" TDEAction */ +TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* receiver, const char* slot, TDEActionCollection*, const char* name); /** Returns a list of all alarm templates. * If shell commands are disabled, command alarm templates are omitted. */ diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 2bf26d68..a971d98f 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -202,9 +202,9 @@ bool KAlarmApp::restoreSession() return true; } MainWindow* trayParent = 0; - for (int i = 1; KMainWindow::canBeRestored(i); ++i) + for (int i = 1; TDEMainWindow::canBeRestored(i); ++i) { - TQString type = KMainWindow::classNameOfToplevel(i); + TQString type = TDEMainWindow::classNameOfToplevel(i); if (type == TQString::fromLatin1("MainWindow")) { MainWindow* win = MainWindow::create(true); diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index 08706246..95a988ad 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -80,11 +80,11 @@ static const TQString SHOW_RESOURCES_KEY = TQString::fromLatin1("ShowResources") static TQString undoText; static TQString undoTextStripped; static TQString undoIcon; -static KShortcut undoShortcut; +static TDEShortcut undoShortcut; static TQString redoText; static TQString redoTextStripped; static TQString redoIcon; -static KShortcut redoShortcut; +static TDEShortcut redoShortcut; /*============================================================================= @@ -188,7 +188,7 @@ MainWindow::~MainWindow() MainWindow* main = mainMainWindow(); if (main) KAlarm::writeConfigWindowSize(WINDOW_NAME, main->size()); - KToolBar* tb = toolBar(); + TDEToolBar* tb = toolBar(); if (tb) tb->saveSettings(TDEGlobal::config(), "Toolbars"); TDEGlobal::config()->sync(); // save any new window size to disc @@ -325,33 +325,33 @@ void MainWindow::columnsReordered() */ void MainWindow::initActions() { - KActionCollection* actions = actionCollection(); - mActionTemplates = new KAction(i18n("&Templates..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTemplates()), actions, "templates"); + 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 KAction(i18n("Create Tem&plate..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTemplate()), actions, "createTemplate"); - mActionCopy = new KAction(i18n("&Copy..."), "editcopy", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions, "copy"); - mActionModify = new KAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotModify()), actions, "modify"); - mActionDelete = new KAction(i18n("&Delete"), "editdelete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDelete()), actions, "delete"); - mActionReactivate = new KAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReactivate()), actions, "undelete"); - mActionEnable = new KAction(TQString(), 0, TQt::CTRL+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotEnable()), actions, "disable"); - mActionView = new KAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actions, "view"); - mActionShowTime = new KToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotShowTime()), actions, "showAlarmTimes"); + mActionCreateTemplate = new TDEAction(i18n("Create Tem&plate..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTemplate()), actions, "createTemplate"); + mActionCopy = new TDEAction(i18n("&Copy..."), "editcopy", 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"), "editdelete", 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"); mActionShowTime->setCheckedState(i18n("Hide &Alarm Times")); - mActionShowTimeTo = new KToggleAction(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, TQT_TQOBJECT(this), TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms"); mActionShowTimeTo->setCheckedState(i18n("Hide Time t&o Alarms")); - mActionShowExpired = new KToggleAction(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, TQT_TQOBJECT(this), TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms"); mActionShowExpired->setCheckedState(i18n_e_HideExpiredAlarms()); - mActionToggleTrayIcon = new KToggleAction(i18n("Show in System &Tray"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray"); + mActionToggleTrayIcon = new TDEToggleAction(i18n("Show in System &Tray"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray"); mActionToggleTrayIcon->setCheckedState(i18n("Hide From System &Tray")); - new KAction(i18n("Import &Alarms..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportAlarms()), actions, "importAlarms"); - new KAction(i18n("Import &Birthdays..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBirthdays()), actions, "importBirthdays"); - new KAction(i18n("&Refresh Alarms"), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResetDaemon()), actions, "refreshAlarms"); + 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"); Daemon::createAlarmEnableAction(actions, "alarmEnable"); if (undoText.isNull()) { // Get standard texts, etc., for Undo and Redo actions - KAction* act = KStdAction::undo(TQT_TQOBJECT(this), 0, actions); + TDEAction* act = KStdAction::undo(TQT_TQOBJECT(this), 0, actions); undoIcon = act->icon(); undoShortcut = act->shortcut(); undoText = act->text(); @@ -364,8 +364,8 @@ void MainWindow::initActions() redoTextStripped = KAlarm::stripAccel(redoText); delete act; } - mActionUndo = new KToolBarPopupAction(undoText, undoIcon, undoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actions, "edit_undo"); - mActionRedo = new KToolBarPopupAction(redoText, redoIcon, redoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actions, "edit_redo"); + 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); @@ -378,8 +378,8 @@ void MainWindow::initActions() setStandardToolBarMenuEnabled(true); createGUI(UI_FILE); - mContextMenu = static_cast(factory()->container("listContext", this)); - mActionsMenu = static_cast(factory()->container("actions", this)); + mContextMenu = static_cast(factory()->container("listContext", this)); + mActionsMenu = static_cast(factory()->container("actions", this)); mMenuError = (!mContextMenu || !mActionsMenu); connect(mActionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(updateActionsMenu())); connect(mActionUndo->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitUndoMenu())); @@ -410,7 +410,7 @@ void MainWindow::initActions() mActionEnable->setEnabled(false); mActionCreateTemplate->setEnabled(false); - KToolBar* tb = toolBar(); + TDEToolBar* tb = toolBar(); if (tb) tb->applySettings(TDEGlobal::config(), "Toolbars"); @@ -1012,7 +1012,7 @@ void MainWindow::slotInitRedoMenu() /****************************************************************************** * Populate the undo or redo menu. */ -void MainWindow::initUndoMenu(KPopupMenu* menu, Undo::Type type) +void MainWindow::initUndoMenu(TDEPopupMenu* menu, Undo::Type type) { menu->clear(); const TQString& action = (type == Undo::UNDO) ? undoTextStripped : redoTextStripped; diff --git a/kalarm/mainwindow.h b/kalarm/mainwindow.h index 47a02447..2e39e027 100644 --- a/kalarm/mainwindow.h +++ b/kalarm/mainwindow.h @@ -29,10 +29,10 @@ #include "undo.h" class TQListViewItem; -class KAction; -class KToggleAction; -class KToolBarPopupAction; -class KPopupMenu; +class TDEAction; +class TDEToggleAction; +class TDEToolBarPopupAction; +class TDEPopupMenu; class ActionAlarmsEnabled; class AlarmListView; class TemplateDlg; @@ -142,7 +142,7 @@ class MainWindow : public MainWindowBase void setEnableText(bool enable); static KAEvent::Action getDropAction(TQDropEvent*, TQString& text); static void executeNew(MainWindow*, const KAEvent*, KAEvent::Action = KAEvent::MESSAGE, const AlarmText& = AlarmText()); - static void initUndoMenu(KPopupMenu*, Undo::Type); + static void initUndoMenu(TDEPopupMenu*, Undo::Type); static void setUpdateTimer(); static void enableTemplateMenuItem(bool); @@ -150,26 +150,26 @@ class MainWindow : public MainWindowBase static TemplateDlg* mTemplateDlg; // the one and only template dialogue AlarmListView* mListView; - KAction* mActionTemplates; - KAction* mActionNew; + TDEAction* mActionTemplates; + TDEAction* mActionNew; TemplateMenuAction* mActionNewFromTemplate; - KAction* mActionCreateTemplate; - KAction* mActionCopy; - KAction* mActionModify; - KAction* mActionView; - KAction* mActionDelete; - KAction* mActionReactivate; - KAction* mActionEnable; - KAction* mActionFindNext; - KAction* mActionFindPrev; - KToolBarPopupAction* mActionUndo; - KToolBarPopupAction* mActionRedo; - KToggleAction* mActionToggleTrayIcon; - KToggleAction* mActionShowTime; - KToggleAction* mActionShowTimeTo; - KToggleAction* mActionShowExpired; - KPopupMenu* mActionsMenu; - KPopupMenu* mContextMenu; + TDEAction* mActionCreateTemplate; + TDEAction* mActionCopy; + TDEAction* mActionModify; + TDEAction* mActionView; + TDEAction* mActionDelete; + TDEAction* mActionReactivate; + TDEAction* mActionEnable; + TDEAction* mActionFindNext; + TDEAction* mActionFindPrev; + TDEToolBarPopupAction* mActionUndo; + TDEToolBarPopupAction* mActionRedo; + TDEToggleAction* mActionToggleTrayIcon; + TDEToggleAction* mActionShowTime; + TDEToggleAction* mActionShowTimeTo; + TDEToggleAction* mActionShowExpired; + TDEPopupMenu* mActionsMenu; + TDEPopupMenu* mContextMenu; bool mMinuteTimerActive; // minute timer is active bool mHiddenTrayParent; // on session restoration, hide this window bool mShowExpired; // include expired alarms in the displayed list diff --git a/kalarm/mainwindowbase.cpp b/kalarm/mainwindowbase.cpp index 16486e48..3d30a5ba 100644 --- a/kalarm/mainwindowbase.cpp +++ b/kalarm/mainwindowbase.cpp @@ -31,7 +31,7 @@ void MainWindowBase::closeEvent(TQCloseEvent* ce) { disableQuit = theApp()->trayIconDisplayed(); - KMainWindow::closeEvent(ce); + TDEMainWindow::closeEvent(ce); disableQuit = false; ce->accept(); // allow window to close even if it's the last main window } @@ -46,5 +46,5 @@ bool MainWindowBase::queryExit() if (kapp->sessionSaving()) return true; #endif - return disableQuit ? false : KMainWindow::queryExit(); + return disableQuit ? false : TDEMainWindow::queryExit(); } diff --git a/kalarm/mainwindowbase.h b/kalarm/mainwindowbase.h index 80e4cad2..17f55ff8 100644 --- a/kalarm/mainwindowbase.h +++ b/kalarm/mainwindowbase.h @@ -31,14 +31,14 @@ * * @author David Jarvie */ -class MainWindowBase : public KMainWindow +class MainWindowBase : public TDEMainWindow { Q_OBJECT public: explicit MainWindowBase(TQWidget* parent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose) - : KMainWindow(parent, name, f), disableQuit(false) { } + : TDEMainWindow(parent, name, f), disableQuit(false) { } protected: virtual void closeEvent(TQCloseEvent*); diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp index 2841ce61..fab155e3 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -79,9 +79,9 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name) TQWhatsThis::add(mDeleteButton, i18n("Delete the currently highlighted alarm template")); layout->addWidget(mDeleteButton); - KAccel* accel = new KAccel(this); - accel->insert(KStdAccel::SelectAll, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotSelectAll())); - accel->insert(KStdAccel::Deselect, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotDeselect())); + 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->readSettings(); mTemplateList->refresh(); diff --git a/kalarm/templatemenuaction.cpp b/kalarm/templatemenuaction.cpp index 7f61d6f9..7500b476 100644 --- a/kalarm/templatemenuaction.cpp +++ b/kalarm/templatemenuaction.cpp @@ -31,8 +31,8 @@ TemplateMenuAction::TemplateMenuAction(const TQString& label, const TQString& icon, TQObject* receiver, - const char* slot, KActionCollection* actions, const char* name) - : KActionMenu(label, icon, actions, name) + const char* slot, TDEActionCollection* actions, const char* name) + : TDEActionMenu(label, icon, actions, name) { setDelayed(false); connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitMenu())); @@ -46,7 +46,7 @@ TemplateMenuAction::TemplateMenuAction(const TQString& label, const TQString& ic */ void TemplateMenuAction::slotInitMenu() { - KPopupMenu* menu = popupMenu(); + TDEPopupMenu* menu = popupMenu(); menu->clear(); mOriginalTexts.clear(); TQValueList templates = KAlarm::templateList(); @@ -70,7 +70,7 @@ void TemplateMenuAction::slotInitMenu() */ void TemplateMenuAction::slotSelected(int id) { - KPopupMenu* menu = popupMenu(); + TDEPopupMenu* menu = popupMenu(); TQString item = mOriginalTexts[menu->indexOf(id)]; if (!item.isEmpty()) { diff --git a/kalarm/templatemenuaction.h b/kalarm/templatemenuaction.h index 7f86a4d0..a5d7f172 100644 --- a/kalarm/templatemenuaction.h +++ b/kalarm/templatemenuaction.h @@ -25,13 +25,13 @@ class KAEvent; -class TemplateMenuAction : public KActionMenu +class TemplateMenuAction : public TDEActionMenu { Q_OBJECT public: TemplateMenuAction(const TQString& label, const TQString& icon, TQObject* receiver, - const char* slot, KActionCollection* parent, const char* name = 0); + const char* slot, TDEActionCollection* parent, const char* name = 0); signals: void selected(const KAEvent&); diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 8bcad17e..3916ebdd 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -84,7 +84,7 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name) setAcceptDrops(true); // allow drag-and-drop onto this window // Set up the context menu - KActionCollection* actcol = actionCollection(); + TDEActionCollection* actcol = actionCollection(); AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable"); a->plug(contextMenu()); connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledStatus(bool))); @@ -118,7 +118,7 @@ TrayWindow::~TrayWindow() * Called just before the context menu is displayed. * Update the Alarms Enabled item status. */ -void TrayWindow::contextMenuAboutToShow(KPopupMenu* menu) +void TrayWindow::contextMenuAboutToShow(TDEPopupMenu* menu) { KSystemTray::contextMenuAboutToShow(menu); // needed for KDE <= 3.1 compatibility Daemon::checkStatus(); diff --git a/kalarm/traywindow.h b/kalarm/traywindow.h index b5deb09c..322df238 100644 --- a/kalarm/traywindow.h +++ b/kalarm/traywindow.h @@ -23,7 +23,7 @@ #include #include -class KPopupMenu; +class TDEPopupMenu; class KAEvent; class MainWindow; @@ -49,7 +49,7 @@ class TrayWindow : public KSystemTray void deleted(); protected: - virtual void contextMenuAboutToShow(KPopupMenu*); + virtual void contextMenuAboutToShow(TDEPopupMenu*); virtual void mousePressEvent(TQMouseEvent*); virtual void mouseReleaseEvent(TQMouseEvent*); virtual void dragEnterEvent(TQDragEnterEvent*); -- cgit v1.2.3