From a6000c6f2f1a03b34f15d1948f63f0c894f09451 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:01:10 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kmymoney2/plugins/importinterface.h | 2 +- kmymoney2/plugins/kmymoneyplugin.cpp | 20 ++++++++++---------- kmymoney2/plugins/kmymoneyplugin.h | 8 ++++---- .../ofximport/dialogs/konlinebankingsetupdecl.ui | 2 +- .../ofximport/dialogs/konlinebankingsetupwizard.cpp | 4 ++-- kmymoney2/plugins/ofximport/ofximporterplugin.cpp | 2 +- kmymoney2/plugins/viewinterface.h | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) (limited to 'kmymoney2/plugins') diff --git a/kmymoney2/plugins/importinterface.h b/kmymoney2/plugins/importinterface.h index 8249ed0..b3d1657 100644 --- a/kmymoney2/plugins/importinterface.h +++ b/kmymoney2/plugins/importinterface.h @@ -33,7 +33,7 @@ #include #include -class KPopupMenu; +class TDEPopupMenu; // ---------------------------------------------------------------------------- // Project Includes diff --git a/kmymoney2/plugins/kmymoneyplugin.cpp b/kmymoney2/plugins/kmymoneyplugin.cpp index db57abd..202b996 100644 --- a/kmymoney2/plugins/kmymoneyplugin.cpp +++ b/kmymoney2/plugins/kmymoneyplugin.cpp @@ -40,12 +40,12 @@ KMyMoneyPlugin::Plugin::~Plugin() { } -KAction* KMyMoneyPlugin::Plugin::action(const TQString& actionName) const +TDEAction* KMyMoneyPlugin::Plugin::action(const TQString& actionName) const { - static KShortcut shortcut(""); - static KAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast(this), 0, static_cast(0), ""); + static TDEShortcut shortcut(""); + static TDEAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast(this), 0, static_cast(0), ""); - KAction* p = actionCollection()->action(actionName.latin1()); + TDEAction* p = actionCollection()->action(actionName.latin1()); if(p) return p; @@ -53,17 +53,17 @@ KAction* KMyMoneyPlugin::Plugin::action(const TQString& actionName) const return &dummyAction; } -KToggleAction* KMyMoneyPlugin::Plugin::toggleAction(const TQString& actionName) const +TDEToggleAction* KMyMoneyPlugin::Plugin::toggleAction(const TQString& actionName) const { - static KShortcut shortcut(""); - static KToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast(this), 0, static_cast(0), ""); + static TDEShortcut shortcut(""); + static TDEToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast(this), 0, static_cast(0), ""); - KAction* q = actionCollection()->action(actionName.latin1()); + TDEAction* q = actionCollection()->action(actionName.latin1()); if(q) { - KToggleAction* p = dynamic_cast(q); + TDEToggleAction* p = dynamic_cast(q); if(!p) { - tqWarning("Action '%s' is not of type KToggleAction", actionName.latin1()); + tqWarning("Action '%s' is not of type TDEToggleAction", actionName.latin1()); p = &dummyAction; } return p; diff --git a/kmymoney2/plugins/kmymoneyplugin.h b/kmymoney2/plugins/kmymoneyplugin.h index d0ca4b6..dda096b 100644 --- a/kmymoney2/plugins/kmymoneyplugin.h +++ b/kmymoney2/plugins/kmymoneyplugin.h @@ -33,8 +33,8 @@ #include class TDEAboutData; class TDEInstance; -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; // ---------------------------------------------------------------------------- // Project Includes @@ -66,10 +66,10 @@ namespace KMyMoneyPlugin { protected: /** See KMyMoney2App::action() for a description */ - KAction* action(const TQString& name) const; + TDEAction* action(const TQString& name) const; /** See KMyMoney2App::toggleAction() for a description */ - KToggleAction* toggleAction(const TQString& name) const; + TDEToggleAction* toggleAction(const TQString& name) const; // define interface classes here. The interface classes provide a mechanism // for the plugin to interact with KMyMoney diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui index 100cbd1..917401c 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui @@ -77,7 +77,7 @@ unnamed - + Financial Institution diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp index a61ad77..1dd5ff0 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp @@ -76,14 +76,14 @@ KOnlineBankingSetupWizard::KOnlineBankingSetupWizard(TQWidget *parent, const cha dlg->setMinimumDuration(0); kapp->processEvents(); - tabLayout->insertWidget(0, new KListViewSearchLineWidget(m_listFi, tab, 0)); + tabLayout->insertWidget(0, new TDEListViewSearchLineWidget(m_listFi, tab, 0)); OfxPartner::setDirectory(locateLocal("appdata", "")); TQStringList banks = OfxPartner::BankNames(); TQStringList::const_iterator it_bank = banks.begin(); while (it_bank != banks.end()) { - new KListViewItem( m_listFi, (*it_bank)); + new TDEListViewItem( m_listFi, (*it_bank)); ++it_bank; } m_fInit = true; diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp index d5d9a85..0b9c9a0 100644 --- a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp +++ b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp @@ -61,7 +61,7 @@ OfxImporterPlugin::~OfxImporterPlugin() void OfxImporterPlugin::createActions(void) { - new KAction(i18n("OFX..."), "", 0, this, TQT_SLOT(slotImportFile()), actionCollection(), "file_import_ofx"); + new TDEAction(i18n("OFX..."), "", 0, this, TQT_SLOT(slotImportFile()), actionCollection(), "file_import_ofx"); } void OfxImporterPlugin::slotImportFile(void) diff --git a/kmymoney2/plugins/viewinterface.h b/kmymoney2/plugins/viewinterface.h index 8f94311..2a0fa6d 100644 --- a/kmymoney2/plugins/viewinterface.h +++ b/kmymoney2/plugins/viewinterface.h @@ -33,7 +33,7 @@ class TQFrame; // ---------------------------------------------------------------------------- // KDE Includes -class KPopupMenu; +class TDEPopupMenu; // ---------------------------------------------------------------------------- // Project Includes -- cgit v1.2.1