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 --- kandy/src/kandy.cpp | 14 +++++++------- kandy/src/kandy.h | 6 +++--- kandy/src/mobilemain.cpp | 8 ++++---- kandy/src/mobilemain.h | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kandy') diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index eeae6f2da..c46f96874 100644 --- a/kandy/src/kandy.cpp +++ b/kandy/src/kandy.cpp @@ -58,7 +58,7 @@ #include "kandy.moc" Kandy::Kandy(CommandScheduler *scheduler) - : KMainWindow( 0, "Kandy" ), + : TDEMainWindow( 0, "Kandy" ), mPrinter(0) { mScheduler = scheduler; @@ -70,7 +70,7 @@ Kandy::Kandy(CommandScheduler *scheduler) // accept dnd setAcceptDrops(true); - // tell the KMainWindow that this is indeed the main widget + // tell the TDEMainWindow that this is indeed the main widget setCentralWidget(mView); // then, setup our actions @@ -136,12 +136,12 @@ void Kandy::setupActions() KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); - new KAction(i18n("Mobile GUI"),0,TQT_TQOBJECT(this),TQT_SLOT(showMobileGui()), + new TDEAction(i18n("Mobile GUI"),0,TQT_TQOBJECT(this),TQT_SLOT(showMobileGui()), actionCollection(),"show_mobilegui"); - mConnectAction = new KAction(i18n("Connect"),0,TQT_TQOBJECT(this),TQT_SLOT(modemConnect()), + mConnectAction = new TDEAction(i18n("Connect"),0,TQT_TQOBJECT(this),TQT_SLOT(modemConnect()), actionCollection(),"modem_connect"); - mDisconnectAction = new KAction(i18n("Disconnect"),0,TQT_TQOBJECT(this), + mDisconnectAction = new TDEAction(i18n("Disconnect"),0,TQT_TQOBJECT(this), TQT_SLOT(modemDisconnect()),actionCollection(), "modem_disconnect"); @@ -166,7 +166,7 @@ void Kandy::readProperties(TDEConfig */*config*/) void Kandy::dragEnterEvent(TQDragEnterEvent *event) { // do nothing - KMainWindow::dragEnterEvent(event); + TDEMainWindow::dragEnterEvent(event); // accept uri drops only // event->accept(KURLDrag::canDecode(event)); @@ -179,7 +179,7 @@ void Kandy::dropEvent(TQDropEvent *event) // much more, so please read the docs there // do nothing - KMainWindow::dropEvent(event); + TDEMainWindow::dropEvent(event); /* KURL::List list; diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h index 05bd39b36..10147d772 100644 --- a/kandy/src/kandy.h +++ b/kandy/src/kandy.h @@ -45,7 +45,7 @@ class KandyPrefsDialog; * @author Cornelius Schumacher * @version 0.1 */ -class Kandy : public KMainWindow +class Kandy : public TDEMainWindow { Q_OBJECT @@ -128,8 +128,8 @@ class Kandy : public KMainWindow TQPrinter *mPrinter; - KAction *mConnectAction; - KAction *mDisconnectAction; + TDEAction *mConnectAction; + TDEAction *mDisconnectAction; TQString mFilename; diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index 43210ba8f..e66909394 100644 --- a/kandy/src/mobilemain.cpp +++ b/kandy/src/mobilemain.cpp @@ -48,7 +48,7 @@ #include "mobilemain.moc" MobileMain::MobileMain(CommandScheduler *scheduler, KandyPrefs *prefs) - : KMainWindow( 0, "MobileMain" ) + : TDEMainWindow( 0, "MobileMain" ) { mView = new MobileGui(scheduler, prefs, this); setCentralWidget(mView); @@ -73,7 +73,7 @@ void MobileMain::setupActions() { KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - new KAction(i18n("Terminal"),0,TQT_TQOBJECT(this),TQT_SLOT(showTerminal()), + new TDEAction(i18n("Terminal"),0,TQT_TQOBJECT(this),TQT_SLOT(showTerminal()), actionCollection(),"show_terminal"); createStandardStatusBarAction(); @@ -104,7 +104,7 @@ void MobileMain::readProperties(TDEConfig */*config*/) void MobileMain::dragEnterEvent(TQDragEnterEvent *event) { // do nothing - KMainWindow::dragEnterEvent(event); + TDEMainWindow::dragEnterEvent(event); // accept uri drops only // event->accept(KURLDrag::canDecode(event)); @@ -117,7 +117,7 @@ void MobileMain::dropEvent(TQDropEvent *event) // much more, so please read the docs there // do nothing - KMainWindow::dropEvent(event); + TDEMainWindow::dropEvent(event); } void MobileMain::optionsConfigureKeys() diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h index eeff40bba..b27124c66 100644 --- a/kandy/src/mobilemain.h +++ b/kandy/src/mobilemain.h @@ -43,7 +43,7 @@ class CommandScheduler; * @author Cornelius Schumacher * @version 0.1 */ -class MobileMain : public KMainWindow +class MobileMain : public TDEMainWindow { Q_OBJECT -- cgit v1.2.1