From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kitchensync/libqopensync/callbackhandler.cpp | 34 ++--- kitchensync/libqopensync/callbackhandler.h | 4 +- kitchensync/libqopensync/conversion.cpp | 6 +- kitchensync/libqopensync/conversion.h | 4 +- kitchensync/libqopensync/environment.cpp | 4 +- kitchensync/libqopensync/environment.h | 6 +- kitchensync/libqopensync/filter.cpp | 6 +- kitchensync/libqopensync/filter.h | 6 +- kitchensync/libqopensync/group.cpp | 58 +++---- kitchensync/libqopensync/group.h | 20 +-- kitchensync/libqopensync/member.cpp | 26 ++-- kitchensync/libqopensync/member.h | 16 +- kitchensync/libqopensync/plugin.cpp | 12 +- kitchensync/libqopensync/plugin.h | 8 +- kitchensync/libqopensync/result.cpp | 12 +- kitchensync/libqopensync/result.h | 14 +- kitchensync/libqopensync/syncchange.cpp | 26 ++-- kitchensync/libqopensync/syncchange.h | 14 +- kitchensync/libqopensync/syncmapping.cpp | 2 +- kitchensync/opensyncdbus/dbusclient.cpp | 36 ++--- kitchensync/opensyncdbus/dbusclient.h | 6 +- kitchensync/src/aboutpage.cpp | 48 +++--- kitchensync/src/aboutpage.h | 6 +- kitchensync/src/addresseediffalgo.cpp | 14 +- kitchensync/src/addresseediffalgo.h | 8 +- kitchensync/src/calendardiffalgo.cpp | 32 ++-- kitchensync/src/calendardiffalgo.h | 2 +- kitchensync/src/configgui.cpp | 32 ++-- kitchensync/src/configgui.h | 26 ++-- kitchensync/src/configguiblank.cpp | 14 +- kitchensync/src/configguiblank.h | 6 +- kitchensync/src/configguievo2.cpp | 38 ++--- kitchensync/src/configguievo2.h | 6 +- kitchensync/src/configguifile.cpp | 32 ++-- kitchensync/src/configguifile.h | 8 +- kitchensync/src/configguigcalendar.cpp | 54 +++---- kitchensync/src/configguigcalendar.h | 12 +- kitchensync/src/configguignokii.cpp | 52 +++---- kitchensync/src/configguignokii.h | 18 +-- kitchensync/src/configguigpe.cpp | 48 +++--- kitchensync/src/configguigpe.h | 8 +- kitchensync/src/configguiirmc.cpp | 64 ++++---- kitchensync/src/configguiirmc.h | 12 +- kitchensync/src/configguijescs.cpp | 42 +++--- kitchensync/src/configguijescs.h | 8 +- kitchensync/src/configguildap.cpp | 74 ++++----- kitchensync/src/configguildap.h | 12 +- kitchensync/src/configguimoto.cpp | 28 ++-- kitchensync/src/configguimoto.h | 6 +- kitchensync/src/configguiopie.cpp | 64 ++++---- kitchensync/src/configguiopie.h | 18 +-- kitchensync/src/configguipalm.cpp | 88 +++++------ kitchensync/src/configguipalm.h | 16 +- kitchensync/src/configguisunbird.cpp | 216 +++++++++++++-------------- kitchensync/src/configguisunbird.h | 54 +++---- kitchensync/src/configguisynce.cpp | 42 +++--- kitchensync/src/configguisynce.h | 12 +- kitchensync/src/configguisyncmlhttp.cpp | 86 +++++------ kitchensync/src/configguisyncmlhttp.h | 22 +-- kitchensync/src/configguisyncmlobex.cpp | 94 ++++++------ kitchensync/src/configguisyncmlobex.h | 36 ++--- kitchensync/src/conflictdialog.cpp | 4 +- kitchensync/src/conflictdialog.h | 4 +- kitchensync/src/connectionwidgets.cpp | 90 +++++------ kitchensync/src/connectionwidgets.h | 30 ++-- kitchensync/src/genericdiffalgo.cpp | 10 +- kitchensync/src/genericdiffalgo.h | 6 +- kitchensync/src/groupconfig.cpp | 48 +++--- kitchensync/src/groupconfig.h | 12 +- kitchensync/src/groupconfigcommon.cpp | 46 +++--- kitchensync/src/groupconfigcommon.h | 10 +- kitchensync/src/groupconfigdialog.cpp | 8 +- kitchensync/src/groupconfigdialog.h | 2 +- kitchensync/src/groupitem.cpp | 100 ++++++------- kitchensync/src/groupitem.h | 26 ++-- kitchensync/src/groupview.cpp | 22 +-- kitchensync/src/groupview.h | 4 +- kitchensync/src/htmldiffalgodisplay.cpp | 34 ++--- kitchensync/src/htmldiffalgodisplay.h | 20 +-- kitchensync/src/kwidgetlist.cpp | 50 +++---- kitchensync/src/kwidgetlist.h | 22 +-- kitchensync/src/mainwidget.cpp | 42 +++--- kitchensync/src/mainwidget.h | 4 +- kitchensync/src/mainwindow.cpp | 2 +- kitchensync/src/memberconfig.cpp | 20 +-- kitchensync/src/memberconfig.h | 4 +- kitchensync/src/memberinfo.cpp | 16 +- kitchensync/src/memberinfo.h | 14 +- kitchensync/src/multiconflictdialog.cpp | 32 ++-- kitchensync/src/multiconflictdialog.h | 2 +- kitchensync/src/part.cpp | 12 +- kitchensync/src/part.h | 4 +- kitchensync/src/pluginpicker.cpp | 38 ++--- kitchensync/src/pluginpicker.h | 8 +- kitchensync/src/singleconflictdialog.cpp | 30 ++-- kitchensync/src/singleconflictdialog.h | 2 +- kitchensync/src/syncprocess.cpp | 10 +- kitchensync/src/syncprocess.h | 6 +- kitchensync/src/syncprocessmanager.cpp | 10 +- kitchensync/src/syncprocessmanager.h | 8 +- 100 files changed, 1295 insertions(+), 1295 deletions(-) (limited to 'kitchensync') diff --git a/kitchensync/libqopensync/callbackhandler.cpp b/kitchensync/libqopensync/callbackhandler.cpp index 86f279f14..504afea99 100644 --- a/kitchensync/libqopensync/callbackhandler.cpp +++ b/kitchensync/libqopensync/callbackhandler.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include "callbackhandler.h" @@ -33,7 +33,7 @@ class CallbackHandler::ConflictEvent : public QCustomEvent { public: ConflictEvent( const SyncMapping& mapping ) - : QCustomEvent( ConflictEventType ), mMapping( mapping ) + : TQCustomEvent( ConflictEventType ), mMapping( mapping ) { } @@ -47,7 +47,7 @@ class CallbackHandler::ChangeEvent : public QCustomEvent { public: ChangeEvent( const SyncChangeUpdate& change ) - : QCustomEvent( ChangeEventType ), mChange( change ) + : TQCustomEvent( ChangeEventType ), mChange( change ) { } @@ -61,7 +61,7 @@ class CallbackHandler::MappingEvent : public QCustomEvent { public: MappingEvent( const SyncMappingUpdate& mapping ) - : QCustomEvent( MappingEventType ), mMapping( mapping ) + : TQCustomEvent( MappingEventType ), mMapping( mapping ) { } @@ -75,7 +75,7 @@ class CallbackHandler::EngineEvent : public QCustomEvent { public: EngineEvent( const SyncEngineUpdate& engine ) - : QCustomEvent( EngineEventType ), mEngine( engine ) + : TQCustomEvent( EngineEventType ), mEngine( engine ) { } @@ -89,7 +89,7 @@ class CallbackHandler::MemberEvent : public QCustomEvent { public: MemberEvent( const SyncMemberUpdate& member ) - : QCustomEvent( MemberEventType ), mMember( member ) + : TQCustomEvent( MemberEventType ), mMember( member ) { } @@ -123,21 +123,21 @@ Engine* CallbackHandler::engine() const return mEngine; } -void CallbackHandler::customEvent( QCustomEvent *event ) +void CallbackHandler::customEvent( TQCustomEvent *event ) { - if ( event->type() == static_cast( ConflictEventType ) ) { + if ( event->type() == static_cast( ConflictEventType ) ) { ConflictEvent *conflictEvent = static_cast( event ); emit conflict( conflictEvent->mapping() ); - } else if ( event->type() == static_cast( ChangeEventType ) ) { + } else if ( event->type() == static_cast( ChangeEventType ) ) { ChangeEvent *changeEvent = static_cast( event ); emit change( changeEvent->change() ); - } else if ( event->type() == static_cast( MappingEventType ) ) { + } else if ( event->type() == static_cast( MappingEventType ) ) { MappingEvent *mappingEvent = static_cast( event ); emit mapping( mappingEvent->mapping() ); - } else if ( event->type() == static_cast( EngineEventType ) ) { + } else if ( event->type() == static_cast( EngineEventType ) ) { EngineEvent *engineEvent = static_cast( event ); emit engine( engineEvent->engine() ); - } else if ( event->type() == static_cast( MemberEventType ) ) { + } else if ( event->type() == static_cast( MemberEventType ) ) { MemberEvent *memberEvent = static_cast( event ); emit member( memberEvent->member() ); } @@ -149,7 +149,7 @@ void CallbackHandler::conflict_callback( OSyncEngine *engine, OSyncMapping *omap CallbackHandler *handler = static_cast( data ); - QApplication::postEvent( handler, new ConflictEvent( mapping ) ); + TQApplication::postEvent( handler, new ConflictEvent( mapping ) ); } void CallbackHandler::change_callback( OSyncEngine*, OSyncChangeUpdate *update, void *data ) @@ -158,7 +158,7 @@ void CallbackHandler::change_callback( OSyncEngine*, OSyncChangeUpdate *update, CallbackHandler *handler = static_cast( data ); - QApplication::postEvent( handler, new ChangeEvent( change ) ); + TQApplication::postEvent( handler, new ChangeEvent( change ) ); } void CallbackHandler::mapping_callback( OSyncMappingUpdate *update, void *data ) @@ -167,7 +167,7 @@ void CallbackHandler::mapping_callback( OSyncMappingUpdate *update, void *data ) SyncMappingUpdate mapping( update, handler->engine()->mEngine ); - QApplication::postEvent( handler, new MappingEvent( mapping ) ); + TQApplication::postEvent( handler, new MappingEvent( mapping ) ); } void CallbackHandler::engine_callback( OSyncEngine*, OSyncEngineUpdate *update, void *data ) @@ -176,7 +176,7 @@ void CallbackHandler::engine_callback( OSyncEngine*, OSyncEngineUpdate *update, CallbackHandler *handler = static_cast( data ); - QApplication::postEvent( handler, new EngineEvent( engine ) ); + TQApplication::postEvent( handler, new EngineEvent( engine ) ); } void CallbackHandler::member_callback( OSyncMemberUpdate *update, void *data ) @@ -185,7 +185,7 @@ void CallbackHandler::member_callback( OSyncMemberUpdate *update, void *data ) CallbackHandler *handler = static_cast( data ); - QApplication::postEvent( handler, new MemberEvent( member ) ); + TQApplication::postEvent( handler, new MemberEvent( member ) ); } #include "callbackhandler.moc" diff --git a/kitchensync/libqopensync/callbackhandler.h b/kitchensync/libqopensync/callbackhandler.h index a31132559..72845de14 100644 --- a/kitchensync/libqopensync/callbackhandler.h +++ b/kitchensync/libqopensync/callbackhandler.h @@ -25,7 +25,7 @@ #include #include -#include +#include class OSyncEngine; class OSyncMapping; @@ -59,7 +59,7 @@ class CallbackHandler : public QObject void member( const QSync::SyncMemberUpdate &update ); protected: - virtual void customEvent( QCustomEvent *event ); + virtual void customEvent( TQCustomEvent *event ); private: enum EventType { diff --git a/kitchensync/libqopensync/conversion.cpp b/kitchensync/libqopensync/conversion.cpp index bf4eb948a..0be2fdb73 100644 --- a/kitchensync/libqopensync/conversion.cpp +++ b/kitchensync/libqopensync/conversion.cpp @@ -39,17 +39,17 @@ bool Conversion::isValid() const return mEnvironment != 0; } -QStringList Conversion::objectTypes() const +TQStringList Conversion::objectTypes() const { Q_ASSERT( mEnvironment ); OSyncFormatEnv *formatEnv = osync_conv_env_new( mEnvironment ); Q_ASSERT( formatEnv ); - QStringList types; + TQStringList types; for ( int i = 0; i < osync_conv_num_objtypes( formatEnv ); i++ ) { OSyncObjType *type = osync_conv_nth_objtype( formatEnv, i ); - types.append( QString::fromUtf8( osync_objtype_get_name( type ) ) ); + types.append( TQString::fromUtf8( osync_objtype_get_name( type ) ) ); } osync_conv_env_free( formatEnv ); diff --git a/kitchensync/libqopensync/conversion.h b/kitchensync/libqopensync/conversion.h index 327f8b475..e4b32c580 100644 --- a/kitchensync/libqopensync/conversion.h +++ b/kitchensync/libqopensync/conversion.h @@ -22,7 +22,7 @@ #ifndef QSYNC_CONVERSION_H #define QSYNC_CONVERSION_H -#include +#include class OSyncEnv; @@ -44,7 +44,7 @@ class Conversion /** Returns the list of names of supported object types. */ - QStringList objectTypes() const; + TQStringList objectTypes() const; private: OSyncEnv *mEnvironment; diff --git a/kitchensync/libqopensync/environment.cpp b/kitchensync/libqopensync/environment.cpp index d878c61d5..f0d918083 100644 --- a/kitchensync/libqopensync/environment.cpp +++ b/kitchensync/libqopensync/environment.cpp @@ -103,7 +103,7 @@ Group Environment::groupAt( int pos ) const return group; } -Group Environment::groupByName( const QString &name ) const +Group Environment::groupByName( const TQString &name ) const { Group group; @@ -152,7 +152,7 @@ Plugin Environment::pluginAt( int pos ) const return plugin; } -Plugin Environment::pluginByName( const QString &name ) const +Plugin Environment::pluginByName( const TQString &name ) const { Plugin plugin; diff --git a/kitchensync/libqopensync/environment.h b/kitchensync/libqopensync/environment.h index f412a32c0..469ffd972 100644 --- a/kitchensync/libqopensync/environment.h +++ b/kitchensync/libqopensync/environment.h @@ -22,7 +22,7 @@ #ifndef OSYNC_ENVIRONMENT_H #define OSYNC_ENVIRONMENT_H -#include +#include #include #include @@ -155,7 +155,7 @@ class Environment Returns a group by name or an invalid group when the group with this name doesn't exists. */ - Group groupByName( const QString &name ) const; + Group groupByName( const TQString &name ) const; /** Adds a new group to the environment. @@ -183,7 +183,7 @@ class Environment Returns a plugin by name or an invalid plugin when the plugin with this name doesn't exists. */ - Plugin pluginByName( const QString &name ) const; + Plugin pluginByName( const TQString &name ) const; /** Returns the conversion object of this environment. diff --git a/kitchensync/libqopensync/filter.cpp b/kitchensync/libqopensync/filter.cpp index fdfcf032f..dc5fe2eee 100644 --- a/kitchensync/libqopensync/filter.cpp +++ b/kitchensync/libqopensync/filter.cpp @@ -39,17 +39,17 @@ bool Filter::isValid() const return (mFilter != 0); } -void Filter::setConfiguration( const QString &configuration ) +void Filter::setConfiguration( const TQString &configuration ) { Q_ASSERT( mFilter ); osync_filter_set_config( mFilter, (const char*)configuration.utf8() ); } -QString Filter::configuration() const +TQString Filter::configuration() const { Q_ASSERT( mFilter ); - return QString::fromUtf8( osync_filter_get_config( mFilter ) ); + return TQString::fromUtf8( osync_filter_get_config( mFilter ) ); } diff --git a/kitchensync/libqopensync/filter.h b/kitchensync/libqopensync/filter.h index 55e3099e1..f10ac18f4 100644 --- a/kitchensync/libqopensync/filter.h +++ b/kitchensync/libqopensync/filter.h @@ -22,7 +22,7 @@ #ifndef QSYNC_FILTER_H #define QSYNC_FILTER_H -#include +#include class OSyncFilter; @@ -45,12 +45,12 @@ class Filter Sets the configuration string of this filter. The format of string is filter specific. */ - void setConfiguration( const QString &configuration ); + void setConfiguration( const TQString &configuration ); /** Returns the configuration string of this filter. */ - QString configuration() const; + TQString configuration() const; bool operator==( const Filter &filter ) const { return mFilter == filter.mFilter; } diff --git a/kitchensync/libqopensync/group.cpp b/kitchensync/libqopensync/group.cpp index 75beab90c..bc94e2208 100644 --- a/kitchensync/libqopensync/group.cpp +++ b/kitchensync/libqopensync/group.cpp @@ -20,8 +20,8 @@ */ /** hack includes **/ -#include -#include +#include +#include /** hack includes **/ #include @@ -42,31 +42,31 @@ GroupConfig::GroupConfig() { } -QStringList GroupConfig::activeObjectTypes() const +TQStringList GroupConfig::activeObjectTypes() const { Q_ASSERT( mGroup ); - const QString fileName = QString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) ); + const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) ); - QFile file( fileName ); + TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) - return QStringList(); + return TQStringList(); - QDomDocument document; + TQDomDocument document; - QString message; + TQString message; if ( !document.setContent( &file, &message ) ) { qDebug( "Error on loading %s: %s", fileName.latin1(), message.latin1() ); - return QStringList(); + return TQStringList(); } file.close(); - QStringList objectTypes; + TQStringList objectTypes; - QDomElement element = document.documentElement(); - QDomNode node = element.firstChild(); + TQDomElement element = document.documentElement(); + TQDomNode node = element.firstChild(); while ( !node.isNull() ) { - QDomElement childElement = node.toElement(); + TQDomElement childElement = node.toElement(); if ( !childElement.isNull() ) objectTypes.append( childElement.tagName() ); @@ -76,30 +76,30 @@ QStringList GroupConfig::activeObjectTypes() const return objectTypes; } -void GroupConfig::setActiveObjectTypes( const QStringList &objectTypes ) +void GroupConfig::setActiveObjectTypes( const TQStringList &objectTypes ) { Q_ASSERT( mGroup ); - QDomDocument document( "Filter" ); + TQDomDocument document( "Filter" ); document.appendChild( document.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) ); - QDomElement element = document.createElement( "filter" ); + TQDomElement element = document.createElement( "filter" ); document.appendChild( element ); for ( uint i = 0; i < objectTypes.count(); ++i ) { - QDomElement entry = document.createElement( objectTypes[ i ] ); + TQDomElement entry = document.createElement( objectTypes[ i ] ); element.appendChild( entry ); } - const QString fileName = QString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) ); + const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) ); - QFile file( fileName ); + TQFile file( fileName ); if ( !file.open( IO_WriteOnly ) ) return; - QTextStream s( &file ); - s.setEncoding( QTextStream::UnicodeUTF8 ); + TQTextStream s( &file ); + s.setEncoding( TQTextStream::UnicodeUTF8 ); s << document.toString(); file.close(); } @@ -135,21 +135,21 @@ Group::Iterator Group::end() return it; } -void Group::setName( const QString &name ) +void Group::setName( const TQString &name ) { Q_ASSERT( mGroup ); osync_group_set_name( mGroup, name.latin1() ); } -QString Group::name() const +TQString Group::name() const { Q_ASSERT( mGroup ); - return QString::fromLatin1( osync_group_get_name( mGroup ) ); + return TQString::fromLatin1( osync_group_get_name( mGroup ) ); } -void Group::setLastSynchronization( const QDateTime &dateTime ) +void Group::setLastSynchronization( const TQDateTime &dateTime ) { Q_ASSERT( mGroup ); @@ -157,11 +157,11 @@ void Group::setLastSynchronization( const QDateTime &dateTime ) osync_group_set_last_synchronization( mGroup, dateTime.toTime_t() ); } -QDateTime Group::lastSynchronization() const +TQDateTime Group::lastSynchronization() const { Q_ASSERT( mGroup ); - QDateTime dateTime; + TQDateTime dateTime; time_t time = osync_group_get_last_synchronization( mGroup ); if ( time != 0 ) dateTime.setTime_t( time ); @@ -269,14 +269,14 @@ Result Group::save() return Result(); } -void Group::setObjectTypeEnabled( const QString &objectType, bool enabled ) +void Group::setObjectTypeEnabled( const TQString &objectType, bool enabled ) { Q_ASSERT( mGroup ); osync_group_set_objtype_enabled( mGroup, objectType.utf8(), enabled ); } -bool Group::isObjectTypeEnabled( const QString &objectType ) const +bool Group::isObjectTypeEnabled( const TQString &objectType ) const { return osync_group_objtype_enabled( mGroup, objectType.utf8() ); } diff --git a/kitchensync/libqopensync/group.h b/kitchensync/libqopensync/group.h index e03365dfe..750e7c41c 100644 --- a/kitchensync/libqopensync/group.h +++ b/kitchensync/libqopensync/group.h @@ -22,8 +22,8 @@ #ifndef QSYNC_GROUP_H #define QSYNC_GROUP_H -#include -#include +#include +#include #include #include @@ -42,8 +42,8 @@ class GroupConfig public: GroupConfig(); - QStringList activeObjectTypes() const; - void setActiveObjectTypes( const QStringList &objectTypes ); + TQStringList activeObjectTypes() const; + void setActiveObjectTypes( const TQStringList &objectTypes ); private: OSyncGroup *mGroup; @@ -119,22 +119,22 @@ class Group /** Sets the name of the group. */ - void setName( const QString &name ); + void setName( const TQString &name ); /** Returns the name of the group. */ - QString name() const; + TQString name() const; /** Sets the time of the last successfull synchronization. */ - void setLastSynchronization( const QDateTime &dateTime ); + void setLastSynchronization( const TQDateTime &dateTime ); /** Returns the time of the last successfull synchronization. */ - QDateTime lastSynchronization() const; + TQDateTime lastSynchronization() const; /** Locks the group. @@ -186,13 +186,13 @@ class Group Set, if the object type with given name is enabled for synchronisation for this group. */ - void setObjectTypeEnabled( const QString &objectType, bool enabled ); + void setObjectTypeEnabled( const TQString &objectType, bool enabled ); /** Returns whether the object type with given name is enabled for synchronisation for this group. */ - bool isObjectTypeEnabled( const QString &objectType ) const; + bool isObjectTypeEnabled( const TQString &objectType ) const; /** Saves the configuration to hard disc. diff --git a/kitchensync/libqopensync/member.cpp b/kitchensync/libqopensync/member.cpp index 3ac24f0dc..35cb04632 100644 --- a/kitchensync/libqopensync/member.cpp +++ b/kitchensync/libqopensync/member.cpp @@ -51,18 +51,18 @@ bool Member::isValid() const return true; } -QString Member::configurationDirectory() const +TQString Member::configurationDirectory() const { Q_ASSERT( mMember ); - return QString::fromLatin1( osync_member_get_configdir( mMember ) ); + return TQString::fromLatin1( osync_member_get_configdir( mMember ) ); } -QString Member::pluginName() const +TQString Member::pluginName() const { Q_ASSERT( mMember ); - return QString::fromLatin1( osync_member_get_pluginname( mMember ) ); + return TQString::fromLatin1( osync_member_get_pluginname( mMember ) ); } Plugin Member::plugin() const @@ -85,28 +85,28 @@ int Member::id() const return osync_member_get_id( mMember ); } -void Member::setName( const QString &name ) +void Member::setName( const TQString &name ) { Q_ASSERT( mMember ); osync_member_set_name( mMember, (const char*)name.utf8() ); } -QString Member::name() const +TQString Member::name() const { Q_ASSERT( mMember ); - return QString::fromUtf8( osync_member_get_name( mMember ) ); + return TQString::fromUtf8( osync_member_get_name( mMember ) ); } -void Member::setConfiguration( const QByteArray &configurationData ) +void Member::setConfiguration( const TQByteArray &configurationData ) { Q_ASSERT( mMember ); osync_member_set_config( mMember, configurationData.data(), configurationData.size() ); } -Result Member::configuration( QByteArray &configurationData, bool useDefault ) +Result Member::configuration( TQByteArray &configurationData, bool useDefault ) { Q_ASSERT( mMember ); @@ -155,7 +155,7 @@ bool Member::operator==( const Member &member ) const return mMember == member.mMember; } -QString Member::scanDevices( const QString &query ) +TQString Member::scanDevices( const TQString &query ) { Q_ASSERT( mMember ); @@ -163,15 +163,15 @@ QString Member::scanDevices( const QString &query ) char *data = (char*)osync_member_call_plugin( mMember, "scan_devices", const_cast( query.utf8().data() ), &error ); if ( error != 0 ) { osync_error_free( &error ); - return QString(); + return TQString(); } else { - QString xml = QString::fromUtf8( data ); + TQString xml = TQString::fromUtf8( data ); free( data ); return xml; } } -bool Member::testConnection( const QString &configuration ) +bool Member::testConnection( const TQString &configuration ) { Q_ASSERT( mMember ); diff --git a/kitchensync/libqopensync/member.h b/kitchensync/libqopensync/member.h index d0d883db3..294c19f15 100644 --- a/kitchensync/libqopensync/member.h +++ b/kitchensync/libqopensync/member.h @@ -48,12 +48,12 @@ class Member /** Returns the configuration directory. */ - QString configurationDirectory() const; + TQString configurationDirectory() const; /** Returns the name of the plugin, the member belongs to. */ - QString pluginName() const; + TQString pluginName() const; /** Returns the plugin, the member belongs to. @@ -68,18 +68,18 @@ class Member /** Sets the name of this member. */ - void setName( const QString &name ); + void setName( const TQString &name ); /** Returns the name of this member. */ - QString name() const; + TQString name() const; /** Sets the configuration data as byte array. The developer has to decide the type of the data ( e.g. xml, plain text, binary ). */ - void setConfiguration( const QByteArray &configurationData ); + void setConfiguration( const TQByteArray &configurationData ); /** Gets the configuration data as byte array. The developer has to decide the @@ -91,7 +91,7 @@ class Member @returns The result of this operation. */ - Result configuration( QByteArray &configurationData, + Result configuration( TQByteArray &configurationData, bool useDefault = true ); /** @@ -111,13 +111,13 @@ class Member The @param query is a plugin specific xml document as well as the return value. */ - QString scanDevices( const QString &query ); + TQString scanDevices( const TQString &query ); /** This method can be used to test whether the plugin can connect to the device with the given configuration. */ - bool testConnection( const QString &configuration ); + bool testConnection( const TQString &configuration ); private: OSyncMember *mMember; diff --git a/kitchensync/libqopensync/plugin.cpp b/kitchensync/libqopensync/plugin.cpp index d22a5f344..acd54447a 100644 --- a/kitchensync/libqopensync/plugin.cpp +++ b/kitchensync/libqopensync/plugin.cpp @@ -39,24 +39,24 @@ bool Plugin::isValid() const return ( mPlugin != 0 ); } -QString Plugin::name() const +TQString Plugin::name() const { Q_ASSERT( mPlugin ); - return QString::fromLatin1( osync_plugin_get_name( mPlugin ) ); + return TQString::fromLatin1( osync_plugin_get_name( mPlugin ) ); } -QString Plugin::longName() const +TQString Plugin::longName() const { Q_ASSERT( mPlugin ); - return QString::fromLatin1( osync_plugin_get_longname( mPlugin ) ); + return TQString::fromLatin1( osync_plugin_get_longname( mPlugin ) ); } -QString Plugin::description() const +TQString Plugin::description() const { Q_ASSERT( mPlugin ); - return QString::fromLatin1( osync_plugin_get_description( mPlugin ) ); + return TQString::fromLatin1( osync_plugin_get_description( mPlugin ) ); } diff --git a/kitchensync/libqopensync/plugin.h b/kitchensync/libqopensync/plugin.h index e951dfffa..d26c2826c 100644 --- a/kitchensync/libqopensync/plugin.h +++ b/kitchensync/libqopensync/plugin.h @@ -22,7 +22,7 @@ #ifndef QSYNC_PLUGIN_H #define QSYNC_PLUGIN_H -#include +#include class OSyncPlugin; @@ -45,17 +45,17 @@ class Plugin /** Returns the name of the plugin. */ - QString name() const; + TQString name() const; /** Returns the long name of the plugin. */ - QString longName() const; + TQString longName() const; /** Returns the description of the plugin. */ - QString description() const; + TQString description() const; private: OSyncPlugin *mPlugin; diff --git a/kitchensync/libqopensync/result.cpp b/kitchensync/libqopensync/result.cpp index b46040418..d38c32a3d 100644 --- a/kitchensync/libqopensync/result.cpp +++ b/kitchensync/libqopensync/result.cpp @@ -96,8 +96,8 @@ Result::Result( OSyncError **error, bool deleteError ) } mType = type; - mName = QString::fromUtf8( osync_error_get_name( error ) ); - mMessage = QString::fromUtf8( osync_error_print( error ) ); + mName = TQString::fromUtf8( osync_error_get_name( error ) ); + mMessage = TQString::fromUtf8( osync_error_print( error ) ); if ( deleteError ) osync_error_free( error ); @@ -107,22 +107,22 @@ Result::~Result() { } -void Result::setName( const QString &name ) +void Result::setName( const TQString &name ) { mName = name; } -QString Result::name() const +TQString Result::name() const { return mName; } -void Result::setMessage( const QString &message ) +void Result::setMessage( const TQString &message ) { mMessage = message; } -QString Result::message() const +TQString Result::message() const { return mMessage; } diff --git a/kitchensync/libqopensync/result.h b/kitchensync/libqopensync/result.h index c7cf13d70..f35ed347a 100644 --- a/kitchensync/libqopensync/result.h +++ b/kitchensync/libqopensync/result.h @@ -22,7 +22,7 @@ #ifndef QSYNC_RESULT_H #define QSYNC_RESULT_H -#include +#include struct OSyncError; @@ -78,22 +78,22 @@ class Result /** Sets the name of the result. */ - void setName( const QString &name ); + void setName( const TQString &name ); /** Returns the name of the result. */ - QString name() const; + TQString name() const; /** Sets the message text of the result. */ - void setMessage( const QString &message ); + void setMessage( const TQString &message ); /** Returns the message text of the result. */ - QString message() const; + TQString message() const; /** Sets the type of the result. @@ -116,8 +116,8 @@ class Result bool isError() const; private: - QString mName; - QString mMessage; + TQString mName; + TQString mMessage; Type mType; }; diff --git a/kitchensync/libqopensync/syncchange.cpp b/kitchensync/libqopensync/syncchange.cpp index f64ef6493..5dd72d7ff 100644 --- a/kitchensync/libqopensync/syncchange.cpp +++ b/kitchensync/libqopensync/syncchange.cpp @@ -44,42 +44,42 @@ bool SyncChange::isValid() const return ( mSyncChange != 0 ); } -void SyncChange::setUid( const QString &uid ) +void SyncChange::setUid( const TQString &uid ) { osync_change_set_uid( mSyncChange, uid.utf8() ); } -QString SyncChange::uid() const +TQString SyncChange::uid() const { - return QString::fromUtf8( osync_change_get_uid( mSyncChange ) ); + return TQString::fromUtf8( osync_change_get_uid( mSyncChange ) ); } -void SyncChange::setHash( const QString &hash ) +void SyncChange::setHash( const TQString &hash ) { osync_change_set_hash( mSyncChange, hash.utf8() ); } -QString SyncChange::hash() const +TQString SyncChange::hash() const { - return QString::fromUtf8( osync_change_get_hash( mSyncChange ) ); + return TQString::fromUtf8( osync_change_get_hash( mSyncChange ) ); } -void SyncChange::setData( const QString &data ) +void SyncChange::setData( const TQString &data ) { osync_change_set_data( mSyncChange, const_cast( data.utf8().data() ), data.utf8().size(), true ); } -QString SyncChange::data() const +TQString SyncChange::data() const { int size = osync_change_get_datasize( mSyncChange ); - QString content; + TQString content; if ( objectFormatName() == "file" ) { fileFormat *format = (fileFormat*)osync_change_get_data( mSyncChange ); if ( format ) - content = QString::fromUtf8( format->data, format->size ); + content = TQString::fromUtf8( format->data, format->size ); } else - content = QString::fromUtf8( osync_change_get_data( mSyncChange ), size ); + content = TQString::fromUtf8( osync_change_get_data( mSyncChange ), size ); return content; } @@ -89,12 +89,12 @@ bool SyncChange::hasData() const return osync_change_has_data( mSyncChange ); } -QString SyncChange::objectFormatName() const +TQString SyncChange::objectFormatName() const { OSyncObjFormat *format = osync_change_get_objformat( mSyncChange ); Q_ASSERT( format ); - return QString::fromUtf8( osync_objformat_get_name( format ) ); + return TQString::fromUtf8( osync_objformat_get_name( format ) ); } Member SyncChange::member() const diff --git a/kitchensync/libqopensync/syncchange.h b/kitchensync/libqopensync/syncchange.h index 775d3a8ed..53d9c4401 100644 --- a/kitchensync/libqopensync/syncchange.h +++ b/kitchensync/libqopensync/syncchange.h @@ -54,32 +54,32 @@ class SyncChange /** Sets the uid of this change. */ - void setUid( const QString &uid ); + void setUid( const TQString &uid ); /** Returns the uid of this change. */ - QString uid() const; + TQString uid() const; /** Sets the hash of this change. */ - void setHash( const QString &hash ); + void setHash( const TQString &hash ); /** Returns the hash of this change. */ - QString hash() const; + TQString hash() const; /** Sets the data provided by the plugin. */ - void setData( const QString &data ); + void setData( const TQString &data ); /** Returns the data provided by the plugin. */ - QString data() const; + TQString data() const; /** Returns whether the change contains data. @@ -89,7 +89,7 @@ class SyncChange /** Returns the object format name. */ - QString objectFormatName() const; + TQString objectFormatName() const; /** Returns the parent member of this change. diff --git a/kitchensync/libqopensync/syncmapping.cpp b/kitchensync/libqopensync/syncmapping.cpp index 8097c5482..95939ab85 100644 --- a/kitchensync/libqopensync/syncmapping.cpp +++ b/kitchensync/libqopensync/syncmapping.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include #include "syncmapping.h" diff --git a/kitchensync/opensyncdbus/dbusclient.cpp b/kitchensync/opensyncdbus/dbusclient.cpp index fcf6eda30..f992350cf 100644 --- a/kitchensync/opensyncdbus/dbusclient.cpp +++ b/kitchensync/opensyncdbus/dbusclient.cpp @@ -29,8 +29,8 @@ #include #include -#include -#include +#include +#include #include @@ -58,7 +58,7 @@ bool OpenSyncService::handleMethodCall( const QDBusMessage &message ) QDBusMessage reply; - QString function = message.member(); + TQString function = message.member(); if ( function == "hello" ) { reply = hello( message ); } else if ( function == "randomNumber" ) { @@ -84,11 +84,11 @@ QDBusMessage OpenSyncService::showMember( const QDBusMessage &message ) { if ( message.count() != 2 ) { return error( message, "arg_count", - QString("Wrong number of arguments. Expected 2, got %1.") + TQString("Wrong number of arguments. Expected 2, got %1.") .arg( message.count() ) ); } - QString groupName = message[ 0 ].toString(); + TQString groupName = message[ 0 ].toString(); if ( groupName.isEmpty() ) { return error( message, "missing_arg", "Missing argument: group name." ); } @@ -110,14 +110,14 @@ QDBusMessage OpenSyncService::showMember( const QDBusMessage &message ) QSync::Group group = env.groupByName( groupName ); if ( !group.isValid() ) { - return error( message, "group_name", QString("Unknown group '%1'.") + return error( message, "group_name", TQString("Unknown group '%1'.") .arg( groupName ) ); } QSync::Member member = group.memberById( memberId ); if ( !member.isValid() ) { return error( message, "member_id", - QString("Unknown member id '%1' in group '%2'.").arg( groupName ) + TQString("Unknown member id '%1' in group '%2'.").arg( groupName ) .arg( memberId ) ); } @@ -135,11 +135,11 @@ QDBusMessage OpenSyncService::showGroup( const QDBusMessage &message ) { if ( message.count() != 1 ) { return error( message, "arg_count", - QString("Wrong number of arguments. Expected 1, got %1") + TQString("Wrong number of arguments. Expected 1, got %1") .arg( message.count() ) ); } - QString groupName = message[ 0 ].toString(); + TQString groupName = message[ 0 ].toString(); if ( groupName.isEmpty() ) { return error( message, "missing_arg", "Missing argument group name." ); } @@ -155,14 +155,14 @@ QDBusMessage OpenSyncService::showGroup( const QDBusMessage &message ) QSync::Group group = env.groupByName( groupName ); if ( !group.isValid() ) { - return error( message, "group_name", QString("Unknown group '%1'") + return error( message, "group_name", TQString("Unknown group '%1'") .arg( groupName ) ); } QSync::Group::Iterator it( &group ); for( it = group.begin(); it != group.end(); ++it ) { QSync::Member member = *it; - reply.append( QVariant( member.id() ) ); + reply.append( TQVariant( member.id() ) ); } env.finalize(); @@ -172,8 +172,8 @@ QDBusMessage OpenSyncService::showGroup( const QDBusMessage &message ) } QDBusMessage OpenSyncService::error( const QDBusMessage &message, - const QString &errorCode, - const QString &errorMessage ) + const TQString &errorCode, + const TQString &errorMessage ) { QDBusError error( "org.opensync." + errorCode, errorMessage ); return QDBusMessage::methodError( message, error ); @@ -193,7 +193,7 @@ QDBusMessage OpenSyncService::listPlugins( const QDBusMessage &message ) QSync::Environment::PluginIterator it( env.pluginBegin() ); for ( ; it != env.pluginEnd(); ++it ) { - reply.append( QVariant( (*it).name() ) ); + reply.append( TQVariant( (*it).name() ) ); } env.finalize(); @@ -216,7 +216,7 @@ QDBusMessage OpenSyncService::listGroups( const QDBusMessage &message ) QSync::Environment::GroupIterator it( env.groupBegin() ); for ( ; it != env.groupEnd(); ++it ) { - reply.append( QVariant( (*it).name() ) ); + reply.append( TQVariant( (*it).name() ) ); } env.finalize(); @@ -232,7 +232,7 @@ QDBusMessage OpenSyncService::hello( const QDBusMessage &message ) // QDBusError error; // reply = QDBusMessage::methodError( message, error ); - reply.append( QVariant( QString( "Hello!" ) ) ); + reply.append( TQVariant( TQString( "Hello!" ) ) ); return reply; } @@ -243,14 +243,14 @@ QDBusMessage OpenSyncService::randomNumber( const QDBusMessage &message ) int number = rand(); - reply.append( QVariant( number ) ); + reply.append( TQVariant( number ) ); return reply; } int main( int argc, char *argv[] ) { - QApplication app(argc, argv); + TQApplication app(argc, argv); std::cout << "Hello" << std::endl; diff --git a/kitchensync/opensyncdbus/dbusclient.h b/kitchensync/opensyncdbus/dbusclient.h index 5cd6635f7..bffcd4ccf 100644 --- a/kitchensync/opensyncdbus/dbusclient.h +++ b/kitchensync/opensyncdbus/dbusclient.h @@ -21,7 +21,7 @@ #ifndef DBUSCLIENT_H #define DBUSCLIENT_H -#include +#include #include @@ -46,8 +46,8 @@ class OpenSyncService : public QDBusObjectBase QDBusMessage showGroup( const QDBusMessage &message ); QDBusMessage showMember( const QDBusMessage &message ); - QDBusMessage error( const QDBusMessage &, const QString &errorCode, - const QString &errorMessage ); + QDBusMessage error( const QDBusMessage &, const TQString &errorCode, + const TQString &errorMessage ); private: QDBusConnection *mConnection; diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp index f8110c4d0..0909fa0fc 100644 --- a/kitchensync/src/aboutpage.cpp +++ b/kitchensync/src/aboutpage.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include #include @@ -33,28 +33,28 @@ #include "aboutpage.h" -static QString readFile( const QString &fileName ) +static TQString readFile( const TQString &fileName ) { - QFile file( fileName ); + TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { kdDebug() << "Unable to open file '" << fileName << "'" << endl; - return QCString(); + return TQCString(); } - QString content = QString::fromUtf8( file.readAll() ); + TQString content = TQString::fromUtf8( file.readAll() ); file.close(); return content; } -AboutPage::AboutPage( QWidget *parent ) - : QWidget( parent, "AboutPage" ) +AboutPage::AboutPage( TQWidget *parent ) + : TQWidget( parent, "AboutPage" ) { - QVBoxLayout *layout = new QVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); - QString location = locate( "data", "kitchensync/about/main.html" ); - QString content = readFile( location ); + TQString location = locate( "data", "kitchensync/about/main.html" ); + TQString content = readFile( location ); content = content.arg( locate( "data", "libkdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) ); @@ -66,21 +66,21 @@ AboutPage::AboutPage( QWidget *parent ) part->begin( KURL( location ) ); - QString appName( i18n( "KDE KitchenSync" ) ); - QString catchPhrase( i18n( "Get Synchronized!" ) ); - QString quickDescription( i18n( "The KDE Synchronization Tool" ) ); + TQString appName( i18n( "KDE KitchenSync" ) ); + TQString catchPhrase( i18n( "Get Synchronized!" ) ); + TQString quickDescription( i18n( "The KDE Synchronization Tool" ) ); - part->write( content.arg( QFont().pointSize() + 2 ).arg( appName ) + part->write( content.arg( TQFont().pointSize() + 2 ).arg( appName ) .arg( catchPhrase ).arg( quickDescription ).arg( htmlText() ) ); part->end(); connect( part->browserExtension(), - SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ), - SLOT( handleUrl( const KURL& ) ) ); + TQT_SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ), + TQT_SLOT( handleUrl( const KURL& ) ) ); connect( part->browserExtension(), - SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ), - SLOT( handleUrl( const KURL& ) ) ); + TQT_SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ), + TQT_SLOT( handleUrl( const KURL& ) ) ); } void AboutPage::handleUrl( const KURL &url ) @@ -92,16 +92,16 @@ void AboutPage::handleUrl( const KURL &url ) new KRun( url, this ); } -QString AboutPage::htmlText() const +TQString AboutPage::htmlText() const { KIconLoader *iconloader = KGlobal::iconLoader(); int iconSize = iconloader->currentSize( KIcon::Desktop ); - QString handbook_icon_path = iconloader->iconPath( "contents2", KIcon::Desktop ); - QString html_icon_path = iconloader->iconPath( "html", KIcon::Desktop ); - QString wizard_icon_path = iconloader->iconPath( "wizard", KIcon::Desktop ); + TQString handbook_icon_path = iconloader->iconPath( "contents2", KIcon::Desktop ); + TQString html_icon_path = iconloader->iconPath( "html", KIcon::Desktop ); + TQString wizard_icon_path = iconloader->iconPath( "wizard", KIcon::Desktop ); - QString info = i18n( "

Welcome to KitchenSync %1

" + TQString info = i18n( "

Welcome to KitchenSync %1

" "

%1

" "" "" diff --git a/kitchensync/src/aboutpage.h b/kitchensync/src/aboutpage.h index d0bed85a0..75f9d489e 100644 --- a/kitchensync/src/aboutpage.h +++ b/kitchensync/src/aboutpage.h @@ -23,14 +23,14 @@ #include -#include +#include class AboutPage : public QWidget { Q_OBJECT public: - AboutPage( QWidget *parent ); + AboutPage( TQWidget *parent ); signals: void addGroup(); @@ -39,7 +39,7 @@ class AboutPage : public QWidget void handleUrl( const KURL& ); private: - QString htmlText() const; + TQString htmlText() const; }; #endif diff --git a/kitchensync/src/addresseediffalgo.cpp b/kitchensync/src/addresseediffalgo.cpp index 18b924b5a..fc73c3677 100644 --- a/kitchensync/src/addresseediffalgo.cpp +++ b/kitchensync/src/addresseediffalgo.cpp @@ -25,7 +25,7 @@ using namespace KSync; -static bool compareString( const QString &left, const QString &right ) +static bool compareString( const TQString &left, const TQString &right ) { if ( left.isEmpty() && right.isEmpty() ) return true; @@ -39,8 +39,8 @@ AddresseeDiffAlgo::AddresseeDiffAlgo( const KABC::Addressee &leftAddressee, { } -AddresseeDiffAlgo::AddresseeDiffAlgo( const QString &leftAddressee, - const QString &rightAddressee ) +AddresseeDiffAlgo::AddresseeDiffAlgo( const TQString &leftAddressee, + const TQString &rightAddressee ) { KABC::VCardConverter converter; @@ -131,19 +131,19 @@ void AddresseeDiffAlgo::run() end(); } -QString AddresseeDiffAlgo::toString( const KABC::PhoneNumber &number ) +TQString AddresseeDiffAlgo::toString( const KABC::PhoneNumber &number ) { return number.number(); } -QString AddresseeDiffAlgo::toString( const KABC::Address &addr ) +TQString AddresseeDiffAlgo::toString( const KABC::Address &addr ) { return addr.formattedAddress(); } template -void AddresseeDiffAlgo::diffList( const QString &id, - const QValueList &left, const QValueList &right ) +void AddresseeDiffAlgo::diffList( const TQString &id, + const TQValueList &left, const TQValueList &right ) { for ( uint i = 0; i < left.count(); ++i ) { if ( right.find( left[ i ] ) == right.end() ) diff --git a/kitchensync/src/addresseediffalgo.h b/kitchensync/src/addresseediffalgo.h index 6eef5a179..e049e9b24 100644 --- a/kitchensync/src/addresseediffalgo.h +++ b/kitchensync/src/addresseediffalgo.h @@ -33,16 +33,16 @@ class AddresseeDiffAlgo : public DiffAlgo { public: AddresseeDiffAlgo( const KABC::Addressee &leftAddressee, const KABC::Addressee &rightAddressee ); - AddresseeDiffAlgo( const QString &leftAddressee, const QString &rightAddressee ); + AddresseeDiffAlgo( const TQString &leftAddressee, const TQString &rightAddressee ); void run(); private: template - void diffList( const QString &id, const QValueList &left, const QValueList &right ); + void diffList( const TQString &id, const TQValueList &left, const TQValueList &right ); - QString toString( const KABC::PhoneNumber &number ); - QString toString( const KABC::Address &address ); + TQString toString( const KABC::PhoneNumber &number ); + TQString toString( const KABC::Address &address ); KABC::Addressee mLeftAddressee; KABC::Addressee mRightAddressee; diff --git a/kitchensync/src/calendardiffalgo.cpp b/kitchensync/src/calendardiffalgo.cpp index f7ef174a2..9d18649a8 100644 --- a/kitchensync/src/calendardiffalgo.cpp +++ b/kitchensync/src/calendardiffalgo.cpp @@ -28,7 +28,7 @@ using namespace KSync; #ifndef KDE_USE_FINAL -static bool compareString( const QString &left, const QString &right ) +static bool compareString( const TQString &left, const TQString &right ) { if ( left.isEmpty() && right.isEmpty() ) return true; @@ -37,42 +37,42 @@ static bool compareString( const QString &left, const QString &right ) } #endif -static QString toString( KCal::Attendee *attendee ) +static TQString toString( KCal::Attendee *attendee ) { return attendee->name() + "<" + attendee->email() + ">"; } -static QString toString( KCal::Alarm * ) +static TQString toString( KCal::Alarm * ) { - return QString::null; + return TQString::null; } -static QString toString( KCal::Incidence * ) +static TQString toString( KCal::Incidence * ) { - return QString::null; + return TQString::null; } -static QString toString( KCal::Attachment * ) +static TQString toString( KCal::Attachment * ) { - return QString::null; + return TQString::null; } -static QString toString( const QDate &date ) +static TQString toString( const TQDate &date ) { return date.toString(); } -static QString toString( const QDateTime &dateTime ) +static TQString toString( const TQDateTime &dateTime ) { return dateTime.toString(); } -static QString toString( const QString str ) +static TQString toString( const TQString str ) { return str; } -static QString toString( bool value ) +static TQString toString( bool value ) { if ( value ) return i18n( "Yes" ); @@ -128,7 +128,7 @@ void CalendarDiffAlgo::diffIncidenceBase( KCal::IncidenceBase *left, KCal::Incid conflictField( i18n( "Has duration" ), toString( left->hasDuration() ), toString( right->hasDuration() ) ); if ( left->duration() != right->duration() ) - conflictField( i18n( "Duration" ), QString::number( left->duration() ), QString::number( right->duration() ) ); + conflictField( i18n( "Duration" ), TQString::number( left->duration() ), TQString::number( right->duration() ) ); } void CalendarDiffAlgo::diffIncidence( KCal::Incidence *left, KCal::Incidence *right ) @@ -195,15 +195,15 @@ void CalendarDiffAlgo::diffTodo( KCal::Todo *left, KCal::Todo *right ) conflictField( i18n( "Has Complete Date" ), toString( left->hasCompletedDate() ), toString( right->hasCompletedDate() ) ); if ( left->percentComplete() != right->percentComplete() ) - conflictField( i18n( "Complete" ), QString::number( left->percentComplete() ), QString::number( right->percentComplete() ) ); + conflictField( i18n( "Complete" ), TQString::number( left->percentComplete() ), TQString::number( right->percentComplete() ) ); if ( left->completed() != right->completed() ) conflictField( i18n( "Completed" ), toString( left->completed() ), toString( right->completed() ) ); } template -void CalendarDiffAlgo::diffList( const QString &id, - const QValueList &left, const QValueList &right ) +void CalendarDiffAlgo::diffList( const TQString &id, + const TQValueList &left, const TQValueList &right ) { for ( uint i = 0; i < left.count(); ++i ) { if ( right.find( left[ i ] ) == right.end() ) diff --git a/kitchensync/src/calendardiffalgo.h b/kitchensync/src/calendardiffalgo.h index fbfb92daa..0310a0838 100644 --- a/kitchensync/src/calendardiffalgo.h +++ b/kitchensync/src/calendardiffalgo.h @@ -39,7 +39,7 @@ class CalendarDiffAlgo : public DiffAlgo private: template - void diffList( const QString &id, const QValueList &left, const QValueList &right ); + void diffList( const TQString &id, const TQValueList &left, const TQValueList &right ); void diffIncidenceBase( KCal::IncidenceBase*, KCal::IncidenceBase* ); void diffIncidence( KCal::Incidence*, KCal::Incidence* ); diff --git a/kitchensync/src/configgui.cpp b/kitchensync/src/configgui.cpp index c57b4d991..6e2aa5d70 100644 --- a/kitchensync/src/configgui.cpp +++ b/kitchensync/src/configgui.cpp @@ -45,40 +45,40 @@ #include #include -#include -#include -#include +#include +#include +#include -ConfigGui::ConfigGui( const QSync::Member &member, QWidget *parent ) - : QWidget( parent ), mMember( member ) +ConfigGui::ConfigGui( const QSync::Member &member, TQWidget *parent ) + : TQWidget( parent ), mMember( member ) { - mTopLayout = new QVBoxLayout( this ); + mTopLayout = new TQVBoxLayout( this ); mTopLayout->setSpacing( KDialog::spacingHint() ); mTopLayout->setMargin( KDialog::marginHint() ); - QBoxLayout *nameLayout = new QHBoxLayout( mTopLayout ); + TQBoxLayout *nameLayout = new TQHBoxLayout( mTopLayout ); - QLabel *label = new QLabel( i18n("Name:"), this ); + TQLabel *label = new TQLabel( i18n("Name:"), this ); nameLayout->addWidget( label ); mNameEdit = new KLineEdit( this ); nameLayout->addWidget( mNameEdit ); } -void ConfigGui::setInstanceName( const QString &t ) +void ConfigGui::setInstanceName( const TQString &t ) { mNameEdit->setText( t ); } -QString ConfigGui::instanceName() const +TQString ConfigGui::instanceName() const { return mNameEdit->text(); } ConfigGui *ConfigGui::Factory::create( const QSync::Member &member, - QWidget *parent ) + TQWidget *parent ) { - QString name = member.pluginName(); + TQString name = member.pluginName(); if ( name == "file-sync" ) { return new ConfigGuiFile( member, parent ); } else if ( name == "palm-sync" ) { @@ -117,19 +117,19 @@ ConfigGui *ConfigGui::Factory::create( const QSync::Member &member, } -ConfigGuiXml::ConfigGuiXml( const QSync::Member &member, QWidget *parent ) +ConfigGuiXml::ConfigGuiXml( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { - mTextEdit = new QTextEdit( this ); + mTextEdit = new TQTextEdit( this ); topLayout()->addWidget( mTextEdit ); } -void ConfigGuiXml::load( const QString &xml ) +void ConfigGuiXml::load( const TQString &xml ) { mTextEdit->setText( xml ); } -QString ConfigGuiXml::save() const +TQString ConfigGuiXml::save() const { return mTextEdit->text(); } diff --git a/kitchensync/src/configgui.h b/kitchensync/src/configgui.h index 0423be715..f339604fc 100644 --- a/kitchensync/src/configgui.h +++ b/kitchensync/src/configgui.h @@ -23,7 +23,7 @@ #include -#include +#include class QBoxLayout; class KLineEdit; @@ -32,41 +32,41 @@ class QTextEdit; class ConfigGui : public QWidget { public: - ConfigGui( const QSync::Member &, QWidget *parent ); + ConfigGui( const QSync::Member &, TQWidget *parent ); class Factory { public: - static ConfigGui *create( const QSync::Member &, QWidget *parent ); + static ConfigGui *create( const QSync::Member &, TQWidget *parent ); }; - void setInstanceName( const QString & ); - QString instanceName() const; + void setInstanceName( const TQString & ); + TQString instanceName() const; - virtual void load( const QString &xml ) = 0; - virtual QString save() const = 0; + virtual void load( const TQString &xml ) = 0; + virtual TQString save() const = 0; QSync::Member member() const { return mMember; } - QBoxLayout *topLayout() const { return mTopLayout; } + TQBoxLayout *topLayout() const { return mTopLayout; } private: QSync::Member mMember; - QBoxLayout *mTopLayout; + TQBoxLayout *mTopLayout; KLineEdit *mNameEdit; }; class ConfigGuiXml : public ConfigGui { public: - ConfigGuiXml( const QSync::Member &, QWidget *parent ); + ConfigGuiXml( const QSync::Member &, TQWidget *parent ); - void load( const QString & ); - QString save() const; + void load( const TQString & ); + TQString save() const; private: - QTextEdit *mTextEdit; + TQTextEdit *mTextEdit; }; #endif diff --git a/kitchensync/src/configguiblank.cpp b/kitchensync/src/configguiblank.cpp index e3f7dbbc1..3e9d47b65 100644 --- a/kitchensync/src/configguiblank.cpp +++ b/kitchensync/src/configguiblank.cpp @@ -23,22 +23,22 @@ #include -#include -#include +#include +#include -ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, QWidget *parent ) +ConfigGuiBlank::ConfigGuiBlank( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { - QLabel *label = new QLabel( i18n( "This member/plugin needs no configuration." ), this ); + TQLabel *label = new TQLabel( i18n( "This member/plugin needs no configuration." ), this ); topLayout()->addWidget( label ); } -void ConfigGuiBlank::load( const QString& ) +void ConfigGuiBlank::load( const TQString& ) { } -QString ConfigGuiBlank::save() const +TQString ConfigGuiBlank::save() const { - QString xml = ""; + TQString xml = ""; return xml; } diff --git a/kitchensync/src/configguiblank.h b/kitchensync/src/configguiblank.h index 692d470e3..e2048ac79 100644 --- a/kitchensync/src/configguiblank.h +++ b/kitchensync/src/configguiblank.h @@ -26,10 +26,10 @@ class ConfigGuiBlank : public ConfigGui { public: - ConfigGuiBlank( const QSync::Member &member, QWidget *parent = 0 ); + ConfigGuiBlank( const QSync::Member &member, TQWidget *parent = 0 ); - void load( const QString &xml ); - QString save() const; + void load( const TQString &xml ); + TQString save() const; }; #endif diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp index a8856c1e8..c313ce3ab 100644 --- a/kitchensync/src/configguievo2.cpp +++ b/kitchensync/src/configguievo2.cpp @@ -21,10 +21,10 @@ #include "configguievo2.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -32,20 +32,20 @@ #include #include -ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, QWidget *parent ) +ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { initGUI(); } -void ConfigGuiEvo2::load( const QString &xml ) +void ConfigGuiEvo2::load( const TQString &xml ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( xml ); - QDomElement docElement = doc.documentElement(); - QDomNode node; + TQDomElement docElement = doc.documentElement(); + TQDomNode node; for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( element.tagName() == "address_path" ) { mAddressPath->setURL( element.text() ); } else if ( element.tagName() == "calendar_path" ) { @@ -56,13 +56,13 @@ void ConfigGuiEvo2::load( const QString &xml ) } } -QString ConfigGuiEvo2::save() const +TQString ConfigGuiEvo2::save() const { - QString config = "\n"; + TQString config = "\n"; - config += QString( "%1\n" ).arg( mAddressPath->url() ); - config += QString( "%1\n" ).arg( mCalendarPath->url() ); - config += QString( "%1\n" ).arg( mTasksPath->url() ); + config += TQString( "%1\n" ).arg( mAddressPath->url() ); + config += TQString( "%1\n" ).arg( mCalendarPath->url() ); + config += TQString( "%1\n" ).arg( mTasksPath->url() ); config += ""; @@ -71,20 +71,20 @@ QString ConfigGuiEvo2::save() const void ConfigGuiEvo2::initGUI() { - QGridLayout *layout = new QGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); layout->setMargin( KDialog::marginHint() ); - layout->addWidget( new QLabel( i18n( "Address Book location:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 ); mAddressPath = new KURLRequester( this ); mAddressPath->setMode( KFile::Directory ); layout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 ); - layout->addWidget( new QLabel( i18n( "Calendar location:" ), this ), 1, 0 ); + layout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 ); mCalendarPath = new KURLRequester( this ); mCalendarPath->setMode( KFile::Directory ); layout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 ); - layout->addWidget( new QLabel( i18n( "Task list location:" ), this ), 2, 0 ); + layout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 ); mTasksPath = new KURLRequester( this ); mTasksPath->setMode( KFile::Directory ); layout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 ); diff --git a/kitchensync/src/configguievo2.h b/kitchensync/src/configguievo2.h index f9e7ad19e..7e3a17679 100644 --- a/kitchensync/src/configguievo2.h +++ b/kitchensync/src/configguievo2.h @@ -29,11 +29,11 @@ class KURLRequester; class ConfigGuiEvo2 : public ConfigGui { public: - ConfigGuiEvo2( const QSync::Member &, QWidget *parent ); + ConfigGuiEvo2( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); + void load( const TQString &xml ); - QString save() const; + TQString save() const; private: void initGUI(); diff --git a/kitchensync/src/configguifile.cpp b/kitchensync/src/configguifile.cpp index e7974ecb6..6a8b0402c 100644 --- a/kitchensync/src/configguifile.cpp +++ b/kitchensync/src/configguifile.cpp @@ -25,39 +25,39 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -ConfigGuiFile::ConfigGuiFile( const QSync::Member &member, QWidget *parent ) +ConfigGuiFile::ConfigGuiFile( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { - QBoxLayout *filenameLayout = new QHBoxLayout( topLayout() ); + TQBoxLayout *filenameLayout = new TQHBoxLayout( topLayout() ); - QLabel *label = new QLabel( i18n("Directory name:"), this ); + TQLabel *label = new TQLabel( i18n("Directory name:"), this ); filenameLayout->addWidget( label ); mFilename = new KURLRequester( this ); mFilename->setMode( KFile::Directory | KFile::LocalOnly ); filenameLayout->addWidget( mFilename ); - QBoxLayout *recursiveLayout = new QHBoxLayout( topLayout() ); + TQBoxLayout *recursiveLayout = new TQHBoxLayout( topLayout() ); - mRecursive = new QCheckBox( i18n("Sync all subdirectories"), this ); + mRecursive = new TQCheckBox( i18n("Sync all subdirectories"), this ); recursiveLayout->addWidget( mRecursive ); topLayout()->addStretch( 1 ); } -void ConfigGuiFile::load( const QString &xml ) +void ConfigGuiFile::load( const TQString &xml ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( xml ); - QDomElement docElement = doc.documentElement(); - QDomNode n; + TQDomElement docElement = doc.documentElement(); + TQDomNode n; for( n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if ( e.tagName() == "path" ) { mFilename->setURL( e.text() ); } else if ( e.tagName() == "recursive" ) { @@ -66,9 +66,9 @@ void ConfigGuiFile::load( const QString &xml ) } } -QString ConfigGuiFile::save() const +TQString ConfigGuiFile::save() const { - QString xml; + TQString xml; xml = ""; xml += "" + mFilename->url() + ""; xml += ""; diff --git a/kitchensync/src/configguifile.h b/kitchensync/src/configguifile.h index 6da034f57..4f1a0b345 100644 --- a/kitchensync/src/configguifile.h +++ b/kitchensync/src/configguifile.h @@ -29,14 +29,14 @@ class QCheckBox; class ConfigGuiFile : public ConfigGui { public: - ConfigGuiFile( const QSync::Member &, QWidget *parent ); + ConfigGuiFile( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); - QString save() const; + void load( const TQString &xml ); + TQString save() const; private: KURLRequester *mFilename; - QCheckBox *mRecursive; + TQCheckBox *mRecursive; }; #endif diff --git a/kitchensync/src/configguigcalendar.cpp b/kitchensync/src/configguigcalendar.cpp index 0434de789..8e8006764 100644 --- a/kitchensync/src/configguigcalendar.cpp +++ b/kitchensync/src/configguigcalendar.cpp @@ -24,52 +24,52 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -ConfigGuiGoogleCalendar::ConfigGuiGoogleCalendar( const QSync::Member &member, QWidget *parent ) +ConfigGuiGoogleCalendar::ConfigGuiGoogleCalendar( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { - QBoxLayout *userLayout = new QHBoxLayout( topLayout() ); + TQBoxLayout *userLayout = new TQHBoxLayout( topLayout() ); - QLabel *userLbl= new QLabel( i18n("Username:"), this ); + TQLabel *userLbl= new TQLabel( i18n("Username:"), this ); userLayout->addWidget(userLbl); - mUsername = new QLineEdit(this); + mUsername = new TQLineEdit(this); userLayout->addWidget(mUsername); - QBoxLayout *passLayout = new QHBoxLayout( topLayout() ); + TQBoxLayout *passLayout = new TQHBoxLayout( topLayout() ); - QLabel *passLbl = new QLabel( i18n("Password:"), this ); + TQLabel *passLbl = new TQLabel( i18n("Password:"), this ); passLayout->addWidget(passLbl); - mPassword = new QLineEdit(this); - mPassword->setEchoMode(QLineEdit::Password); + mPassword = new TQLineEdit(this); + mPassword->setEchoMode(TQLineEdit::Password); passLayout->addWidget(mPassword); - topLayout()->addWidget(new QLabel( i18n("Please notice that currently the password is stored as plain text in the plugin configuration file"), this )); + topLayout()->addWidget(new TQLabel( i18n("Please notice that currently the password is stored as plain text in the plugin configuration file"), this )); - QBoxLayout *urlLayout = new QHBoxLayout( topLayout() ); - QLabel *urlLbl = new QLabel( i18n("Calendar URL:"), this ); + TQBoxLayout *urlLayout = new TQHBoxLayout( topLayout() ); + TQLabel *urlLbl = new TQLabel( i18n("Calendar URL:"), this ); urlLayout->addWidget(urlLbl); - mUrl = new QLineEdit(this); + mUrl = new TQLineEdit(this); urlLayout->addWidget(mUrl); topLayout()->addStretch( 1 ); } -void ConfigGuiGoogleCalendar::load( const QString &xml ) +void ConfigGuiGoogleCalendar::load( const TQString &xml ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( xml ); - QDomElement docElement = doc.documentElement(); - QDomNode n; + TQDomElement docElement = doc.documentElement(); + TQDomNode n; for( n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if ( e.tagName() == "username" ) { mUsername->setText(e.text()); } else if ( e.tagName() == "password" ) { @@ -80,21 +80,21 @@ void ConfigGuiGoogleCalendar::load( const QString &xml ) } } -QString ConfigGuiGoogleCalendar::save() const +TQString ConfigGuiGoogleCalendar::save() const { - QDomDocument doc; - QDomElement root = doc.createElement("config"); + TQDomDocument doc; + TQDomElement root = doc.createElement("config"); doc.appendChild(root); - QDomElement un = doc.createElement("username"); + TQDomElement un = doc.createElement("username"); root.appendChild(un); un.appendChild(doc.createTextNode(mUsername->text())); - QDomElement pass = doc.createElement("password"); + TQDomElement pass = doc.createElement("password"); root.appendChild(pass); pass.appendChild(doc.createTextNode(mPassword->text())); - QDomElement url = doc.createElement("url"); + TQDomElement url = doc.createElement("url"); root.appendChild(url); url.appendChild(doc.createTextNode(mUrl->text())); diff --git a/kitchensync/src/configguigcalendar.h b/kitchensync/src/configguigcalendar.h index e87eb300d..e1ebdef84 100644 --- a/kitchensync/src/configguigcalendar.h +++ b/kitchensync/src/configguigcalendar.h @@ -29,15 +29,15 @@ class QLineEdit; class ConfigGuiGoogleCalendar : public ConfigGui { public: - ConfigGuiGoogleCalendar( const QSync::Member &, QWidget *parent ); + ConfigGuiGoogleCalendar( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); - QString save() const; + void load( const TQString &xml ); + TQString save() const; private: - QLineEdit *mUsername; - QLineEdit *mPassword; - QLineEdit *mUrl; + TQLineEdit *mUsername; + TQLineEdit *mPassword; + TQLineEdit *mUrl; }; #endif diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp index 1379f5e5a..38f2fbf3a 100644 --- a/kitchensync/src/configguignokii.cpp +++ b/kitchensync/src/configguignokii.cpp @@ -27,20 +27,20 @@ #include -#include -#include -#include -#include -#include -#include - -ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, QWidget *parent ) +#include +#include +#include +#include +#include +#include + +ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { - QGridLayout *layout = new QGridLayout( topLayout() ); + TQGridLayout *layout = new TQGridLayout( topLayout() ); // Model - QLabel *label = new QLabel( i18n("Model:"), this ); + TQLabel *label = new TQLabel( i18n("Model:"), this ); layout->addWidget( label, 0, 0 ); mModel = new KComboBox( true, this ); @@ -62,18 +62,18 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, QWidget *parent ) mModel->insertItem( "symbian" ); mModel->insertItem( "sx1" ); - connect( mModel, SIGNAL (activated( int ) ), - this, SLOT( slotModelChanged () ) ); + connect( mModel, TQT_SIGNAL (activated( int ) ), + this, TQT_SLOT( slotModelChanged () ) ); // Connection - label = new QLabel( i18n("Connection:"), this ); + label = new TQLabel( i18n("Connection:"), this ); layout->addWidget( label, 1, 0 ); - mConnection = new QComboBox( this ); + mConnection = new TQComboBox( this ); layout->addWidget( mConnection, 1, 1 ); - connect( mConnection, SIGNAL (activated( int ) ), - this, SLOT( slotConnectionChanged ( int ) ) ); + connect( mConnection, TQT_SIGNAL (activated( int ) ), + this, TQT_SLOT( slotConnectionChanged ( int ) ) ); // this is a list of all connection types accepted by the gnokii-sync plugin mConnectionTypes.append( ConnectionType( "bluetooth", i18n( "Bluetooth" ) ) ); @@ -93,7 +93,7 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, QWidget *parent ) mConnection->insertItem( (*it).second ); } - QVBox *connectionWidget = new QVBox( this ); + TQVBox *connectionWidget = new TQVBox( this ); connectionWidget->setMargin( KDialog::marginHint() ); connectionWidget->setSpacing( 5 ); @@ -103,7 +103,7 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, QWidget *parent ) layout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 ); // Port - mPortLabel = new QLabel( i18n("Port:"), this ); + mPortLabel = new TQLabel( i18n("Port:"), this ); layout->addWidget( mPortLabel, 2, 0 ); mPortLabel->hide(); @@ -161,14 +161,14 @@ void ConfigGuiGnokii::slotModelChanged() mBluetooth->setChannel(""); } -void ConfigGuiGnokii::load( const QString &xml ) +void ConfigGuiGnokii::load( const TQString &xml ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( xml ); - QDomElement docElement = doc.documentElement(); - QDomNode n; + TQDomElement docElement = doc.documentElement(); + TQDomNode n; for( n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if ( e.tagName() == "connection" ) { for ( uint i = 0; i < mConnectionTypes.count(); i++ ) { if ( mConnectionTypes[i].first == e.text()) { @@ -188,9 +188,9 @@ void ConfigGuiGnokii::load( const QString &xml ) } } -QString ConfigGuiGnokii::save() const +TQString ConfigGuiGnokii::save() const { - QString xml; + TQString xml; xml = ""; ConnectionTypeList::ConstIterator it; @@ -204,7 +204,7 @@ QString ConfigGuiGnokii::save() const if ( (*it).first == "bluetooth" ) xml += "" + mBluetooth->address() + ""; else if ( (*it).first == "dku2libusb" ) - xml += "" + QString("FF:FF:FF:FF:FF:FF") + ""; // Only place holder for libgnokii + xml += "" + TQString("FF:FF:FF:FF:FF:FF") + ""; // Only place holder for libgnokii else xml += "" + mPort->currentText() + ""; diff --git a/kitchensync/src/configguignokii.h b/kitchensync/src/configguignokii.h index 6f413a4c1..939e46730 100644 --- a/kitchensync/src/configguignokii.h +++ b/kitchensync/src/configguignokii.h @@ -24,8 +24,8 @@ #include "configgui.h" #include "connectionwidgets.h" -#include -#include +#include +#include class QLabel; class QLineEdit; @@ -36,21 +36,21 @@ class ConfigGuiGnokii : public ConfigGui Q_OBJECT public: - ConfigGuiGnokii( const QSync::Member &, QWidget *parent ); + ConfigGuiGnokii( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); - QString save() const; + void load( const TQString &xml ); + TQString save() const; private: - QComboBox *mConnection; + TQComboBox *mConnection; KComboBox *mPort; - QLabel *mPortLabel; + TQLabel *mPortLabel; KComboBox *mModel; BluetoothWidget *mBluetooth; - typedef QPair ConnectionType; - typedef QValueList ConnectionTypeList; + typedef QPair ConnectionType; + typedef TQValueList ConnectionTypeList; ConnectionTypeList mConnectionTypes; protected slots: diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp index 4b71c766a..b3bff63af 100644 --- a/kitchensync/src/configguigpe.cpp +++ b/kitchensync/src/configguigpe.cpp @@ -21,18 +21,18 @@ #include "configguigpe.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include -ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, QWidget *parent ) +ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { initGUI(); @@ -41,14 +41,14 @@ ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, QWidget *parent ) mConnectionMode->insertItem( i18n( "Ssh" ) ); } -void ConfigGuiGpe::load( const QString &xml ) +void ConfigGuiGpe::load( const TQString &xml ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( xml ); - QDomElement docElement = doc.documentElement(); - QDomNode node; + TQDomElement docElement = doc.documentElement(); + TQDomNode node; for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( element.tagName() == "use_local" ) { if ( element.text().toInt() == 1 ) mConnectionMode->setCurrentItem( 0 ); @@ -64,15 +64,15 @@ void ConfigGuiGpe::load( const QString &xml ) } } -QString ConfigGuiGpe::save() const +TQString ConfigGuiGpe::save() const { - QString config = ""; + TQString config = ""; - config += QString( "%1" ).arg( mConnectionMode->currentItem() == 0 ); - config += QString( "%1" ).arg( mConnectionMode->currentItem() == 1 ); - config += QString( "%1" ).arg( mIP->text() ); - config += QString( "%1" ).arg( mPort->value() ); - config += QString( "%1" ).arg( mUser->text() ); + config += TQString( "%1" ).arg( mConnectionMode->currentItem() == 0 ); + config += TQString( "%1" ).arg( mConnectionMode->currentItem() == 1 ); + config += TQString( "%1" ).arg( mIP->text() ); + config += TQString( "%1" ).arg( mPort->value() ); + config += TQString( "%1" ).arg( mUser->text() ); config += ""; @@ -81,23 +81,23 @@ QString ConfigGuiGpe::save() const void ConfigGuiGpe::initGUI() { - QGridLayout *layout = new QGridLayout( topLayout(), 12, 4, KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() ); layout->setMargin( KDialog::marginHint() ); - layout->addWidget( new QLabel( i18n( "Connection Mode:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 ); mConnectionMode = new KComboBox( this ); layout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 ); - layout->addWidget( new QLabel( i18n( "IP Address:" ), this ), 1, 0 ); + layout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 ); mIP = new KLineEdit( this ); mIP->setInputMask( "000.000.000.000" ); layout->addWidget( mIP, 1, 1 ); - layout->addWidget( new QLabel( i18n( "Port:" ), this ), 1, 2, Qt::AlignRight ); - mPort = new QSpinBox( 1, 65536, 1, this ); + layout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, Qt::AlignRight ); + mPort = new TQSpinBox( 1, 65536, 1, this ); layout->addWidget( mPort, 1, 3 ); - layout->addWidget( new QLabel( i18n( "User:" ), this ), 2, 0 ); + layout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 ); mUser = new KLineEdit( this ); layout->addMultiCellWidget( mUser, 2, 2, 1, 3 ); } diff --git a/kitchensync/src/configguigpe.h b/kitchensync/src/configguigpe.h index 48f66674e..141f084e3 100644 --- a/kitchensync/src/configguigpe.h +++ b/kitchensync/src/configguigpe.h @@ -32,10 +32,10 @@ class KLineEdit; class ConfigGuiGpe : public ConfigGui { public: - ConfigGuiGpe( const QSync::Member &, QWidget *parent ); + ConfigGuiGpe( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); - QString save() const; + void load( const TQString &xml ); + TQString save() const; private: void initGUI(); @@ -43,7 +43,7 @@ class ConfigGuiGpe : public ConfigGui KComboBox *mConnectionMode; KLineEdit *mIP; - QSpinBox *mPort; + TQSpinBox *mPort; KLineEdit *mUser; }; diff --git a/kitchensync/src/configguiirmc.cpp b/kitchensync/src/configguiirmc.cpp index 54d837b68..721c82d70 100644 --- a/kitchensync/src/configguiirmc.cpp +++ b/kitchensync/src/configguiirmc.cpp @@ -30,19 +30,19 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "configguiirmc.h" -ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, QWidget *parent ) +ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { initGUI(); @@ -51,20 +51,20 @@ ConfigGuiIRMC::ConfigGuiIRMC( const QSync::Member &member, QWidget *parent ) mConnectionType->insertItem( i18n( "InfraRed (IR)" ) ); mConnectionType->insertItem( i18n( "Cable" ) ); - connect( mConnectionType, SIGNAL( activated( int ) ), - this, SLOT( connectionTypeChanged( int ) ) ); + connect( mConnectionType, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( connectionTypeChanged( int ) ) ); connectionTypeChanged( 0 ); } -void ConfigGuiIRMC::load( const QString &xml ) +void ConfigGuiIRMC::load( const TQString &xml ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( xml ); - QDomElement docElement = doc.documentElement(); - QDomNode node; + TQDomElement docElement = doc.documentElement(); + TQDomNode node; for ( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( element.tagName() == "connectmedium" ) { if ( element.text() == "bluetooth" ) { mConnectionType->setCurrentItem( 0 ); @@ -91,13 +91,13 @@ void ConfigGuiIRMC::load( const QString &xml ) mCableWidget->load( docElement ); } -QString ConfigGuiIRMC::save() const +TQString ConfigGuiIRMC::save() const { - QDomDocument doc; - QDomElement config = doc.createElement( "config" ); + TQDomDocument doc; + TQDomElement config = doc.createElement( "config" ); doc.appendChild( config ); - QDomElement element = doc.createElement( "connectmedium" ); + TQDomElement element = doc.createElement( "connectmedium" ); if ( mConnectionType->currentItem() == 0 ) element.appendChild( doc.createTextNode( "bluetooth" ) ); if ( mConnectionType->currentItem() == 1 ) @@ -108,11 +108,11 @@ QString ConfigGuiIRMC::save() const config.appendChild( element ); if ( mConnectionType->currentItem() == 0 ) { - QDomElement btunit = doc.createElement( "btunit" ); + TQDomElement btunit = doc.createElement( "btunit" ); if ( !mBluetoothWidget->address().isEmpty() ) btunit.appendChild( doc.createTextNode( mBluetoothWidget->address() ) ); - QDomElement btchannel = doc.createElement( "btchannel" ); + TQDomElement btchannel = doc.createElement( "btchannel" ); if ( !mBluetoothWidget->channel().isEmpty() ) btchannel.appendChild( doc.createTextNode( mBluetoothWidget->channel() ) ); @@ -121,7 +121,7 @@ QString ConfigGuiIRMC::save() const } if ( mDontTellSync->isChecked() ) { - QDomElement dontellsync = doc.createElement( "donttellsync" ); + TQDomElement dontellsync = doc.createElement( "donttellsync" ); dontellsync.appendChild( doc.createTextNode( "true" ) ); config.appendChild( dontellsync ); } @@ -148,17 +148,17 @@ void ConfigGuiIRMC::connectionTypeChanged( int type ) void ConfigGuiIRMC::initGUI() { - QTabWidget *tabWidget = new QTabWidget( this ); + TQTabWidget *tabWidget = new TQTabWidget( this ); topLayout()->addWidget( tabWidget ); - QVBox *connectionWidget = new QVBox( tabWidget ); + TQVBox *connectionWidget = new TQVBox( tabWidget ); connectionWidget->setMargin( KDialog::marginHint() ); connectionWidget->setSpacing( 5 ); tabWidget->addTab( connectionWidget, i18n( "Connection" ) ); mConnectionType = new KComboBox( connectionWidget ); - QToolTip::add( mConnectionType, i18n( "Select your connection type." ) ); + TQToolTip::add( mConnectionType, i18n( "Select your connection type." ) ); mBluetoothWidget = new BluetoothWidget( connectionWidget ); mBluetoothWidget->hide(); @@ -173,18 +173,18 @@ void ConfigGuiIRMC::initGUI() connectionWidget->setStretchFactor( mIRWidget, 1 ); connectionWidget->setStretchFactor( mCableWidget, 1 ); - QVBox *optionsWidget = new QVBox( tabWidget ); + TQVBox *optionsWidget = new TQVBox( tabWidget ); optionsWidget->setMargin( KDialog::marginHint() ); optionsWidget->setSpacing( 5 ); tabWidget->addTab( optionsWidget, i18n( "Options" ) ); - QHBox *optionBox = new QHBox( optionsWidget ); + TQHBox *optionBox = new TQHBox( optionsWidget ); optionBox->setSpacing( KDialog::spacingHint() ); - QLabel *label = new QLabel( i18n( "Don't send OBEX UUID (IRMC-SYNC)" ), optionBox ); - mDontTellSync = new QCheckBox( optionBox ); - QToolTip::add( mDontTellSync, i18n( "Don't send OBEX UUID while connecting. Needed for older IrMC based mobile phones." ) ); + TQLabel *label = new TQLabel( i18n( "Don't send OBEX UUID (IRMC-SYNC)" ), optionBox ); + mDontTellSync = new TQCheckBox( optionBox ); + TQToolTip::add( mDontTellSync, i18n( "Don't send OBEX UUID while connecting. Needed for older IrMC based mobile phones." ) ); label->setBuddy( mDontTellSync ); } diff --git a/kitchensync/src/configguiirmc.h b/kitchensync/src/configguiirmc.h index a50051679..20f1197c8 100644 --- a/kitchensync/src/configguiirmc.h +++ b/kitchensync/src/configguiirmc.h @@ -22,8 +22,8 @@ #ifndef CONFIGGUIIRMC_H #define CONFIGGUIIRMC_H -#include -#include +#include +#include #include "configgui.h" #include "connectionwidgets.h" @@ -39,10 +39,10 @@ class ConfigGuiIRMC : public ConfigGui Q_OBJECT public: - ConfigGuiIRMC( const QSync::Member &, QWidget *parent ); + ConfigGuiIRMC( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); - QString save() const; + void load( const TQString &xml ); + TQString save() const; protected slots: void connectionTypeChanged( int type ); @@ -51,7 +51,7 @@ class ConfigGuiIRMC : public ConfigGui void initGUI(); KComboBox *mConnectionType; - QCheckBox *mDontTellSync; + TQCheckBox *mDontTellSync; BluetoothWidget *mBluetoothWidget; IRWidget *mIRWidget; diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp index 6a66e8590..2b37ad424 100644 --- a/kitchensync/src/configguijescs.cpp +++ b/kitchensync/src/configguijescs.cpp @@ -21,29 +21,29 @@ #include "configguijescs.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, QWidget *parent ) +ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { initGUI(); } -void ConfigGuiJescs::load( const QString &xml ) +void ConfigGuiJescs::load( const TQString &xml ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( xml ); - QDomElement docElement = doc.documentElement(); - QDomNode node; + TQDomElement docElement = doc.documentElement(); + TQDomNode node; for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( element.tagName() == "url" ) { mUrl->setText( element.text() ); } else if ( element.tagName() == "username" ) { @@ -56,18 +56,18 @@ void ConfigGuiJescs::load( const QString &xml ) } } -QString ConfigGuiJescs::save() const +TQString ConfigGuiJescs::save() const { int delNotifyState; - QString config = "\n"; + TQString config = "\n"; - config += QString( "%1\n" ).arg( mUrl->text() ); - config += QString( "%1\n" ).arg( mUsername->text() ); - config += QString( "%1\n" ).arg( mPassword->text() ); + config += TQString( "%1\n" ).arg( mUrl->text() ); + config += TQString( "%1\n" ).arg( mUsername->text() ); + config += TQString( "%1\n" ).arg( mPassword->text() ); if ( mDelNotify->isChecked() ) { delNotifyState = 1; } else { delNotifyState = 0; } - config += QString( "%1\n" ).arg( delNotifyState ); + config += TQString( "%1\n" ).arg( delNotifyState ); config += ""; @@ -76,23 +76,23 @@ QString ConfigGuiJescs::save() const void ConfigGuiJescs::initGUI() { - QGridLayout *layout = new QGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); layout->setMargin( KDialog::marginHint() ); - layout->addWidget( new QLabel( i18n( "URL:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 ); mUrl = new KLineEdit( this ); layout->addMultiCellWidget( mUrl, 0, 0, 1, 2 ); - layout->addWidget( new QLabel( i18n( "Username:" ), this ), 1, 0 ); + layout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 ); mUsername = new KLineEdit( this ); layout->addMultiCellWidget( mUsername, 1, 1, 1, 2 ); - layout->addWidget( new QLabel( i18n( "Password:" ), this ), 2, 0 ); + layout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 ); mPassword = new KLineEdit( this ); mPassword->setEchoMode( KLineEdit::Password ); layout->addMultiCellWidget( mPassword, 2, 2, 1, 2 ); - mDelNotify = new QCheckBox( this ); + mDelNotify = new TQCheckBox( this ); mDelNotify->setText( "Notify attendees about event/task deletion" ); layout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 ); } diff --git a/kitchensync/src/configguijescs.h b/kitchensync/src/configguijescs.h index 4e56376bb..672d81b72 100644 --- a/kitchensync/src/configguijescs.h +++ b/kitchensync/src/configguijescs.h @@ -30,11 +30,11 @@ class QCheckBox; class ConfigGuiJescs : public ConfigGui { public: - ConfigGuiJescs( const QSync::Member &, QWidget *parent ); + ConfigGuiJescs( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); + void load( const TQString &xml ); - QString save() const; + TQString save() const; private: void initGUI(); @@ -42,7 +42,7 @@ class ConfigGuiJescs : public ConfigGui KLineEdit *mUrl; KLineEdit *mUsername; KLineEdit *mPassword; - QCheckBox *mDelNotify; + TQCheckBox *mDelNotify; }; #endif diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp index ce4881156..3ef451c36 100644 --- a/kitchensync/src/configguildap.cpp +++ b/kitchensync/src/configguildap.cpp @@ -21,18 +21,18 @@ #include "configguildap.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include -ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, QWidget *parent ) +ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { initGUI(); @@ -42,14 +42,14 @@ ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, QWidget *parent ) mSearchScope->insertItem( i18n( "Sub" ) ); } -void ConfigGuiLdap::load( const QString &xml ) +void ConfigGuiLdap::load( const TQString &xml ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( xml ); - QDomElement docElement = doc.documentElement(); - QDomNode node; + TQDomElement docElement = doc.documentElement(); + TQDomNode node; for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( element.tagName() == "servername" ) { mLdapWidget->setHost( element.text() ); } else if ( element.tagName() == "serverport" ) { @@ -69,7 +69,7 @@ void ConfigGuiLdap::load( const QString &xml ) } else if ( element.tagName() == "keyattr" ) { mKeyAttribute->setText( element.text() ); } else if ( element.tagName() == "scope" ) { - QStringList list; + TQStringList list; list << "base" << "one" << "sub"; for ( uint i = 0; i < list.count(); ++i ) if ( list[ i ] == element.text() ) @@ -89,30 +89,30 @@ void ConfigGuiLdap::load( const QString &xml ) } } -QString ConfigGuiLdap::save() const +TQString ConfigGuiLdap::save() const { - QString config = "\n"; - - config += QString( "%1\n" ).arg( mLdapWidget->host() ); - config += QString( "%1\n" ).arg( mLdapWidget->port() ); - config += QString( "%1\n" ).arg( mLdapWidget->bindDN() ); - config += QString( "%1\n" ).arg( mLdapWidget->password() ); - config += QString( "%1\n" ).arg( mLdapWidget->isAuthAnon() ? "1" : "0" ); - config += QString( "%1\n" ).arg( mLdapWidget->dn() ); - config += QString( "%1\n" ).arg( mLdapWidget->filter() ); - config += QString( "%1\n" ).arg( mLdapWidget->dn() ); - config += QString( "%1\n" ).arg( mKeyAttribute->text() ); - - QStringList scopes; + TQString config = "\n"; + + config += TQString( "%1\n" ).arg( mLdapWidget->host() ); + config += TQString( "%1\n" ).arg( mLdapWidget->port() ); + config += TQString( "%1\n" ).arg( mLdapWidget->bindDN() ); + config += TQString( "%1\n" ).arg( mLdapWidget->password() ); + config += TQString( "%1\n" ).arg( mLdapWidget->isAuthAnon() ? "1" : "0" ); + config += TQString( "%1\n" ).arg( mLdapWidget->dn() ); + config += TQString( "%1\n" ).arg( mLdapWidget->filter() ); + config += TQString( "%1\n" ).arg( mLdapWidget->dn() ); + config += TQString( "%1\n" ).arg( mKeyAttribute->text() ); + + TQStringList scopes; scopes << "base" << "one" << "sub"; - config += QString( "%1\n" ).arg( scopes[ mSearchScope->currentItem() ] ); + config += TQString( "%1\n" ).arg( scopes[ mSearchScope->currentItem() ] ); - config += QString( "SIMPLE\n" ); - config += QString( "%1\n" ).arg( mEncryption->isChecked() ? "1" : "0" ); + config += TQString( "SIMPLE\n" ); + config += TQString( "%1\n" ).arg( mEncryption->isChecked() ? "1" : "0" ); - config += QString( "%1\n" ).arg( mReadLdap->isChecked() ? "1" : "0" ); - config += QString( "%1\n" ).arg( mWriteLdap->isChecked() ? "1" : "0" ); + config += TQString( "%1\n" ).arg( mReadLdap->isChecked() ? "1" : "0" ); + config += TQString( "%1\n" ).arg( mWriteLdap->isChecked() ? "1" : "0" ); config += ""; @@ -121,7 +121,7 @@ QString ConfigGuiLdap::save() const void ConfigGuiLdap::initGUI() { - QGridLayout *layout = new QGridLayout( topLayout(), 12, 4, KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() ); layout->setMargin( KDialog::marginHint() ); mLdapWidget = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_HOST | @@ -135,14 +135,14 @@ void ConfigGuiLdap::initGUI() mKeyAttribute = new KLineEdit( this ); mSearchScope = new KComboBox( this ); - mEncryption = new QCheckBox( i18n( "Use encryption" ), this ); - mReadLdap = new QCheckBox( i18n( "Load data from LDAP" ), this ); - mWriteLdap = new QCheckBox( i18n( "Save data to LDAP" ), this ); + mEncryption = new TQCheckBox( i18n( "Use encryption" ), this ); + mReadLdap = new TQCheckBox( i18n( "Load data from LDAP" ), this ); + mWriteLdap = new TQCheckBox( i18n( "Save data to LDAP" ), this ); layout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 ); - layout->addWidget( new QLabel( i18n( "Key Attribute:" ), this ), 10, 0 ); + layout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 ); layout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 ); - layout->addWidget( new QLabel( i18n( "Search Scope:" ), this ), 11, 0 ); + layout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 ); layout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 ); layout->addWidget( mEncryption, 12, 0 ); layout->addWidget( mReadLdap, 13, 0 ); diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h index e02d7ab68..d40c01e38 100644 --- a/kitchensync/src/configguildap.h +++ b/kitchensync/src/configguildap.h @@ -38,10 +38,10 @@ class ConfigGuiLdap : public ConfigGui Q_OBJECT public: - ConfigGuiLdap( const QSync::Member &, QWidget *parent ); + ConfigGuiLdap( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); - QString save() const; + void load( const TQString &xml ); + TQString save() const; private: void initGUI(); @@ -49,9 +49,9 @@ class ConfigGuiLdap : public ConfigGui KABC::LdapConfigWidget *mLdapWidget; KLineEdit *mKeyAttribute; KComboBox *mSearchScope; - QCheckBox *mEncryption; - QCheckBox *mReadLdap; - QCheckBox *mWriteLdap; + TQCheckBox *mEncryption; + TQCheckBox *mReadLdap; + TQCheckBox *mWriteLdap; }; diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp index 80c493dca..a310692f0 100644 --- a/kitchensync/src/configguimoto.cpp +++ b/kitchensync/src/configguimoto.cpp @@ -21,39 +21,39 @@ #include "configguimoto.h" -#include -#include -#include +#include +#include +#include #include #include #include -ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, QWidget *parent ) +ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { initGUI(); } -void ConfigGuiMoto::load( const QString &xml ) +void ConfigGuiMoto::load( const TQString &xml ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( xml ); - QDomElement docElement = doc.documentElement(); - QDomNode node; + TQDomElement docElement = doc.documentElement(); + TQDomNode node; for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( element.tagName() == "device" ) { mDeviceString->setText( element.text() ); } } } -QString ConfigGuiMoto::save() const +TQString ConfigGuiMoto::save() const { - QString config = "\n"; + TQString config = "\n"; - config += QString( "%1\n" ).arg( mDeviceString->text() ); + config += TQString( "%1\n" ).arg( mDeviceString->text() ); config += ""; @@ -62,10 +62,10 @@ QString ConfigGuiMoto::save() const void ConfigGuiMoto::initGUI() { - QGridLayout *layout = new QGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() ); layout->setMargin( KDialog::marginHint() ); - layout->addWidget( new QLabel( i18n( "Device String:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 ); mDeviceString = new KLineEdit( this ); layout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 ); } diff --git a/kitchensync/src/configguimoto.h b/kitchensync/src/configguimoto.h index 54afcb759..cd588facf 100644 --- a/kitchensync/src/configguimoto.h +++ b/kitchensync/src/configguimoto.h @@ -29,10 +29,10 @@ class KLineEdit; class ConfigGuiMoto : public ConfigGui { public: - ConfigGuiMoto( const QSync::Member &, QWidget *parent ); + ConfigGuiMoto( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); - QString save() const; + void load( const TQString &xml ); + TQString save() const; private: void initGUI(); diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp index 6d0a5d80c..e823ffe3e 100644 --- a/kitchensync/src/configguiopie.cpp +++ b/kitchensync/src/configguiopie.cpp @@ -23,59 +23,59 @@ #include -#include -#include -#include -#include -#include -#include - -ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, QWidget *parent ) +#include +#include +#include +#include +#include +#include + +ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { - QGridLayout *layout = new QGridLayout( topLayout() ); + TQGridLayout *layout = new TQGridLayout( topLayout() ); - QLabel *label = new QLabel( i18n("Device IP:"), this ); + TQLabel *label = new TQLabel( i18n("Device IP:"), this ); layout->addWidget( label, 0, 0 ); - mDeviceIP = new QLineEdit( this ); + mDeviceIP = new TQLineEdit( this ); mDeviceIP->setInputMask( "000.000.000.000" ); label->setBuddy( mDeviceIP ); layout->addWidget( mDeviceIP, 0, 1 ); - label = new QLabel( i18n("Device Type:"), this ); + label = new TQLabel( i18n("Device Type:"), this ); layout->addWidget( label, 1, 0 ); - mDeviceType = new QComboBox( this ); + mDeviceType = new TQComboBox( this ); label->setBuddy( mDeviceType ); layout->addWidget( mDeviceType, 1, 1 ); - label = new QLabel( i18n("Username:"), this ); + label = new TQLabel( i18n("Username:"), this ); layout->addWidget( label, 2, 0 ); - mUserName = new QLineEdit( this ); + mUserName = new TQLineEdit( this ); label->setBuddy( mUserName ); layout->addWidget( mUserName, 2, 1 ); - label = new QLabel( i18n("Password:"), this ); + label = new TQLabel( i18n("Password:"), this ); layout->addWidget( label, 3, 0 ); - mPassword = new QLineEdit( this ); - mPassword->setEchoMode( QLineEdit::Password ); + mPassword = new TQLineEdit( this ); + mPassword->setEchoMode( TQLineEdit::Password ); label->setBuddy( mPassword ); layout->addWidget( mPassword, 3, 1 ); - label = new QLabel( i18n("Protocol:"), this ); + label = new TQLabel( i18n("Protocol:"), this ); layout->addWidget( label, 4, 0 ); - mConnectionType = new QComboBox( this ); + mConnectionType = new TQComboBox( this ); label->setBuddy( mConnectionType ); layout->addWidget( mConnectionType, 4, 1 ); - label = new QLabel( i18n("Port:"), this ); + label = new TQLabel( i18n("Port:"), this ); layout->addWidget( label, 5, 0 ); - mPort = new QSpinBox( this ); + mPort = new TQSpinBox( this ); mPort->setRange( 0, 65335 ); label->setBuddy( mPort ); layout->addWidget( mPort, 5, 1 ); @@ -89,14 +89,14 @@ ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, QWidget *parent ) topLayout()->addStretch( 1 ); } -void ConfigGuiOpie::load( const QString &xml ) +void ConfigGuiOpie::load( const TQString &xml ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( xml ); - QDomElement docElement = doc.documentElement(); - QDomNode n; + TQDomElement docElement = doc.documentElement(); + TQDomNode n; for( n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if ( e.tagName() == "username" ) { mUserName->setText( e.text() ); } else if ( e.tagName() == "password" ) { @@ -119,16 +119,16 @@ void ConfigGuiOpie::load( const QString &xml ) } } -QString ConfigGuiOpie::save() const +TQString ConfigGuiOpie::save() const { - QString xml; + TQString xml; xml = ""; xml += "" + mUserName->text() + ""; xml += "" + mPassword->text() + ""; xml += "" + mDeviceIP->text() + ""; - xml += "" + QString( mDeviceType->currentItem() == 0 ? "opie" : "qtopia2" ) + ""; - xml += "" + QString::number( mPort->value() ) + ""; - xml += "" + QString( mConnectionType->currentItem() == 0 ? "scp" : "ftp" ) + ""; + xml += "" + TQString( mDeviceType->currentItem() == 0 ? "opie" : "qtopia2" ) + ""; + xml += "" + TQString::number( mPort->value() ) + ""; + xml += "" + TQString( mConnectionType->currentItem() == 0 ? "scp" : "ftp" ) + ""; xml += ""; return xml; diff --git a/kitchensync/src/configguiopie.h b/kitchensync/src/configguiopie.h index 671526d6d..8d5e195a2 100644 --- a/kitchensync/src/configguiopie.h +++ b/kitchensync/src/configguiopie.h @@ -30,18 +30,18 @@ class QSpinBox; class ConfigGuiOpie : public ConfigGui { public: - ConfigGuiOpie( const QSync::Member &, QWidget *parent ); + ConfigGuiOpie( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); - QString save() const; + void load( const TQString &xml ); + TQString save() const; private: - QLineEdit *mDeviceIP; - QComboBox *mDeviceType; - QLineEdit *mUserName; - QLineEdit *mPassword; - QComboBox *mConnectionType; - QSpinBox *mPort; + TQLineEdit *mDeviceIP; + TQComboBox *mDeviceType; + TQLineEdit *mUserName; + TQLineEdit *mPassword; + TQComboBox *mConnectionType; + TQSpinBox *mPort; }; #endif diff --git a/kitchensync/src/configguipalm.cpp b/kitchensync/src/configguipalm.cpp index de18e92c2..03d87cdb4 100644 --- a/kitchensync/src/configguipalm.cpp +++ b/kitchensync/src/configguipalm.cpp @@ -24,18 +24,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "configguipalm.h" -ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, QWidget *parent ) +ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { initGUI(); @@ -53,14 +53,14 @@ ConfigGuiPalm::ConfigGuiPalm( const QSync::Member &member, QWidget *parent ) mSpeed->insertItem( "115200" ); } -void ConfigGuiPalm::load( const QString &xml ) +void ConfigGuiPalm::load( const TQString &xml ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( xml ); - QDomElement docElement = doc.documentElement(); - QDomNode node; + TQDomElement docElement = doc.documentElement(); + TQDomNode node; for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( element.tagName() == "sockaddr" ) { mDevice->setCurrentText( element.text() ); } else if ( element.tagName() == "speed" ) { @@ -88,20 +88,20 @@ void ConfigGuiPalm::load( const QString &xml ) } } -QString ConfigGuiPalm::save() const +TQString ConfigGuiPalm::save() const { - QString config = ""; + TQString config = ""; config += "" + mDevice->currentText() + ""; config += "" + mUserName->text() + ""; - config += "" + QString::number( mTimeout->value() ) + ""; + config += "" + TQString::number( mTimeout->value() ) + ""; config += "0"; config += "" + mSpeed->currentText() + ""; config += "0"; config += "cp1252"; - config += "" + QString( mPopup->isChecked() ? "1" : "0" ) + ""; + config += "" + TQString( mPopup->isChecked() ? "1" : "0" ) + ""; - QString popup; + TQString popup; if ( mSyncAlways->isChecked() ) popup = "0"; else if ( mSyncAsk->isChecked() ) @@ -118,29 +118,29 @@ QString ConfigGuiPalm::save() const void ConfigGuiPalm::initGUI() { - QFont boldFont = font(); + TQFont boldFont = font(); boldFont.setBold( true ); - QTabWidget *tabWidget = new QTabWidget( this ); + TQTabWidget *tabWidget = new TQTabWidget( this ); - QWidget *connectionWidget = new QWidget( tabWidget ); - QVBoxLayout *connectionLayout = new QVBoxLayout( connectionWidget, + TQWidget *connectionWidget = new TQWidget( tabWidget ); + TQVBoxLayout *connectionLayout = new TQVBoxLayout( connectionWidget, KDialog::marginHint(), KDialog::spacingHint() ); - QLabel *label = new QLabel( i18n( "Connection" ), connectionWidget ); + TQLabel *label = new TQLabel( i18n( "Connection" ), connectionWidget ); label->setFont( boldFont ); connectionLayout->addWidget( label ); - QGridLayout *gridLayout = new QGridLayout( connectionLayout, 3, 2, KDialog::spacingHint() ); + TQGridLayout *gridLayout = new TQGridLayout( connectionLayout, 3, 2, KDialog::spacingHint() ); gridLayout->setMargin( KDialog::marginHint() ); - gridLayout->addWidget( new QLabel( i18n( "Port:" ), connectionWidget ), 0, 0 ); - gridLayout->addWidget( new QLabel( i18n( "Speed:" ), connectionWidget ), 1, 0 ); - gridLayout->addWidget( new QLabel( i18n( "Timeout:" ), connectionWidget ), 2, 0 ); + gridLayout->addWidget( new TQLabel( i18n( "Port:" ), connectionWidget ), 0, 0 ); + gridLayout->addWidget( new TQLabel( i18n( "Speed:" ), connectionWidget ), 1, 0 ); + gridLayout->addWidget( new TQLabel( i18n( "Timeout:" ), connectionWidget ), 2, 0 ); mDevice = new KComboBox( true, connectionWidget ); mSpeed = new KComboBox( connectionWidget ); - mTimeout = new QSpinBox( 1, 60, 1, connectionWidget ); + mTimeout = new TQSpinBox( 1, 60, 1, connectionWidget ); mTimeout->setSuffix( i18n( " sec" ) ); gridLayout->addWidget( mDevice, 0, 1 ); @@ -148,49 +148,49 @@ void ConfigGuiPalm::initGUI() gridLayout->addWidget( mTimeout, 2, 1 ); gridLayout->setColStretch( 1, 1 ); - label = new QLabel( i18n( "User" ), connectionWidget ); + label = new TQLabel( i18n( "User" ), connectionWidget ); label->setFont( boldFont ); connectionLayout->addWidget( label ); - gridLayout = new QGridLayout( connectionLayout, 1, 2, KDialog::spacingHint() ); + gridLayout = new TQGridLayout( connectionLayout, 1, 2, KDialog::spacingHint() ); gridLayout->setMargin( KDialog::marginHint() ); - gridLayout->addWidget( new QLabel( i18n( "Username:" ), connectionWidget ), 0, 0 ); + gridLayout->addWidget( new TQLabel( i18n( "Username:" ), connectionWidget ), 0, 0 ); mUserName = new KLineEdit( connectionWidget ); gridLayout->addWidget( mUserName, 0, 1 ); - label = new QLabel( i18n( "What to do if Username does not match" ), connectionWidget ); + label = new TQLabel( i18n( "What to do if Username does not match" ), connectionWidget ); label->setFont( boldFont ); connectionLayout->addWidget( label ); - gridLayout = new QGridLayout( connectionLayout, 1, 2, KDialog::spacingHint() ); + gridLayout = new TQGridLayout( connectionLayout, 1, 2, KDialog::spacingHint() ); gridLayout->setMargin( KDialog::marginHint() ); - QButtonGroup *buttonGroup = new QButtonGroup( 1, Qt::Horizontal, connectionWidget ); + TQButtonGroup *buttonGroup = new TQButtonGroup( 1, Qt::Horizontal, connectionWidget ); buttonGroup->setExclusive( true ); - buttonGroup->setFrameStyle( QFrame::NoFrame ); - mSyncAlways = new QRadioButton( i18n( "Sync Anyway" ), buttonGroup ); - mSyncAsk = new QRadioButton( i18n( "Ask What To Do" ), buttonGroup ); - mSyncAbort = new QRadioButton( i18n( "Abort Sync" ), buttonGroup ); + buttonGroup->setFrameStyle( TQFrame::NoFrame ); + mSyncAlways = new TQRadioButton( i18n( "Sync Anyway" ), buttonGroup ); + mSyncAsk = new TQRadioButton( i18n( "Ask What To Do" ), buttonGroup ); + mSyncAbort = new TQRadioButton( i18n( "Abort Sync" ), buttonGroup ); gridLayout->addMultiCellWidget( buttonGroup, 0, 0, 0, 1 ); connectionLayout->addStretch( 1 ); tabWidget->addTab( connectionWidget, i18n( "Connection" ) ); - QWidget *optionWidget = new QWidget( tabWidget ); - QVBoxLayout *optionLayout = new QVBoxLayout( optionWidget, + TQWidget *optionWidget = new TQWidget( tabWidget ); + TQVBoxLayout *optionLayout = new TQVBoxLayout( optionWidget, KDialog::marginHint(), KDialog::spacingHint() ); - label = new QLabel( i18n( "Hotsync Notification" ), optionWidget ); + label = new TQLabel( i18n( "Hotsync Notification" ), optionWidget ); label->setFont( boldFont ); optionLayout->addWidget( label ); - gridLayout = new QGridLayout( optionLayout, 1, 2, KDialog::spacingHint() ); + gridLayout = new TQGridLayout( optionLayout, 1, 2, KDialog::spacingHint() ); gridLayout->setMargin( KDialog::marginHint() ); - mPopup = new QCheckBox( i18n( "Popup when interaction is required" ), optionWidget ); + mPopup = new TQCheckBox( i18n( "Popup when interaction is required" ), optionWidget ); gridLayout->addMultiCellWidget( mPopup, 0, 0, 0, 1 ); optionLayout->addStretch( 1 ); diff --git a/kitchensync/src/configguipalm.h b/kitchensync/src/configguipalm.h index 212ef61a6..bfae30a24 100644 --- a/kitchensync/src/configguipalm.h +++ b/kitchensync/src/configguipalm.h @@ -33,25 +33,25 @@ class QSpinBox; class ConfigGuiPalm : public ConfigGui { public: - ConfigGuiPalm( const QSync::Member &, QWidget *parent ); + ConfigGuiPalm( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); - QString save() const; + void load( const TQString &xml ); + TQString save() const; private: void initGUI(); KComboBox *mDevice; KComboBox *mSpeed; - QSpinBox *mTimeout; + TQSpinBox *mTimeout; KLineEdit *mUserName; - QRadioButton *mSyncAlways; - QRadioButton *mSyncAsk; - QRadioButton *mSyncAbort; + TQRadioButton *mSyncAlways; + TQRadioButton *mSyncAsk; + TQRadioButton *mSyncAbort; - QCheckBox *mPopup; + TQCheckBox *mPopup; KComboBox *mVerbosity; KComboBox *mCodePage; }; diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp index 7b09cd50c..99e86f3c7 100644 --- a/kitchensync/src/configguisunbird.cpp +++ b/kitchensync/src/configguisunbird.cpp @@ -22,16 +22,16 @@ #include "configguisunbird.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -40,131 +40,131 @@ #include #include -ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, QWidget *parent ) +ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { - QTabWidget *tabWidget = new QTabWidget( this ); + TQTabWidget *tabWidget = new TQTabWidget( this ); topLayout()->addWidget( tabWidget ); - mLocalWidget = new QWidget( tabWidget ); - mLocalLayout = new QVBoxLayout( mLocalWidget, KDialog::spacingHint() ); + mLocalWidget = new TQWidget( tabWidget ); + mLocalLayout = new TQVBoxLayout( mLocalWidget, KDialog::spacingHint() ); - mWebdavWidget = new QWidget( tabWidget ); - mWebdavLayout = new QVBoxLayout( mWebdavWidget, KDialog::spacingHint() ); + mWebdavWidget = new TQWidget( tabWidget ); + mWebdavLayout = new TQVBoxLayout( mWebdavWidget, KDialog::spacingHint() ); tabWidget->addTab( mLocalWidget, i18n( "Local Calendars" ) ); tabWidget->addTab( mWebdavWidget, i18n( "WebDAV Calendars" ) ); KPushButton *mLocalAddButton = new KPushButton( mLocalWidget ); mLocalAddButton->setText( i18n( "Add new calendar" ) ); - mLocalAddButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); + mLocalAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mLocalLayout->addWidget( mLocalAddButton ); - connect( mLocalAddButton, SIGNAL( clicked() ), - this, SLOT( addLocalCalendar() ) ); + connect( mLocalAddButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( addLocalCalendar() ) ); KPushButton *mWebdavAddButton = new KPushButton( mWebdavWidget ); mWebdavAddButton->setText( i18n( "Add new calendar" ) ); - mWebdavAddButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); + mWebdavAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mWebdavLayout->addWidget( mWebdavAddButton ); - connect( mWebdavAddButton, SIGNAL( clicked() ), - this, SLOT( addWebdavCalendar() ) ); + connect( mWebdavAddButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( addWebdavCalendar() ) ); - mLocalSpacer = new QSpacerItem( 20, 40, QSizePolicy::Expanding ); + mLocalSpacer = new TQSpacerItem( 20, 40, TQSizePolicy::Expanding ); mLocalLayout->addItem( mLocalSpacer ); - mWebdavSpacer = new QSpacerItem( 20, 40, QSizePolicy::Expanding ); + mWebdavSpacer = new TQSpacerItem( 20, 40, TQSizePolicy::Expanding ); mWebdavLayout->addItem( mWebdavSpacer ); } -void ConfigGuiSunbird::load( const QString &xml ) +void ConfigGuiSunbird::load( const TQString &xml ) { - QString path; - QString url; - QString username; - QString password; - QString defaultcal; - QString days; - - QDomDocument doc; + TQString path; + TQString url; + TQString username; + TQString password; + TQString defaultcal; + TQString days; + + TQDomDocument doc; doc.setContent( xml ); - QDomElement docElement = doc.documentElement(); - QDomNode node; + TQDomElement docElement = doc.documentElement(); + TQDomNode node; for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( element.tagName() == "file" ) { - QDomAttr pathAttr = element.attributeNode( "path" ); + TQDomAttr pathAttr = element.attributeNode( "path" ); path = pathAttr.value(); - QDomAttr defaultAttr = element.attributeNode( "default" ); + TQDomAttr defaultAttr = element.attributeNode( "default" ); defaultcal = defaultAttr.value(); - QDomAttr daysAttr = element.attributeNode( "deletedaysold" ); + TQDomAttr daysAttr = element.attributeNode( "deletedaysold" ); days = daysAttr.value(); LocalCalendar *cal = new LocalCalendar( path, defaultcal, days, mLocalWidget ); mLocalLayout->removeItem( mLocalSpacer ); - cal->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); + cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); mLocalLayout->addWidget( cal ); mLocalLayout->addItem( mLocalSpacer ); mLocalList.append( cal ); - connect( cal, SIGNAL( deleteRequest( LocalCalendar* ) ), SLOT( delLocalCalendar( LocalCalendar* ) ) ); + connect( cal, TQT_SIGNAL( deleteRequest( LocalCalendar* ) ), TQT_SLOT( delLocalCalendar( LocalCalendar* ) ) ); cal->show(); } else if ( element.tagName() == "webdav" ) { - QDomAttr urlAttr = element.attributeNode( "url" ); + TQDomAttr urlAttr = element.attributeNode( "url" ); url = urlAttr.value(); - QDomAttr unameAttr = element.attributeNode( "username" ); + TQDomAttr unameAttr = element.attributeNode( "username" ); username = unameAttr.value(); - QDomAttr pwordAttr = element.attributeNode( "password" ); + TQDomAttr pwordAttr = element.attributeNode( "password" ); password = pwordAttr.value(); - QDomAttr defaultAttr = element.attributeNode( "default" ); + TQDomAttr defaultAttr = element.attributeNode( "default" ); defaultcal = defaultAttr.value(); - QDomAttr daysAttr = element.attributeNode( "deletedaysold" ); + TQDomAttr daysAttr = element.attributeNode( "deletedaysold" ); days = daysAttr.value(); WebdavCalendar *cal = new WebdavCalendar( username, password, url, defaultcal, days, mWebdavWidget ); mWebdavLayout->removeItem( mWebdavSpacer ); - cal->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); + cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); mWebdavLayout->addWidget( cal ); mWebdavLayout->addItem( mWebdavSpacer ); mWebdavList.append( cal ); - connect( cal, SIGNAL( deleteRequest( WebdavCalendar* ) ), SLOT( delWebdavCalendar( WebdavCalendar* ) ) ); + connect( cal, TQT_SIGNAL( deleteRequest( WebdavCalendar* ) ), TQT_SLOT( delWebdavCalendar( WebdavCalendar* ) ) ); cal->show(); } } } -QString ConfigGuiSunbird::save() const +TQString ConfigGuiSunbird::save() const { - QString config = "\n"; + TQString config = "\n"; for ( uint i = 0; i < mLocalList.count(); ++i ) { LocalCalendar *lcal = mLocalList[ i ]; - config += QString( "mPathRequester->url() ); + config += TQString( "mPathRequester->url() ); if ( lcal->mDaysCheckBox->isChecked() ) { - config += QString( "deletedaysold=\"%1\" " ).arg( lcal->mDaysSpinBox->value() ); + config += TQString( "deletedaysold=\"%1\" " ).arg( lcal->mDaysSpinBox->value() ); } if ( lcal->mDefaultCheckBox->isChecked() ) { - config += QString( "default=\"1\" " ); + config += TQString( "default=\"1\" " ); } - config += QString( "/>\n" ); + config += TQString( "/>\n" ); } for ( uint i = 0; i < mWebdavList.count(); ++i ) { WebdavCalendar *wcal = mWebdavList[ i ]; - config += QString( "mUsername->text() ); - config += QString( "password=\"%1\" " ).arg( wcal->mPassword->text() ); - config += QString( "url=\"%1\" " ).arg( wcal->mUrl->text() ); + config += TQString( "mUsername->text() ); + config += TQString( "password=\"%1\" " ).arg( wcal->mPassword->text() ); + config += TQString( "url=\"%1\" " ).arg( wcal->mUrl->text() ); if ( wcal->mDaysCheckBox->isChecked() ) { - config += QString( "deletedaysold=\"%1\" " ).arg( wcal->mDaysSpinBox->value() ); + config += TQString( "deletedaysold=\"%1\" " ).arg( wcal->mDaysSpinBox->value() ); } if ( wcal->mDefaultCheckBox->isChecked() ) { - config += QString( "default=\"1\" " ); + config += TQString( "default=\"1\" " ); } - config += QString( "/>\n" ); + config += TQString( "/>\n" ); } config += ""; @@ -175,12 +175,12 @@ void ConfigGuiSunbird::addLocalCalendar() { LocalCalendar *cal = new LocalCalendar( mLocalWidget ); mLocalLayout->removeItem( mLocalSpacer ); - cal->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); + cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); mLocalLayout->addWidget( cal ); mLocalLayout->addItem( mLocalSpacer ); mLocalList.append( cal ); - connect( cal, SIGNAL( deleteRequest( LocalCalendar* ) ), SLOT( delLocalCalendar( LocalCalendar* ) ) ); + connect( cal, TQT_SIGNAL( deleteRequest( LocalCalendar* ) ), TQT_SLOT( delLocalCalendar( LocalCalendar* ) ) ); cal->show(); } @@ -194,12 +194,12 @@ void ConfigGuiSunbird::addWebdavCalendar() { WebdavCalendar *cal = new WebdavCalendar( mWebdavWidget ); mWebdavLayout->removeItem( mWebdavSpacer ); - cal->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); + cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); mWebdavLayout->addWidget( cal ); mWebdavLayout->addItem( mWebdavSpacer ); mWebdavList.append( cal ); - connect( cal, SIGNAL( deleteRequest( WebdavCalendar* ) ), SLOT( delWebdavCalendar( WebdavCalendar* ) ) ); + connect( cal, TQT_SIGNAL( deleteRequest( WebdavCalendar* ) ), TQT_SLOT( delWebdavCalendar( WebdavCalendar* ) ) ); cal->show(); } @@ -209,14 +209,14 @@ void ConfigGuiSunbird::delWebdavCalendar( WebdavCalendar *calendar ) calendar->deleteLater(); } -LocalCalendar::LocalCalendar( QWidget *parent ) - : QWidget( parent ) +LocalCalendar::LocalCalendar( TQWidget *parent ) + : TQWidget( parent ) { initGui(); } -LocalCalendar::LocalCalendar( const QString &path, const QString &defaultcal, const QString &days, QWidget *parent ) - : QWidget( parent ) +LocalCalendar::LocalCalendar( const TQString &path, const TQString &defaultcal, const TQString &days, TQWidget *parent ) + : TQWidget( parent ) { initGui(); @@ -232,39 +232,39 @@ LocalCalendar::LocalCalendar( const QString &path, const QString &defaultcal, co void LocalCalendar::initGui() { - QBoxLayout *bottomLayout = new QHBoxLayout(); + TQBoxLayout *bottomLayout = new TQHBoxLayout(); - mDaysCheckBox = new QCheckBox( this ); + mDaysCheckBox = new TQCheckBox( this ); mDaysCheckBox->setText( i18n( "Sync only events newer than" ) ); - mDaysSpinBox = new QSpinBox( this ); + mDaysSpinBox = new TQSpinBox( this ); mDaysSpinBox->setDisabled( true ); - mDaysSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); + mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - connect( mDaysCheckBox, SIGNAL( toggled( bool ) ), - this, SLOT( toggleDays( bool ) ) ); + connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ), + this, TQT_SLOT( toggleDays( bool ) ) ); bottomLayout->addWidget( mDaysCheckBox ); bottomLayout->addWidget( mDaysSpinBox ); - bottomLayout->addWidget( new QLabel( i18n( "day(s)" ), this ) ); + bottomLayout->addWidget( new TQLabel( i18n( "day(s)" ), this ) ); - QGridLayout *localLayout = new QGridLayout( this ); + TQGridLayout *localLayout = new TQGridLayout( this ); mPathRequester = new KURLRequester( this ); KPushButton *removeButton = new KPushButton( this ); - removeButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); + removeButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); removeButton->setText( i18n( "Remove" ) ); - connect( removeButton, SIGNAL( clicked() ), - this, SLOT( deleteWidget() ) ); + connect( removeButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( deleteWidget() ) ); - mDefaultCheckBox = new QCheckBox( this ); + mDefaultCheckBox = new TQCheckBox( this ); mDefaultCheckBox->setText( i18n( "Set as Default" ) ); - localLayout->addItem( new QSpacerItem( 40, 20, QSizePolicy::Expanding ), 0, 0 ); - localLayout->addWidget( new QLabel( i18n( "Location:" ), this ), 1, 0 ); + localLayout->addItem( new TQSpacerItem( 40, 20, TQSizePolicy::Expanding ), 0, 0 ); + localLayout->addWidget( new TQLabel( i18n( "Location:" ), this ), 1, 0 ); localLayout->addWidget( mPathRequester, 1, 1 ); - localLayout->addItem( new QSpacerItem( 40, 20, QSizePolicy::Fixed ), 1, 2 ); + localLayout->addItem( new TQSpacerItem( 40, 20, TQSizePolicy::Fixed ), 1, 2 ); localLayout->addWidget( removeButton, 1, 3 ); localLayout->addMultiCellLayout( bottomLayout, 2, 2, 0, 2 ); localLayout->addWidget( mDefaultCheckBox, 2, 3 ); @@ -275,15 +275,15 @@ void LocalCalendar::deleteWidget() emit deleteRequest( this ); } -WebdavCalendar::WebdavCalendar( QWidget *parent ) - : QWidget( parent ) +WebdavCalendar::WebdavCalendar( TQWidget *parent ) + : TQWidget( parent ) { initGui(); }; -WebdavCalendar::WebdavCalendar( const QString &username, const QString &password, const QString &url, - const QString &defaultcal, const QString &days, QWidget *parent ) - : QWidget( parent ) +WebdavCalendar::WebdavCalendar( const TQString &username, const TQString &password, const TQString &url, + const TQString &defaultcal, const TQString &days, TQWidget *parent ) + : TQWidget( parent ) { initGui(); @@ -301,23 +301,23 @@ WebdavCalendar::WebdavCalendar( const QString &username, const QString &password void WebdavCalendar::initGui() { - QBoxLayout *bottomLayout = new QHBoxLayout(); + TQBoxLayout *bottomLayout = new TQHBoxLayout(); - mDaysCheckBox = new QCheckBox( this ); + mDaysCheckBox = new TQCheckBox( this ); mDaysCheckBox->setText( i18n( "Sync only events newer than" ) ); - mDaysSpinBox = new QSpinBox( this ); + mDaysSpinBox = new TQSpinBox( this ); mDaysSpinBox->setDisabled( true ); - mDaysSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); + mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - connect( mDaysCheckBox, SIGNAL( toggled( bool ) ), - this, SLOT( toggleDays( bool ) ) ); + connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ), + this, TQT_SLOT( toggleDays( bool ) ) ); bottomLayout->addWidget( mDaysCheckBox ); bottomLayout->addWidget( mDaysSpinBox ); - bottomLayout->addWidget( new QLabel( i18n( "day(s)" ), this ) ); + bottomLayout->addWidget( new TQLabel( i18n( "day(s)" ), this ) ); - QGridLayout *webdavLayout = new QGridLayout(); + TQGridLayout *webdavLayout = new TQGridLayout(); mUrl = new KLineEdit( this ); mUsername = new KLineEdit( this ); @@ -326,26 +326,26 @@ void WebdavCalendar::initGui() KPushButton *removeButton = new KPushButton( this ); removeButton->setText( i18n( "Remove" ) ); - connect( removeButton, SIGNAL( clicked() ), - this, SLOT( deleteWidget() ) ); + connect( removeButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( deleteWidget() ) ); - mDefaultCheckBox = new QCheckBox( this ); + mDefaultCheckBox = new TQCheckBox( this ); mDefaultCheckBox->setText( i18n( "Set as Default" ) ); - webdavLayout->addWidget( new QLabel( i18n( "Location:" ), this ), 0, 0 ); + webdavLayout->addWidget( new TQLabel( i18n( "Location:" ), this ), 0, 0 ); webdavLayout->addWidget( mUrl, 0, 1 ); - webdavLayout->addItem( new QSpacerItem( 40, 20, QSizePolicy::Fixed ), 0, 2 ); + webdavLayout->addItem( new TQSpacerItem( 40, 20, TQSizePolicy::Fixed ), 0, 2 ); webdavLayout->addWidget( removeButton, 0, 3 ); webdavLayout->addMultiCellLayout( bottomLayout, 1, 1, 0, 1 ); webdavLayout->addWidget( mDefaultCheckBox, 1, 3 ); - QGridLayout *mainLayout = new QGridLayout( this ); - mainLayout->addItem( new QSpacerItem( 40, 20, QSizePolicy::Fixed ), 0, 0 ); + TQGridLayout *mainLayout = new TQGridLayout( this ); + mainLayout->addItem( new TQSpacerItem( 40, 20, TQSizePolicy::Fixed ), 0, 0 ); mainLayout->addMultiCellLayout( webdavLayout, 1, 1, 0, 4 ); - mainLayout->addWidget( new QLabel( i18n( "Username:" ), this ), 2, 0 ); + mainLayout->addWidget( new TQLabel( i18n( "Username:" ), this ), 2, 0 ); mainLayout->addWidget( mUsername, 2, 1 ); - mainLayout->addItem( new QSpacerItem( 40, 20, QSizePolicy::Fixed ), 2, 2 ); - mainLayout->addWidget( new QLabel( i18n( "Password:" ), this ), 2, 3 ); + mainLayout->addItem( new TQSpacerItem( 40, 20, TQSizePolicy::Fixed ), 2, 2 ); + mainLayout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 3 ); mainLayout->addWidget( mPassword, 2, 4 ); } diff --git a/kitchensync/src/configguisunbird.h b/kitchensync/src/configguisunbird.h index df69417f7..98164a2e1 100644 --- a/kitchensync/src/configguisunbird.h +++ b/kitchensync/src/configguisunbird.h @@ -41,15 +41,15 @@ class LocalCalendar : public QWidget Q_OBJECT public: - LocalCalendar( QWidget *parent = 0 ); - LocalCalendar( const QString &path, - const QString &defaultcal, - const QString &days, QWidget *parent = 0 ); + LocalCalendar( TQWidget *parent = 0 ); + LocalCalendar( const TQString &path, + const TQString &defaultcal, + const TQString &days, TQWidget *parent = 0 ); KURLRequester *mPathRequester; - QCheckBox *mDaysCheckBox; - QSpinBox *mDaysSpinBox; - QCheckBox *mDefaultCheckBox; + TQCheckBox *mDaysCheckBox; + TQSpinBox *mDaysSpinBox; + TQCheckBox *mDefaultCheckBox; signals: void deleteRequest( LocalCalendar* ); @@ -67,17 +67,17 @@ class WebdavCalendar : public QWidget Q_OBJECT public: - WebdavCalendar( QWidget *parent = 0 ); - WebdavCalendar( const QString &username, - const QString &password, - const QString &url, - const QString &defaultcal, - const QString &days, QWidget *parent = 0 ); + WebdavCalendar( TQWidget *parent = 0 ); + WebdavCalendar( const TQString &username, + const TQString &password, + const TQString &url, + const TQString &defaultcal, + const TQString &days, TQWidget *parent = 0 ); KLineEdit *mUrl; - QCheckBox *mDaysCheckBox; - QSpinBox *mDaysSpinBox; - QCheckBox *mDefaultCheckBox; + TQCheckBox *mDaysCheckBox; + TQSpinBox *mDaysSpinBox; + TQCheckBox *mDefaultCheckBox; KLineEdit *mUsername; KLineEdit *mPassword; @@ -97,11 +97,11 @@ class ConfigGuiSunbird : public ConfigGui Q_OBJECT public: - ConfigGuiSunbird( const QSync::Member &, QWidget *parent ); + ConfigGuiSunbird( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); + void load( const TQString &xml ); - QString save() const; + TQString save() const; public slots: void addLocalCalendar(); @@ -111,20 +111,20 @@ class ConfigGuiSunbird : public ConfigGui void delWebdavCalendar( WebdavCalendar* ); private: - QValueList mLocalList; - QValueList mWebdavList; + TQValueList mLocalList; + TQValueList mWebdavList; - QWidget *mLocalWidget; - QWidget *mWebdavWidget; + TQWidget *mLocalWidget; + TQWidget *mWebdavWidget; - QVBoxLayout *mLocalLayout; - QVBoxLayout *mWebdavLayout; + TQVBoxLayout *mLocalLayout; + TQVBoxLayout *mWebdavLayout; KPushButton *mLocalAddButton; KPushButton *mWebdavAddButton; - QSpacerItem *mLocalSpacer; - QSpacerItem *mWebdavSpacer; + TQSpacerItem *mLocalSpacer; + TQSpacerItem *mWebdavSpacer; }; #endif diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp index 43b509a46..6e521beeb 100644 --- a/kitchensync/src/configguisynce.cpp +++ b/kitchensync/src/configguisynce.cpp @@ -21,29 +21,29 @@ #include "configguisynce.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, QWidget *parent ) +ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { initGUI(); } -void ConfigGuiSynce::load( const QString &xml ) +void ConfigGuiSynce::load( const TQString &xml ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( xml ); - QDomElement docElement = doc.documentElement(); - QDomNode node; + TQDomElement docElement = doc.documentElement(); + TQDomNode node; for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( element.tagName() == "contact" ) { mContacts->setChecked( element.text().toInt() == 1 ); } else if ( element.tagName() == "todos" ) { @@ -56,14 +56,14 @@ void ConfigGuiSynce::load( const QString &xml ) } } -QString ConfigGuiSynce::save() const +TQString ConfigGuiSynce::save() const { - QString config = "\n"; + TQString config = "\n"; - config += QString( "%1\n" ).arg( mContacts->isChecked() ? "1" : "0" ); - config += QString( "%1\n" ).arg( mTodos->isChecked() ? "1" : "0" ); - config += QString( "%1\n" ).arg( mCalendar->isChecked() ? "1" : "0" ); - config += QString( "%1\n" ).arg( mFile->text() ); + config += TQString( "%1\n" ).arg( mContacts->isChecked() ? "1" : "0" ); + config += TQString( "%1\n" ).arg( mTodos->isChecked() ? "1" : "0" ); + config += TQString( "%1\n" ).arg( mCalendar->isChecked() ? "1" : "0" ); + config += TQString( "%1\n" ).arg( mFile->text() ); config += ""; @@ -72,22 +72,22 @@ QString ConfigGuiSynce::save() const void ConfigGuiSynce::initGUI() { - QGridLayout *layout = new QGridLayout( topLayout(), 12, 2, KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() ); layout->setMargin( KDialog::marginHint() ); - mContacts = new QCheckBox( this ); + mContacts = new TQCheckBox( this ); mContacts->setText( "Sync Contacts" ); layout->addMultiCellWidget( mContacts, 0, 0, 0, 1 ); - mTodos = new QCheckBox( this ); + mTodos = new TQCheckBox( this ); mTodos->setText( "Sync \'Todo\' items" ); layout->addMultiCellWidget( mTodos, 1, 1, 0, 1 ); - mCalendar = new QCheckBox( this ); + mCalendar = new TQCheckBox( this ); mCalendar->setText( "Sync Calendar" ); layout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 ); - layout->addWidget( new QLabel( i18n( "File:" ), this ), 3, 0 ); + layout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 ); mFile = new KLineEdit( this ); layout->addWidget( mFile, 3, 1 ); } diff --git a/kitchensync/src/configguisynce.h b/kitchensync/src/configguisynce.h index 07835572e..9d5f126be 100644 --- a/kitchensync/src/configguisynce.h +++ b/kitchensync/src/configguisynce.h @@ -31,18 +31,18 @@ class KLineEdit; class ConfigGuiSynce : public ConfigGui { public: - ConfigGuiSynce( const QSync::Member &, QWidget *parent ); + ConfigGuiSynce( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); + void load( const TQString &xml ); - QString save() const; + TQString save() const; private: void initGUI(); - QCheckBox *mContacts; - QCheckBox *mTodos; - QCheckBox *mCalendar; + TQCheckBox *mContacts; + TQCheckBox *mTodos; + TQCheckBox *mCalendar; KLineEdit *mFile; }; diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp index 63a073c90..26a8c2241 100644 --- a/kitchensync/src/configguisyncmlhttp.cpp +++ b/kitchensync/src/configguisyncmlhttp.cpp @@ -27,46 +27,46 @@ #include #include -#include -#include -#include -#include -#include -#include -#include - -ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, QWidget *parent ) +#include +#include +#include +#include +#include +#include +#include + +ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ), mUrl( 0 ), mPort( 0 ) { - QTabWidget *tabWidget = new QTabWidget( this ); + TQTabWidget *tabWidget = new TQTabWidget( this ); topLayout()->addWidget( tabWidget ); // Connection - QWidget *connectionWidget = new QWidget( tabWidget ); - QVBoxLayout *connectionLayout = new QVBoxLayout( connectionWidget, + TQWidget *connectionWidget = new TQWidget( tabWidget ); + TQVBoxLayout *connectionLayout = new TQVBoxLayout( connectionWidget, KDialog::marginHint(), KDialog::spacingHint() ); tabWidget->addTab( connectionWidget, i18n( "Connection" ) ); - mGridLayout = new QGridLayout( connectionLayout ); + mGridLayout = new TQGridLayout( connectionLayout ); - QLabel *label = new QLabel( i18n("Port:"), connectionWidget ); + TQLabel *label = new TQLabel( i18n("Port:"), connectionWidget ); mGridLayout->addWidget( label, 0, 0 ); - mPort = new QSpinBox( connectionWidget ); + mPort = new TQSpinBox( connectionWidget ); mPort->setMinValue( 1 ); mPort->setMaxValue( 65536 ); mGridLayout->addWidget( mPort, 0, 1 ); // Database - QWidget *databaseWidget = new QWidget( tabWidget ); - QVBoxLayout *databaseLayout = new QVBoxLayout( databaseWidget, + TQWidget *databaseWidget = new TQWidget( tabWidget ); + TQVBoxLayout *databaseLayout = new TQVBoxLayout( databaseWidget, KDialog::marginHint(), KDialog::spacingHint() ); tabWidget->addTab( databaseWidget, i18n( "Databases" ) ); - mGridLayout = new QGridLayout( databaseLayout ); + mGridLayout = new TQGridLayout( databaseLayout ); addLineEdit( databaseWidget, i18n("Contact Database:"), &mContactDb, 0 ); addLineEdit( databaseWidget, i18n("Calendar Database:"), &mCalendarDb, 1 ); addLineEdit( databaseWidget, i18n("Note Database:"), &mNoteDb, 2 ); @@ -81,55 +81,55 @@ ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, QWidget * // Options - QWidget *optionWidget = new QWidget( tabWidget ); - QVBoxLayout *optionLayout = new QVBoxLayout( optionWidget, + TQWidget *optionWidget = new TQWidget( tabWidget ); + TQVBoxLayout *optionLayout = new TQVBoxLayout( optionWidget, KDialog::marginHint(), KDialog::spacingHint() ); tabWidget->addTab( optionWidget, i18n( "Options" ) ); - mGridLayout = new QGridLayout( optionLayout ); + mGridLayout = new TQGridLayout( optionLayout ); - label = new QLabel( i18n("User name:"), optionWidget ); + label = new TQLabel( i18n("User name:"), optionWidget ); mGridLayout->addWidget( label, 0, 0 ); mUsername = new KLineEdit( optionWidget ); mGridLayout->addWidget( mUsername, 0, 1 ); - label = new QLabel( i18n("Password:"), optionWidget ); + label = new TQLabel( i18n("Password:"), optionWidget ); mGridLayout->addWidget( label, 1, 0 ); mPassword = new KLineEdit( optionWidget ); - mPassword->setEchoMode( QLineEdit::Password ); + mPassword->setEchoMode( TQLineEdit::Password ); mGridLayout->addWidget( mPassword, 1, 1 ); - mUseStringTable = new QCheckBox( i18n("Use String Table"), optionWidget ); + mUseStringTable = new TQCheckBox( i18n("Use String Table"), optionWidget ); mGridLayout->addMultiCellWidget( mUseStringTable, 2, 2, 0, 1 ); - mOnlyReplace = new QCheckBox( i18n("Only Replace Entries"), optionWidget ); + mOnlyReplace = new TQCheckBox( i18n("Only Replace Entries"), optionWidget ); mGridLayout->addMultiCellWidget( mOnlyReplace, 3, 3, 0, 1 ); // Url - label = new QLabel( i18n("URL:"), optionWidget ); + label = new TQLabel( i18n("URL:"), optionWidget ); mGridLayout->addWidget( label, 4, 0 ); mUrl = new KLineEdit( optionWidget ); mGridLayout->addWidget( mUrl, 4, 1 ); // recvLimit - label = new QLabel( i18n("Receive Limit:"), optionWidget ); + label = new TQLabel( i18n("Receive Limit:"), optionWidget ); mGridLayout->addWidget( label, 5, 0 ); - mRecvLimit = new QSpinBox( optionWidget ); + mRecvLimit = new TQSpinBox( optionWidget ); mRecvLimit->setMinValue( 1 ); mRecvLimit->setMaxValue( 65536 ); mGridLayout->addWidget( mRecvLimit, 5, 1 ); // maxObjSize - label = new QLabel( i18n("Maximum Object Size"), optionWidget ); + label = new TQLabel( i18n("Maximum Object Size"), optionWidget ); mGridLayout->addWidget( label, 6, 0 ); - mMaxObjSize = new QSpinBox( optionWidget ); + mMaxObjSize = new TQSpinBox( optionWidget ); mMaxObjSize->setMinValue( 1 ); mMaxObjSize->setMaxValue( 65536 ); mGridLayout->addWidget( mMaxObjSize, 6, 1 ); @@ -137,25 +137,25 @@ ConfigGuiSyncmlHttp::ConfigGuiSyncmlHttp( const QSync::Member &member, QWidget * topLayout()->addStretch( 1 ); } -void ConfigGuiSyncmlHttp::addLineEdit( QWidget *parent, const QString &text, KComboBox **edit, int row ) +void ConfigGuiSyncmlHttp::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row ) { - QLabel *label = new QLabel( text, parent); + TQLabel *label = new TQLabel( text, parent); mGridLayout->addWidget( label, row, 0 ); *edit = new KComboBox( true, parent ); mGridLayout->addWidget( *edit, row, 1 ); } -void ConfigGuiSyncmlHttp::load( const QString &xml ) +void ConfigGuiSyncmlHttp::load( const TQString &xml ) { - QDomDocument document; + TQDomDocument document; document.setContent( xml ); - QDomElement docElement = document.documentElement(); - QDomNode node; + TQDomElement docElement = document.documentElement(); + TQDomNode node; for ( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( element.tagName() == "username" ) { mUsername->setText( element.text() ); } else if ( element.tagName() == "password" ) { @@ -186,20 +186,20 @@ void ConfigGuiSyncmlHttp::load( const QString &xml ) } } -QString ConfigGuiSyncmlHttp::save() const +TQString ConfigGuiSyncmlHttp::save() const { - QString xml; + TQString xml; xml = "\n"; xml += "" + mUsername->text() + "\n"; xml += "" + mPassword->text() + "\n"; xml += "" + mUrl->text() + "\n"; - xml += "" + QString::number( mPort->value() ) + "\n"; + xml += "" + TQString::number( mPort->value() ) + "\n"; // Receive Limit - xml += "" + QString::number( mRecvLimit->value() ) + "\n"; + xml += "" + TQString::number( mRecvLimit->value() ) + "\n"; // Maximal Object Size - xml += "" + QString::number( mMaxObjSize->value() ) + "\n"; + xml += "" + TQString::number( mMaxObjSize->value() ) + "\n"; xml += ""; if ( mUseStringTable->isChecked() ) diff --git a/kitchensync/src/configguisyncmlhttp.h b/kitchensync/src/configguisyncmlhttp.h index 2cbcfc40a..8230f6d0c 100644 --- a/kitchensync/src/configguisyncmlhttp.h +++ b/kitchensync/src/configguisyncmlhttp.h @@ -21,7 +21,7 @@ #ifndef CONFIGGUISYNCML_H #define CONFIGGUISYNCML_H -#include +#include #include "configgui.h" @@ -38,30 +38,30 @@ class ConfigGuiSyncmlHttp : public ConfigGui Q_OBJECT public: - ConfigGuiSyncmlHttp( const QSync::Member &, QWidget *parent ); + ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *parent ); - void load( const QString &xml ); - QString save() const; + void load( const TQString &xml ); + TQString save() const; private: - QGridLayout *mGridLayout; + TQGridLayout *mGridLayout; KLineEdit *mUsername; KLineEdit *mPassword; KLineEdit *mUrl; - QSpinBox *mPort; - QCheckBox *mUseStringTable; - QCheckBox *mOnlyReplace; + TQSpinBox *mPort; + TQCheckBox *mUseStringTable; + TQCheckBox *mOnlyReplace; - QSpinBox *mRecvLimit; - QSpinBox *mMaxObjSize; + TQSpinBox *mRecvLimit; + TQSpinBox *mMaxObjSize; KComboBox *mContactDb; KComboBox *mCalendarDb; KComboBox *mNoteDb; protected slots: - void addLineEdit( QWidget *parent, const QString &text, KComboBox **edit, int row ); + void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row ); }; #endif diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp index 488a0d944..372cf9261 100644 --- a/kitchensync/src/configguisyncmlobex.cpp +++ b/kitchensync/src/configguisyncmlobex.cpp @@ -28,23 +28,23 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include - -ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, QWidget *parent ) +#include +#include +#include +#include +#include +#include +#include +#include + +ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) { - QTabWidget *tabWidget = new QTabWidget( this ); + TQTabWidget *tabWidget = new TQTabWidget( this ); topLayout()->addWidget( tabWidget ); // Connection - QVBox *connectionWidget = new QVBox( this ); + TQVBox *connectionWidget = new TQVBox( this ); connectionWidget->setMargin( KDialog::marginHint() ); connectionWidget->setSpacing( 5 ); @@ -52,8 +52,8 @@ ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, QWidget * mConnection = new KComboBox( connectionWidget ); - connect( mConnection, SIGNAL (activated( int ) ), - this, SLOT( slotConnectionChanged ( int ) ) ); + connect( mConnection, TQT_SIGNAL (activated( int ) ), + this, TQT_SLOT( slotConnectionChanged ( int ) ) ); mConnectionTypes.append( ConnectionType( 2, i18n( "Bluetooth" ) ) ); mConnectionTypes.append( ConnectionType( 5, i18n( "USB" ) ) ); @@ -72,13 +72,13 @@ ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, QWidget * connectionWidget->setStretchFactor( mUsb, 1 ); // Databases - QWidget *databaseWidget = new QWidget( tabWidget ); - QVBoxLayout *databaseLayout = new QVBoxLayout( databaseWidget, + TQWidget *databaseWidget = new TQWidget( tabWidget ); + TQVBoxLayout *databaseLayout = new TQVBoxLayout( databaseWidget, KDialog::marginHint(), KDialog::spacingHint() ); tabWidget->addTab( databaseWidget, i18n( "Databases" ) ); - mGridLayout = new QGridLayout( databaseLayout ); + mGridLayout = new TQGridLayout( databaseLayout ); addLineEdit( databaseWidget, i18n("Contact Database:"), &mContactDb, 0 ); addLineEdit( databaseWidget, i18n("Calendar Database:"), &mCalendarDb, 1 ); addLineEdit( databaseWidget, i18n("Note Database:"), &mNoteDb, 2 ); @@ -92,38 +92,38 @@ ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, QWidget * mNoteDb->insertItem( "notes" ); // Options - QWidget *optionsWidget = new QWidget( tabWidget ); - QVBoxLayout *optionsLayout = new QVBoxLayout( optionsWidget, + TQWidget *optionsWidget = new TQWidget( tabWidget ); + TQVBoxLayout *optionsLayout = new TQVBoxLayout( optionsWidget, KDialog::marginHint(), KDialog::spacingHint() ); tabWidget->addTab( optionsWidget, i18n( "Options" ) ); - mGridLayout = new QGridLayout( optionsLayout ); + mGridLayout = new TQGridLayout( optionsLayout ); - QLabel *label = new QLabel( i18n("User name:"), optionsWidget ); + TQLabel *label = new TQLabel( i18n("User name:"), optionsWidget ); mGridLayout->addWidget( label, 0, 0 ); mUsername = new KLineEdit( optionsWidget ); mGridLayout->addWidget( mUsername, 0, 1 ); - label = new QLabel( i18n("Password:"), optionsWidget ); + label = new TQLabel( i18n("Password:"), optionsWidget ); mGridLayout->addWidget( label, 1, 0 ); mPassword = new KLineEdit( optionsWidget ); - mPassword->setEchoMode( QLineEdit::Password ); + mPassword->setEchoMode( TQLineEdit::Password ); mGridLayout->addWidget( mPassword, 1, 1 ); - mUseStringTable = new QCheckBox( i18n("Use String Table"), optionsWidget ); + mUseStringTable = new TQCheckBox( i18n("Use String Table"), optionsWidget ); mGridLayout->addMultiCellWidget( mUseStringTable, 2, 2, 0, 1 ); - mOnlyReplace = new QCheckBox( i18n("Only Replace Entries"), optionsWidget ); + mOnlyReplace = new TQCheckBox( i18n("Only Replace Entries"), optionsWidget ); mGridLayout->addMultiCellWidget( mOnlyReplace, 3, 3, 0, 1 ); // SynML Version - label = new QLabel( i18n("SyncML Version:"), optionsWidget ); + label = new TQLabel( i18n("SyncML Version:"), optionsWidget ); mGridLayout->addWidget( label, 4, 0 ); - mSyncmlVersion = new QComboBox( optionsWidget ); + mSyncmlVersion = new TQComboBox( optionsWidget ); mGridLayout->addWidget( mSyncmlVersion, 4, 1 ); mSyncmlVersions.append( SyncmlVersion( 0, i18n( "1.0" ) ) ); @@ -135,11 +135,11 @@ ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, QWidget * mSyncmlVersion->insertItem( (*itVersion).second ); // WBXML - mWbxml = new QCheckBox( i18n("WAP Binary XML"), optionsWidget ); + mWbxml = new TQCheckBox( i18n("WAP Binary XML"), optionsWidget ); mGridLayout->addMultiCellWidget( mWbxml, 12, 12, 0, 1 ); // Identifier - label = new QLabel( i18n("Software Identifier:"), optionsWidget ); + label = new TQLabel( i18n("Software Identifier:"), optionsWidget ); mGridLayout->addWidget( label, 13, 0 ); mIdentifier = new KComboBox( true, optionsWidget ); @@ -149,19 +149,19 @@ ConfigGuiSyncmlObex::ConfigGuiSyncmlObex( const QSync::Member &member, QWidget * mIdentifier->insertItem( "PC Suite" ); // recvLimit - label = new QLabel( i18n("Receive Limit:"), optionsWidget ); + label = new TQLabel( i18n("Receive Limit:"), optionsWidget ); mGridLayout->addWidget( label, 14, 0 ); - mRecvLimit = new QSpinBox( optionsWidget ); + mRecvLimit = new TQSpinBox( optionsWidget ); mRecvLimit->setMinValue( 1 ); mRecvLimit->setMaxValue( 65536 ); mGridLayout->addWidget( mRecvLimit, 14, 1 ); // maxObjSize - label = new QLabel( i18n("Maximum Object Size"), optionsWidget ); + label = new TQLabel( i18n("Maximum Object Size"), optionsWidget ); mGridLayout->addWidget( label, 15, 0 ); - mMaxObjSize = new QSpinBox( optionsWidget ); + mMaxObjSize = new TQSpinBox( optionsWidget ); mMaxObjSize->setMinValue( 1 ); mMaxObjSize->setMaxValue( 65536 ); mGridLayout->addWidget( mMaxObjSize, 15, 1 ); @@ -180,16 +180,16 @@ void ConfigGuiSyncmlObex::slotConnectionChanged( int pos ) mUsb->show(); } -void ConfigGuiSyncmlObex::load( const QString &xml ) +void ConfigGuiSyncmlObex::load( const TQString &xml ) { - QDomDocument document; + TQDomDocument document; document.setContent( xml ); - QDomElement docElement = document.documentElement(); + TQDomElement docElement = document.documentElement(); - QDomNode node; + TQDomNode node; for( node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( element.tagName() == "username" ) { mUsername->setText( element.text() ); } else if ( element.tagName() == "password" ) { @@ -237,16 +237,16 @@ void ConfigGuiSyncmlObex::load( const QString &xml ) } } -QString ConfigGuiSyncmlObex::save() const +TQString ConfigGuiSyncmlObex::save() const { - QString xml; + TQString xml; xml = "\n"; xml += "" + mUsername->text() + "\n"; xml += "" + mPassword->text() + "\n"; ConnectionTypeList::ConstIterator it; for ( it = mConnectionTypes.begin(); it != mConnectionTypes.end(); it++ ) { if ( mConnection->currentText() == (*it).second ) { - xml += "" + QString("%1").arg((*it).first) + "\n"; + xml += "" + TQString("%1").arg((*it).first) + "\n"; break; } } @@ -258,13 +258,13 @@ QString ConfigGuiSyncmlObex::save() const xml += "" + mBluetooth->channel() + "\n"; // USB Interface - xml += "" + QString::number( mUsb->interface() ) +"\n"; + xml += "" + TQString::number( mUsb->interface() ) +"\n"; // SyncML Version SyncmlVersionList::ConstIterator itVersion; for ( itVersion = mSyncmlVersions.begin(); itVersion != mSyncmlVersions.end(); itVersion++ ) { if ( mSyncmlVersion->currentText() == (*itVersion).second ) { - xml += "" + QString("%1").arg((*itVersion).first) + "\n"; + xml += "" + TQString("%1").arg((*itVersion).first) + "\n"; break; } } @@ -281,10 +281,10 @@ QString ConfigGuiSyncmlObex::save() const xml += "\n"; // Receive Limit - xml += "" + QString::number( mRecvLimit->value() ) + "\n"; + xml += "" + TQString::number( mRecvLimit->value() ) + "\n"; // Maximal Object Size - xml += "" + QString::number( mMaxObjSize->value() ) + "\n"; + xml += "" + TQString::number( mMaxObjSize->value() ) + "\n"; xml += ""; if ( mUseStringTable->isChecked() ) @@ -308,9 +308,9 @@ QString ConfigGuiSyncmlObex::save() const return xml; } -void ConfigGuiSyncmlObex::addLineEdit( QWidget *parent, const QString &text, KComboBox **edit, int row ) +void ConfigGuiSyncmlObex::addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row ) { - QLabel *label = new QLabel( text, parent ); + TQLabel *label = new TQLabel( text, parent ); mGridLayout->addWidget( label, row, 0 ); *edit = new KComboBox( true, parent ); diff --git a/kitchensync/src/configguisyncmlobex.h b/kitchensync/src/configguisyncmlobex.h index a10d06a52..028f8b077 100644 --- a/kitchensync/src/configguisyncmlobex.h +++ b/kitchensync/src/configguisyncmlobex.h @@ -22,7 +22,7 @@ #ifndef CONFIGGUISYNCMLOBEX_H #define CONFIGGUISYNCMLOBEX_H -#include +#include #include "configgui.h" #include "connectionwidgets.h" @@ -40,48 +40,48 @@ class ConfigGuiSyncmlObex : public ConfigGui Q_OBJECT public: - ConfigGuiSyncmlObex( const QSync::Member &, QWidget *parent = 0 ); + ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *parent = 0 ); - void load( const QString &xml ); - QString save() const; + void load( const TQString &xml ); + TQString save() const; public slots: void slotConnectionChanged( int pos ); private: // Connection - typedef QPair ConnectionType; - typedef QValueList ConnectionTypeList; + typedef QPair ConnectionType; + typedef TQValueList ConnectionTypeList; ConnectionTypeList mConnectionTypes; - QComboBox *mConnection; + TQComboBox *mConnection; BluetoothWidget *mBluetooth; UsbWidget *mUsb; // Options - typedef QPair SyncmlVersion; - typedef QValueList SyncmlVersionList; + typedef QPair SyncmlVersion; + typedef TQValueList SyncmlVersionList; SyncmlVersionList mSyncmlVersions; - QStringList mIdentiferList; + TQStringList mIdentiferList; KLineEdit *mUsername; KLineEdit *mPassword; - QCheckBox *mUseStringTable; - QCheckBox *mOnlyReplace; - QSpinBox *mRecvLimit; - QSpinBox *mMaxObjSize; - QComboBox *mSyncmlVersion; + TQCheckBox *mUseStringTable; + TQCheckBox *mOnlyReplace; + TQSpinBox *mRecvLimit; + TQSpinBox *mMaxObjSize; + TQComboBox *mSyncmlVersion; KComboBox *mIdentifier; - QCheckBox *mWbxml; + TQCheckBox *mWbxml; - QGridLayout *mGridLayout; + TQGridLayout *mGridLayout; KComboBox *mContactDb; KComboBox *mCalendarDb; KComboBox *mNoteDb; protected slots: - void addLineEdit( QWidget *parent, const QString &text, KComboBox **edit, int row ); + void addLineEdit( TQWidget *parent, const TQString &text, KComboBox **edit, int row ); }; #endif diff --git a/kitchensync/src/conflictdialog.cpp b/kitchensync/src/conflictdialog.cpp index a021e121a..39943ffe4 100644 --- a/kitchensync/src/conflictdialog.cpp +++ b/kitchensync/src/conflictdialog.cpp @@ -20,7 +20,7 @@ #include "conflictdialog.h" -ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, QWidget *parent ) - : QDialog( parent ), mMapping( mapping ) +ConflictDialog::ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ) + : TQDialog( parent ), mMapping( mapping ) { } diff --git a/kitchensync/src/conflictdialog.h b/kitchensync/src/conflictdialog.h index 9718f4c65..1a17e06ca 100644 --- a/kitchensync/src/conflictdialog.h +++ b/kitchensync/src/conflictdialog.h @@ -21,7 +21,7 @@ #ifndef CONFLICTDIALOG_H #define CONFLICTDIALOG_H -#include +#include #include @@ -31,7 +31,7 @@ class ConflictDialog : public QDialog { public: - ConflictDialog( QSync::SyncMapping &mapping, QWidget *parent ); + ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ); protected: QSync::SyncMapping mMapping; diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp index 76d2297b7..ac5277fb7 100644 --- a/kitchensync/src/connectionwidgets.cpp +++ b/kitchensync/src/connectionwidgets.cpp @@ -28,35 +28,35 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "connectionwidgets.h" -BluetoothWidget::BluetoothWidget( QWidget *parent ) - : QWidget( parent ) +BluetoothWidget::BluetoothWidget( TQWidget *parent ) + : TQWidget( parent ) { - QGridLayout *layout = new QGridLayout( this ); + TQGridLayout *layout = new TQGridLayout( this ); mAddress = new KLineEdit( this ); mAddress->setInputMask( ">NN:NN:NN:NN:NN:NN;" ); layout->addWidget( mAddress, 1, 0 ); - QLabel *label = new QLabel( i18n( "Bluetooth address:" ), this ); + TQLabel *label = new TQLabel( i18n( "Bluetooth address:" ), this ); label->setBuddy( mAddress ); layout->addWidget( label, 0, 0 ); mChannel = new KLineEdit( this ); layout->addWidget( mChannel, 1, 1 ); - mChannelLabel = new QLabel( i18n( "Channel:" ), this ); + mChannelLabel = new TQLabel( i18n( "Channel:" ), this ); mChannelLabel->setBuddy( mChannel ); layout->addWidget( mChannelLabel, 0, 1 ); @@ -75,35 +75,35 @@ void BluetoothWidget::showChannel() mChannel->show(); } -void BluetoothWidget::setAddress( const QString address ) +void BluetoothWidget::setAddress( const TQString address ) { mAddress->setText( address ); } -void BluetoothWidget::setChannel( const QString channel ) +void BluetoothWidget::setChannel( const TQString channel ) { if ( mChannel ) mChannel->setText( channel ); } -QString BluetoothWidget::address() const +TQString BluetoothWidget::address() const { return mAddress->text(); } -QString BluetoothWidget::channel() const +TQString BluetoothWidget::channel() const { if ( mChannel->text().isEmpty() ) - return QString(); + return TQString(); return mChannel->text(); } // FIXME - Only IrMC specific -IRWidget::IRWidget( QWidget *parent ) - : QWidget( parent ) +IRWidget::IRWidget( TQWidget *parent ) + : TQWidget( parent ) { - QGridLayout *layout = new QGridLayout( this, 3, 3, 11, 3 ); + TQGridLayout *layout = new TQGridLayout( this, 3, 3, 11, 3 ); mDevice = new KLineEdit( this ); mSerialNumber = new KLineEdit( this ); @@ -111,22 +111,22 @@ IRWidget::IRWidget( QWidget *parent ) layout->addWidget( mDevice, 1, 0 ); layout->addWidget( mSerialNumber, 1, 1 ); - QLabel *label = new QLabel( i18n( "Device Name:" ), this ); + TQLabel *label = new TQLabel( i18n( "Device Name:" ), this ); label->setBuddy( mDevice ); layout->addWidget( label, 0, 0 ); - label = new QLabel( i18n( "Serial Number:" ), this ); + label = new TQLabel( i18n( "Serial Number:" ), this ); label->setBuddy( mSerialNumber ); layout->addWidget( label, 0, 1 ); layout->setRowStretch( 2, 1 ); } -void IRWidget::load( const QDomElement &parent ) +void IRWidget::load( const TQDomElement &parent ) { - QDomNode node; + TQDomNode node; for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( element.tagName() == "irname" ) mDevice->setText( element.text() ); else if ( element.tagName() == "irserial" ) @@ -134,9 +134,9 @@ void IRWidget::load( const QDomElement &parent ) } } -void IRWidget::save( QDomDocument &doc, QDomElement &parent ) +void IRWidget::save( TQDomDocument &doc, TQDomElement &parent ) { - QDomElement element = doc.createElement( "irname" ); + TQDomElement element = doc.createElement( "irname" ); element.appendChild( doc.createTextNode( mDevice->text() ) ); parent.appendChild( element ); @@ -146,10 +146,10 @@ void IRWidget::save( QDomDocument &doc, QDomElement &parent ) } // FIXME - Only IrMC specific -CableWidget::CableWidget( QWidget *parent ) - : QWidget( parent ) +CableWidget::CableWidget( TQWidget *parent ) + : TQWidget( parent ) { - QGridLayout *layout = new QGridLayout( this, 3, 2, 11, 3 ); + TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3 ); mManufacturer = new KComboBox( this ); mDevice = new KComboBox( true, this ); @@ -157,11 +157,11 @@ CableWidget::CableWidget( QWidget *parent ) layout->addWidget( mManufacturer, 0, 1 ); layout->addWidget( mDevice, 1, 1 ); - QLabel *label = new QLabel( i18n( "Device Manufacturer:" ), this ); + TQLabel *label = new TQLabel( i18n( "Device Manufacturer:" ), this ); label->setBuddy( mManufacturer ); layout->addWidget( label, 0, 0 ); - label = new QLabel( i18n( "Device:" ), this ); + label = new TQLabel( i18n( "Device:" ), this ); label->setBuddy( mDevice ); layout->addWidget( label, 1, 0 ); @@ -176,11 +176,11 @@ CableWidget::CableWidget( QWidget *parent ) mDevice->insertItem( "/dev/ttyUSB1" ); } -void CableWidget::load( const QDomElement &parent ) +void CableWidget::load( const TQDomElement &parent ) { - QDomNode node; + TQDomNode node; for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( element.tagName() == "cabletype" ) mManufacturer->setCurrentItem( element.text().toInt() ); else if ( element.tagName() == "cabledev" ) @@ -188,10 +188,10 @@ void CableWidget::load( const QDomElement &parent ) } } -void CableWidget::save( QDomDocument &doc, QDomElement &parent ) +void CableWidget::save( TQDomDocument &doc, TQDomElement &parent ) { - QDomElement element = doc.createElement( "cabletype" ); - element.appendChild( doc.createTextNode( QString::number( mManufacturer->currentItem() ) ) ); + TQDomElement element = doc.createElement( "cabletype" ); + element.appendChild( doc.createTextNode( TQString::number( mManufacturer->currentItem() ) ) ); parent.appendChild( element ); element = doc.createElement( "cabledev" ); @@ -199,15 +199,15 @@ void CableWidget::save( QDomDocument &doc, QDomElement &parent ) parent.appendChild( element ); } -UsbWidget::UsbWidget( QWidget *parent ) - : QWidget( parent ) +UsbWidget::UsbWidget( TQWidget *parent ) + : TQWidget( parent ) { - QGridLayout *layout = new QGridLayout( this, 3, 2, 11, 3); + TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3); - mInterface = new QSpinBox( this ); + mInterface = new TQSpinBox( this ); layout->addWidget( mInterface, 0, 1 ); - QLabel *label = new QLabel( i18n( "USB Interface:" ), this ); + TQLabel *label = new TQLabel( i18n( "USB Interface:" ), this ); label->setBuddy( mInterface ); layout->addWidget( label, 0, 0 ); diff --git a/kitchensync/src/connectionwidgets.h b/kitchensync/src/connectionwidgets.h index cb7dfb428..b9cc25e8a 100644 --- a/kitchensync/src/connectionwidgets.h +++ b/kitchensync/src/connectionwidgets.h @@ -23,7 +23,7 @@ #ifndef CONNECTIONWIDGETS_H #define CONNECTIONWIDGETS_H -#include +#include #include "configgui.h" @@ -40,20 +40,20 @@ class BluetoothWidget : public QWidget Q_OBJECT public: - BluetoothWidget( QWidget *parent ); + BluetoothWidget( TQWidget *parent ); void hideChannel(); void showChannel(); - void setAddress( const QString address ); - void setChannel( const QString channel ); - QString address() const; - QString channel() const; + void setAddress( const TQString address ); + void setChannel( const TQString channel ); + TQString address() const; + TQString channel() const; private: KLineEdit *mAddress; KLineEdit *mChannel; - QLabel *mChannelLabel; + TQLabel *mChannelLabel; }; class IRWidget : public QWidget @@ -61,10 +61,10 @@ class IRWidget : public QWidget Q_OBJECT public: - IRWidget( QWidget *parent ); + IRWidget( TQWidget *parent ); - void load( const QDomElement& ); - void save( QDomDocument&, QDomElement& ); + void load( const TQDomElement& ); + void save( TQDomDocument&, TQDomElement& ); private: KLineEdit *mDevice; @@ -74,10 +74,10 @@ class IRWidget : public QWidget class CableWidget : public QWidget { public: - CableWidget( QWidget *parent ); + CableWidget( TQWidget *parent ); - void load( const QDomElement& ); - void save( QDomDocument&, QDomElement& ); + void load( const TQDomElement& ); + void save( TQDomDocument&, TQDomElement& ); private: KComboBox *mManufacturer; @@ -87,13 +87,13 @@ class CableWidget : public QWidget class UsbWidget : public QWidget { public: - UsbWidget( QWidget *parent ); + UsbWidget( TQWidget *parent ); int interface() const; void setInterface( int interface ); private: - QSpinBox *mInterface; + TQSpinBox *mInterface; }; #endif // CONNECTIONWIDGETS_H diff --git a/kitchensync/src/genericdiffalgo.cpp b/kitchensync/src/genericdiffalgo.cpp index 9c03360e9..67e49bab4 100644 --- a/kitchensync/src/genericdiffalgo.cpp +++ b/kitchensync/src/genericdiffalgo.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include @@ -32,7 +32,7 @@ using namespace KSync; #ifndef KDE_USE_FINAL // With --enable-final, we get the (identical) compareString from // addresseediffalgo.cpp -static bool compareString( const QString &left, const QString &right ) +static bool compareString( const TQString &left, const TQString &right ) { if ( left.isEmpty() && right.isEmpty() ) return true; @@ -41,7 +41,7 @@ static bool compareString( const QString &left, const QString &right ) } #endif -GenericDiffAlgo::GenericDiffAlgo( const QString &leftData, const QString &rightData ) +GenericDiffAlgo::GenericDiffAlgo( const TQString &leftData, const TQString &rightData ) : mLeftData( leftData ), mRightData( rightData ) { } @@ -50,8 +50,8 @@ void GenericDiffAlgo::run() { begin(); - QStringList leftList = QStringList::split( '\n', mLeftData, true ); - QStringList rightList = QStringList::split( '\n', mRightData, true ); + TQStringList leftList = TQStringList::split( '\n', mLeftData, true ); + TQStringList rightList = TQStringList::split( '\n', mRightData, true ); uint lines = MAX( leftList.count(), rightList.count() ); for ( uint i = 0; i < lines; ++i ) { diff --git a/kitchensync/src/genericdiffalgo.h b/kitchensync/src/genericdiffalgo.h index 64f4a4404..c87e6bc02 100644 --- a/kitchensync/src/genericdiffalgo.h +++ b/kitchensync/src/genericdiffalgo.h @@ -31,13 +31,13 @@ namespace KSync { class GenericDiffAlgo : public DiffAlgo { public: - GenericDiffAlgo( const QString &left, const QString &right ); + GenericDiffAlgo( const TQString &left, const TQString &right ); void run(); private: - QString mLeftData; - QString mRightData; + TQString mLeftData; + TQString mRightData; }; } diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp index 2ad4af631..cfedcbfad 100644 --- a/kitchensync/src/groupconfig.cpp +++ b/kitchensync/src/groupconfig.cpp @@ -37,42 +37,42 @@ #include -#include -#include -#include +#include +#include +#include -GroupConfig::GroupConfig( QWidget *parent ) - : QWidget( parent ) +GroupConfig::GroupConfig( TQWidget *parent ) + : TQWidget( parent ) { - QBoxLayout *topLayout = new QVBoxLayout( this ); + TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); - QFrame *titleFrame = new QFrame( this ); + TQFrame *titleFrame = new TQFrame( this ); topLayout->addWidget( titleFrame ); titleFrame->setPaletteForegroundColor( colorGroup().light() ); titleFrame->setPaletteBackgroundColor( colorGroup().mid() ); - QBoxLayout *nameLayout = new QHBoxLayout( titleFrame ); + TQBoxLayout *nameLayout = new TQHBoxLayout( titleFrame ); nameLayout->setMargin( 4 ); - QPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_summary", + TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kontact_summary", KIcon::Desktop ); - QLabel *iconLabel = new QLabel( titleFrame ); + TQLabel *iconLabel = new TQLabel( titleFrame ); iconLabel->setPixmap( icon ); nameLayout->addWidget( iconLabel ); nameLayout->addSpacing( 8 ); - QLabel *label = new QLabel( i18n("Group:"), titleFrame ); - QFont font = label->font(); + TQLabel *label = new TQLabel( i18n("Group:"), titleFrame ); + TQFont font = label->font(); font.setBold( true ); font.setPointSize( font.pointSize() + 2 ); label->setFont( font ); nameLayout->addWidget( label ); - mNameLabel = new QLabel( titleFrame ); + mNameLabel = new TQLabel( titleFrame ); font = mNameLabel->font(); font.setBold( true ); font.setPointSize( font.pointSize() + 2 ); @@ -84,18 +84,18 @@ GroupConfig::GroupConfig( QWidget *parent ) mMemberView = new KJanusWidget( this, 0, KJanusWidget::IconList ); topLayout->addWidget( mMemberView ); - QBoxLayout *buttonLayout = new QHBoxLayout( topLayout ); + TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout ); - QPushButton *addButton = new QPushButton( i18n("Add Member..."), this ); - connect( addButton, SIGNAL( clicked() ), SLOT( addMember() ) ); + TQPushButton *addButton = new TQPushButton( i18n("Add Member..."), this ); + connect( addButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addMember() ) ); buttonLayout->addWidget( addButton ); buttonLayout->addStretch( 1 ); icon = KGlobal::iconLoader()->loadIcon( "bookmark", KIcon::Desktop ); - QFrame *page = mMemberView->addPage( i18n("Group"), + TQFrame *page = mMemberView->addPage( i18n("Group"), i18n("General Group Settings"), icon ); - QBoxLayout *pageLayout = new QVBoxLayout( page ); + TQBoxLayout *pageLayout = new TQVBoxLayout( page ); mCommonConfig = new GroupConfigCommon( page ); pageLayout->addWidget( mCommonConfig ); @@ -113,11 +113,11 @@ void GroupConfig::setSyncProcess( SyncProcess *process ) void GroupConfig::updateMembers() { - QValueList::ConstIterator memberIt; + TQValueList::ConstIterator memberIt; for ( memberIt = mMemberConfigs.begin(); memberIt != mMemberConfigs.end(); ++memberIt ) (*memberIt)->saveData(); - QValueList::ConstIterator it2; + TQValueList::ConstIterator it2; for ( it2 = mConfigPages.begin(); it2 != mConfigPages.end(); ++it2 ) { mMemberView->removePage( *it2 ); delete *it2; @@ -130,10 +130,10 @@ void GroupConfig::updateMembers() for ( ; it != group.end(); ++it ) { QSync::Member member = *it; MemberInfo mi( member ); - QFrame *page = mMemberView->addPage( mi.name(), - QString( "%1 (%2)" ).arg( mi.name() ).arg(member.pluginName()), mi.desktopIcon() ); + TQFrame *page = mMemberView->addPage( mi.name(), + TQString( "%1 (%2)" ).arg( mi.name() ).arg(member.pluginName()), mi.desktopIcon() ); - QBoxLayout *pageLayout = new QVBoxLayout( page ); + TQBoxLayout *pageLayout = new TQVBoxLayout( page ); mConfigPages.append( page ); MemberConfig *memberConfig = new MemberConfig( page, member ); @@ -148,7 +148,7 @@ void GroupConfig::saveConfig() { mProcess->group().save(); - QValueList::ConstIterator it; + TQValueList::ConstIterator it; for ( it = mMemberConfigs.begin(); it != mMemberConfigs.end(); ++it ) (*it)->saveData(); diff --git a/kitchensync/src/groupconfig.h b/kitchensync/src/groupconfig.h index d46d64575..3c23b6925 100644 --- a/kitchensync/src/groupconfig.h +++ b/kitchensync/src/groupconfig.h @@ -20,8 +20,8 @@ #ifndef GROUPCONFIG_H #define GROUPCONFIG_H -#include -#include +#include +#include class QFrame; class QLabel; @@ -36,7 +36,7 @@ class GroupConfig : public QWidget Q_OBJECT public: - GroupConfig( QWidget *parent ); + GroupConfig( TQWidget *parent ); void setSyncProcess( SyncProcess *process ); @@ -48,15 +48,15 @@ class GroupConfig : public QWidget void addMember(); private: - QLabel *mNameLabel; + TQLabel *mNameLabel; KJanusWidget *mMemberView; SyncProcess *mProcess; GroupConfigCommon *mCommonConfig; - QValueList mMemberConfigs; - QValueList mConfigPages; + TQValueList mMemberConfigs; + TQValueList mConfigPages; }; #endif diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp index d5b0bd1c1..9f629c4d2 100644 --- a/kitchensync/src/groupconfigcommon.cpp +++ b/kitchensync/src/groupconfigcommon.cpp @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -38,26 +38,26 @@ #include "groupconfigcommon.h" -ObjectTypeSelector::ObjectTypeSelector( QWidget *parent ) - : QWidget( parent ) +ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent ) + : TQWidget( parent ) { - QGridLayout *layout = new QGridLayout( this ); + TQGridLayout *layout = new TQGridLayout( this ); layout->setMargin( 0 ); const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion(); - QMap objectTypeMap; + TQMap objectTypeMap; objectTypeMap.insert( "contact", i18n( "Contacts" ) ); objectTypeMap.insert( "event", i18n( "Events" ) ); objectTypeMap.insert( "todo", i18n( "To-dos" ) ); objectTypeMap.insert( "note", i18n( "Notes" ) ); - QStringList objectTypes = conversion.objectTypes(); + TQStringList objectTypes = conversion.objectTypes(); // reorder the entries so that contact and event are the first one qHeapSort( objectTypes ); - QStringList reoderedObjectTypes, stack; + TQStringList reoderedObjectTypes, stack; for ( uint i = 0; i < objectTypes.count(); ++i ) { if ( objectTypes[ i ] == "contact" || objectTypes[ i ] == "event" ) reoderedObjectTypes.append( objectTypes[ i ] ); @@ -66,18 +66,18 @@ ObjectTypeSelector::ObjectTypeSelector( QWidget *parent ) } reoderedObjectTypes += stack; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; int row = 0; int col = 0; for( it = reoderedObjectTypes.begin(); it != reoderedObjectTypes.end(); ++it ) { - QString objectType = *it; + TQString objectType = *it; // Don't display object type "data". Object type "data" is a kind of wildcard - so don't filter * if ( objectType == "data" ) continue; - QCheckBox *objectCheckBox = new QCheckBox( objectTypeMap[ objectType ], this ); + TQCheckBox *objectCheckBox = new TQCheckBox( objectTypeMap[ objectType ], this ); layout->addWidget( objectCheckBox, row, col ); mObjectTypeChecks.insert( objectType, objectCheckBox ); @@ -93,27 +93,27 @@ void ObjectTypeSelector::load( const QSync::Group &group ) { const QSync::GroupConfig config = group.config(); - const QStringList objectTypes = config.activeObjectTypes(); + const TQStringList objectTypes = config.activeObjectTypes(); // Enable everything on the inital load bool initialLoad = false; if ( objectTypes.isEmpty() ) initialLoad = true; - QMap::ConstIterator it; + TQMap::ConstIterator it; for( it = mObjectTypeChecks.begin(); it != mObjectTypeChecks.end(); ++it ) { - QCheckBox *check = it.data(); + TQCheckBox *check = it.data(); check->setChecked( objectTypes.contains( it.key() ) || initialLoad ); } } void ObjectTypeSelector::save( QSync::Group group ) { - QStringList objectTypes; + TQStringList objectTypes; - QMap::ConstIterator it; + TQMap::ConstIterator it; for( it = mObjectTypeChecks.begin(); it != mObjectTypeChecks.end(); ++it ) { - QCheckBox *check = it.data(); + TQCheckBox *check = it.data(); if ( check->isChecked() ) objectTypes.append( it.key() ); } @@ -125,17 +125,17 @@ void ObjectTypeSelector::save( QSync::Group group ) config.setActiveObjectTypes( objectTypes ); } -GroupConfigCommon::GroupConfigCommon( QWidget *parent ) - : QWidget( parent ) +GroupConfigCommon::GroupConfigCommon( TQWidget *parent ) + : TQWidget( parent ) { - QGridLayout *layout = new QGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); - layout->addWidget( new QLabel( i18n( "Name:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 ); mGroupName = new KLineEdit( this ); layout->addWidget( mGroupName, 0, 1 ); - layout->addWidget( new QLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, Qt::AlignTop ); + layout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, Qt::AlignTop ); mObjectTypeSelector = new ObjectTypeSelector( this ); layout->addWidget( mObjectTypeSelector, 1, 1 ); diff --git a/kitchensync/src/groupconfigcommon.h b/kitchensync/src/groupconfigcommon.h index b28499aa0..6721358e6 100644 --- a/kitchensync/src/groupconfigcommon.h +++ b/kitchensync/src/groupconfigcommon.h @@ -21,8 +21,8 @@ #ifndef GROUPCONFIGCOMMON_H #define GROUPCONFIGCOMMON_H -#include -#include +#include +#include #include @@ -33,19 +33,19 @@ class QCheckBox; class ObjectTypeSelector : public QWidget { public: - ObjectTypeSelector( QWidget *parent ); + ObjectTypeSelector( TQWidget *parent ); void load( const QSync::Group &group ); void save( QSync::Group group ); private: - QMap mObjectTypeChecks; + TQMap mObjectTypeChecks; }; class GroupConfigCommon : public QWidget { public: - GroupConfigCommon( QWidget *parent ); + GroupConfigCommon( TQWidget *parent ); void setSyncProcess( SyncProcess *syncProcess ); void save(); diff --git a/kitchensync/src/groupconfigdialog.cpp b/kitchensync/src/groupconfigdialog.cpp index 868915da2..4d8be65d0 100644 --- a/kitchensync/src/groupconfigdialog.cpp +++ b/kitchensync/src/groupconfigdialog.cpp @@ -24,15 +24,15 @@ #include -#include +#include -GroupConfigDialog::GroupConfigDialog( QWidget *parent, SyncProcess *process ) +GroupConfigDialog::GroupConfigDialog( TQWidget *parent, SyncProcess *process ) : KDialogBase( parent, 0, true, i18n("Configure Synchronization Group"), Ok ) { - QFrame *topFrame = makeMainWidget(); + TQFrame *topFrame = makeMainWidget(); - QBoxLayout *topLayout = new QVBoxLayout( topFrame ); + TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); mConfigWidget = new GroupConfig( topFrame ); topLayout->addWidget( mConfigWidget ); diff --git a/kitchensync/src/groupconfigdialog.h b/kitchensync/src/groupconfigdialog.h index 10000b960..5fd70884f 100644 --- a/kitchensync/src/groupconfigdialog.h +++ b/kitchensync/src/groupconfigdialog.h @@ -30,7 +30,7 @@ class GroupConfigDialog : public KDialogBase Q_OBJECT public: - GroupConfigDialog( QWidget *parent, SyncProcess * ); + GroupConfigDialog( TQWidget *parent, SyncProcess * ); ~GroupConfigDialog(); protected slots: diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp index bd5a8821d..784991c6f 100644 --- a/kitchensync/src/groupitem.cpp +++ b/kitchensync/src/groupitem.cpp @@ -27,11 +27,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "memberinfo.h" #include "multiconflictdialog.h" @@ -46,42 +46,42 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process ) mProcessedItems( 0 ), mMaxProcessedItems( 0 ), mSynchronizing( false ) { - QFont boldFont; + TQFont boldFont; boldFont.setBold( true ); boldFont.setPointSize( boldFont.pointSize() + 2 ); - QGridLayout *layout = new QGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() ); - mBox = new QVBox( this ); + mBox = new TQVBox( this ); mBox->setMargin( 5 ); - mProgressBar = new QProgressBar( this ); + mProgressBar = new TQProgressBar( this ); mProgressBar->setTotalSteps( 100 ); - mTime = new QLabel( this ); + mTime = new TQLabel( this ); mSyncAction = new KURLLabel( "exec:/sync", i18n( "Synchronize Now" ), this ); mConfigureAction = new KURLLabel( "exec:/config", i18n( "Configure" ), this ); // header - QHBox* hbox = new QHBox( this ); + TQHBox* hbox = new TQHBox( this ); hbox->setMargin( 2 ); - static QPixmap icon; + static TQPixmap icon; if ( icon.isNull() ) icon = KGlobal::iconLoader()->loadIcon( "kontact_summary", KIcon::Desktop ); - mIcon = new QLabel( hbox ); + mIcon = new TQLabel( hbox ); mIcon->setPixmap( icon ); mIcon->setFixedSize( mIcon->sizeHint() ); mIcon->setPaletteBackgroundColor( colorGroup().mid() ); - mGroupName = new QLabel( hbox ); + mGroupName = new TQLabel( hbox ); mGroupName->setAlignment( AlignLeft | AlignVCenter ); mGroupName->setIndent( KDialog::spacingHint() ); mGroupName->setFont( boldFont ); mGroupName->setPaletteForegroundColor( colorGroup().light() ); mGroupName->setPaletteBackgroundColor( colorGroup().mid() ); - mStatus = new QLabel( hbox ); + mStatus = new TQLabel( hbox ); mStatus->setAlignment( Qt::AlignRight ); mStatus->setAlignment( AlignRight | AlignVCenter ); mStatus->setIndent( KDialog::spacingHint() ); @@ -104,22 +104,22 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process ) setPaletteBackgroundColor( kapp->palette().active().base() ); - connect( mCallbackHandler, SIGNAL( conflict( QSync::SyncMapping ) ), - this, SLOT( conflict( QSync::SyncMapping ) ) ); - connect( mCallbackHandler, SIGNAL( change( const QSync::SyncChangeUpdate& ) ), - this, SLOT( change( const QSync::SyncChangeUpdate& ) ) ); - connect( mCallbackHandler, SIGNAL( mapping( const QSync::SyncMappingUpdate& ) ), - this, SLOT( mapping( const QSync::SyncMappingUpdate& ) ) ); - connect( mCallbackHandler, SIGNAL( engine( const QSync::SyncEngineUpdate& ) ), - this, SLOT( engine( const QSync::SyncEngineUpdate& ) ) ); - connect( mCallbackHandler, SIGNAL( member( const QSync::SyncMemberUpdate& ) ), - this, SLOT( member( const QSync::SyncMemberUpdate& ) ) ); - connect( mSyncAction, SIGNAL( leftClickedURL() ), - this, SLOT( synchronize() ) ); - connect( mConfigureAction, SIGNAL( leftClickedURL() ), - this, SLOT( configure() ) ); - connect( mSyncProcess, SIGNAL( engineChanged( QSync::Engine* ) ), - this, SLOT( engineChanged( QSync::Engine* ) ) ); + connect( mCallbackHandler, TQT_SIGNAL( conflict( QSync::SyncMapping ) ), + this, TQT_SLOT( conflict( QSync::SyncMapping ) ) ); + connect( mCallbackHandler, TQT_SIGNAL( change( const QSync::SyncChangeUpdate& ) ), + this, TQT_SLOT( change( const QSync::SyncChangeUpdate& ) ) ); + connect( mCallbackHandler, TQT_SIGNAL( mapping( const QSync::SyncMappingUpdate& ) ), + this, TQT_SLOT( mapping( const QSync::SyncMappingUpdate& ) ) ); + connect( mCallbackHandler, TQT_SIGNAL( engine( const QSync::SyncEngineUpdate& ) ), + this, TQT_SLOT( engine( const QSync::SyncEngineUpdate& ) ) ); + connect( mCallbackHandler, TQT_SIGNAL( member( const QSync::SyncMemberUpdate& ) ), + this, TQT_SLOT( member( const QSync::SyncMemberUpdate& ) ) ); + connect( mSyncAction, TQT_SIGNAL( leftClickedURL() ), + this, TQT_SLOT( synchronize() ) ); + connect( mConfigureAction, TQT_SIGNAL( leftClickedURL() ), + this, TQT_SLOT( configure() ) ); + connect( mSyncProcess, TQT_SIGNAL( engineChanged( QSync::Engine* ) ), + this, TQT_SLOT( engineChanged( QSync::Engine* ) ) ); mCallbackHandler->setEngine( mSyncProcess->engine() ); @@ -141,7 +141,7 @@ void GroupItem::update() mGroupName->setText( i18n( "Group: %1" ).arg( mSyncProcess->group().name() ) ); - QDateTime dateTime = mSyncProcess->group().lastSynchronization(); + TQDateTime dateTime = mSyncProcess->group().lastSynchronization(); if ( dateTime.isValid() ) mTime->setText( i18n( "Last synchronized on: %1" ).arg( KGlobal::locale()->formatDateTime( dateTime ) ) ); else @@ -164,9 +164,9 @@ void GroupItem::update() void GroupItem::clear() { - mGroupName->setText( QString() ); + mGroupName->setText( TQString() ); - QValueList::Iterator it; + TQValueList::Iterator it; for ( it = mMemberItems.begin(); it != mMemberItems.end(); ++it ) delete *it; @@ -220,7 +220,7 @@ void GroupItem::change( const QSync::SyncChangeUpdate &update ) KPassivePopup::message( update.result().message(), this ); break; default: - mStatus->setText( QString() ); + mStatus->setText( TQString() ); break; } } @@ -259,7 +259,7 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update ) break; case QSync::SyncEngineUpdate::SyncSuccessfull: mStatus->setText( i18n( "Successfully synchronized" ) ); - mSyncProcess->group().setLastSynchronization( QDateTime::currentDateTime() ); + mSyncProcess->group().setLastSynchronization( TQDateTime::currentDateTime() ); mSyncProcess->group().save(); this->update(); @@ -274,14 +274,14 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update ) mMaxProcessedItems = mProcessedItems; break; default: - mStatus->setText( QString() ); + mStatus->setText( TQString() ); break; } } void GroupItem::member( const QSync::SyncMemberUpdate &update ) { - QValueList::Iterator it; + TQValueList::Iterator it; for ( it = mMemberItems.begin(); it != mMemberItems.end(); ++it ) { if ( (*it)->member() == update.member() ) { switch ( update.type() ) { @@ -345,43 +345,43 @@ void GroupItem::engineChanged( QSync::Engine *engine ) this->update(); } -MemberItem::MemberItem( QWidget *parent, SyncProcess *process, +MemberItem::MemberItem( TQWidget *parent, SyncProcess *process, const QSync::Member &member ) - : QWidget( parent ), mSyncProcess( process ), mMember( member ) + : TQWidget( parent ), mSyncProcess( process ), mMember( member ) { - QFont boldFont; + TQFont boldFont; boldFont.setBold( true ); MemberInfo mi( member ); - QPixmap icon = mi.smallIcon(); + TQPixmap icon = mi.smallIcon(); QSync::Plugin plugin = member.plugin(); - QVBoxLayout *layout = new QVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); - QHBox* box = new QHBox( this ); + TQHBox* box = new TQHBox( this ); box->setMargin( 5 ); box->setSpacing( 6 ); layout->addWidget( box ); - mIcon = new QLabel( box ); + mIcon = new TQLabel( box ); mIcon->setPixmap( icon ); mIcon->setAlignment( Qt::AlignTop ); mIcon->setFixedWidth( mIcon->sizeHint().width() ); - QVBox *nameBox = new QVBox( box ); - mMemberName = new QLabel( nameBox ); + TQVBox *nameBox = new TQVBox( box ); + mMemberName = new TQLabel( nameBox ); mMemberName->setFont( boldFont ); - mDescription = new QLabel( nameBox ); + mDescription = new TQLabel( nameBox ); - mStatus = new QLabel( box ); + mStatus = new TQLabel( box ); mMemberName->setText( member.name() ); mDescription->setText( plugin.longName() ); } -void MemberItem::setStatusMessage( const QString &msg ) +void MemberItem::setStatusMessage( const TQString &msg ) { mStatus->setText( msg ); } diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h index a18ca1d83..c53f26c0b 100644 --- a/kitchensync/src/groupitem.h +++ b/kitchensync/src/groupitem.h @@ -71,16 +71,16 @@ class GroupItem : public KWidgetListItem private: SyncProcess *mSyncProcess; QSync::CallbackHandler *mCallbackHandler; - QValueList mMemberItems; + TQValueList mMemberItems; - QLabel *mIcon; - QLabel *mGroupName; - QLabel *mStatus; - QLabel *mTime; + TQLabel *mIcon; + TQLabel *mGroupName; + TQLabel *mStatus; + TQLabel *mTime; KURLLabel *mSyncAction; KURLLabel *mConfigureAction; - QVBox *mBox; - QProgressBar *mProgressBar; + TQVBox *mBox; + TQProgressBar *mProgressBar; int mProcessedItems; int mMaxProcessedItems; @@ -90,22 +90,22 @@ class GroupItem : public KWidgetListItem class MemberItem : public QWidget { public: - MemberItem( QWidget *parent, SyncProcess *syncProcess, + MemberItem( TQWidget *parent, SyncProcess *syncProcess, const QSync::Member &member ); SyncProcess* syncProcess() const { return mSyncProcess; } QSync::Member member() const { return mMember; } - void setStatusMessage( const QString &msg ); + void setStatusMessage( const TQString &msg ); private: SyncProcess *mSyncProcess; QSync::Member mMember; - QLabel *mIcon; - QLabel *mMemberName; - QLabel *mDescription; - QLabel *mStatus; + TQLabel *mIcon; + TQLabel *mMemberName; + TQLabel *mDescription; + TQLabel *mStatus; }; #endif diff --git a/kitchensync/src/groupview.cpp b/kitchensync/src/groupview.cpp index b0c061e84..8e1adf87e 100644 --- a/kitchensync/src/groupview.cpp +++ b/kitchensync/src/groupview.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include "aboutpage.h" #include "groupitem.h" @@ -26,10 +26,10 @@ #include "groupview.h" -GroupView::GroupView( QWidget *parent ) - : QWidget( parent ), mAboutPage( 0 ) +GroupView::GroupView( TQWidget *parent ) + : TQWidget( parent ), mAboutPage( 0 ) { - mLayout = new QVBoxLayout( this ); + mLayout = new TQVBoxLayout( this ); mWidgetList = new KWidgetList( this ); @@ -61,7 +61,7 @@ void GroupView::updateView() mAboutPage = new AboutPage( this ); mLayout->addWidget( mAboutPage ); - connect( mAboutPage, SIGNAL( addGroup() ), SIGNAL( addGroup() ) ); + connect( mAboutPage, TQT_SIGNAL( addGroup() ), TQT_SIGNAL( addGroup() ) ); } mAboutPage->show(); @@ -76,12 +76,12 @@ void GroupView::updateView() SyncProcess *process = SyncProcessManager::self()->at( i ); GroupItem *item = new GroupItem( mWidgetList, process ); - connect( item, SIGNAL( synchronizeGroup( SyncProcess* ) ), - SIGNAL( synchronizeGroup( SyncProcess* ) ) ); - connect( item, SIGNAL( abortSynchronizeGroup( SyncProcess* ) ), - SIGNAL( abortSynchronizeGroup( SyncProcess* ) ) ); - connect( item, SIGNAL( configureGroup( SyncProcess* ) ), - SIGNAL( configureGroup( SyncProcess* ) ) ); + connect( item, TQT_SIGNAL( synchronizeGroup( SyncProcess* ) ), + TQT_SIGNAL( synchronizeGroup( SyncProcess* ) ) ); + connect( item, TQT_SIGNAL( abortSynchronizeGroup( SyncProcess* ) ), + TQT_SIGNAL( abortSynchronizeGroup( SyncProcess* ) ) ); + connect( item, TQT_SIGNAL( configureGroup( SyncProcess* ) ), + TQT_SIGNAL( configureGroup( SyncProcess* ) ) ); mWidgetList->appendItem( item ); } diff --git a/kitchensync/src/groupview.h b/kitchensync/src/groupview.h index 7aba895a1..4d2917b42 100644 --- a/kitchensync/src/groupview.h +++ b/kitchensync/src/groupview.h @@ -31,7 +31,7 @@ class GroupView : public QWidget Q_OBJECT public: - GroupView( QWidget *parent ); + GroupView( TQWidget *parent ); SyncProcess* selectedSyncProcess() const; @@ -51,7 +51,7 @@ class GroupView : public QWidget AboutPage *mAboutPage; KWidgetList *mWidgetList; - QVBoxLayout *mLayout; + TQVBoxLayout *mLayout; }; #endif diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp index b3b1bf819..610f05a54 100644 --- a/kitchensync/src/htmldiffalgodisplay.cpp +++ b/kitchensync/src/htmldiffalgodisplay.cpp @@ -25,17 +25,17 @@ using namespace KSync; -static QString textToHTML( const QString &text ) +static TQString textToHTML( const TQString &text ) { - return QStyleSheet::convertFromPlainText( text ); + return TQStyleSheet::convertFromPlainText( text ); } -HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( QWidget *parent ) +HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *parent ) : KTextBrowser( parent ) { - setWrapPolicy( QTextEdit::AtWordBoundary ); - setVScrollBarMode( QScrollView::AlwaysOff ); - setHScrollBarMode( QScrollView::AlwaysOff ); + setWrapPolicy( TQTextEdit::AtWordBoundary ); + setVScrollBarMode( TQScrollView::AlwaysOff ); + setHScrollBarMode( TQScrollView::AlwaysOff ); } void HTMLDiffAlgoDisplay::begin() @@ -44,12 +44,12 @@ void HTMLDiffAlgoDisplay::begin() mText = ""; mText.append( "" ); - mText.append( QString( "" ) + mText.append( TQString( "" ) .arg( KGlobalSettings::textColor().name() ) .arg( KGlobalSettings::baseColor().name() ) ); mText.append( "
" ); - mText.append( QString( "" ) + mText.append( TQString( "" ) .arg( mLeftTitle ) .arg( mRightTitle ) ); } @@ -63,34 +63,34 @@ void HTMLDiffAlgoDisplay::end() setText( mText ); } -void HTMLDiffAlgoDisplay::setLeftSourceTitle( const QString &title ) +void HTMLDiffAlgoDisplay::setLeftSourceTitle( const TQString &title ) { mLeftTitle = title; } -void HTMLDiffAlgoDisplay::setRightSourceTitle( const QString &title ) +void HTMLDiffAlgoDisplay::setRightSourceTitle( const TQString &title ) { mRightTitle = title; } -void HTMLDiffAlgoDisplay::additionalLeftField( const QString &id, const QString &value ) +void HTMLDiffAlgoDisplay::additionalLeftField( const TQString &id, const TQString &value ) { - mText.append( QString( "" ) + mText.append( TQString( "" ) .arg( id ) .arg( textToHTML( value ) ) ); } -void HTMLDiffAlgoDisplay::additionalRightField( const QString &id, const QString &value ) +void HTMLDiffAlgoDisplay::additionalRightField( const TQString &id, const TQString &value ) { - mText.append( QString( "" ) + mText.append( TQString( "" ) .arg( id ) .arg( textToHTML( value ) ) ); } -void HTMLDiffAlgoDisplay::conflictField( const QString &id, const QString &leftValue, - const QString &rightValue ) +void HTMLDiffAlgoDisplay::conflictField( const TQString &id, const TQString &leftValue, + const TQString &rightValue ) { - mText.append( QString( "" ) + mText.append( TQString( "" ) .arg( id ) .arg( textToHTML( leftValue ) ) .arg( textToHTML( rightValue ) ) ); diff --git a/kitchensync/src/htmldiffalgodisplay.h b/kitchensync/src/htmldiffalgodisplay.h index e35e5eb40..b3d52259f 100644 --- a/kitchensync/src/htmldiffalgodisplay.h +++ b/kitchensync/src/htmldiffalgodisplay.h @@ -32,21 +32,21 @@ namespace KSync { class HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser { public: - HTMLDiffAlgoDisplay( QWidget *parent ); + HTMLDiffAlgoDisplay( TQWidget *parent ); void begin(); void end(); - void setLeftSourceTitle( const QString &title ); - void setRightSourceTitle( const QString &title ); - void additionalLeftField( const QString &id, const QString &value ); - void additionalRightField( const QString &id, const QString &value ); - void conflictField( const QString &id, const QString &leftValue, - const QString &rightValue ); + void setLeftSourceTitle( const TQString &title ); + void setRightSourceTitle( const TQString &title ); + void additionalLeftField( const TQString &id, const TQString &value ); + void additionalRightField( const TQString &id, const TQString &value ); + void conflictField( const TQString &id, const TQString &leftValue, + const TQString &rightValue ); private: - QString mLeftTitle; - QString mRightTitle; - QString mText; + TQString mLeftTitle; + TQString mRightTitle; + TQString mText; }; } diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp index 450a719e8..d34fcb2b3 100644 --- a/kitchensync/src/kwidgetlist.cpp +++ b/kitchensync/src/kwidgetlist.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include @@ -33,20 +33,20 @@ class KWidgetList::Private { } - QValueList mItems; + TQValueList mItems; KWidgetListItem *mSelectedItem; - QVBox *mBox; + TQVBox *mBox; }; -KWidgetList::KWidgetList( QWidget *parent, const char *name ) - : QScrollView( parent, name ), +KWidgetList::KWidgetList( TQWidget *parent, const char *name ) + : TQScrollView( parent, name ), d( new Private ) { - d->mBox = new QVBox( viewport() ); + d->mBox = new TQVBox( viewport() ); addChild( d->mBox ); setResizePolicy( AutoOneFit ); - setFocusPolicy( QWidget::StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); viewport()->setFocus(); } @@ -71,7 +71,7 @@ void KWidgetList::appendItem( KWidgetListItem *item ) if ( !d->mItems.contains( item ) ) { d->mItems.append( item ); - item->reparent( d->mBox, 0, QPoint( 0, 0 ), true ); + item->reparent( d->mBox, 0, TQPoint( 0, 0 ), true ); item->setSelected( false ); item->installEventFilter( this ); @@ -111,7 +111,7 @@ void KWidgetList::removeItem( int index ) void KWidgetList::takeItem( KWidgetListItem *item ) { d->mItems.remove( item ); - item->reparent( 0, 0, QPoint( 0, 0 ) ); + item->reparent( 0, 0, TQPoint( 0, 0 ) ); item->removeEventFilter( this ); item->hide(); @@ -174,7 +174,7 @@ int KWidgetList::index( KWidgetListItem *item ) const void KWidgetList::clear() { - QValueList::Iterator it; + TQValueList::Iterator it; for ( it = d->mItems.begin(); it != d->mItems.end(); ++it ) delete *it; @@ -188,12 +188,12 @@ void KWidgetList::setFocus() viewport()->setFocus(); } -bool KWidgetList::eventFilter( QObject *object, QEvent *event ) +bool KWidgetList::eventFilter( TQObject *object, TQEvent *event ) { - if ( event->type() == QEvent::MouseButtonPress ) { - QMouseEvent *mouseEvent = static_cast( event ); + if ( event->type() == TQEvent::MouseButtonPress ) { + TQMouseEvent *mouseEvent = static_cast( event ); if ( mouseEvent->button() & LeftButton ) { - QValueList::Iterator it; + TQValueList::Iterator it; for ( it = d->mItems.begin(); it != d->mItems.end(); ++it ) { if ( *it == object ) { if ( d->mItems.count() != 1 ) { @@ -204,8 +204,8 @@ bool KWidgetList::eventFilter( QObject *object, QEvent *event ) } } } - } else if ( event->type() == QEvent::MouseButtonDblClick ) { - QValueList::Iterator it; + } else if ( event->type() == TQEvent::MouseButtonDblClick ) { + TQValueList::Iterator it; for ( it = d->mItems.begin(); it != d->mItems.end(); ++it ) { if ( *it == object ) { if ( d->mItems.count() != 1 ) { @@ -215,8 +215,8 @@ bool KWidgetList::eventFilter( QObject *object, QEvent *event ) return true; } } - } else if ( event->type() == QEvent::KeyPress ) { - QKeyEvent *keyEvent = static_cast( event ); + } else if ( event->type() == TQEvent::KeyPress ) { + TQKeyEvent *keyEvent = static_cast( event ); if ( keyEvent->key() == Qt::Key_Up ) { if ( d->mSelectedItem == 0 ) { if ( !d->mItems.isEmpty() ) { @@ -253,18 +253,18 @@ bool KWidgetList::eventFilter( QObject *object, QEvent *event ) } } - return QScrollView::eventFilter( object, event ); + return TQScrollView::eventFilter( object, event ); } KWidgetListItem::KWidgetListItem( KWidgetList *parent, const char *name ) - : QWidget( parent, name ) + : TQWidget( parent, name ) { mForegroundColor = KGlobalSettings::textColor(); mBackgroundColor = KGlobalSettings::baseColor(); mSelectionForegroundColor = KGlobalSettings::highlightedTextColor(); mSelectionBackgroundColor = KGlobalSettings::highlightColor(); - setFocusPolicy( QWidget::StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); } KWidgetListItem::~KWidgetListItem() @@ -282,22 +282,22 @@ void KWidgetListItem::setSelected( bool select ) } } -void KWidgetListItem::setForegroundColor( const QColor &color ) +void KWidgetListItem::setForegroundColor( const TQColor &color ) { mForegroundColor = color; } -void KWidgetListItem::setBackgroundColor( const QColor &color ) +void KWidgetListItem::setBackgroundColor( const TQColor &color ) { mBackgroundColor = color; } -void KWidgetListItem::setSelectionForegroundColor( const QColor &color ) +void KWidgetListItem::setSelectionForegroundColor( const TQColor &color ) { mSelectionForegroundColor = color; } -void KWidgetListItem::setSelectionBackgroundColor( const QColor &color ) +void KWidgetListItem::setSelectionBackgroundColor( const TQColor &color ) { mSelectionBackgroundColor = color; } diff --git a/kitchensync/src/kwidgetlist.h b/kitchensync/src/kwidgetlist.h index 59567b7d5..83c928f25 100644 --- a/kitchensync/src/kwidgetlist.h +++ b/kitchensync/src/kwidgetlist.h @@ -22,7 +22,7 @@ #ifndef KWIDGETLIST_H #define KWIDGETLIST_H -#include +#include class KWidgetListItem; @@ -31,7 +31,7 @@ class KWidgetList : public QScrollView Q_OBJECT public: - KWidgetList( QWidget *parent = 0, const char *name = 0 ); + KWidgetList( TQWidget *parent = 0, const char *name = 0 ); ~KWidgetList(); uint count() const; @@ -51,7 +51,7 @@ class KWidgetList : public QScrollView int index( KWidgetListItem *item ) const; - virtual bool eventFilter( QObject *object, QEvent *event ); + virtual bool eventFilter( TQObject *object, TQEvent *event ); public slots: void clear(); @@ -75,16 +75,16 @@ class KWidgetListItem : public QWidget void setSelected( bool selected ); protected: - void setForegroundColor( const QColor& ); - void setBackgroundColor( const QColor& ); - void setSelectionForegroundColor( const QColor& ); - void setSelectionBackgroundColor( const QColor& ); + void setForegroundColor( const TQColor& ); + void setBackgroundColor( const TQColor& ); + void setSelectionForegroundColor( const TQColor& ); + void setSelectionBackgroundColor( const TQColor& ); private: - QColor mForegroundColor; - QColor mBackgroundColor; - QColor mSelectionForegroundColor; - QColor mSelectionBackgroundColor; + TQColor mForegroundColor; + TQColor mBackgroundColor; + TQColor mSelectionForegroundColor; + TQColor mSelectionBackgroundColor; }; #endif diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp index 683436364..d04542f9d 100644 --- a/kitchensync/src/mainwidget.cpp +++ b/kitchensync/src/mainwidget.cpp @@ -38,10 +38,10 @@ #include #include -#include +#include -MainWidget::MainWidget( KXMLGUIClient *guiClient, QWidget *widget, const char *name ) - : QWidget( widget, name ), mGUIClient( guiClient ) +MainWidget::MainWidget( KXMLGUIClient *guiClient, TQWidget *widget, const char *name ) + : TQWidget( widget, name ), mGUIClient( guiClient ) { initGUI(); initActions(); @@ -55,10 +55,10 @@ MainWidget::MainWidget( KXMLGUIClient *guiClient, QWidget *widget, const char *n mGroupView->updateView(); - connect( SyncProcessManager::self(), SIGNAL( changed() ), - mGroupView, SLOT( updateView() ) ); - connect( SyncProcessManager::self(), SIGNAL( syncProcessChanged( SyncProcess* ) ), - mGroupView, SLOT( updateSyncProcess( SyncProcess* ) ) ); + connect( SyncProcessManager::self(), TQT_SIGNAL( changed() ), + mGroupView, TQT_SLOT( updateView() ) ); + connect( SyncProcessManager::self(), TQT_SIGNAL( syncProcessChanged( SyncProcess* ) ), + mGroupView, TQT_SLOT( updateSyncProcess( SyncProcess* ) ) ); enableActions(); } @@ -86,29 +86,29 @@ KAboutData *MainWidget::aboutData() void MainWidget::initGUI() { - QVBoxLayout *topLayout = new QVBoxLayout( this ); + TQVBoxLayout *topLayout = new TQVBoxLayout( this ); mGroupView = new GroupView( this ); topLayout->addWidget( mGroupView ); - connect( mGroupView, SIGNAL( addGroup() ), SLOT( addGroup() ) ); - connect( mGroupView, SIGNAL( synchronizeGroup( SyncProcess* ) ), - SLOT( sync( SyncProcess* ) ) ); - connect( mGroupView, SIGNAL( abortSynchronizeGroup( SyncProcess* ) ), - SLOT( abortSync( SyncProcess* ) ) ); - connect( mGroupView, SIGNAL( configureGroup( SyncProcess* ) ), - SLOT( editGroup( SyncProcess* ) ) ); + connect( mGroupView, TQT_SIGNAL( addGroup() ), TQT_SLOT( addGroup() ) ); + connect( mGroupView, TQT_SIGNAL( synchronizeGroup( SyncProcess* ) ), + TQT_SLOT( sync( SyncProcess* ) ) ); + connect( mGroupView, TQT_SIGNAL( abortSynchronizeGroup( SyncProcess* ) ), + TQT_SLOT( abortSync( SyncProcess* ) ) ); + connect( mGroupView, TQT_SIGNAL( configureGroup( SyncProcess* ) ), + TQT_SLOT( editGroup( SyncProcess* ) ) ); } void MainWidget::initActions() { - mActionSynchronize = new KAction( i18n("Synchronize"), "hotsync", 0, this, SLOT( sync() ), + mActionSynchronize = new KAction( i18n("Synchronize"), "hotsync", 0, this, TQT_SLOT( sync() ), mGUIClient->actionCollection(), "sync" ); - mActionAddGroup = new KAction( i18n("Add Group..."), "filenew", 0, this, SLOT( addGroup() ), + mActionAddGroup = new KAction( i18n("Add Group..."), "filenew", 0, this, TQT_SLOT( addGroup() ), mGUIClient->actionCollection(), "add_group" ); - mActionDeleteGroup = new KAction( i18n("Delete Group..."), "editdelete", 0, this, SLOT( deleteGroup() ), + mActionDeleteGroup = new KAction( i18n("Delete Group..."), "editdelete", 0, this, TQT_SLOT( deleteGroup() ), mGUIClient->actionCollection(), "delete_group" ); - mActionEditGroup = new KAction( i18n("Edit Group..."), "edit", 0, this, SLOT( editGroup() ), + mActionEditGroup = new KAction( i18n("Edit Group..."), "edit", 0, this, TQT_SLOT( editGroup() ), mGUIClient->actionCollection(), "edit_group" ); } @@ -124,8 +124,8 @@ void MainWidget::enableActions() void MainWidget::addGroup() { bool ok; - QString name = KInputDialog::getText( i18n("Create Synchronization Group"), - i18n("Name for new synchronization group."), QString::null, &ok, this ); + TQString name = KInputDialog::getText( i18n("Create Synchronization Group"), + i18n("Name for new synchronization group."), TQString::null, &ok, this ); if ( ok ) { SyncProcessManager::self()->addGroup( name ); enableActions(); diff --git a/kitchensync/src/mainwidget.h b/kitchensync/src/mainwidget.h index 3bbfcb5cd..acd353434 100644 --- a/kitchensync/src/mainwidget.h +++ b/kitchensync/src/mainwidget.h @@ -23,7 +23,7 @@ #include #include -#include +#include class KAboutData; class KAction; @@ -40,7 +40,7 @@ class KDE_EXPORT MainWidget : public QWidget { Q_OBJECT public: - MainWidget( KXMLGUIClient *guiClient, QWidget *widget = 0, const char *name = 0 ); + MainWidget( KXMLGUIClient *guiClient, TQWidget *widget = 0, const char *name = 0 ); ~MainWidget(); virtual KXMLGUIClient *guiClient() const; diff --git a/kitchensync/src/mainwindow.cpp b/kitchensync/src/mainwindow.cpp index 2426b11dc..4052cb0c1 100644 --- a/kitchensync/src/mainwindow.cpp +++ b/kitchensync/src/mainwindow.cpp @@ -55,7 +55,7 @@ MainWindow::~MainWindow() void MainWindow::initActions() { - KStdAction::quit( this, SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); } #include "mainwindow.moc" diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp index 932830cd8..37755a504 100644 --- a/kitchensync/src/memberconfig.cpp +++ b/kitchensync/src/memberconfig.cpp @@ -26,14 +26,14 @@ #include #include -#include -#include -#include +#include +#include +#include -MemberConfig::MemberConfig( QWidget *parent, const QSync::Member &member ) - : QWidget( parent ), mMember( member ) +MemberConfig::MemberConfig( TQWidget *parent, const QSync::Member &member ) + : TQWidget( parent ), mMember( member ) { - QBoxLayout *topLayout = new QVBoxLayout( this ); + TQBoxLayout *topLayout = new TQVBoxLayout( this ); mGui = ConfigGui::Factory::create( member, this ); topLayout->addWidget( mGui ); @@ -45,7 +45,7 @@ MemberConfig::~MemberConfig() void MemberConfig::loadData() { - QByteArray cfg; + TQByteArray cfg; QSync::Result error = mMember.configuration( cfg ); if ( error ) { @@ -53,7 +53,7 @@ void MemberConfig::loadData() i18n("Unable to read config from plugin '%1':\n%2") .arg( mMember.pluginName() ).arg( error.message() ) ); } else { - QString txt = QString::fromUtf8( cfg.data(), cfg.size() ); + TQString txt = TQString::fromUtf8( cfg.data(), cfg.size() ); mGui->load( txt ); MemberInfo mi( mMember ); mGui->setInstanceName( mi.name() ); @@ -62,12 +62,12 @@ void MemberConfig::loadData() void MemberConfig::saveData() { - QString txt = mGui->save(); + TQString txt = mGui->save(); if ( txt.isEmpty() ) { KMessageBox::sorry( this, i18n("Configuration of %1 is empty.").arg( mMember.pluginName() ) ); } else { - QByteArray cfg = txt.utf8(); + TQByteArray cfg = txt.utf8(); cfg.truncate(cfg.size() - 1); /* discard NUL terminator */ mMember.setConfiguration( cfg ); mMember.setName( mGui->instanceName() ); diff --git a/kitchensync/src/memberconfig.h b/kitchensync/src/memberconfig.h index 5bb46b8ff..6e10da3dd 100644 --- a/kitchensync/src/memberconfig.h +++ b/kitchensync/src/memberconfig.h @@ -22,7 +22,7 @@ #include -#include +#include class QTextEdit; class ConfigGui; @@ -32,7 +32,7 @@ class MemberConfig : public QWidget Q_OBJECT public: - MemberConfig( QWidget *parent, const QSync::Member & ); + MemberConfig( TQWidget *parent, const QSync::Member & ); ~MemberConfig(); void loadData(); diff --git a/kitchensync/src/memberinfo.cpp b/kitchensync/src/memberinfo.cpp index be43991fd..212e2e396 100644 --- a/kitchensync/src/memberinfo.cpp +++ b/kitchensync/src/memberinfo.cpp @@ -30,24 +30,24 @@ MemberInfo::MemberInfo( const QSync::Member &member ) { } -QPixmap MemberInfo::smallIcon() const +TQPixmap MemberInfo::smallIcon() const { return KGlobal::iconLoader()->loadIcon( iconName(), KIcon::Small ); } -QPixmap MemberInfo::desktopIcon() const +TQPixmap MemberInfo::desktopIcon() const { return KGlobal::iconLoader()->loadIcon( iconName(), KIcon::Desktop ); } -QString MemberInfo::iconName() const +TQString MemberInfo::iconName() const { return pluginIconName( mMember.pluginName() ); } -QString MemberInfo::name() const +TQString MemberInfo::name() const { - static QMap nameMap; + static TQMap nameMap; if ( nameMap.isEmpty() ) { nameMap.insert( "file-sync", i18n( "File" ) ); nameMap.insert( "palm-sync", i18n( "Palm" ) ); @@ -69,12 +69,12 @@ QString MemberInfo::name() const } if ( mMember.name().isEmpty() ) - return nameMap[ mMember.pluginName() ] + " (" + QString::number( mMember.id() ) + ") "; + return nameMap[ mMember.pluginName() ] + " (" + TQString::number( mMember.id() ) + ") "; else return mMember.name(); } -QString MemberInfo::pluginIconName( const QString &pluginName ) +TQString MemberInfo::pluginIconName( const TQString &pluginName ) { if ( pluginName == "file-sync" ) return "folder"; if ( pluginName == "palm-sync" ) return "pda_black"; @@ -95,5 +95,5 @@ QString MemberInfo::pluginIconName( const QString &pluginName ) if ( pluginName == "jescs-sync" ) return "www"; - return QString::null; + return TQString::null; } diff --git a/kitchensync/src/memberinfo.h b/kitchensync/src/memberinfo.h index 2ec35cfaa..8f0d7f4f7 100644 --- a/kitchensync/src/memberinfo.h +++ b/kitchensync/src/memberinfo.h @@ -23,22 +23,22 @@ #include -#include -#include +#include +#include class MemberInfo { public: MemberInfo( const QSync::Member &member ); - QPixmap smallIcon() const; - QPixmap desktopIcon() const; + TQPixmap smallIcon() const; + TQPixmap desktopIcon() const; - QString iconName() const; + TQString iconName() const; - QString name() const; + TQString name() const; - static QString pluginIconName( const QString &pluginName ); + static TQString pluginIconName( const TQString &pluginName ); private: QSync::Member mMember; diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp index 996ef08af..7d7805c42 100644 --- a/kitchensync/src/multiconflictdialog.cpp +++ b/kitchensync/src/multiconflictdialog.cpp @@ -22,9 +22,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "memberinfo.h" @@ -37,12 +37,12 @@ class ChangeItem : public KWidgetListItem : KWidgetListItem( parent ), mChange( change ) { - QGridLayout *layout = new QGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() ); MemberInfo mi( change.member() ); - layout->addWidget( new QLabel( mi.name(), this ), 0, 0 ); + layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 ); - QString type; + TQString type; switch ( change.changeType() ) { case QSync::SyncChange::UnknownChange: type = i18n( "Unknown" ); @@ -62,7 +62,7 @@ class ChangeItem : public KWidgetListItem break; } - layout->addWidget( new QLabel( type, this ), 1, 0 ); + layout->addWidget( new TQLabel( type, this ), 1, 0 ); } QSync::SyncChange change() const { return mChange; } @@ -71,7 +71,7 @@ class ChangeItem : public KWidgetListItem QSync::SyncChange mChange; }; -MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, QWidget *parent ) +MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ) : ConflictDialog( mapping, parent ) { initGUI(); @@ -118,23 +118,23 @@ void MultiConflictDialog::ignoreChange() void MultiConflictDialog::initGUI() { - QGridLayout *layout = new QGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() ); - layout->addMultiCellWidget( new QLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 ); + layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 ); mWidgetList = new KWidgetList( this ); layout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 ); - QPushButton *button = new QPushButton( i18n( "Use Selected Item" ), this ); - connect( button, SIGNAL( clicked() ), SLOT( useSelectedChange() ) ); + TQPushButton *button = new TQPushButton( i18n( "Use Selected Item" ), this ); + connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSelectedChange() ) ); layout->addWidget( button, 2, 0 ); - button = new QPushButton( i18n( "Duplicate Items" ), this ); - connect( button, SIGNAL( clicked() ), SLOT( duplicateChange() ) ); + button = new TQPushButton( i18n( "Duplicate Items" ), this ); + connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) ); layout->addWidget( button, 2, 1 ); - button = new QPushButton( i18n( "Ignore Conflict" ), this ); - connect( button, SIGNAL( clicked() ), SLOT( ignoreChange() ) ); + button = new TQPushButton( i18n( "Ignore Conflict" ), this ); + connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) ); layout->addWidget( button, 2, 2 ); } diff --git a/kitchensync/src/multiconflictdialog.h b/kitchensync/src/multiconflictdialog.h index d98fb927b..a7dcfaddc 100644 --- a/kitchensync/src/multiconflictdialog.h +++ b/kitchensync/src/multiconflictdialog.h @@ -30,7 +30,7 @@ class MultiConflictDialog : public ConflictDialog Q_OBJECT public: - MultiConflictDialog( QSync::SyncMapping &mapping, QWidget *parent ); + MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ); ~MultiConflictDialog(); private slots: diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp index e0d65cf40..f66eece63 100644 --- a/kitchensync/src/part.cpp +++ b/kitchensync/src/part.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include #include @@ -36,14 +36,14 @@ typedef KParts::GenericFactory< KitchenSyncPart > KitchenSyncFactory; K_EXPORT_COMPONENT_FACTORY( libkitchensyncpart, KitchenSyncFactory ) -KitchenSyncPart::KitchenSyncPart( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const QStringList& ) +KitchenSyncPart::KitchenSyncPart( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const TQStringList& ) : KParts::ReadOnlyPart( parent, name ) { setInstance( KitchenSyncFactory::instance() ); - QVBox *canvas = new QVBox( parentWidget, widgetName ); + TQVBox *canvas = new TQVBox( parentWidget, widgetName ); setWidget( canvas ); new MainWidget( this, canvas ); diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h index f51ddd158..3e053bbdc 100644 --- a/kitchensync/src/part.h +++ b/kitchensync/src/part.h @@ -32,8 +32,8 @@ class KitchenSyncPart: public KParts::ReadOnlyPart Q_OBJECT public: - KitchenSyncPart( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, const QStringList& ); + KitchenSyncPart( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, const TQStringList& ); virtual ~KitchenSyncPart(); static KAboutData *createAboutData(); diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp index 5fe4b5e81..d981599bd 100644 --- a/kitchensync/src/pluginpicker.cpp +++ b/kitchensync/src/pluginpicker.cpp @@ -31,23 +31,23 @@ #include #include -#include -#include +#include +#include PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin ) : KWidgetListItem( list ), mPlugin( plugin ) { - QString iconName = MemberInfo::pluginIconName( mPlugin.name() ); - QGridLayout *layout = new QGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); + TQString iconName = MemberInfo::pluginIconName( mPlugin.name() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); - QLabel *icon = new QLabel( this ); + TQLabel *icon = new TQLabel( this ); icon->setPixmap( KGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) ); icon->setFixedSize( icon->sizeHint() ); - QLabel *name = new QLabel( plugin.longName(), this ); - QLabel *description = new QLabel( plugin.description(), this ); + TQLabel *name = new TQLabel( plugin.longName(), this ); + TQLabel *description = new TQLabel( plugin.description(), this ); - QFont font = name->font(); + TQFont font = name->font(); font.setBold( true ); name->setFont( font ); @@ -57,16 +57,16 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin ) } -PluginPicker::PluginPicker( QWidget *parent ) - : QWidget( parent ) +PluginPicker::PluginPicker( TQWidget *parent ) + : TQWidget( parent ) { - QBoxLayout *layout = new QVBoxLayout( this ); + TQBoxLayout *layout = new TQVBoxLayout( this ); mPluginList = new KWidgetList( this ); layout->addWidget( mPluginList ); - connect( mPluginList, SIGNAL( doubleClicked( KWidgetListItem* ) ), - SIGNAL( selected() ) ); + connect( mPluginList, TQT_SIGNAL( doubleClicked( KWidgetListItem* ) ), + TQT_SIGNAL( selected() ) ); updatePluginList(); @@ -94,19 +94,19 @@ QSync::Plugin PluginPicker::selectedPlugin() const } -PluginPickerDialog::PluginPickerDialog( QWidget *parent ) +PluginPickerDialog::PluginPickerDialog( TQWidget *parent ) : KDialogBase( parent, 0, true, i18n("Select Member Type"), Ok | Cancel ) { - QFrame *topFrame = makeMainWidget(); + TQFrame *topFrame = makeMainWidget(); - QBoxLayout *topLayout = new QVBoxLayout( topFrame ); + TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); mPicker = new PluginPicker( topFrame ); topLayout->addWidget( mPicker ); - connect( mPicker, SIGNAL( selected() ), SLOT( slotOk() ) ); + connect( mPicker, TQT_SIGNAL( selected() ), TQT_SLOT( slotOk() ) ); - setInitialSize( QSize( 460, 380 ) ); + setInitialSize( TQSize( 460, 380 ) ); } QSync::Plugin PluginPickerDialog::selectedPlugin() const @@ -114,7 +114,7 @@ QSync::Plugin PluginPickerDialog::selectedPlugin() const return mPicker->selectedPlugin(); } -QSync::Plugin PluginPickerDialog::getPlugin( QWidget *parent ) +QSync::Plugin PluginPickerDialog::getPlugin( TQWidget *parent ) { PluginPickerDialog dlg( parent ); if ( dlg.exec() ) diff --git a/kitchensync/src/pluginpicker.h b/kitchensync/src/pluginpicker.h index 39630f448..81b49161e 100644 --- a/kitchensync/src/pluginpicker.h +++ b/kitchensync/src/pluginpicker.h @@ -26,7 +26,7 @@ #include #include -#include +#include class PluginItem : public KWidgetListItem { @@ -44,7 +44,7 @@ class PluginPicker : public QWidget Q_OBJECT public: - PluginPicker( QWidget *parent ); + PluginPicker( TQWidget *parent ); QSync::Plugin selectedPlugin() const; @@ -63,11 +63,11 @@ class PluginPickerDialog : public KDialogBase Q_OBJECT public: - PluginPickerDialog( QWidget *parent ); + PluginPickerDialog( TQWidget *parent ); QSync::Plugin selectedPlugin() const; - static QSync::Plugin getPlugin( QWidget *parent ); + static QSync::Plugin getPlugin( TQWidget *parent ); protected slots: void slotOk(); diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp index 53acba799..8975b6f98 100644 --- a/kitchensync/src/singleconflictdialog.cpp +++ b/kitchensync/src/singleconflictdialog.cpp @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "addresseediffalgo.h" #include "genericdiffalgo.h" @@ -32,12 +32,12 @@ #include "singleconflictdialog.h" -SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, QWidget *parent ) +SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ) : ConflictDialog( mapping, parent ), mDiffAlgo( 0 ) { initGUI(); - QString format = mapping.changeAt( 0 ).objectFormatName(); + TQString format = mapping.changeAt( 0 ).objectFormatName(); QSync::SyncChange leftChange = mapping.changeAt( 0 ); QSync::SyncChange rightChange = mapping.changeAt( 1 ); @@ -96,27 +96,27 @@ void SingleConflictDialog::ignoreChange() void SingleConflictDialog::initGUI() { - QGridLayout *layout = new QGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() ); - layout->addMultiCellWidget( new QLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 ); + layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 ); mDiffAlgoDisplay = new KSync::HTMLDiffAlgoDisplay( this ); layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 ); - QPushButton *button = new QPushButton( i18n( "Use Item" ), this ); - connect( button, SIGNAL( clicked() ), SLOT( useFirstChange() ) ); + TQPushButton *button = new TQPushButton( i18n( "Use Item" ), this ); + connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useFirstChange() ) ); layout->addWidget( button, 2, 0 ); - button = new QPushButton( i18n( "Duplicate Items" ), this ); - connect( button, SIGNAL( clicked() ), SLOT( duplicateChange() ) ); + button = new TQPushButton( i18n( "Duplicate Items" ), this ); + connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) ); layout->addWidget( button, 2, 1 ); - button = new QPushButton( i18n( "Ignore Conflict" ), this ); - connect( button, SIGNAL( clicked() ), SLOT( ignoreChange() ) ); + button = new TQPushButton( i18n( "Ignore Conflict" ), this ); + connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) ); layout->addWidget( button, 2, 2 ); - button = new QPushButton( i18n( "Use Item" ), this ); - connect( button, SIGNAL( clicked() ), SLOT( useSecondChange() ) ); + button = new TQPushButton( i18n( "Use Item" ), this ); + connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSecondChange() ) ); layout->addWidget( button, 2, 3 ); } diff --git a/kitchensync/src/singleconflictdialog.h b/kitchensync/src/singleconflictdialog.h index 75e083895..25ff4bd78 100644 --- a/kitchensync/src/singleconflictdialog.h +++ b/kitchensync/src/singleconflictdialog.h @@ -35,7 +35,7 @@ class SingleConflictDialog : public ConflictDialog Q_OBJECT public: - SingleConflictDialog( QSync::SyncMapping &mapping, QWidget *parent ); + SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ); ~SingleConflictDialog(); private slots: diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp index b52cc6db4..60310b803 100644 --- a/kitchensync/src/syncprocess.cpp +++ b/kitchensync/src/syncprocess.cpp @@ -30,7 +30,7 @@ using namespace QSync; SyncProcess::SyncProcess( const QSync::Group &group ) - : QObject( 0, "SyncProcess" ) + : TQObject( 0, "SyncProcess" ) { mGroup = group; mEngine = new QSync::Engine( mGroup ); @@ -48,12 +48,12 @@ SyncProcess::~SyncProcess() mEngine = 0; } -QString SyncProcess::groupStatus() const +TQString SyncProcess::groupStatus() const { return i18n( "Ready" ); } -QString SyncProcess::memberStatus( const QSync::Member& ) const +TQString SyncProcess::memberStatus( const QSync::Member& ) const { return i18n( "Ready" ); } @@ -86,8 +86,8 @@ void SyncProcess::reinitEngine() void SyncProcess::applyObjectTypeFilter() { const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion(); - const QStringList objectTypes = conversion.objectTypes(); - const QStringList activeObjectTypes = mGroup.config().activeObjectTypes(); + const TQStringList objectTypes = conversion.objectTypes(); + const TQStringList activeObjectTypes = mGroup.config().activeObjectTypes(); for ( uint i = 0; i < objectTypes.count(); ++i ) { if ( activeObjectTypes.contains( objectTypes[ i ] ) ) { diff --git a/kitchensync/src/syncprocess.h b/kitchensync/src/syncprocess.h index 5b70a4b49..ef23f7c52 100644 --- a/kitchensync/src/syncprocess.h +++ b/kitchensync/src/syncprocess.h @@ -21,7 +21,7 @@ #ifndef SYNCPROCESS_H #define SYNCPROCESS_H -#include +#include #include @@ -40,8 +40,8 @@ class SyncProcess : public QObject QSync::Group group() const { return mGroup; } QSync::Engine* engine() const { return mEngine; } - QString groupStatus() const; - QString memberStatus( const QSync::Member &member ) const; + TQString groupStatus() const; + TQString memberStatus( const QSync::Member &member ) const; QSync::Result addMember( const QSync::Plugin &plugin ); diff --git a/kitchensync/src/syncprocessmanager.cpp b/kitchensync/src/syncprocessmanager.cpp index f2cb1ab0a..fda111efd 100644 --- a/kitchensync/src/syncprocessmanager.cpp +++ b/kitchensync/src/syncprocessmanager.cpp @@ -55,7 +55,7 @@ SyncProcessManager::SyncProcessManager() SyncProcessManager::~SyncProcessManager() { - QValueList::Iterator it; + TQValueList::Iterator it; for ( it = mProcesses.begin(); it != mProcesses.end(); ++it ) delete *it; @@ -80,7 +80,7 @@ SyncProcess* SyncProcessManager::at( int pos ) const SyncProcess* SyncProcessManager::byGroup( const QSync::Group &group ) { - QValueList::Iterator it; + TQValueList::Iterator it; for ( it = mProcesses.begin(); it != mProcesses.end(); ++it ) if ( (*it)->group() == group ) return *it; @@ -88,9 +88,9 @@ SyncProcess* SyncProcessManager::byGroup( const QSync::Group &group ) return 0; } -SyncProcess* SyncProcessManager::byGroupName( const QString &name ) +SyncProcess* SyncProcessManager::byGroupName( const TQString &name ) { - QValueList::Iterator it; + TQValueList::Iterator it; for ( it = mProcesses.begin(); it != mProcesses.end(); ++it ) if ( (*it)->group().name() == name ) return *it; @@ -98,7 +98,7 @@ SyncProcess* SyncProcessManager::byGroupName( const QString &name ) return 0; } -void SyncProcessManager::addGroup( const QString &name ) +void SyncProcessManager::addGroup( const TQString &name ) { SyncProcess* process = byGroupName( name ); if ( !process ) { diff --git a/kitchensync/src/syncprocessmanager.h b/kitchensync/src/syncprocessmanager.h index 488312939..b95018a84 100644 --- a/kitchensync/src/syncprocessmanager.h +++ b/kitchensync/src/syncprocessmanager.h @@ -21,7 +21,7 @@ #ifndef SYNCPROCESSMANAGER_H #define SYNCPROCESSMANAGER_H -#include +#include #include @@ -65,12 +65,12 @@ class SyncProcessManager : public QObject /** Returns the SyncProcess with the given group @param name. */ - SyncProcess* byGroupName( const QString &name ); + SyncProcess* byGroupName( const TQString &name ); /** Adds a group with given @param name. */ - void addGroup( const QString &name ); + void addGroup( const TQString &name ); /** Removes the given @param sync process. @@ -91,7 +91,7 @@ class SyncProcessManager : public QObject void init( QSync::Environment *environment ); - QValueList mProcesses; + TQValueList mProcesses; QSync::Environment *mEnvironment; static SyncProcessManager *mSelf; -- cgit v1.2.1
%1 %2
%1 %2
%1:%2
%1:%2
%1:%2
%1:%2
%1:%2%3
%1:%2%3