From 7716a5e605907a009e19f429cec4e6b5f346bd71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:36 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kapptemplate/ChangeLog | 4 ++-- kapptemplate/kapp/app.cpp | 6 +++--- kapptemplate/kapp/app.h | 2 +- kapptemplate/kpartapp/app_part.cpp | 2 +- kapptemplate/kpartplugin/plugin_app.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kapptemplate') diff --git a/kapptemplate/ChangeLog b/kapptemplate/ChangeLog index 0e9e42f8..e3563d37 100644 --- a/kapptemplate/ChangeLog +++ b/kapptemplate/ChangeLog @@ -111,7 +111,7 @@ Jun-09-2000 - Kurt Granroth (v0.6.3) compile with the newly ambiguous KDialogBase::addPage methods May-30-2000 - Kurt Granroth (v0.6.2) - o Removed KAccel stuff... KKeyDialog can handle action collections + o Removed TDEAccel stuff... KKeyDialog can handle action collections o Use KURLRequesterDlg instead of homemade job Mar-14-2000 - Kurt Granroth (v0.6.1) @@ -144,7 +144,7 @@ Nov-29-1999 - Kurt Granroth (v0.4.4) Nov-26-1999 - Kurt Granroth (v0.4.3) o Beefed up the print function with more boilerplate stuff - o KAccel keys should now work + o TDEAccel keys should now work Nov-20-1999 - Kurt Granroth (v0.4.2) o Use mkinstalldirs instead of mkdir diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp index df8cc8ed..62f1a261 100644 --- a/kapptemplate/kapp/app.cpp +++ b/kapptemplate/kapp/app.cpp @@ -34,14 +34,14 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp #include ${APP_NAME}::${APP_NAME}() - : KMainWindow( 0, "${APP_NAME}" ), + : TDEMainWindow( 0, "${APP_NAME}" ), m_view(new ${APP_NAME}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 @@ -102,7 +102,7 @@ void ${APP_NAME}::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/kapptemplate/kapp/app.h b/kapptemplate/kapp/app.h index 7c80c0f2..bc96132f 100644 --- a/kapptemplate/kapp/app.h +++ b/kapptemplate/kapp/app.h @@ -23,7 +23,7 @@ class KURL; * @author $AUTHOR <$EMAIL> * @version $APP_VERSION */ -class ${APP_NAME} : public KMainWindow +class ${APP_NAME} : public TDEMainWindow { Q_OBJECT diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp index 7ef6e964..c87f6be5 100644 --- a/kapptemplate/kpartapp/app_part.cpp +++ b/kapptemplate/kpartapp/app_part.cpp @@ -68,7 +68,7 @@ void ${APP_NAME}Part::setReadWrite(bool rw) void ${APP_NAME}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/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp index 29388b46..74de46f5 100644 --- a/kapptemplate/kpartplugin/plugin_app.cpp +++ b/kapptemplate/kpartplugin/plugin_app.cpp @@ -19,7 +19,7 @@ Plugin${APP_NAME}::Plugin${APP_NAME}( 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"), "${APP_NAME_LC}", 0, + (void) new TDEAction( i18n("&Plugin Action"), "${APP_NAME_LC}", 0, this, TQT_SLOT(slotAction()), actionCollection(), "plugin_action" ); } -- cgit v1.2.1