From f78eb03afb8c9a380985d26286afc40b4c89b292 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:15:35 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- languages/cpp/app_templates/kapp/app.cpp | 6 +++--- languages/cpp/app_templates/kapp/app.h | 2 +- languages/cpp/app_templates/kateplugin/plugin_app.cpp | 2 +- languages/cpp/app_templates/kateplugin2/plugin_app.cpp | 2 +- languages/cpp/app_templates/kde4app/kapp4.cpp | 2 +- languages/cpp/app_templates/kde4app/kapp4.h | 6 +++--- languages/cpp/app_templates/kdedcop/app.cpp | 2 +- languages/cpp/app_templates/kdedcop/app.h | 2 +- languages/cpp/app_templates/kdevlang/kdevlang_part.cpp | 2 +- languages/cpp/app_templates/kdevlang/kdevlang_part.h | 4 ++-- languages/cpp/app_templates/kdevpart/kdevpart_part.cpp | 2 +- languages/cpp/app_templates/kdevpart/kdevpart_part.h | 4 ++-- languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp | 2 +- languages/cpp/app_templates/kdevpart2/kdevpart_part.h | 4 ++-- languages/cpp/app_templates/khello/app.cpp | 2 +- languages/cpp/app_templates/khello/app.h | 2 +- languages/cpp/app_templates/khello2/app.cpp | 2 +- languages/cpp/app_templates/khello2/app.h | 2 +- languages/cpp/app_templates/kofficepart/kopart_view.cpp | 2 +- languages/cpp/app_templates/kofficepart/kopart_view.h | 4 ++-- languages/cpp/app_templates/kpartapp/app.h | 6 +++--- languages/cpp/app_templates/kpartapp/app_part.cpp | 2 +- languages/cpp/app_templates/kpartplugin/plugin_app.cpp | 2 +- languages/cpp/app_templates/kscons_kxt/app.cpp | 6 +++--- languages/cpp/app_templates/kscons_kxt/app.h | 8 ++++---- languages/cpp/app_templates/kscons_tdemdi/app_part.cpp | 2 +- languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp | 2 +- languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h | 8 ++++---- languages/cpp/app_templates/kxt/app.cpp | 6 +++--- languages/cpp/app_templates/kxt/app.h | 8 ++++---- languages/cpp/app_templates/tdeconfig35/app.cpp | 6 +++--- languages/cpp/app_templates/tdeconfig35/app.h | 2 +- 32 files changed, 57 insertions(+), 57 deletions(-) (limited to 'languages/cpp/app_templates') diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index cefcc605..f4c4cba2 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -26,14 +26,14 @@ #include %{APPNAME}::%{APPNAME}() - : KMainWindow( 0, "%{APPNAME}" ), + : TDEMainWindow( 0, "%{APPNAME}" ), m_view(new %{APPNAME}View(this)), m_printer(0) { // 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(m_view); // then, setup our actions @@ -99,7 +99,7 @@ void %{APPNAME}::setupActions() // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item - KAction *custom = new KAction(i18n("Cus&tom Menuitem"), 0, + TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0, this, TQT_SLOT(optionsPreferences()), actionCollection(), "custom_action"); } diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h index 2085e6e6..007a5db0 100644 --- a/languages/cpp/app_templates/kapp/app.h +++ b/languages/cpp/app_templates/kapp/app.h @@ -23,7 +23,7 @@ class KURL; * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAME} : public KMainWindow +class %{APPNAME} : public TDEMainWindow { Q_OBJECT diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 9ef7ccc7..b9d5a9b4 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -54,7 +54,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) /// @todo doesn't this have to be deleted? PluginView *view = new PluginView (); - (void) new KAction ( i18n("Insert Hello World"), 0, this, + (void) new TDEAction ( i18n("Insert Hello World"), 0, this, TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 008db5a8..269a6b9e 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -58,7 +58,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) /// @todo doesn't this have to be deleted? PluginView *view = new PluginView (); - (void) new KAction ( i18n("Insert Hello World"), 0, this, + (void) new TDEAction ( i18n("Insert Hello World"), 0, this, TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp index b6a93a2b..0cbd25ed 100644 --- a/languages/cpp/app_templates/kde4app/kapp4.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4.cpp @@ -53,7 +53,7 @@ void %{APPNAME}::setupActions() TDEStandardAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View - KAction *custom = new KAction(KIcon("colorize"), i18n("Swi&tch Colors"), this); + TDEAction *custom = new TDEAction(KIcon("colorize"), i18n("Swi&tch Colors"), this); actionCollection()->addAction( TQLatin1String("switch_action"), custom ); connect(custom, TQT_SIGNAL(triggered(bool)), m_view, TQT_SLOT(switchColors())); } diff --git a/languages/cpp/app_templates/kde4app/kapp4.h b/languages/cpp/app_templates/kde4app/kapp4.h index 68799e3c..3c209de2 100644 --- a/languages/cpp/app_templates/kde4app/kapp4.h +++ b/languages/cpp/app_templates/kde4app/kapp4.h @@ -9,7 +9,7 @@ class %{APPNAME}View; class KPrinter; -class KToggleAction; +class TDEToggleAction; class KUrl; /** @@ -47,8 +47,8 @@ private: %{APPNAME}View *m_view; KPrinter *m_printer; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; }; #endif // _%{APPNAMELC}_H_ diff --git a/languages/cpp/app_templates/kdedcop/app.cpp b/languages/cpp/app_templates/kdedcop/app.cpp index e4fa554f..0548f6bd 100644 --- a/languages/cpp/app_templates/kdedcop/app.cpp +++ b/languages/cpp/app_templates/kdedcop/app.cpp @@ -8,7 +8,7 @@ #include %{APPNAME}::%{APPNAME}() - : KMainWindow( 0, "%{APPNAME}" ) + : TDEMainWindow( 0, "%{APPNAME}" ) { m_mainClass = new MainClass(); } diff --git a/languages/cpp/app_templates/kdedcop/app.h b/languages/cpp/app_templates/kdedcop/app.h index 19489d45..5e533c50 100644 --- a/languages/cpp/app_templates/kdedcop/app.h +++ b/languages/cpp/app_templates/kdedcop/app.h @@ -16,7 +16,7 @@ * @author %{AUTHOR} <%{EMAIL}> * @version 0.1 */ -class %{APPNAME} : public KMainWindow +class %{APPNAME} : public TDEMainWindow { Q_OBJECT diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 364ec0d7..ce011498 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -28,7 +28,7 @@ static const KDevPluginInfo data("kdev%{APPNAMELC}"); setXMLFile("kdevlang_%{APPNAMELC}.rc"); - m_build = new KAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); + m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); kdDebug() << "Creating %{APPNAMELC} Part" << endl; diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h index f6439768..1cce0fa6 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h @@ -10,7 +10,7 @@ #include #include -class KAction; +class TDEAction; /* Please read the README.dox file for more info about this part @@ -37,7 +37,7 @@ class %{APPNAME}Part : public KDevLanguageSupport void parse(); void slotActivePartChanged(KParts::Part *part); private: - KAction *m_build; + TDEAction *m_build; }; diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp index 082549c4..62ab3d94 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp @@ -91,7 +91,7 @@ void %{APPNAME}Part::init() void %{APPNAME}Part::setupActions() { // create XMLGUI actions here - action = new KAction(i18n("&Do Something..."), 0, + action = new TDEAction(i18n("&Do Something..."), 0, this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("Do something

