From fecb0e67b23e8b83ba7fc881bb57bc48c0852d62 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 5 Jul 2011 06:00:29 +0000 Subject: TQt4 port kmymoney This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1239855 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../plugins/interfaces/kmmimportinterface.cpp | 8 ++++---- kmymoney2/plugins/interfaces/kmmimportinterface.h | 5 +++-- .../plugins/interfaces/kmmstatementinterface.cpp | 8 ++++---- .../plugins/interfaces/kmmstatementinterface.h | 5 +++-- kmymoney2/plugins/interfaces/kmmviewinterface.cpp | 22 +++++++++++----------- kmymoney2/plugins/interfaces/kmmviewinterface.h | 7 ++++--- 6 files changed, 29 insertions(+), 26 deletions(-) (limited to 'kmymoney2/plugins/interfaces') diff --git a/kmymoney2/plugins/interfaces/kmmimportinterface.cpp b/kmymoney2/plugins/interfaces/kmmimportinterface.cpp index b3c54d8..d21959b 100644 --- a/kmymoney2/plugins/interfaces/kmmimportinterface.cpp +++ b/kmymoney2/plugins/interfaces/kmmimportinterface.cpp @@ -27,15 +27,15 @@ #include "../../kmymoney2.h" #include "kmmimportinterface.h" -KMyMoneyPlugin::KMMImportInterface::KMMImportInterface(KMyMoney2App* app, QObject* parent, const char* name) : - ImportInterface(parent, name), +KMyMoneyPlugin::KMMImportInterface::KMMImportInterface(KMyMoney2App* app, TQObject* tqparent, const char* name) : + ImportInterface(tqparent, name), m_app(app) { } -KURL KMyMoneyPlugin::KMMImportInterface::selectFile(const QString& title, const QString& path, const QString& mask, KFile::Mode mode) const +KURL KMyMoneyPlugin::KMMImportInterface::selectFile(const TQString& title, const TQString& path, const TQString& tqmask, KFile::Mode mode) const { - return m_app->selectFile(title, path, mask, mode); + return m_app->selectFile(title, path, tqmask, mode); } #include "kmmimportinterface.moc" diff --git a/kmymoney2/plugins/interfaces/kmmimportinterface.h b/kmymoney2/plugins/interfaces/kmmimportinterface.h index 484a228..97ffa5e 100644 --- a/kmymoney2/plugins/interfaces/kmmimportinterface.h +++ b/kmymoney2/plugins/interfaces/kmmimportinterface.h @@ -45,12 +45,13 @@ namespace KMyMoneyPlugin { */ class KMMImportInterface : public ImportInterface { Q_OBJECT + TQ_OBJECT public: - KMMImportInterface(KMyMoney2App* app, QObject* parent, const char* name = 0); + KMMImportInterface(KMyMoney2App* app, TQObject* tqparent, const char* name = 0); ~KMMImportInterface() {} - KURL selectFile(const QString& title, const QString& path, const QString& mask, KFile::Mode mode) const; + KURL selectFile(const TQString& title, const TQString& path, const TQString& tqmask, KFile::Mode mode) const; private: KMyMoney2App* m_app; diff --git a/kmymoney2/plugins/interfaces/kmmstatementinterface.cpp b/kmymoney2/plugins/interfaces/kmmstatementinterface.cpp index 9e09db2..c14caea 100644 --- a/kmymoney2/plugins/interfaces/kmmstatementinterface.cpp +++ b/kmymoney2/plugins/interfaces/kmmstatementinterface.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -31,8 +31,8 @@ #include #include -KMyMoneyPlugin::KMMStatementInterface::KMMStatementInterface(KMyMoney2App* app, QObject* parent, const char* name) : - StatementInterface(parent, name), +KMyMoneyPlugin::KMMStatementInterface::KMMStatementInterface(KMyMoney2App* app, TQObject* tqparent, const char* name) : + StatementInterface(tqparent, name), m_app(app) { } @@ -43,7 +43,7 @@ bool KMyMoneyPlugin::KMMStatementInterface::import(const MyMoneyStatement& s) return m_app->slotStatementImport(s); } -const MyMoneyAccount& KMyMoneyPlugin::KMMStatementInterface::account(const QString& key, const QString& value) const +const MyMoneyAccount& KMyMoneyPlugin::KMMStatementInterface::account(const TQString& key, const TQString& value) const { return m_app->account(key, value); } diff --git a/kmymoney2/plugins/interfaces/kmmstatementinterface.h b/kmymoney2/plugins/interfaces/kmmstatementinterface.h index 7890002..6eee779 100644 --- a/kmymoney2/plugins/interfaces/kmmstatementinterface.h +++ b/kmymoney2/plugins/interfaces/kmmstatementinterface.h @@ -46,9 +46,10 @@ namespace KMyMoneyPlugin { class KMMStatementInterface : public StatementInterface { Q_OBJECT + TQ_OBJECT public: - KMMStatementInterface(KMyMoney2App* app, QObject* parent, const char* name = 0); + KMMStatementInterface(KMyMoney2App* app, TQObject* tqparent, const char* name = 0); ~KMMStatementInterface() {} /** @@ -61,7 +62,7 @@ public: * If the account is not found in the list of accounts, MyMoneyAccount() * is returned. */ - const MyMoneyAccount& account(const QString& key, const QString& value) const; + const MyMoneyAccount& account(const TQString& key, const TQString& value) const; /** * This method stores the online parameters in @a kvps used by the plugin diff --git a/kmymoney2/plugins/interfaces/kmmviewinterface.cpp b/kmymoney2/plugins/interfaces/kmmviewinterface.cpp index 9779876..cc6ec5b 100644 --- a/kmymoney2/plugins/interfaces/kmmviewinterface.cpp +++ b/kmymoney2/plugins/interfaces/kmmviewinterface.cpp @@ -29,28 +29,28 @@ #include "../../widgets/selectedtransaction.h" #include "kmmviewinterface.h" -KMyMoneyPlugin::KMMViewInterface::KMMViewInterface(KMyMoney2App* app, KMyMoneyView* view, QObject* parent, const char* name) : - ViewInterface(parent, name), +KMyMoneyPlugin::KMMViewInterface::KMMViewInterface(KMyMoney2App* app, KMyMoneyView* view, TQObject* tqparent, const char* name) : + ViewInterface(tqparent, name), m_app(app), m_view(view) { - connect(app, SIGNAL(accountSelected(const MyMoneyAccount&)), this, SIGNAL(accountSelected(const MyMoneyAccount&))); - connect(app, SIGNAL(transactionsSelected(const KMyMoneyRegister::SelectedTransactions&)), this, SIGNAL(transactionsSelected(const KMyMoneyRegister::SelectedTransactions&))); - connect(app, SIGNAL(accountReconciled(const MyMoneyAccount&, const QDate&, const MyMoneyMoney&, const MyMoneyMoney&, const QValueList >&)), - this, SIGNAL(accountReconciled(const MyMoneyAccount&, const QDate&, const MyMoneyMoney&, const MyMoneyMoney&, const QValueList >&))); + connect(app, TQT_SIGNAL(accountSelected(const MyMoneyAccount&)), this, TQT_SIGNAL(accountSelected(const MyMoneyAccount&))); + connect(app, TQT_SIGNAL(transactionsSelected(const KMyMoneyRegister::SelectedTransactions&)), this, TQT_SIGNAL(transactionsSelected(const KMyMoneyRegister::SelectedTransactions&))); + connect(app, TQT_SIGNAL(accountReconciled(const MyMoneyAccount&, const TQDate&, const MyMoneyMoney&, const MyMoneyMoney&, const TQValueList >&)), + this, TQT_SIGNAL(accountReconciled(const MyMoneyAccount&, const TQDate&, const MyMoneyMoney&, const MyMoneyMoney&, const TQValueList >&))); - connect(app, SIGNAL(institutionSelected(const MyMoneyInstitution&)), this, SIGNAL(institutionSelected(const MyMoneyInstitution&))); + connect(app, TQT_SIGNAL(institutionSelected(const MyMoneyInstitution&)), this, TQT_SIGNAL(institutionSelected(const MyMoneyInstitution&))); - connect(m_view, SIGNAL(viewStateChanged(bool)), this, SIGNAL(viewStateChanged(bool))); - connect(m_view, SIGNAL(kmmFilePlugin(unsigned int)), this, SIGNAL(kmmFilePlugin(unsigned int))); + connect(m_view, TQT_SIGNAL(viewStateChanged(bool)), this, TQT_SIGNAL(viewStateChanged(bool))); + connect(m_view, TQT_SIGNAL(kmmFilePlugin(unsigned int)), this, TQT_SIGNAL(kmmFilePlugin(unsigned int))); } -KMyMoneyViewBase* KMyMoneyPlugin::KMMViewInterface::addPage(const QString& item, const QString& icon) +KMyMoneyViewBase* KMyMoneyPlugin::KMMViewInterface::addPage(const TQString& item, const TQString& icon) { return m_view->addPage(item, icon); } -void KMyMoneyPlugin::KMMViewInterface::addWidget(KMyMoneyViewBase* view, QWidget* w) +void KMyMoneyPlugin::KMMViewInterface::addWidget(KMyMoneyViewBase* view, TQWidget* w) { if(view && w) view->addWidget(w); diff --git a/kmymoney2/plugins/interfaces/kmmviewinterface.h b/kmymoney2/plugins/interfaces/kmmviewinterface.h index d06b4f8..9797a8c 100644 --- a/kmymoney2/plugins/interfaces/kmmviewinterface.h +++ b/kmymoney2/plugins/interfaces/kmmviewinterface.h @@ -45,9 +45,10 @@ namespace KMyMoneyPlugin { */ class KMMViewInterface : public ViewInterface { Q_OBJECT + TQ_OBJECT public: - KMMViewInterface(KMyMoney2App* app, KMyMoneyView* view, QObject* parent, const char* name = 0); + KMMViewInterface(KMyMoney2App* app, KMyMoneyView* view, TQObject* tqparent, const char* name = 0); ~KMMViewInterface() {} /** @@ -59,7 +60,7 @@ public: * * @return pointer to KMyMoneyViewBase object */ - KMyMoneyViewBase* addPage(const QString& item, const QString& icon); + KMyMoneyViewBase* addPage(const TQString& item, const TQString& icon); /** * This method allows to add a widget to the view @@ -68,7 +69,7 @@ public: * @param view pointer to view object * @param w pointer to widget */ - void addWidget(KMyMoneyViewBase* view, QWidget* w); + void addWidget(KMyMoneyViewBase* view, TQWidget* w); private: KMyMoney2App* m_app; -- cgit v1.2.1