rename the following methods:

tqparent parent
tqmask mask


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

10 files changed, 19 insertions, 19 deletions

diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp
index 01aac790..0aad71d0 100644
--- a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp
@@ -37,8 +37,8 @@
 typedef KGenericFactory<SMPPPDCSPlugin> SMPPPDCSPluginFactory;
 K_EXPORT_COMPONENT_FACTORY(kopete_smpppdcs, SMPPPDCSPluginFactory("kopete_smpppdcs"))
 
-SMPPPDCSPlugin::SMPPPDCSPlugin(TQObject *tqparent, const char * name, const TQStringList& /* args */)
-        : DCOPObject("SMPPPDCSIface"), Kopete::Plugin(SMPPPDCSPluginFactory::instance(), tqparent, name),
+SMPPPDCSPlugin::SMPPPDCSPlugin(TQObject *parent, const char * name, const TQStringList& /* args */)
+        : DCOPObject("SMPPPDCSIface"), Kopete::Plugin(SMPPPDCSPluginFactory::instance(), parent, name),
         m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_detectorNetworktqStatus(NULL), m_timer(NULL),
 m_onlineInquiry(NULL) {
 
diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.h b/kopete/plugins/smpppdcs/smpppdcsplugin.h
index 13cd8ec3..24697ca7 100644
--- a/kopete/plugins/smpppdcs/smpppdcsplugin.h
+++ b/kopete/plugins/smpppdcs/smpppdcsplugin.h
@@ -56,7 +56,7 @@ public:
     /**
      * @brief Creates an <code>SMPPPDCSPlugin</code> instance
      */
-    SMPPPDCSPlugin( TQObject *tqparent, const char *name, const TQStringList &args );
+    SMPPPDCSPlugin( TQObject *parent, const char *name, const TQStringList &args );
 
     /**
      * @brief Destroys an <code>SMPPPDCSPlugin</code> instance
diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
index 944779f1..3c486135 100644
--- a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
@@ -35,8 +35,8 @@
 typedef KGenericFactory<SMPPPDCSPreferences> SMPPPDCSPreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY(kcm_kopete_smpppdcs, SMPPPDCSPreferencesFactory("kcm_kopete_smpppdcs"))
 
-SMPPPDCSPreferences::SMPPPDCSPreferences(TQWidget * tqparent, const char * /* name */, const TQStringList& args)
- : KCModule(SMPPPDCSPreferencesFactory::instance(), tqparent, args), m_ui(NULL) {
+SMPPPDCSPreferences::SMPPPDCSPreferences(TQWidget * parent, const char * /* name */, const TQStringList& args)
+ : KCModule(SMPPPDCSPreferencesFactory::instance(), parent, args), m_ui(NULL) {
 
  	Kopete::AccountManager * manager = Kopete::AccountManager::self(); 
 	(new TQVBoxLayout(this))->setAutoAdd(true);
diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.h b/kopete/plugins/smpppdcs/smpppdcspreferences.h
index 3671d552..f406d2aa 100644
--- a/kopete/plugins/smpppdcs/smpppdcspreferences.h
+++ b/kopete/plugins/smpppdcs/smpppdcspreferences.h
@@ -49,7 +49,7 @@ public:
     /**
      * @brief Creates an <code>SMPPPDCSPreferences</code> instance
      */
-    SMPPPDCSPreferences(TQWidget * tqparent = 0, const char * name = 0, const TQStringList &args = TQStringList());
+    SMPPPDCSPreferences(TQWidget * parent = 0, const char * name = 0, const TQStringList &args = TQStringList());
 	
 	/**
      * @brief Destroys an <code>SMPPPDCSPreferences</code> instance
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
index f66f9e47..72ec92d0 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
@@ -35,8 +35,8 @@
 #include "smpppdcsprefsimpl.h"
 #include "smpppdsearcher.h"
 
-SMPPPDCSPrefs::SMPPPDCSPrefs(TQWidget* tqparent, const char* name, WFlags fl)
-	: SMPPPDCSPrefsBase(tqparent, name, fl), m_plugin(NULL), m_scanProgressDlg(NULL), m_curSearcher(NULL) {
+SMPPPDCSPrefs::SMPPPDCSPrefs(TQWidget* parent, const char* name, WFlags fl)
+	: SMPPPDCSPrefsBase(parent, name, fl), m_plugin(NULL), m_scanProgressDlg(NULL), m_curSearcher(NULL) {
 
 	// search for our main-plugin instance
 	Kopete::Plugin * p = Kopete::PluginManager::self()->plugin("kopete_smpppdcs");
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h
index 607197c3..5d013585 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h
+++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h
@@ -39,7 +39,7 @@ class SMPPPDCSPrefs : public SMPPPDCSPrefsBase
 	
 public:
 
-    SMPPPDCSPrefs(TQWidget* tqparent, const char* name = 0, WFlags fl = 0);
+    SMPPPDCSPrefs(TQWidget* parent, const char* name = 0, WFlags fl = 0);
     ~SMPPPDCSPrefs();
 
 signals:
diff --git a/kopete/plugins/smpppdcs/smpppdlocationwidget.cpp b/kopete/plugins/smpppdcs/smpppdlocationwidget.cpp
index a1f5f9a5..44de2552 100644
--- a/kopete/plugins/smpppdcs/smpppdlocationwidget.cpp
+++ b/kopete/plugins/smpppdcs/smpppdlocationwidget.cpp
@@ -18,8 +18,8 @@
 
 #include "smpppdlocationwidget.h"
 
-SMPPPDLocationWidget::SMPPPDLocationWidget(TQWidget* tqparent, const char* name, WFlags fl)
- : SMPPPDLocationWidgetBase(tqparent, name, fl) {}
+SMPPPDLocationWidget::SMPPPDLocationWidget(TQWidget* parent, const char* name, WFlags fl)
+ : SMPPPDLocationWidgetBase(parent, name, fl) {}
 
 SMPPPDLocationWidget::~SMPPPDLocationWidget() {}
 
diff --git a/kopete/plugins/smpppdcs/smpppdlocationwidget.h b/kopete/plugins/smpppdcs/smpppdlocationwidget.h
index 3f0ba866..71393a08 100644
--- a/kopete/plugins/smpppdcs/smpppdlocationwidget.h
+++ b/kopete/plugins/smpppdcs/smpppdlocationwidget.h
@@ -31,7 +31,7 @@ class SMPPPDLocationWidget : public SMPPPDLocationWidgetBase
 	SMPPPDLocationWidget& operator=(const SMPPPDLocationWidget&);
 
 public:
-    SMPPPDLocationWidget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0);
+    SMPPPDLocationWidget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0);
     ~SMPPPDLocationWidget();
 
     void setServer(const TQString& serv);
diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.cpp b/kopete/plugins/smpppdcs/smpppdsearcher.cpp
index 4ec77196..cfb103c2 100644
--- a/kopete/plugins/smpppdcs/smpppdsearcher.cpp
+++ b/kopete/plugins/smpppdcs/smpppdsearcher.cpp
@@ -105,8 +105,8 @@ void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf
 /*!
     \fn SMPPPDSearcher::scan() const
  */
-bool SMPPPDSearcher::scan(const TQString& ip, const TQString& tqmask) {
-    kdDebug(14312) << k_funcinfo << "Scanning " << ip << "/" << tqmask << "..." << endl;
+bool SMPPPDSearcher::scan(const TQString& ip, const TQString& mask) {
+    kdDebug(14312) << k_funcinfo << "Scanning " << ip << "/" << mask << "..." << endl;
 	
 	SMPPPD::Client client;
 	
@@ -123,7 +123,7 @@ bool SMPPPDSearcher::scan(const TQString& ip, const TQString& tqmask) {
     uint min_range = 0;
     uint max_range = 255;
 
-    // calculate ip range (only last tqmask entry)
+    // calculate ip range (only last mask entry)
     TQRegExp lastRex("([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})");
     if(lastRex.exactMatch(ip)) {
 
@@ -134,7 +134,7 @@ bool SMPPPDSearcher::scan(const TQString& ip, const TQString& tqmask) {
             ipToks.push_back(lastRex.cap(i));
         }
 
-        if(lastRex.exactMatch(tqmask)) {
+        if(lastRex.exactMatch(mask)) {
             uint lastWordMask = lastRex.cap(4).toUInt();
 
             if(lastWordMask == 0) {
diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.h b/kopete/plugins/smpppdcs/smpppdsearcher.h
index 1e96f737..e5bb05a1 100644
--- a/kopete/plugins/smpppdcs/smpppdsearcher.h
+++ b/kopete/plugins/smpppdcs/smpppdsearcher.h
@@ -60,13 +60,13 @@ protected:
      * @brief Scans a network for a smpppd
 	 *
 	 * Scans a network for a smpppd described by
-	 * ip and tqmask.
+	 * ip and mask.
 	 *
      * @param ip   the ntwork ip
-     * @param tqmask the network tqmask
+     * @param mask the network mask
      * @return <code>TRUE</code> if an smpppd was found
      */
-    bool scan(const TQString& ip, const TQString& tqmask);
+    bool scan(const TQString& ip, const TQString& mask);
 
 signals:
     /**