Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

4 files changed, 11 insertions, 11 deletions

diff --git a/kitchensync/libqopensync/group.cpp b/kitchensync/libqopensync/group.cpp
index bc94e2208..d716e1c4c 100644
--- a/kitchensync/libqopensync/group.cpp
+++ b/kitchensync/libqopensync/group.cpp
@@ -46,7 +46,7 @@ TQStringList GroupConfig::activeObjectTypes() const
 {
   Q_ASSERT( mGroup );
 
-  const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) );
+  const TQString fileName = TQString( "%1/filter.conf" ).tqarg( osync_group_get_configdir( mGroup ) );
 
   TQFile file( fileName );
   if ( !file.open( IO_ReadOnly ) )
@@ -92,7 +92,7 @@ void GroupConfig::setActiveObjectTypes( const TQStringList &objectTypes )
     element.appendChild( entry );
   }
 
-  const TQString fileName = TQString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) );
+  const TQString fileName = TQString( "%1/filter.conf" ).tqarg( osync_group_get_configdir( mGroup ) );
 
   TQFile file( fileName );
   if ( !file.open( IO_WriteOnly ) )
@@ -146,7 +146,7 @@ TQString Group::name() const
 {
   Q_ASSERT( mGroup );
 
-  return TQString::fromLatin1( osync_group_get_name( mGroup ) );
+  return TQString::tqfromLatin1( osync_group_get_name( mGroup ) );
 }
 
 void Group::setLastSynchronization( const TQDateTime &dateTime )
diff --git a/kitchensync/libqopensync/member.cpp b/kitchensync/libqopensync/member.cpp
index 35cb04632..fc7dfe312 100644
--- a/kitchensync/libqopensync/member.cpp
+++ b/kitchensync/libqopensync/member.cpp
@@ -55,14 +55,14 @@ TQString Member::configurationDirectory() const
 {
   Q_ASSERT( mMember );
 
-  return TQString::fromLatin1( osync_member_get_configdir( mMember ) );
+  return TQString::tqfromLatin1( osync_member_get_configdir( mMember ) );
 }
 
 TQString Member::pluginName() const
 {
   Q_ASSERT( mMember );
 
-  return TQString::fromLatin1( osync_member_get_pluginname( mMember ) );
+  return TQString::tqfromLatin1( osync_member_get_pluginname( mMember ) );
 }
 
 Plugin Member::plugin() const
@@ -160,7 +160,7 @@ TQString Member::scanDevices( const TQString &query )
   Q_ASSERT( mMember );
 
   OSyncError *error = 0;
-  char *data = (char*)osync_member_call_plugin( mMember, "scan_devices", const_cast<char*>( query.utf8().data() ), &error );
+  char *data = (char*)osync_member_call_plugin( mMember, "scan_tqdevices", const_cast<char*>( query.utf8().data() ), &error );
   if ( error != 0 ) {
     osync_error_free( &error );
     return TQString();
diff --git a/kitchensync/libqopensync/member.h b/kitchensync/libqopensync/member.h
index 6fa3ee737..48a1164b1 100644
--- a/kitchensync/libqopensync/member.h
+++ b/kitchensync/libqopensync/member.h
@@ -107,7 +107,7 @@ class Member
     bool operator==( const Member& ) const;
 
     /**
-      This method can be used to query the plugin for scanning devices.
+      This method can be used to query the plugin for scanning tqdevices.
       The @param query is a plugin specific xml document as well as
       the return value.
      */
@@ -115,7 +115,7 @@ class Member
 
     /**
       This method can be used to test whether the plugin can connect
-      to the device with the given configuration.
+      to the tqdevice with the given configuration.
      */
     bool testConnection( const TQString &configuration );
 
diff --git a/kitchensync/libqopensync/plugin.cpp b/kitchensync/libqopensync/plugin.cpp
index acd54447a..fd7600499 100644
--- a/kitchensync/libqopensync/plugin.cpp
+++ b/kitchensync/libqopensync/plugin.cpp
@@ -43,20 +43,20 @@ TQString Plugin::name() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::fromLatin1( osync_plugin_get_name( mPlugin ) );
+  return TQString::tqfromLatin1( osync_plugin_get_name( mPlugin ) );
 }
 
 TQString Plugin::longName() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::fromLatin1( osync_plugin_get_longname( mPlugin ) );
+  return TQString::tqfromLatin1( osync_plugin_get_longname( mPlugin ) );
 }
 
 TQString Plugin::description() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::fromLatin1( osync_plugin_get_description( mPlugin ) );
+  return TQString::tqfromLatin1( osync_plugin_get_description( mPlugin ) );
 }