summaryrefslogtreecommitdiffstats
path: root/kitchensync/libqopensync
diff options
context:
space:
mode:
Diffstat (limited to 'kitchensync/libqopensync')
-rw-r--r--kitchensync/libqopensync/callbackhandler.cpp34
-rw-r--r--kitchensync/libqopensync/callbackhandler.h4
-rw-r--r--kitchensync/libqopensync/conversion.cpp6
-rw-r--r--kitchensync/libqopensync/conversion.h4
-rw-r--r--kitchensync/libqopensync/environment.cpp4
-rw-r--r--kitchensync/libqopensync/environment.h6
-rw-r--r--kitchensync/libqopensync/filter.cpp6
-rw-r--r--kitchensync/libqopensync/filter.h6
-rw-r--r--kitchensync/libqopensync/group.cpp58
-rw-r--r--kitchensync/libqopensync/group.h20
-rw-r--r--kitchensync/libqopensync/member.cpp26
-rw-r--r--kitchensync/libqopensync/member.h16
-rw-r--r--kitchensync/libqopensync/plugin.cpp12
-rw-r--r--kitchensync/libqopensync/plugin.h8
-rw-r--r--kitchensync/libqopensync/result.cpp12
-rw-r--r--kitchensync/libqopensync/result.h14
-rw-r--r--kitchensync/libqopensync/syncchange.cpp26
-rw-r--r--kitchensync/libqopensync/syncchange.h14
-rw-r--r--kitchensync/libqopensync/syncmapping.cpp2
19 files changed, 139 insertions, 139 deletions
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 <libqopensync/engine.h>
-#include <qapplication.h>
+#include <tqapplication.h>
#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<QEvent::Type>( ConflictEventType ) ) {
+ if ( event->type() == static_cast<TQEvent::Type>( ConflictEventType ) ) {
ConflictEvent *conflictEvent = static_cast<ConflictEvent*>( event );
emit conflict( conflictEvent->mapping() );
- } else if ( event->type() == static_cast<QEvent::Type>( ChangeEventType ) ) {
+ } else if ( event->type() == static_cast<TQEvent::Type>( ChangeEventType ) ) {
ChangeEvent *changeEvent = static_cast<ChangeEvent*>( event );
emit change( changeEvent->change() );
- } else if ( event->type() == static_cast<QEvent::Type>( MappingEventType ) ) {
+ } else if ( event->type() == static_cast<TQEvent::Type>( MappingEventType ) ) {
MappingEvent *mappingEvent = static_cast<MappingEvent*>( event );
emit mapping( mappingEvent->mapping() );
- } else if ( event->type() == static_cast<QEvent::Type>( EngineEventType ) ) {
+ } else if ( event->type() == static_cast<TQEvent::Type>( EngineEventType ) ) {
EngineEvent *engineEvent = static_cast<EngineEvent*>( event );
emit engine( engineEvent->engine() );
- } else if ( event->type() == static_cast<QEvent::Type>( MemberEventType ) ) {
+ } else if ( event->type() == static_cast<TQEvent::Type>( MemberEventType ) ) {
MemberEvent *memberEvent = static_cast<MemberEvent*>( event );
emit member( memberEvent->member() );
}
@@ -149,7 +149,7 @@ void CallbackHandler::conflict_callback( OSyncEngine *engine, OSyncMapping *omap
CallbackHandler *handler = static_cast<CallbackHandler*>( 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<CallbackHandler*>( 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<CallbackHandler*>( 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<CallbackHandler*>( 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 <libqopensync/syncmapping.h>
#include <libqopensync/syncupdates.h>
-#include <qobject.h>
+#include <tqobject.h>
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 <qstringlist.h>
+#include <tqstringlist.h>
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 <qstring.h>
+#include <tqstring.h>
#include <libqopensync/group.h>
#include <libqopensync/plugin.h>
@@ -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 <qstring.h>
+#include <tqstring.h>
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 <qdom.h>
-#include <qfile.h>
+#include <tqdom.h>
+#include <tqfile.h>
/** hack includes **/
#include <opensync/opensync.h>
@@ -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 <qdatetime.h>
-#include <qstringlist.h>
+#include <tqdatetime.h>
+#include <tqstringlist.h>
#include <libqopensync/filter.h>
#include <libqopensync/member.h>
@@ -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<char*>( 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 <qstring.h>
+#include <tqstring.h>
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 <qstring.h>
+#include <tqstring.h>
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<char*>( 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 <qstring.h>
+#include <tqstring.h>
#include <osengine/engine.h>
#include "syncmapping.h"