diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kitchensync/libqopensync | |
parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip |
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
Diffstat (limited to 'kitchensync/libqopensync')
-rw-r--r-- | kitchensync/libqopensync/callbackhandler.cpp | 10 | ||||
-rw-r--r-- | kitchensync/libqopensync/callbackhandler.h | 7 | ||||
-rw-r--r-- | kitchensync/libqopensync/conversion.h | 4 | ||||
-rw-r--r-- | kitchensync/libqopensync/engine.h | 4 | ||||
-rw-r--r-- | kitchensync/libqopensync/filter.h | 4 | ||||
-rw-r--r-- | kitchensync/libqopensync/group.h | 4 | ||||
-rw-r--r-- | kitchensync/libqopensync/member.cpp | 2 | ||||
-rw-r--r-- | kitchensync/libqopensync/member.h | 8 | ||||
-rw-r--r-- | kitchensync/libqopensync/plugin.h | 4 | ||||
-rw-r--r-- | kitchensync/libqopensync/result.h | 4 | ||||
-rw-r--r-- | kitchensync/libqopensync/syncchange.h | 8 | ||||
-rw-r--r-- | kitchensync/libqopensync/syncmapping.h | 4 | ||||
-rw-r--r-- | kitchensync/libqopensync/syncupdates.h | 4 |
13 files changed, 34 insertions, 33 deletions
diff --git a/kitchensync/libqopensync/callbackhandler.cpp b/kitchensync/libqopensync/callbackhandler.cpp index 504afea99..f3ae4c68b 100644 --- a/kitchensync/libqopensync/callbackhandler.cpp +++ b/kitchensync/libqopensync/callbackhandler.cpp @@ -29,7 +29,7 @@ using namespace QSync; -class CallbackHandler::ConflictEvent : public QCustomEvent +class CallbackHandler::ConflictEvent : public TQCustomEvent { public: ConflictEvent( const SyncMapping& mapping ) @@ -43,7 +43,7 @@ class CallbackHandler::ConflictEvent : public QCustomEvent SyncMapping mMapping; }; -class CallbackHandler::ChangeEvent : public QCustomEvent +class CallbackHandler::ChangeEvent : public TQCustomEvent { public: ChangeEvent( const SyncChangeUpdate& change ) @@ -57,7 +57,7 @@ class CallbackHandler::ChangeEvent : public QCustomEvent SyncChangeUpdate mChange; }; -class CallbackHandler::MappingEvent : public QCustomEvent +class CallbackHandler::MappingEvent : public TQCustomEvent { public: MappingEvent( const SyncMappingUpdate& mapping ) @@ -71,7 +71,7 @@ class CallbackHandler::MappingEvent : public QCustomEvent SyncMappingUpdate mMapping; }; -class CallbackHandler::EngineEvent : public QCustomEvent +class CallbackHandler::EngineEvent : public TQCustomEvent { public: EngineEvent( const SyncEngineUpdate& engine ) @@ -85,7 +85,7 @@ class CallbackHandler::EngineEvent : public QCustomEvent SyncEngineUpdate mEngine; }; -class CallbackHandler::MemberEvent : public QCustomEvent +class CallbackHandler::MemberEvent : public TQCustomEvent { public: MemberEvent( const SyncMemberUpdate& member ) diff --git a/kitchensync/libqopensync/callbackhandler.h b/kitchensync/libqopensync/callbackhandler.h index fa6b97c60..f0971fd61 100644 --- a/kitchensync/libqopensync/callbackhandler.h +++ b/kitchensync/libqopensync/callbackhandler.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QSYNC_CALLBACKHANDLER_H -#define QSYNC_CALLBACKHANDLER_H +#ifndef TQSYNC_CALLBACKHANDLER_H +#define TQSYNC_CALLBACKHANDLER_H #include <libqopensync/syncmapping.h> #include <libqopensync/syncupdates.h> @@ -40,9 +40,10 @@ namespace QSync { class Engine; -class CallbackHandler : public QObject +class CallbackHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: CallbackHandler(); diff --git a/kitchensync/libqopensync/conversion.h b/kitchensync/libqopensync/conversion.h index e4b32c580..3e5204c9b 100644 --- a/kitchensync/libqopensync/conversion.h +++ b/kitchensync/libqopensync/conversion.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QSYNC_CONVERSION_H -#define QSYNC_CONVERSION_H +#ifndef TQSYNC_CONVERSION_H +#define TQSYNC_CONVERSION_H #include <tqstringlist.h> diff --git a/kitchensync/libqopensync/engine.h b/kitchensync/libqopensync/engine.h index e62a5f689..e014d3f4b 100644 --- a/kitchensync/libqopensync/engine.h +++ b/kitchensync/libqopensync/engine.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QSYNC_ENGINE_H -#define QSYNC_ENGINE_H +#ifndef TQSYNC_ENGINE_H +#define TQSYNC_ENGINE_H #include <libqopensync/group.h> diff --git a/kitchensync/libqopensync/filter.h b/kitchensync/libqopensync/filter.h index f10ac18f4..94d419a9d 100644 --- a/kitchensync/libqopensync/filter.h +++ b/kitchensync/libqopensync/filter.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QSYNC_FILTER_H -#define QSYNC_FILTER_H +#ifndef TQSYNC_FILTER_H +#define TQSYNC_FILTER_H #include <tqstring.h> diff --git a/kitchensync/libqopensync/group.h b/kitchensync/libqopensync/group.h index 750e7c41c..fe9ceaebb 100644 --- a/kitchensync/libqopensync/group.h +++ b/kitchensync/libqopensync/group.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QSYNC_GROUP_H -#define QSYNC_GROUP_H +#ifndef TQSYNC_GROUP_H +#define TQSYNC_GROUP_H #include <tqdatetime.h> #include <tqstringlist.h> diff --git a/kitchensync/libqopensync/member.cpp b/kitchensync/libqopensync/member.cpp index 5ed409861..fc7dfe312 100644 --- a/kitchensync/libqopensync/member.cpp +++ b/kitchensync/libqopensync/member.cpp @@ -160,7 +160,7 @@ TQString Member::scanDevices( const TQString &query ) Q_ASSERT( mMember ); OSyncError *error = 0; - char *data = (char*)osync_member_call_plugin( mMember, "scan_devices", const_cast<char*>( query.utf8().data() ), &error ); + char *data = (char*)osync_member_call_plugin( mMember, "scan_tqdevices", const_cast<char*>( query.utf8().data() ), &error ); if ( error != 0 ) { osync_error_free( &error ); return TQString(); diff --git a/kitchensync/libqopensync/member.h b/kitchensync/libqopensync/member.h index 294c19f15..48a1164b1 100644 --- a/kitchensync/libqopensync/member.h +++ b/kitchensync/libqopensync/member.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QSYNC_MEMBER_H -#define QSYNC_MEMBER_H +#ifndef TQSYNC_MEMBER_H +#define TQSYNC_MEMBER_H #include <libqopensync/plugin.h> #include <libqopensync/result.h> @@ -107,7 +107,7 @@ class Member bool operator==( const Member& ) const; /** - This method can be used to query the plugin for scanning devices. + This method can be used to query the plugin for scanning tqdevices. The @param query is a plugin specific xml document as well as the return value. */ @@ -115,7 +115,7 @@ class Member /** This method can be used to test whether the plugin can connect - to the device with the given configuration. + to the tqdevice with the given configuration. */ bool testConnection( const TQString &configuration ); diff --git a/kitchensync/libqopensync/plugin.h b/kitchensync/libqopensync/plugin.h index d26c2826c..1c6c219eb 100644 --- a/kitchensync/libqopensync/plugin.h +++ b/kitchensync/libqopensync/plugin.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QSYNC_PLUGIN_H -#define QSYNC_PLUGIN_H +#ifndef TQSYNC_PLUGIN_H +#define TQSYNC_PLUGIN_H #include <tqstring.h> diff --git a/kitchensync/libqopensync/result.h b/kitchensync/libqopensync/result.h index f35ed347a..29d3dad8b 100644 --- a/kitchensync/libqopensync/result.h +++ b/kitchensync/libqopensync/result.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QSYNC_RESULT_H -#define QSYNC_RESULT_H +#ifndef TQSYNC_RESULT_H +#define TQSYNC_RESULT_H #include <tqstring.h> diff --git a/kitchensync/libqopensync/syncchange.h b/kitchensync/libqopensync/syncchange.h index 27ff6b220..1ab3fb720 100644 --- a/kitchensync/libqopensync/syncchange.h +++ b/kitchensync/libqopensync/syncchange.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QSYNC_SYNCCHANGE_H -#define QSYNC_SYNCCHANGE_H +#ifndef TQSYNC_SYNCCHANGE_H +#define TQSYNC_SYNCCHANGE_H #include <libqopensync/member.h> @@ -82,7 +82,7 @@ class SyncChange TQString data() const; /** - Returns whether the change tqcontains data. + Returns whether the change contains data. */ bool hasData() const; @@ -92,7 +92,7 @@ class SyncChange TQString objectFormatName() const; /** - Returns the parent member of this change. + Returns the tqparent member of this change. */ Member member() const; diff --git a/kitchensync/libqopensync/syncmapping.h b/kitchensync/libqopensync/syncmapping.h index 6de67330a..a9eee6709 100644 --- a/kitchensync/libqopensync/syncmapping.h +++ b/kitchensync/libqopensync/syncmapping.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QSYNC_SYNCMAPPING_H -#define QSYNC_SYNCMAPPING_H +#ifndef TQSYNC_SYNCMAPPING_H +#define TQSYNC_SYNCMAPPING_H #include <libqopensync/syncchange.h> diff --git a/kitchensync/libqopensync/syncupdates.h b/kitchensync/libqopensync/syncupdates.h index 14a2d9193..29f2ce782 100644 --- a/kitchensync/libqopensync/syncupdates.h +++ b/kitchensync/libqopensync/syncupdates.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QSYNC_SYNCUPDATES_H -#define QSYNC_SYNCUPDATES_H +#ifndef TQSYNC_SYNCUPDATES_H +#define TQSYNC_SYNCUPDATES_H #include <libqopensync/member.h> #include <libqopensync/result.h> |