From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kontact/plugins/test/test_part.cpp | 10 +++++----- kontact/plugins/test/test_part.h | 7 ++++--- kontact/plugins/test/test_plugin.cpp | 4 ++-- kontact/plugins/test/test_plugin.h | 5 +++-- 4 files changed, 14 insertions(+), 12 deletions(-) (limited to 'kontact/plugins/test') diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index b921d025a..d8cfe9e6a 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "test_part.h" @@ -41,8 +41,8 @@ #include -TestPart::TestPart(TQObject *parent, const char *name) // ## tqparentWidget - : KParts::ReadOnlyPart(parent, name) +TestPart::TestPart(TQObject *tqparent, const char *name) // ## tqparentWidget + : KParts::ReadOnlyPart(tqparent, name) { setInstance( new KInstance("testpart") ); // ## memleak m_edit = new TQTextEdit; @@ -85,7 +85,7 @@ bool TestPart::connectToAddressBook() { TQString error; TQCString dcopService; - int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/AddressBook", TQString::null, TQString::null, &error, &dcopService ); + int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/AddressBook", TQString(), TQString(), &error, &dcopService ); if ( result != 0 ) { // You might want to show "error" (if not empty) here, using e.g. KMessageBox return false; diff --git a/kontact/plugins/test/test_part.h b/kontact/plugins/test/test_part.h index 8a80dcb42..7f14aed27 100644 --- a/kontact/plugins/test/test_part.h +++ b/kontact/plugins/test/test_part.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef TEST_PART_H #define TEST_PART_H @@ -34,10 +34,11 @@ class KAddressBookIface_stub; class TestPart : public KParts::ReadOnlyPart { Q_OBJECT + TQ_OBJECT public: - TestPart(TQObject *parent=0, const char *name=0); + TestPart(TQObject *tqparent=0, const char *name=0); ~TestPart(); protected: diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp index 93001d2f7..4e033fcd1 100644 --- a/kontact/plugins/test/test_plugin.cpp +++ b/kontact/plugins/test/test_plugin.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include #include diff --git a/kontact/plugins/test/test_plugin.h b/kontact/plugins/test/test_plugin.h index 9d1a0e8ea..8a22b33a6 100644 --- a/kontact/plugins/test/test_plugin.h +++ b/kontact/plugins/test/test_plugin.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef TEST_PLUGIN_H #define TEST_PLUGIN_H @@ -34,6 +34,7 @@ class TestPart; class TestPlugin : public Kontact::Plugin { Q_OBJECT + TQ_OBJECT public: -- cgit v1.2.1