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

17 files changed, 56 insertions, 56 deletions

diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index 2fef0da67..bd35ddf8b 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -56,10 +56,10 @@
 K_EXPORT_COMPONENT_FACTORY( libkmobile_gnokii, KMobileGnokii() )
 
 /* createObject needs to be reimplemented by every KMobileDevice driver */
-TQObject *KMobileGnokii::createObject( TQObject *tqparent, const char *name,
+TQObject *KMobileGnokii::createObject( TQObject *parent, const char *name,
         const char *, const TQStringList &args )
 {
-  return new KMobileGnokii( tqparent, name, args );
+  return new KMobileGnokii( parent, name, args );
 }
 
 
@@ -494,7 +494,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
 
 
 // connect the tqdevice and ask user to turn tqdevice on (if necessary)
-bool KMobileGnokii::connectDevice(TQWidget * /*tqparent*/)
+bool KMobileGnokii::connectDevice(TQWidget * /*parent*/)
 {
   if (connected())
 	return true;
@@ -506,7 +506,7 @@ bool KMobileGnokii::connectDevice(TQWidget * /*tqparent*/)
 }
 
 // disconnect the tqdevice and return true, if sucessful
-bool KMobileGnokii::disconnectDevice(TQWidget * /*tqparent*/)
+bool KMobileGnokii::disconnectDevice(TQWidget * /*parent*/)
 {
   if (!connected())
 	return true;
@@ -517,11 +517,11 @@ bool KMobileGnokii::disconnectDevice(TQWidget * /*tqparent*/)
 }
 
 // provice the own configuration dialog
-bool KMobileGnokii::configDialog(TQWidget *tqparent)
+bool KMobileGnokii::configDialog(TQWidget *parent)
 {
   TQString model, connection, port, baud;
   int ok = 0;
-  GnokiiConfig *dialog = new GnokiiConfig(tqparent);
+  GnokiiConfig *dialog = new GnokiiConfig(parent);
   if (dialog) {
 	dialog->setValues(m_modelnr, m_connection, m_port, m_baud);
 	ok = dialog->exec();
diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h
index 9562c2221..96f32a5c0 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.h
+++ b/kmobile/devices/gnokii/gnokii_mobile.h
@@ -36,15 +36,15 @@ public:
     ~KMobileGnokii();
 
     // createObject needs to be reimplemented by every KMobileDevice driver
-    TQObject *createObject( TQObject *tqparent=0, const char *name=0, 
+    TQObject *createObject( TQObject *parent=0, const char *name=0, 
 	const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() );
 
     // connect, disconnect and current status
-    bool connectDevice(TQWidget *tqparent);
-    bool disconnectDevice(TQWidget *tqparent);
+    bool connectDevice(TQWidget *parent);
+    bool disconnectDevice(TQWidget *parent);
 
     // provide a tqdevice-specific configure dialog
-    bool configDialog(TQWidget *tqparent);
+    bool configDialog(TQWidget *parent);
 
     // filename and path to gnokii-icon
     TQString iconFileName() const;
diff --git a/kmobile/devices/gnokii/gnokiiconfig.cpp b/kmobile/devices/gnokii/gnokiiconfig.cpp
index e8ad19bdd..07bc46f46 100644
--- a/kmobile/devices/gnokii/gnokiiconfig.cpp
+++ b/kmobile/devices/gnokii/gnokiiconfig.cpp
@@ -43,8 +43,8 @@
 #define BAUDRATES	"57600 38400 19200 14400 9600 4800 2400"
 
 
-GnokiiConfig::GnokiiConfig( TQWidget* tqparent, const char* name, bool modal, WFlags fl )
-	: GnokiiConfigUI(tqparent, name, modal, fl)
+GnokiiConfig::GnokiiConfig( TQWidget* parent, const char* name, bool modal, WFlags fl )
+	: GnokiiConfigUI(parent, name, modal, fl)
 {
    TQStringList list = TQStringList::split(" ", MODELS);
    cb_Model->insertStringList(list);
diff --git a/kmobile/devices/gnokii/gnokiiconfig.h b/kmobile/devices/gnokii/gnokiiconfig.h
index bb6ffe771..9422fcedc 100644
--- a/kmobile/devices/gnokii/gnokiiconfig.h
+++ b/kmobile/devices/gnokii/gnokiiconfig.h
@@ -28,7 +28,7 @@ class GnokiiConfig : public GnokiiConfigUI
 Q_OBJECT
   TQ_OBJECT
 public:
-    GnokiiConfig( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~GnokiiConfig();
 
     void setValues(const TQString &model, const TQString &connection, const TQString &port, const TQString &baud);
diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp
index c1bcd4929..b5073de87 100644
--- a/kmobile/devices/skeleton/skeleton.cpp
+++ b/kmobile/devices/skeleton/skeleton.cpp
@@ -35,10 +35,10 @@
 K_EXPORT_COMPONENT_FACTORY( libkmobile_skeleton, KMobileSkeleton() )
 
 /* createObject needs to be reimplemented by every KMobileDevice driver */
-TQObject *KMobileSkeleton::createObject( TQObject *tqparent, const char *name,
+TQObject *KMobileSkeleton::createObject( TQObject *parent, const char *name,
         const char *, const TQStringList &args )
 {
-  return new KMobileSkeleton( tqparent, name, args );
+  return new KMobileSkeleton( parent, name, args );
 }
 
 
@@ -61,9 +61,9 @@ KMobileSkeleton::~KMobileSkeleton()
 }
 
 // connect the tqdevice and ask user to turn tqdevice on (if necessary)
-bool KMobileSkeleton::connectDevice(TQWidget *tqparent)
+bool KMobileSkeleton::connectDevice(TQWidget *parent)
 {
-  if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparent,
+  if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parent,
 	i18n("Please turn on your %1 on now and press continue to proceed.").tqarg(m_tqdeviceName),
 	m_tqdeviceClassName ) )
 	return false;
diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h
index 8d5c3db4c..6ae0287b9 100644
--- a/kmobile/devices/skeleton/skeleton.h
+++ b/kmobile/devices/skeleton/skeleton.h
@@ -35,12 +35,12 @@ public:
     ~KMobileSkeleton();
 
     // createObject needs to be reimplemented by every KMobileDevice driver
-    TQObject *createObject( TQObject *tqparent=0, const char *name=0,
+    TQObject *createObject( TQObject *parent=0, const char *name=0,
 	const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList() );
 
     // connect, disconnect and current status
-    bool connectDevice(TQWidget *tqparent);
-    bool disconnectDevice(TQWidget *tqparent);
+    bool connectDevice(TQWidget *parent);
+    bool disconnectDevice(TQWidget *parent);
 
     // returns true, if this tqdevice is read-only (default: false)
     bool isReadOnly() const;
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp
index db2e1cd11..8bd1da8a9 100644
--- a/kmobile/kmobile.cpp
+++ b/kmobile/kmobile.cpp
@@ -315,32 +315,32 @@ void KMobile::addDevice()
  * show dialog to user, in which he may choose and select one of the already
  * configured mobile tqdevices.
  */
-KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *tqparent, 
+KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, 
 		enum KMobileDevice::ClassType /*type*/, enum KMobileDevice::Capabilities /*caps*/ )
 {
   int num;
 
-  m_tqparent = tqparent;
+  m_parent = parent;
 
   // do we already have some tqdevices configured ?
   num = readDevicesList();
   if (!num) {
      int answ;
-     answ = KMessageBox::questionYesNo(tqparent,
+     answ = KMessageBox::questionYesNo(parent,
 		i18n( "<qt>You have no mobile tqdevices configured yet.<p>"
 			"Do you want to add a tqdevice now ?</qt>" ),
 		i18n( "KDE Mobile Device Access" ), KStdGuiItem::add(), i18n("Do Not Add") );
      if (answ != KMessageBox::Yes)
 	return 0L;
      // add a new tqdevice
-     addDeviceDialog(tqparent);
+     addDeviceDialog(parent);
   }
   num = readDevicesList();
   if (!num) 
     return 0L;
 
   // let the user select one of the configured tqdevices
-  KMobile_selectiondialog *dialog = new KMobile_selectiondialog(tqparent);
+  KMobile_selectiondialog *dialog = new KMobile_selectiondialog(parent);
   if (!dialog)
     return 0L;
 
diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp
index cc25c3664..a4d807da0 100644
--- a/kmobile/kmobiledevice.cpp
+++ b/kmobile/kmobiledevice.cpp
@@ -104,9 +104,9 @@ bool KMobileDevice::isReadOnly() const
   return false;
 }
 
-bool KMobileDevice::configDialog( TQWidget *tqparent )
+bool KMobileDevice::configDialog( TQWidget *parent )
 {
-  KMessageBox::information( tqparent,
+  KMessageBox::information( parent,
 		i18n("This tqdevice does not need any configuration."),
 		tqdeviceName() );
   return true;
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index d89e3f2d8..5cf19092d 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -51,10 +51,10 @@ class KConfig;
  * For a KMobileSomeDevice driver you have to write the following code:
  * <pre>
  * K_EXPORT_COMPONENT_FACTORY( libkmobile_sometqdevice, KMobileSomeDevice() );
- * TQObject *KMobileSomeDevice::createObject( TQObject *tqparent, const char *name,
+ * TQObject *KMobileSomeDevice::createObject( TQObject *parent, const char *name,
  *      const char *, const TQStringList &args )
  * {
- *    return new KMobileSomeDevice( tqparent, name, args );
+ *    return new KMobileSomeDevice( parent, name, args );
  * }
  * </pre>
  *
@@ -72,7 +72,7 @@ public:
     /**
      * Construct a new KMobileDevice.
      *
-     * @param obj The tqparent object. This is usually 0.
+     * @param obj The parent object. This is usually 0.
      * @param name The object name. For session management and window management to work.
      * @param args Additional commandline parameters - the first entry has the config file name.
      */
@@ -83,16 +83,16 @@ public:
     /**
      * Connect to the device.
      *
-     * @param tqparent The tqparent widget. It will be used as tqparent for message boxes.
+     * @param parent The parent widget. It will be used as parent for message boxes.
      */
-    virtual bool connectDevice( TQWidget *tqparent = 0 ) = 0;
+    virtual bool connectDevice( TQWidget *parent = 0 ) = 0;
 
     /**
      * Disconnect from the device.
      *
-     * @param tqparent The tqparent widget. It will be used as tqparent for message boxes.
+     * @param parent The parent widget. It will be used as parent for message boxes.
      */
-    virtual bool disconnectDevice( TQWidget *tqparent = 0 ) = 0;
+    virtual bool disconnectDevice( TQWidget *parent = 0 ) = 0;
 
     /**
      * Returns true, if the tqdevice is currently connected and the link is online.
@@ -135,9 +135,9 @@ public:
     /**
      * Pop-up a tqdevice-specific configuration dialog.
      *
-     * @param tqparent The tqparent widget. It will be used as tqparent for the configuration dialog.
+     * @param parent The parent widget. It will be used as parent for the configuration dialog.
      */
-    virtual bool configDialog(TQWidget *tqparent);
+    virtual bool configDialog(TQWidget *parent);
 
     // The ClassType may be used e.g. to select an suitable icon
     enum ClassType {
diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp
index 5469902ee..3778f1c16 100644
--- a/kmobile/kmobileitem.cpp
+++ b/kmobile/kmobileitem.cpp
@@ -29,8 +29,8 @@
 
 #define PRINT_DEBUG kdDebug() << "KMobileItem: "
 
-KMobileItem::KMobileItem(TQIconView *tqparent, KConfig *_config, KService::Ptr service)
-	: TQObject(tqparent), TQIconViewItem(tqparent), m_dev(0L)
+KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr service)
+	: TQObject(parent), TQIconViewItem(parent), m_dev(0L)
 {
    config = _config;
 
@@ -51,8 +51,8 @@ KMobileItem::KMobileItem(TQIconView *tqparent, KConfig *_config, KService::Ptr s
 }
 
 /* restore this item from the config file */
-KMobileItem::KMobileItem(TQIconView *tqparent, KConfig *_config, int reload_index)
-	: TQObject(tqparent), TQIconViewItem(tqparent), m_dev(0L)
+KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, int reload_index)
+	: TQObject(parent), TQIconViewItem(parent), m_dev(0L)
 {
    config = _config;
 
diff --git a/kmobile/kmobileitem.h b/kmobile/kmobileitem.h
index cfbca72c7..e82a5cb15 100644
--- a/kmobile/kmobileitem.h
+++ b/kmobile/kmobileitem.h
@@ -16,8 +16,8 @@ class KMobileItem : public TQObject, public TQIconViewItem
   TQ_OBJECT
     friend class KMobileView;
 public:
-    KMobileItem(TQIconView *tqparent, KConfig *config, KService::Ptr service);
-    KMobileItem(TQIconView *tqparent, KConfig *config, int reload_index);
+    KMobileItem(TQIconView *parent, KConfig *config, KService::Ptr service);
+    KMobileItem(TQIconView *parent, KConfig *config, int reload_index);
     virtual ~KMobileItem();
 
     void configSave() const;
diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp
index 32fb916ae..26ac4d0b3 100644
--- a/kmobile/kmobileview.cpp
+++ b/kmobile/kmobileview.cpp
@@ -32,8 +32,8 @@
 #include "kmobileitem.h"
 
 
-KMobileView::KMobileView(TQWidget *tqparent, KConfig *_config)
-    : DCOPObject("kmobileIface"), TQIconView(tqparent)
+KMobileView::KMobileView(TQWidget *parent, KConfig *_config)
+    : DCOPObject("kmobileIface"), TQIconView(parent)
 {
    m_config = _config;
    setSelectionMode(TQIconView::Single);
diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h
index bcbfd4e1e..4c0826f53 100644
--- a/kmobile/kmobileview.h
+++ b/kmobile/kmobileview.h
@@ -25,7 +25,7 @@ class KDE_EXPORT KMobileView : public TQIconView, public kmobileIface
     Q_OBJECT
   TQ_OBJECT
 public:
-    KMobileView(TQWidget *tqparent, KConfig *_config);
+    KMobileView(TQWidget *parent, KConfig *_config);
     virtual ~KMobileView();
 
     bool addNewDevice(KConfig *config, KService::Ptr service);
diff --git a/kmobile/pref.cpp b/kmobile/pref.cpp
index a6d113350..2bb907445 100644
--- a/kmobile/pref.cpp
+++ b/kmobile/pref.cpp
@@ -24,8 +24,8 @@ KMobilePreferences::KMobilePreferences()
     m_pageTwo = new KMobilePrefPageTwo(frame);
 }
 
-KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *tqparent)
-    : TQFrame(tqparent)
+KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent)
+    : TQFrame(parent)
 {
     TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
     tqlayout->setAutoAdd(true);
@@ -33,8 +33,8 @@ KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *tqparent)
     new TQLabel(i18n("Add something here"), this);
 }
 
-KMobilePrefPageTwo::KMobilePrefPageTwo(TQWidget *tqparent)
-    : TQFrame(tqparent)
+KMobilePrefPageTwo::KMobilePrefPageTwo(TQWidget *parent)
+    : TQFrame(parent)
 {
     TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
     tqlayout->setAutoAdd(true);
diff --git a/kmobile/pref.h b/kmobile/pref.h
index 641571082..ad28b1de5 100644
--- a/kmobile/pref.h
+++ b/kmobile/pref.h
@@ -28,7 +28,7 @@ class KMobilePrefPageOne : public TQFrame
     Q_OBJECT
   TQ_OBJECT
 public:
-    KMobilePrefPageOne(TQWidget *tqparent = 0);
+    KMobilePrefPageOne(TQWidget *parent = 0);
 };
 
 class KMobilePrefPageTwo : public TQFrame
@@ -36,7 +36,7 @@ class KMobilePrefPageTwo : public TQFrame
     Q_OBJECT
   TQ_OBJECT
 public:
-    KMobilePrefPageTwo(TQWidget *tqparent = 0);
+    KMobilePrefPageTwo(TQWidget *parent = 0);
 };
 
 #endif // _KMOBILEPREF_H_
diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp
index 76546cce0..c0c0bec03 100644
--- a/kmobile/systemtray.cpp
+++ b/kmobile/systemtray.cpp
@@ -35,7 +35,7 @@
 #include "kmobileview.h"
 
 
-SystemTray::SystemTray(KMainWindow *tqparent, const char *name) : KSystemTray(tqparent, name)
+SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(parent, name)
 
 {
     m_appPix = KGlobal::instance()->iconLoader()->loadIcon("kmobile", KIcon::Small);
@@ -43,7 +43,7 @@ SystemTray::SystemTray(KMainWindow *tqparent, const char *name) : KSystemTray(tq
 
     setToolTip();
 
-    m_actionCollection = tqparent->actionCollection();
+    m_actionCollection = parent->actionCollection();
     KAction *addAction = m_actionCollection->action("tqdevice_add");
     
     KPopupMenu* menu = contextMenu();
@@ -60,7 +60,7 @@ SystemTray::~SystemTray()
 
 void SystemTray::contextMenuAboutToShow(KPopupMenu *menu)
 {
-    KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(tqparent()));
+    KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(parent()));
 
     const int pos = 3;
     while (menu->idAt(pos)>=SYSTEMTRAY_STARTID &&
@@ -84,7 +84,7 @@ void SystemTray::menuItemSelected()
     if (m_menuID<SYSTEMTRAY_STARTID || m_menuID>SYSTEMTRAY_STARTID+1000)
 	return;
     TQString devName = contextMenu()->text(m_menuID);
-    KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(tqparent()));
+    KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(parent()));
     main->mainView()->startKonqueror(devName);
 }
 
diff --git a/kmobile/systemtray.h b/kmobile/systemtray.h
index dce846174..87843c306 100644
--- a/kmobile/systemtray.h
+++ b/kmobile/systemtray.h
@@ -31,7 +31,7 @@ class SystemTray : public KSystemTray
   TQ_OBJECT
 
 public:
-    SystemTray(KMainWindow *tqparent = 0, const char *name = 0);
+    SystemTray(KMainWindow *parent = 0, const char *name = 0);
     virtual ~SystemTray();
 
 protected slots: