rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

10 files changed, 26 insertions, 26 deletions

diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
index 459a6b6f7..02a2f1ad3 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
@@ -33,8 +33,8 @@
 
 using namespace KABC;
 
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent,  const char* name )
-  : KRES::ConfigWidget( tqparent, name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent,  const char* name )
+  : KRES::ConfigWidget( parent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.h b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
index a680cfb01..084f92109 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
@@ -35,7 +35,7 @@ class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
   TQ_OBJECT
 
   public:
-    ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 );
+    ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index 25f4c1f2d..3360d18cd 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@@ -250,7 +250,7 @@ bool ResourceXMLRPC::doLoad()
   columns.insert( "type", "task" );
   args.insert( "filter", "none" );
   args.insert( "col_filter", columns );
-  args.insert( "order", "id_tqparent" );
+  args.insert( "order", "id_parent" );
 
   mServer->call( SearchTodosCommand, args,
                  this, TQT_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
@@ -1115,7 +1115,7 @@ void ResourceXMLRPC::writeTodo( Todo* todo, TQMap<TQString, TQVariant>& args )
   Incidence *inc = todo->relatedTo();
   if ( inc ) {
     TQString parentUid = idMapper().remoteId( inc->uid() );
-    args.insert( "id_tqparent", parentUid );
+    args.insert( "id_parent", parentUid );
   }
 
   // STATE
@@ -1172,13 +1172,13 @@ void ResourceXMLRPC::readTodo( const TQMap<TQString, TQVariant>& args, Todo *tod
   }
 
   // SUBTODO
-  TQString parentId = args[ "id_tqparent" ].toString();
+  TQString parentId = args[ "id_parent" ].toString();
   if ( parentId != "0" ) { // we are a sub todo
     TQString localParentUid = idMapper().localId( parentId );
-    if ( !localParentUid.isEmpty() ) { // found tqparent todo
-      Todo *tqparent = mCalendar.todo( localParentUid );
-      if ( tqparent )
-        todo->setRelatedTo( tqparent );
+    if ( !localParentUid.isEmpty() ) { // found parent todo
+      Todo *parent = mCalendar.todo( localParentUid );
+      if ( parent )
+        todo->setRelatedTo( parent );
     }
   }
 
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
index 740602b50..36e3b9486 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
@@ -34,8 +34,8 @@
 
 using namespace KCal;
 
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent,  const char* name )
-  : KRES::ConfigWidget( tqparent, name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent,  const char* name )
+  : KRES::ConfigWidget( parent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.h b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
index d070eebf4..13e359b00 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
@@ -36,7 +36,7 @@ class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
   TQ_OBJECT
 
   public:
-    ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 );
+    ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp
index ada19144b..6446a833d 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp
@@ -132,7 +132,7 @@ bool ResourceXMLRPC::load()
   args.clear();
   args.insert( "filter", "none" );
   args.insert( "col_filter", columns );
-  args.insert( "order", "id_tqparent" );
+  args.insert( "order", "id_parent" );
 
   mServer->call( SearchNotesCommand, args,
                  this, TQT_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
index 0e2816b12..224cb9914 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
@@ -34,8 +34,8 @@
 
 using namespace KNotes;
 
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* tqparent,  const char* name )
-  : KRES::ConfigWidget( tqparent, name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent,  const char* name )
+  : KRES::ConfigWidget( parent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.h b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
index 70201f609..dac45f818 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
@@ -36,7 +36,7 @@ class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
   TQ_OBJECT
 
   public:
-    ResourceXMLRPCConfig( TQWidget* tqparent = 0, const char* name = 0 );
+    ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index 59b467bb2..09176ae6b 100644
--- a/kresources/egroupware/xmlrpciface.cpp
+++ b/kresources/egroupware/xmlrpciface.cpp
@@ -54,9 +54,9 @@ namespace KXMLRPC
   };
 }
 
-Query *Query::create( const TQVariant &id, TQObject *tqparent, const char *name )
+Query *Query::create( const TQVariant &id, TQObject *parent, const char *name )
 {
-  return new Query( id, tqparent, name );
+  return new Query( id, parent, name );
 }
 
 void Query::call( const TQString &server, const TQString &method,
@@ -310,8 +310,8 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const
   return TQVariant();
 }
 
-Query::Query( const TQVariant &id, TQObject *tqparent, const char *name )
-  : TQObject( tqparent, name ), m_id( id )
+Query::Query( const TQVariant &id, TQObject *parent, const char *name )
+  : TQObject( parent, name ), m_id( id )
 {}
 
 Query::~Query()
@@ -321,8 +321,8 @@ Query::~Query()
     (*it)->kill();
 }
 
-Server::Server( const KURL &url, TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name )
+Server::Server( const KURL &url, TQObject *parent, const char *name )
+    : TQObject( parent, name )
 {
   if ( url.isValid() )
     m_url = url;
diff --git a/kresources/egroupware/xmlrpciface.h b/kresources/egroupware/xmlrpciface.h
index 5c49eee8b..4e05dc675 100644
--- a/kresources/egroupware/xmlrpciface.h
+++ b/kresources/egroupware/xmlrpciface.h
@@ -38,7 +38,7 @@ namespace KXMLRPC
 
 
       static Query *create( const TQVariant &id = TQVariant(),
-                            TQObject *tqparent = 0, const char *name = 0 );
+                            TQObject *parent = 0, const char *name = 0 );
 
     public slots:
       void call( const TQString &server, const TQString &method,
@@ -66,7 +66,7 @@ namespace KXMLRPC
       TQString marshal( const TQVariant &v ) const;
       TQVariant demarshal( const TQDomElement &e ) const;
 
-      Query( const TQVariant &id, TQObject *tqparent = 0, const char *name = 0 );
+      Query( const TQVariant &id, TQObject *parent = 0, const char *name = 0 );
       ~Query();
 
       TQByteArray m_buffer;
@@ -81,7 +81,7 @@ namespace KXMLRPC
   TQ_OBJECT
     public:
       Server( const KURL &url = KURL(),
-              TQObject *tqparent = 0, const char *name = 0 );
+              TQObject *parent = 0, const char *name = 0 );
       ~Server();
 
       const KURL &url() const { return m_url; }