1 files changed, 9 insertions, 9 deletions
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index 68bade03..bd31a194 100644
--- a/kresources/egroupware/xmlrpciface.cpp
+++ b/kresources/egroupware/xmlrpciface.cpp
@@ -54,9 +54,9 @@ namespace KXMLRPC
   };
 }
 
-Query *Query::create( const TQVariant &id, TQObject *parent, const char *name )
+Query *Query::create( const TQVariant &id, TQObject *tqparent, const char *name )
 {
-  return new Query( id, parent, name );
+  return new Query( id, tqparent, name );
 }
 
 void Query::call( const TQString &server, const TQString &method,
@@ -222,7 +222,7 @@ TQString Query::marshal( const TQVariant &arg ) const
       case TQVariant::ByteArray:
       return "<value><base64>" + KCodecs::base64Encode( arg.toByteArray() ) + "</base64></value>\r\n";
       case TQVariant::DateTime:
-      return "<value><datetime.iso8601>" + arg.toDateTime().toString( Qt::ISODate ) + "</datetime.iso8601></value>\r\n";
+      return "<value><datetime.iso8601>" + arg.toDateTime().toString( TQt::ISODate ) + "</datetime.iso8601></value>\r\n";
       case TQVariant::List:
       {
         TQString markup = "<value><array><data>\r\n";
@@ -253,7 +253,7 @@ TQString Query::marshal( const TQVariant &arg ) const
       default:
       kdWarning() << "Failed to marshal unknown variant type: " << arg.type() << endl;
   };
-  return TQString::null;
+  return TQString();
 }
 
 TQVariant Query::demarshal( const TQDomElement &elem ) const
@@ -279,7 +279,7 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const
   else if ( typeName == "base64" )
     return TQVariant( KCodecs::base64Decode( typeElement.text().latin1() ) );
   else if ( typeName == "datetime" || typeName == "datetime.iso8601" )
-    return TQVariant( TQDateTime::fromString( typeElement.text(), Qt::ISODate ) );
+    return TQVariant( TQDateTime::fromString( typeElement.text(), TQt::ISODate ) );
   else if ( typeName == "array" )
   {
     TQValueList<TQVariant> values;
@@ -310,8 +310,8 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const
   return TQVariant();
 }
 
-Query::Query( const TQVariant &id, TQObject *parent, const char *name )
-  : TQObject( parent, name ), m_id( id )
+Query::Query( const TQVariant &id, TQObject *tqparent, const char *name )
+  : TQObject( tqparent, name ), m_id( id )
 {}
 
 Query::~Query()
@@ -321,8 +321,8 @@ Query::~Query()
     (*it)->kill();
 }
 
-Server::Server( const KURL &url, TQObject *parent, const char *name )
-    : TQObject( parent, name )
+Server::Server( const KURL &url, TQObject *tqparent, const char *name )
+    : TQObject( tqparent, name )
 {
   if ( url.isValid() )
     m_url = url;