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, 70 insertions, 70 deletions

diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp
index ba3d41156..36b6cc99a 100644
--- a/kresources/slox/kabcresourceslox.cpp
+++ b/kresources/slox/kabcresourceslox.cpp
@@ -631,14 +631,14 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop
   }
 }
 
-void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &tqparent,
+void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &parent,
                                                const TQString &prefix, const KABC::Address &addr )
 {
-  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( Street ), addr.street() );
-  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( PostalCode ), addr.postalCode() );
-  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( City ), addr.locality() );
-  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( State ), addr.region() );
-  WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( Country ), addr.country() );
+  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Street ), addr.street() );
+  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( PostalCode ), addr.postalCode() );
+  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( City ), addr.locality() );
+  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( State ), addr.region() );
+  WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Country ), addr.country() );
 }
 
 void ResourceSlox::slotProgress( KIO::Job *job, unsigned long percent )
diff --git a/kresources/slox/kabcresourceslox.h b/kresources/slox/kabcresourceslox.h
index d7d3417f7..98be4bd5e 100644
--- a/kresources/slox/kabcresourceslox.h
+++ b/kresources/slox/kabcresourceslox.h
@@ -81,7 +81,7 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
     void parseContactAttribute( const TQDomElement &e, Addressee &a );
 
     void createAddresseeFields( TQDomDocument &doc, TQDomElement &prop, const Addressee &a );
-    void createAddressFields( TQDomDocument &doc, TQDomElement &tqparent,
+    void createAddressFields( TQDomDocument &doc, TQDomElement &parent,
                               const TQString &prefix, const KABC::Address &addr );
 
     void uploadContacts();
diff --git a/kresources/slox/kabcresourcesloxconfig.cpp b/kresources/slox/kabcresourcesloxconfig.cpp
index d6760156b..abacaf718 100644
--- a/kresources/slox/kabcresourcesloxconfig.cpp
+++ b/kresources/slox/kabcresourcesloxconfig.cpp
@@ -39,8 +39,8 @@
 
 using namespace KABC;
 
-ResourceSloxConfig::ResourceSloxConfig( TQWidget* tqparent,  const char* name )
-  : KRES::ConfigWidget( tqparent, name ), mRes( 0 )
+ResourceSloxConfig::ResourceSloxConfig( TQWidget* parent,  const char* name )
+  : KRES::ConfigWidget( parent, name ), mRes( 0 )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/slox/kabcresourcesloxconfig.h b/kresources/slox/kabcresourcesloxconfig.h
index 2392d5cc7..79b255a1c 100644
--- a/kresources/slox/kabcresourcesloxconfig.h
+++ b/kresources/slox/kabcresourcesloxconfig.h
@@ -38,7 +38,7 @@ class KDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget
   TQ_OBJECT
 
   public:
-    ResourceSloxConfig( TQWidget* tqparent = 0, const char* name = 0 );
+    ResourceSloxConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp
index cb477038c..b2c24b8ab 100644
--- a/kresources/slox/kcalresourceslox.cpp
+++ b/kresources/slox/kcalresourceslox.cpp
@@ -393,17 +393,17 @@ void KCalResourceSlox::uploadIncidences()
 }
 
 void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc,