Describe here what does this action do.")); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h index 482df00f..9414d448 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h @@ -7,7 +7,7 @@ #include class TQPopupMenu; -class KAction; +class TDEAction; class KDialogBase; class Context; class ConfigWidgetProxy; @@ -37,7 +37,7 @@ private slots: private: void setupActions(); - KAction *action; + TDEAction *action; TQGuardedPtr<%{APPNAME}Widget> m_widget; ConfigWidgetProxy *m_configProxy; diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index 082549c4..62ab3d94 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -91,7 +91,7 @@ void %{APPNAME}Part::init() void %{APPNAME}Part::setupActions() { // create XMLGUI actions here - action = new KAction(i18n("&Do Something..."), 0, + action = new TDEAction(i18n("&Do Something..."), 0, this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("Do something

Describe here what does this action do.")); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h index 482df00f..9414d448 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h @@ -7,7 +7,7 @@ #include class TQPopupMenu; -class KAction; +class TDEAction; class KDialogBase; class Context; class ConfigWidgetProxy; @@ -37,7 +37,7 @@ private slots: private: void setupActions(); - KAction *action; + TDEAction *action; TQGuardedPtr<%{APPNAME}Widget> m_widget; ConfigWidgetProxy *m_configProxy; diff --git a/languages/cpp/app_templates/khello/app.cpp b/languages/cpp/app_templates/khello/app.cpp index 811f9337..72b9e2dc 100644 --- a/languages/cpp/app_templates/khello/app.cpp +++ b/languages/cpp/app_templates/khello/app.cpp @@ -8,7 +8,7 @@ #include %{APPNAME}::%{APPNAME}() - : KMainWindow( 0, "%{APPNAME}" ) + : TDEMainWindow( 0, "%{APPNAME}" ) { // set the shell's ui resource file setXMLFile("%{APPNAMELC}ui.rc"); diff --git a/languages/cpp/app_templates/khello/app.h b/languages/cpp/app_templates/khello/app.h index f8617bab..a3e4bd31 100644 --- a/languages/cpp/app_templates/khello/app.h +++ b/languages/cpp/app_templates/khello/app.h @@ -14,7 +14,7 @@ * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAME} : public KMainWindow +class %{APPNAME} : public TDEMainWindow { Q_OBJECT diff --git a/languages/cpp/app_templates/khello2/app.cpp b/languages/cpp/app_templates/khello2/app.cpp index 948a98fc..e506490b 100644 --- a/languages/cpp/app_templates/khello2/app.cpp +++ b/languages/cpp/app_templates/khello2/app.cpp @@ -7,7 +7,7 @@ #include "%{APPNAMELC}widget.h" %{APPNAME}::%{APPNAME}() - : KMainWindow( 0, "%{APPNAME}" ) + : TDEMainWindow( 0, "%{APPNAME}" ) { setCentralWidget( new %{APPNAME}Widget( this ) ); } diff --git a/languages/cpp/app_templates/khello2/app.h b/languages/cpp/app_templates/khello2/app.h index f8617bab..a3e4bd31 100644 --- a/languages/cpp/app_templates/khello2/app.h +++ b/languages/cpp/app_templates/khello2/app.h @@ -14,7 +14,7 @@ * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAME} : public KMainWindow +class %{APPNAME} : public TDEMainWindow { Q_OBJECT diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index f32707a8..26b70e3d 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -20,7 +20,7 @@ setXMLFile( "%{APPNAMELC}.rc" ); KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" ); // Note: Prefer KStdAction::* to any custom action if possible. - //m_cut = new KAction( i18n("&Cut"), "editcut", 0, this, TQT_SLOT( cut() ), + //m_cut = new TDEAction( i18n("&Cut"), "editcut", 0, this, TQT_SLOT( cut() ), // actionCollection(), "cut"); } diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.h b/languages/cpp/app_templates/kofficepart/kopart_view.h index c6853333..a7e0fd50 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.h +++ b/languages/cpp/app_templates/kofficepart/kopart_view.h @@ -8,7 +8,7 @@ #include -class KAction; +class TDEAction; class TQPaintEvent; class %{APPNAME}Part; @@ -29,7 +29,7 @@ protected: virtual void updateReadWrite( bool readwrite ); private: - //KAction* m_cut; + //TDEAction* m_cut; }; #endif diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h index 6b470b92..c64525c6 100644 --- a/languages/cpp/app_templates/kpartapp/app.h +++ b/languages/cpp/app_templates/kpartapp/app.h @@ -9,7 +9,7 @@ #include #include -class KToggleAction; +class TDEToggleAction; /** * This is the application "Shell". It has a menubar, toolbar, and @@ -70,8 +70,8 @@ private: private: KParts::ReadWritePart *m_part; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; }; #endif // _%{APPNAMEUC}_H_ diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 518d4514..0187646e 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -63,7 +63,7 @@ void %{APPNAME}Part::setReadWrite(bool rw) void %{APPNAME}Part::setModified(bool modified) { // get a handle on our Save action and make sure it is valid - KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); + TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); if (!save) return; diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index b6297139..3941fa56 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -13,7 +13,7 @@ Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name ) { // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. - (void) new KAction( i18n("&Plugin Action"), "%{APPNAMELC}", 0, + (void) new TDEAction( i18n("&Plugin Action"), "%{APPNAMELC}", 0, this, TQT_SLOT(slotAction()), actionCollection(), "plugin_action" ); } diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index 2895fb0a..6b37401d 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -26,14 +26,14 @@ #include %{APPNAME}::%{APPNAME}() - : KMainWindow( 0, "%{APPNAME}" ), + : TDEMainWindow( 0, "%{APPNAME}" ), m_view(new %{APPNAME}View(this)), m_printer(0) { // 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(m_view); // then, setup our actions @@ -76,7 +76,7 @@ void %{APPNAME}::setupActions() KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View - KAction *custom = new KAction(i18n("Swi&tch Colors"), 0, + TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, m_view, TQT_SLOT(switchColors()), actionCollection(), "switch_action"); diff --git a/languages/cpp/app_templates/kscons_kxt/app.h b/languages/cpp/app_templates/kscons_kxt/app.h index 6ac2acb8..fd0e7fa1 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.h +++ b/languages/cpp/app_templates/kscons_kxt/app.h @@ -14,7 +14,7 @@ #include "%{APPNAMELC}view.h" class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; /** @@ -25,7 +25,7 @@ class KURL; * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAME} : public KMainWindow, public DCOPObject +class %{APPNAME} : public TDEMainWindow, public DCOPObject { K_DCOP Q_OBJECT @@ -66,8 +66,8 @@ private: %{APPNAME}View *m_view; KPrinter *m_printer; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; }; #endif // _%{APPNAMEUC}_H_ diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp index 5ea5d069..87c66b54 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp @@ -77,7 +77,7 @@ void %{APPNAMELC}Part::setReadWrite(bool rw) void %{APPNAMELC}Part::setModified(bool modified) { // get a handle on our Save action and make sure it is valid - KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); + TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); if (!save) return; diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp index 7ea17587..bc36931c 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp @@ -138,7 +138,7 @@ void %{APPNAMELC}tdemdi::setupActions() KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); - KAction* action = KStdAction::configureToolbars(this, + TDEAction* action = KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); createGUI( NULL ); diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h index 02d26d0c..6819937d 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h @@ -9,8 +9,8 @@ #include #include -class KToggleAction; -class KRecentFilesAction; +class TDEToggleAction; +class TDERecentFilesAction; class tdemdikonsole; class KMdiChildView; @@ -71,8 +71,8 @@ class %{APPNAMELC}tdemdi : public KMdiMainFrm TQValueList<%{APPNAMELC}tdemdiView*> m_views; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; KParts::PartManager *m_manager; diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp index 6f3e19fb..183841ad 100644 --- a/languages/cpp/app_templates/kxt/app.cpp +++ b/languages/cpp/app_templates/kxt/app.cpp @@ -25,14 +25,14 @@ #include %{APPNAMELC}::%{APPNAMELC}() - : KMainWindow( 0, "%{APPNAMELC}" ), + : TDEMainWindow( 0, "%{APPNAMELC}" ), m_view(new %{APPNAMELC}View(this)), m_printer(0) { // 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(m_view); // then, setup our actions @@ -71,7 +71,7 @@ void %{APPNAMELC}::setupActions() KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAMELC}View - KAction *custom = new KAction(i18n("Swi&tch Colors"), 0, + TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, m_view, TQT_SLOT(switchColors()), actionCollection(), "switch_action"); diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h index 76d48c70..b56f3ae9 100644 --- a/languages/cpp/app_templates/kxt/app.h +++ b/languages/cpp/app_templates/kxt/app.h @@ -13,7 +13,7 @@ #include "%{APPNAMELC}view.h" class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; /** @@ -24,7 +24,7 @@ class KURL; * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAMELC} : public KMainWindow +class %{APPNAMELC} : public TDEMainWindow { Q_OBJECT @@ -59,8 +59,8 @@ private: %{APPNAMELC}View *m_view; KPrinter *m_printer; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; }; #endif // _%{APPNAMEUC}_H_ diff --git a/languages/cpp/app_templates/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp index d158e45f..41e30220 100644 --- a/languages/cpp/app_templates/tdeconfig35/app.cpp +++ b/languages/cpp/app_templates/tdeconfig35/app.cpp @@ -14,14 +14,14 @@ #include %{APPNAMELC}::%{APPNAMELC}() - : KMainWindow( 0, "%{APPNAMELC}" ), + : TDEMainWindow( 0, "%{APPNAMELC}" ), m_view(new %{APPNAMELC}View(this)), m_printer(0) { // 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(m_view); // and a status bar statusBar()->show(); @@ -53,7 +53,7 @@ void %{APPNAMELC}::setupActions() KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - KAction *custom = new KAction(i18n("Swi&tch Colors"), 0, + TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, m_view, TQT_SLOT(switchColors()), actionCollection(), "switch_action"); diff --git a/languages/cpp/app_templates/tdeconfig35/app.h b/languages/cpp/app_templates/tdeconfig35/app.h index c1aac7e4..67073ea3 100644 --- a/languages/cpp/app_templates/tdeconfig35/app.h +++ b/languages/cpp/app_templates/tdeconfig35/app.h @@ -23,7 +23,7 @@ class KURL; * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAMELC} : public KMainWindow +class %{APPNAMELC} : public TDEMainWindow { Q_OBJECT -- cgit v1.2.3