From 189e536f1a74ecc2d9dcf35b9f5b3d54a2d1901e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:10:12 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kcron/ktapp.cpp | 44 ++++++++++++++++++++++---------------------- kcron/ktapp.h | 4 ++-- kcron/ktprintopt.h | 2 +- kcron/kttask.cpp | 8 ++++---- kcron/kttask.h | 4 ++-- 5 files changed, 31 insertions(+), 31 deletions(-) (limited to 'kcron') diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp index 9f00362..98e6603 100644 --- a/kcron/ktapp.cpp +++ b/kcron/ktapp.cpp @@ -33,7 +33,7 @@ const int KTApp::statusMessage (1001); -KTApp::KTApp() : KMainWindow(0) +KTApp::KTApp() : TDEMainWindow(0) { config=kapp->config(); @@ -56,8 +56,8 @@ KTApp::KTApp() : KMainWindow(0) view->disableIcons(); //Connections - KPopupMenu *editMenu = static_cast(guiFactory()->container("edit", this)); - KPopupMenu *settingsMenu = static_cast(guiFactory()->container("settings", this)); + TDEPopupMenu *editMenu = static_cast(guiFactory()->container("edit", this)); + TDEPopupMenu *settingsMenu = static_cast(guiFactory()->container("settings", this)); connect(editMenu,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(statusEditCallback(int))); connect(settingsMenu,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(statusSettingsCallback(int))); @@ -128,16 +128,16 @@ void KTApp::setupActions() KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); - (void)new KAction(i18n("&New..."), KStdAccel::openNew(), TQT_TQOBJECT(this),TQT_SLOT(slotEditNew()),actionCollection(),"edit_new"); - //I don't like this KStdAccel::open() for modifying, but I'm just porting this to xmlui - (void)new KAction(i18n("M&odify..."), KStdAccel::open(), TQT_TQOBJECT(this),TQT_SLOT(slotEditModify()),actionCollection(),"edit_modify"); - (void)new KAction(i18n("&Delete"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditDelete()),actionCollection(),"edit_delete"); - (void)new KAction(i18n("&Enabled"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditEnable()),actionCollection(),"edit_enable"); - (void)new KAction(i18n("&Run Now"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditRunNow()),actionCollection(),"edit_run"); + (void)new TDEAction(i18n("&New..."), TDEStdAccel::openNew(), TQT_TQOBJECT(this),TQT_SLOT(slotEditNew()),actionCollection(),"edit_new"); + //I don't like this TDEStdAccel::open() for modifying, but I'm just porting this to xmlui + (void)new TDEAction(i18n("M&odify..."), TDEStdAccel::open(), TQT_TQOBJECT(this),TQT_SLOT(slotEditModify()),actionCollection(),"edit_modify"); + (void)new TDEAction(i18n("&Delete"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditDelete()),actionCollection(),"edit_delete"); + (void)new TDEAction(i18n("&Enabled"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditEnable()),actionCollection(),"edit_enable"); + (void)new TDEAction(i18n("&Run Now"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditRunNow()),actionCollection(),"edit_run"); //Settings menu - (void)new KAction(i18n("Show &Toolbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewToolBar()),actionCollection(),"show_toolbar"); - (void)new KAction(i18n("Show &Statusbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewStatusBar()),actionCollection(),"show_statusbar"); + (void)new TDEAction(i18n("Show &Toolbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewToolBar()),actionCollection(),"show_toolbar"); + (void)new TDEAction(i18n("Show &Statusbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewStatusBar()),actionCollection(),"show_statusbar"); } @@ -160,7 +160,7 @@ void KTApp::saveOptions() void KTApp::readOptions() { config->setGroup(TQString("General Options")); - KPopupMenu *settingsMenu = static_cast(guiFactory()->container("settings", this)); + TDEPopupMenu *settingsMenu = static_cast(guiFactory()->container("settings", this)); // bar status settings bool bViewToolbar = config->readBoolEntry(TQString("Show Toolbar"), true); @@ -174,10 +174,10 @@ void KTApp::readOptions() statusBar()->hide(); // bar position settings - KToolBar::BarPosition tool_bar_pos; - tool_bar_pos=(KToolBar::BarPosition) + TDEToolBar::BarPosition tool_bar_pos; + tool_bar_pos=(TDEToolBar::BarPosition) config->readNumEntry(TQString("ToolBarPos"), - KToolBar::Top); + TDEToolBar::Top); toolBar()->setBarPos(tool_bar_pos); @@ -276,7 +276,7 @@ void KTApp::slotFileQuit() void KTApp::slotEdit(const TQPoint& qp) { - KPopupMenu *editMenu = static_cast(guiFactory()->container("edit", this)); + TDEPopupMenu *editMenu = static_cast(guiFactory()->container("edit", this)); editMenu->exec(qp, 0); } @@ -325,7 +325,7 @@ void KTApp::slotEditDelete() void KTApp::slotEditEnable() { - KPopupMenu *editMenu = static_cast(guiFactory()->container("edit", this)); + TDEPopupMenu *editMenu = static_cast(guiFactory()->container("edit", this)); if (editMenu->isItemChecked(editMenu->idAt(8))) { slotStatusMsg(i18n("Disabling entry...")); @@ -355,7 +355,7 @@ void KTApp::slotViewToolBar() else toolBar()->show(); - KPopupMenu *settingsMenu = static_cast(guiFactory()->container("settings", this)); + TDEPopupMenu *settingsMenu = static_cast(guiFactory()->container("settings", this)); settingsMenu->setItemChecked(settingsMenu->idAt(0),toolBar()->isVisible()); slotStatusMsg(i18n("Ready.")); @@ -368,7 +368,7 @@ void KTApp::slotViewStatusBar() else statusBar()->show(); - KPopupMenu *settingsMenu = static_cast(guiFactory()->container("settings", this)); + TDEPopupMenu *settingsMenu = static_cast(guiFactory()->container("settings", this)); settingsMenu->setItemChecked(settingsMenu->idAt(1),statusBar()->isVisible()); slotStatusMsg(i18n("Ready.")); @@ -388,7 +388,7 @@ void KTApp::slotStatusHelpMsg(const TQString & text) void KTApp::statusEditCallback(int id_) { - KPopupMenu *editMenu = static_cast(guiFactory()->container("edit", this)); + TDEPopupMenu *editMenu = static_cast(guiFactory()->container("edit", this)); int index = editMenu->indexOf(id_); switch (index) { case menuEditNew: @@ -414,7 +414,7 @@ void KTApp::statusEditCallback(int id_) void KTApp::statusSettingsCallback(int id_) { - KPopupMenu *settingsMenu = static_cast(guiFactory()->container("settings", this)); + TDEPopupMenu *settingsMenu = static_cast(guiFactory()->container("settings", this)); int index = settingsMenu->indexOf(id_); switch (index) { case menuSettingsShowToolBar: @@ -456,7 +456,7 @@ void KTApp::slotEnableRunNow(bool state) void KTApp::slotEnableEnabled(bool state) { - KPopupMenu *editMenu = static_cast(guiFactory()->container("edit", this)); + TDEPopupMenu *editMenu = static_cast(guiFactory()->container("edit", this)); editMenu->setItemChecked(editMenu->idAt(8),state); } diff --git a/kcron/ktapp.h b/kcron/ktapp.h index b4e1d38..5a00140 100644 --- a/kcron/ktapp.h +++ b/kcron/ktapp.h @@ -18,7 +18,7 @@ #include -class KAction; +class TDEAction; class TQString; class KTView; class CTHost; @@ -31,7 +31,7 @@ class CTHost; * Provides main window handling, session management and keyboard * acceleration. */ -class KTApp : public KMainWindow +class KTApp : public TDEMainWindow { Q_OBJECT diff --git a/kcron/ktprintopt.h b/kcron/ktprintopt.h index bff1f6c..60ace3f 100644 --- a/kcron/ktprintopt.h +++ b/kcron/ktprintopt.h @@ -21,7 +21,7 @@ #include class TQCheckBox; -class KAccel; +class TDEAccel; /** *Give the user the option to print the crontab file. diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp index 8465d3d..d0ceabd 100644 --- a/kcron/kttask.cpp +++ b/kcron/kttask.cpp @@ -397,10 +397,10 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption) } // key acceleration - key_accel = new KAccel(this); - key_accel->insert(KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT(slotOK())); - key_accel->insert(KStdAccel::Close, TQT_TQOBJECT(this), TQT_SLOT(slotCancel())); - key_accel->insert(KStdAccel::Quit, TQT_TQOBJECT(this), TQT_SLOT(slotCancel())); + key_accel = new TDEAccel(this); + key_accel->insert(TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT(slotOK())); + key_accel->insert(TDEStdAccel::Close, TQT_TQOBJECT(this), TQT_SLOT(slotCancel())); + key_accel->insert(TDEStdAccel::Quit, TQT_TQOBJECT(this), TQT_SLOT(slotCancel())); key_accel->readSettings(); setFixedSize( minimumSize() ); diff --git a/kcron/kttask.h b/kcron/kttask.h index 6d715bb..40d1f6e 100644 --- a/kcron/kttask.h +++ b/kcron/kttask.h @@ -21,7 +21,7 @@ class TQLineEdit; class TQCheckBox; class TQButtonGroup; class TQPushButton; -class KAccel; +class TDEAccel; class CTTask; @@ -133,7 +133,7 @@ private: * Key accelerator. */ - KAccel* key_accel; + TDEAccel* key_accel; // Widgets. -- cgit v1.2.1