-                                                  TQDomElement &tqparent,
+                                                  TQDomElement &parent,
                                                   Incidence *incidence )
 {
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( IncidenceTitle ),
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( IncidenceTitle ),
                                  incidence->summary() );
 
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Description ),
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( Description ),
                                  incidence->description() );
 
   if ( incidence->attendeeCount() > 0 ) {
-    TQDomElement members = WebdavHandler::addSloxElement( this, doc, tqparent,
+    TQDomElement members = WebdavHandler::addSloxElement( this, doc, parent,
         fieldName( Participants ) );
     Attendee::List attendees = incidence->attendees();
     Attendee::List::ConstIterator it;
@@ -428,62 +428,62 @@ void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc,
   // TODO OX support
   if ( incidence->secrecy() == Incidence::SecrecyPublic && type() != "ox" )
   {
-    TQDomElement rights = WebdavHandler::addSloxElement( this, doc, tqparent, "readrights" );
+    TQDomElement rights = WebdavHandler::addSloxElement( this, doc, parent, "readrights" );
     WebdavHandler::addSloxElement( this, doc, rights, "group", "users" );
   }
 
   // set reminder as the number of minutes to the start of the event
   KCal::Alarm::List alarms = incidence->alarms();
   if ( !alarms.isEmpty() && alarms.first()->hasStartOffset() && alarms.first()->enabled() )
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Reminder ),
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( Reminder ),
                                    TQString::number( (-1) * alarms.first()->startOffset().asSeconds() / 60 ) );
   else
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Reminder ), "0" );
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( Reminder ), "0" );
 
   // categories
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Categories ), incidence->categories().join( ", " ) );
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( Categories ), incidence->categories().join( ", " ) );
 }
 
 void KCalResourceSlox::createEventAttributes( TQDomDocument &doc,
-                                              TQDomElement &tqparent,
+                                              TQDomElement &parent,
                                               Event *event )
 {
   TQString folderId = mPrefs->calendarFolderId();
   if ( folderId.isEmpty() && type() == "ox" ) // SLOX and OX use diffrent default folders
     folderId = "-1";
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FolderId ), folderId );
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( FolderId ), folderId );
 
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( EventBegin ),
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( EventBegin ),
       WebdavHandler::qDateTimeToSlox( event->dtStart(), timeZoneId() ) );
 
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( EventEnd ),
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( EventEnd ),
       WebdavHandler::qDateTimeToSlox( event->dtEnd(), timeZoneId() ) );
 
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Location ), event->location() );
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( Location ), event->location() );
 
   if ( event->doesFloat() ) {
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FullTime ), boolToStr( true ) );
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( FullTime ), boolToStr( true ) );
   } else {
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FullTime ), boolToStr( false ) );
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( FullTime ), boolToStr( false ) );
   }
 }
 
 void KCalResourceSlox::createTodoAttributes( TQDomDocument &doc,
-                                             TQDomElement &tqparent,
+                                             TQDomElement &parent,
                                              Todo *todo )
 {
   TQString folderId = mPrefs->taskFolderId();
   if ( folderId.isEmpty() && type() == "ox" ) // SLOX and OX use diffrent default folders
     folderId = "-1";
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( FolderId ), folderId );
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( FolderId ), folderId );
 
   if ( todo->hasStartDate() ) {
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( TaskBegin ),
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( TaskBegin ),
         WebdavHandler::qDateTimeToSlox( todo->dtStart(), timeZoneId() ) );
   }
 
   if ( todo->hasDueDate() ) {
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( TaskEnd ),
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( TaskEnd ),
         WebdavHandler::qDateTimeToSlox( todo->dtDue(), timeZoneId() ) );
   }
 
@@ -502,18 +502,18 @@ void KCalResourceSlox::createTodoAttributes( TQDomDocument &doc,
       txt = "2";
       break;
   }
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( Priority ), txt );
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( Priority ), txt );
 
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( PercentComplete ),
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( PercentComplete ),
                                  TQString::number( todo->percentComplete() ) );
 }
 
 void KCalResourceSlox::createRecurrenceAttributes( TQDomDocument &doc,
-                                                   TQDomElement &tqparent,
+                                                   TQDomElement &parent,
                                                    KCal::Incidence *incidence )
 {
   if ( !incidence->doesRecur() ) {
-    WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ),
+    WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ),
                                    type() == "ox" ? "none" : "no" );
     return;
   }
@@ -521,13 +521,13 @@ void KCalResourceSlox::createRecurrenceAttributes( TQDomDocument &doc,
   int monthOffset = ( type() == "ox" ? -1 : 0 );
   switch ( r->recurrenceType() ) {
     case Recurrence::rDaily:
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "daily" );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceDailyFreq ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "daily" );
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceDailyFreq ),
                                      TQString::number( r->frequency() ) );
       break;
     case Recurrence::rWeekly: {
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "weekly" );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceWeeklyFreq ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "weekly" );
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceWeeklyFreq ),
                                      TQString::number( r->frequency() ) );
       // TODO: SLOX support
       int oxDays = 0;
