rename the following methods:

tqparent parent
tqmask mask


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

6 files changed, 11 insertions, 11 deletions

diff --git a/k9devices/k9dbusdispatch.cpp b/k9devices/k9dbusdispatch.cpp
index 32f8df8..9c148fe 100644
--- a/k9devices/k9dbusdispatch.cpp
+++ b/k9devices/k9dbusdispatch.cpp
@@ -205,8 +205,8 @@ void K9DBusDispatch::dispatch()
         }
 }
 
-K9DBusDispatch::K9DBusDispatch(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name)
+K9DBusDispatch::K9DBusDispatch(TQObject *parent, const char *name)
+ : TQObject(parent, name)
 {
     m_dispatcher = new TQTimer(this);
     TQObject::connect(m_dispatcher, TQT_SIGNAL(timeout()), this, TQT_SLOT(dispatch()));
diff --git a/k9devices/k9dbusdispatch.h b/k9devices/k9dbusdispatch.h
index d9d210e..8e86426 100644
--- a/k9devices/k9dbusdispatch.h
+++ b/k9devices/k9dbusdispatch.h
@@ -45,7 +45,7 @@ class K9DBusDispatch : public TQObject
 Q_OBJECT
   TQ_OBJECT
 public:
-    K9DBusDispatch(TQObject *tqparent = 0, const char *name = 0);
+    K9DBusDispatch(TQObject *parent = 0, const char *name = 0);
 
     ~K9DBusDispatch();
     void setConnection(DBusConnection* _value);
diff --git a/k9devices/k9halconnection.cpp b/k9devices/k9halconnection.cpp
index 12d23cb..e420472 100644
--- a/k9devices/k9halconnection.cpp
+++ b/k9devices/k9halconnection.cpp
@@ -31,8 +31,8 @@ void halDeviceRemoved (LibHalContext *ctx, const char *udi) {
 }
 
   
-k9HalConnection::k9HalConnection(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name)
+k9HalConnection::k9HalConnection(TQObject *parent, const char *name)
+ : TQObject(parent, name)
 {
    m_devices.setAutoDelete(true);
   m_context =(void*) libhal_ctx_new();
@@ -104,7 +104,7 @@ void k9HalConnection::testVolumeChanged( const char * udi) {
   }  
   else 
   if( libhal_device_query_capability( (LibHalContext*) m_context, udi, "volume", 0 ) ) {
-    char* udiParent = libhal_device_get_property_string( (LibHalContext*) m_context, udi, "info.tqparent", 0 );
+    char* udiParent = libhal_device_get_property_string( (LibHalContext*) m_context, udi, "info.parent", 0 );
     if( udiParent ) {
       k9HalDevice *device=findDevice( udiParent);    
       libhal_free_string( udiParent );
diff --git a/k9devices/k9halconnection.h b/k9devices/k9halconnection.h
index ac44db4..6c532d8 100644
--- a/k9devices/k9halconnection.h
+++ b/k9devices/k9halconnection.h
@@ -61,7 +61,7 @@ private:
     K9DBusDispatch *m_dbusDispatch;
 private:
 
-    k9HalConnection(TQObject *tqparent = 0, const char *name = 0);
+    k9HalConnection(TQObject *parent = 0, const char *name = 0);
 
     ~k9HalConnection();
 
diff --git a/k9devices/k9haldevice.cpp b/k9devices/k9haldevice.cpp
index f42ead8..3c35adc 100644
--- a/k9devices/k9haldevice.cpp
+++ b/k9devices/k9haldevice.cpp
@@ -17,10 +17,10 @@
 #include <hal/libhal.h>
 #include <hal/libhal-storage.h>
 
-k9HalDevice::k9HalDevice(TQObject *tqparent, const char *udi)
-        : TQObject(tqparent, udi) {
+k9HalDevice::k9HalDevice(TQObject *parent, const char *udi)
+        : TQObject(parent, udi) {
 
-    m_connection=(k9HalConnection*)tqparent;
+    m_connection=(k9HalConnection*)parent;
     getDriveProperties();
 }
 
diff --git a/k9devices/k9haldevice.h b/k9devices/k9haldevice.h
index c2c0e0c..e77adef 100644
--- a/k9devices/k9haldevice.h
+++ b/k9devices/k9haldevice.h
@@ -31,7 +31,7 @@ Q_OBJECT
   TQ_OBJECT
 public:   
     
-    k9HalDevice(TQObject *tqparent = 0, const char *name = 0);
+    k9HalDevice(TQObject *parent = 0, const char *name = 0);
 
     ~k9HalDevice();