@@ -536,61 +536,61 @@ void KCalResourceSlox::createRecurrenceAttributes( TQDomDocument &doc,
           oxDays += 1 << ( ( i + 1 ) % 7 );
       }
       if ( type() == "ox" )
-        WebdavHandler::addSloxElement( this, doc, tqparent, "days", TQString::number( oxDays ) );
+        WebdavHandler::addSloxElement( this, doc, parent, "days", TQString::number( oxDays ) );
       break; }
     case Recurrence::rMonthlyDay:
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "monthly" );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthlyFreq ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "monthly" );
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthlyFreq ),
                                      TQString::number( r->frequency() ) );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthlyDay ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthlyDay ),
                                      TQString::number( r->monthDays().first() ) );
       break;
     case Recurrence::rMonthlyPos: {
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ),
                                      type() == "ox" ? "monthly" : "monthly2" );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthly2Freq ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Freq ),
                                      TQString::number( r->frequency() ) );
       RecurrenceRule::WDayPos wdp = r->monthPositions().first();
       // TODO: SLOX support
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthly2Day ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Day ),
                                      TQString::number( 1 << wdp.day() ) );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceMonthly2Pos ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Pos ),
                                      TQString::number( wdp.pos() ) );
       break; }
     case Recurrence::rYearlyMonth:
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ), "yearly" );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearlyDay ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "yearly" );
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearlyDay ),
                                      TQString::number( r->yearDates().first() ) );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearlyMonth ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearlyMonth ),
                                      TQString::number( r->yearMonths().first() + monthOffset ) );
       if ( type() == "ox" )
-        WebdavHandler::addSloxElement( this, doc, tqparent, "interval", "1" );
+        WebdavHandler::addSloxElement( this, doc, parent, "interval", "1" );
       break;
     case Recurrence::rYearlyPos: {
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceType ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ),
                                      type() == "ox" ? "yearly" : "yearly2" );
       RecurrenceRule::WDayPos wdp = r->monthPositions().first();
       // TODO: SLOX support
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearly2Day ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Day ),
                                      TQString::number( 1 << wdp.day() ) );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearly2Pos ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Pos ),
                                      TQString::number( wdp.pos() ) );
-      WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceYearly2Month ),
+      WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Month ),
                                      TQString::number( r->yearMonths().first() + monthOffset ) );
       if ( type() == "ox" )
-        WebdavHandler::addSloxElement( this, doc, tqparent, "interval", "1" );
+        WebdavHandler::addSloxElement( this, doc, parent, "interval", "1" );
       break; }
     default:
       kdDebug() << k_funcinfo << "unsupported recurrence type: " << r->recurrenceType() << endl;
   }
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceEnd ),
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceEnd ),
                                  WebdavHandler::qDateTimeToSlox( r->endDateTime() ) );
   // delete exceptions
   DateList exlist = r->exDates();
   TQStringList res;
   for ( DateList::Iterator it = exlist.begin(); it != exlist.end(); ++it )
     res.append( WebdavHandler::qDateTimeToSlox( *it ) );
-  WebdavHandler::addSloxElement( this, doc, tqparent, fieldName( RecurrenceDelEx ), res.join( "," ) );
+  WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceDelEx ), res.join( "," ) );
 }
 
 void KCalResourceSlox::parseMembersAttribute( const TQDomElement &e,
diff --git a/kresources/slox/kcalresourceslox.h b/kresources/slox/kcalresourceslox.h
index 73e44a118..17eb8789a 100644
--- a/kresources/slox/kcalresourceslox.h
+++ b/kresources/slox/kcalresourceslox.h
@@ -125,16 +125,16 @@ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase
     void parseRecurrence( const TQDomNode &n, KCal::Event *event );
 
     void createIncidenceAttributes( TQDomDocument &doc,
-                                    TQDomElement &tqparent,
+                                    TQDomElement &parent,
                                     KCal::Incidence *incidence );
     void createEventAttributes( TQDomDocument &doc,
-                                TQDomElement &tqparent,
+                                TQDomElement &parent,
                                 KCal::Event *event );
     void createTodoAttributes( TQDomDocument &doc,
-                               TQDomElement &tqparent,
+                               TQDomElement &parent,
                                KCal::Todo *todo );
     void createRecurrenceAttributes( TQDomDocument &doc,
-                                     TQDomElement &tqparent,
+                                     TQDomElement &parent,
                                      KCal::Incidence *incidence );
 
     bool confirmSave();
diff --git a/kresources/slox/kcalresourcesloxconfig.cpp b/kresources/slox/kcalresourcesloxconfig.cpp
index 8b1683ea5..441ea5336 100644
--- a/kresources/slox/kcalresourcesloxconfig.cpp
+++ b/kresources/slox/kcalresourcesloxconfig.cpp
@@ -40,8 +40,8 @@
 
 #include "kcalresourcesloxconfig.h"
 
-KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* tqparent,  const char* name ) :
-  KRES::ConfigWidget( tqparent, name ), mRes( 0 )
+KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* parent,  const char* name ) :
+  KRES::ConfigWidget( parent, name ), mRes( 0 )
 {
   resize( 245, 115 );
   TQGridLayout *mainLayout = new TQGridLayout( this, 6, 2, KDialog::spacingHint(), KDialog::spacingHint() );
diff --git a/kresources/slox/kcalresourcesloxconfig.h b/kresources/slox/kcalresourcesloxconfig.h
index 56fef761e..63526070c 100644
--- a/kresources/slox/kcalresourcesloxconfig.h
+++ b/kresources/slox/kcalresourcesloxconfig.h
@@ -47,7 +47,7 @@ class KDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget
     Q_OBJECT
   TQ_OBJECT
   public:
-    KCalResourceSloxConfig( TQWidget *tqparent = 0, const char *name = 0 );
+    KCalResourceSloxConfig( TQWidget *parent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp
index f2fe58a92..4f17ea893 100644
--- a/kresources/slox/sloxfolderdialog.cpp
+++ b/kresources/slox/sloxfolderdialog.cpp
@@ -25,8 +25,8 @@
 #include "sloxfolderdialog.h"
 #include "sloxfoldermanager.h"
 
-SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget *tqparent, const char *name ) :
-  KDialogBase( tqparent, name, true, i18n("Select Folder"), Ok|Cancel|User1, Ok, false, KGuiItem( i18n("Reload"), "reload" ) ),
+SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget *parent, const char *name ) :
+  KDialogBase( parent, name, true, i18n("Select Folder"), Ok|Cancel|User1, Ok, false, KGuiItem( i18n("Reload"), "reload" ) ),
   mManager( manager ),
   mFolderType( type )
 {
@@ -71,10 +71,10 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder )
   if ( folder->type() != mFolderType && folder->type() != Unbound )
     return;
   if( mManager->folders().contains( folder->parentId() ) ) {
-    SloxFolder *tqparent = mManager->folders()[folder->parentId()];
-    createFolderViewItem( tqparent );
-    if ( tqparent->item )
-      folder->item = new KListViewItem( tqparent->item );
+    SloxFolder *parent = mManager->folders()[folder->parentId()];
+    createFolderViewItem( parent );
+    if ( parent->item )
+      folder->item = new KListViewItem( parent->item );
     else
       folder->item = new KListViewItem( mListView );
   } else {
diff --git a/kresources/slox/sloxfolderdialog.h b/kresources/slox/sloxfolderdialog.h
index 3c2cac883..c29ebda59 100644
--- a/kresources/slox/sloxfolderdialog.h
+++ b/kresources/slox/sloxfolderdialog.h
@@ -33,7 +33,7 @@ class SloxFolderDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
   public:
-    SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* tqparent = 0, const char *name = 0 );
+    SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* parent = 0, const char *name = 0 );
     ~SloxFolderDialog();
 
     TQString selectedFolder() const;