summaryrefslogtreecommitdiffstats
path: root/libk3b/core
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commitdf8e67b86696f691708af8592d86282b09bab011 (patch)
treeca90d734c9011d457a42f0a7004a9507b2c2c1bd /libk3b/core
parent33881ea4441221b1ca0789a72c4c7249d923a0df (diff)
downloadk3b-df8e67b86696f691708af8592d86282b09bab011.tar.gz
k3b-df8e67b86696f691708af8592d86282b09bab011.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libk3b/core')
-rw-r--r--libk3b/core/k3bcore.cpp4
-rw-r--r--libk3b/core/k3bcore.h2
-rw-r--r--libk3b/core/k3bexternalbinmanager.cpp4
-rw-r--r--libk3b/core/k3bexternalbinmanager.h2
-rw-r--r--libk3b/core/k3bglobals.cpp12
-rw-r--r--libk3b/core/k3bglobals.h2
-rw-r--r--libk3b/core/k3bjob.cpp8
-rw-r--r--libk3b/core/k3bjob.h6
-rw-r--r--libk3b/core/k3bsimplejobhandler.cpp4
-rw-r--r--libk3b/core/k3bsimplejobhandler.h2
-rw-r--r--libk3b/core/k3bthreadjob.cpp8
-rw-r--r--libk3b/core/k3bthreadjob.h4
12 files changed, 29 insertions, 29 deletions
diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp
index a32acae..29a60e3 100644
--- a/libk3b/core/k3bcore.cpp
+++ b/libk3b/core/k3bcore.cpp
@@ -121,8 +121,8 @@ K3bCore* K3bCore::s_k3bCore = 0;
-K3bCore::K3bCore( TQObject* tqparent, const char* name )
- : TQObject( tqparent, name )
+K3bCore::K3bCore( TQObject* parent, const char* name )
+ : TQObject( parent, name )
{
d = new Private();
diff --git a/libk3b/core/k3bcore.h b/libk3b/core/k3bcore.h
index f97430c..bc11521 100644
--- a/libk3b/core/k3bcore.h
+++ b/libk3b/core/k3bcore.h
@@ -62,7 +62,7 @@ class LIBK3B_EXPORT K3bCore : public TQObject
* Although K3bCore is a singlelton it's constructor is not private to make inheritance
* possible. Just make sure to only create one instance.
*/
- K3bCore( TQObject* tqparent = 0, const char* name = 0 );
+ K3bCore( TQObject* parent = 0, const char* name = 0 );
virtual ~K3bCore();
const TQValueList<K3bJob*>& runningJobs() const;
diff --git a/libk3b/core/k3bexternalbinmanager.cpp b/libk3b/core/k3bexternalbinmanager.cpp
index eb7203f..ac9ffa4 100644
--- a/libk3b/core/k3bexternalbinmanager.cpp
+++ b/libk3b/core/k3bexternalbinmanager.cpp
@@ -161,8 +161,8 @@ void K3bExternalProgram::addUserParameter( const TQString& p )
// ///////////////////////////////////////////////////////////
-K3bExternalBinManager::K3bExternalBinManager( TQObject* tqparent, const char* name )
- : TQObject( tqparent, name )
+K3bExternalBinManager::K3bExternalBinManager( TQObject* parent, const char* name )
+ : TQObject( parent, name )
{
}
diff --git a/libk3b/core/k3bexternalbinmanager.h b/libk3b/core/k3bexternalbinmanager.h
index 11a8dcb..e0e9d42 100644
--- a/libk3b/core/k3bexternalbinmanager.h
+++ b/libk3b/core/k3bexternalbinmanager.h
@@ -117,7 +117,7 @@ class LIBK3B_EXPORT K3bExternalBinManager : public TQObject
TQ_OBJECT
public:
- K3bExternalBinManager( TQObject* tqparent = 0, const char* name = 0 );
+ K3bExternalBinManager( TQObject* parent = 0, const char* name = 0 );
~K3bExternalBinManager();
void search();
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index 1d91cd3..09373be 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -191,17 +191,17 @@ TQString K3b::prepareDir( const TQString& dir )
TQString K3b::parentDir( const TQString& path )
{
- TQString tqparent = path;
+ TQString parent = path;
if( path[path.length()-1] == '/' )
- tqparent.truncate( tqparent.length()-1 );
+ parent.truncate( parent.length()-1 );
- int pos = tqparent.findRev( '/' );
+ int pos = parent.findRev( '/' );
if( pos >= 0 )
- tqparent.truncate( pos+1 );
+ parent.truncate( pos+1 );
else // relative path, do anything...
- tqparent = "/";
+ parent = "/";
- return tqparent;
+ return parent;
}
diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h
index 6554d7d..0b58f58 100644
--- a/libk3b/core/k3bglobals.h
+++ b/libk3b/core/k3bglobals.h
@@ -161,7 +161,7 @@ namespace K3b
LIBK3B_EXPORT TQString prepareDir( const TQString& dir );
/**
- * returns the tqparent dir of a path.
+ * returns the parent dir of a path.
* CAUTION: this does only work well with absolut paths.
*
* Example: /usr/share/doc -> /usr/share/
diff --git a/libk3b/core/k3bjob.cpp b/libk3b/core/k3bjob.cpp
index 046de06..02697d6 100644
--- a/libk3b/core/k3bjob.cpp
+++ b/libk3b/core/k3bjob.cpp
@@ -34,8 +34,8 @@ public:
const char* K3bJob::DEFAULT_SIGNAL_CONNECTION = "K3bJobDefault";
-K3bJob::K3bJob( K3bJobHandler* handler, TQObject* tqparent, const char* name )
- : TQObject( tqparent, name ),
+K3bJob::K3bJob( K3bJobHandler* handler, TQObject* parent, const char* name )
+ : TQObject( parent, name ),
m_jobHandler( handler ),
m_canceled(false),
m_active(false)
@@ -231,8 +231,8 @@ public:
-K3bBurnJob::K3bBurnJob( K3bJobHandler* handler, TQObject* tqparent, const char* name )
- : K3bJob( handler, tqparent, name ),
+K3bBurnJob::K3bBurnJob( K3bJobHandler* handler, TQObject* parent, const char* name )
+ : K3bJob( handler, parent, name ),
m_writeMethod( K3b::DEFAULT )
{
d = new Private;
diff --git a/libk3b/core/k3bjob.h b/libk3b/core/k3bjob.h
index b64b85b..cbb4758 100644
--- a/libk3b/core/k3bjob.h
+++ b/libk3b/core/k3bjob.h
@@ -30,7 +30,7 @@ namespace K3bDevice {
/**
* This is the baseclass for all the jobs in K3b which actually do the work like burning a cd!
- * The K3bJob object takes care of registering with the k3bcore or with a tqparent K3bJob.
+ * The K3bJob object takes care of registering with the k3bcore or with a parent K3bJob.
*
* Every job has a jobhandler which can be another job (in which case the job is handled as
* a subjob) or an arbitrary class implementing the K3bJobHandler interface.
@@ -212,7 +212,7 @@ class LIBK3B_EXPORT K3bJob : public TQObject, public K3bJobHandler
* \see runningSubJobs()
* \see numRunningSubJobs()
*/
- K3bJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 );
+ K3bJob( K3bJobHandler* hdl, TQObject* parent = 0, const char* name = 0 );
/**
* Call this in start() to properly register the job and emit the started() signal.
@@ -260,7 +260,7 @@ class LIBK3B_EXPORT K3bBurnJob : public K3bJob
TQ_OBJECT
public:
- K3bBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 );
+ K3bBurnJob( K3bJobHandler* hdl, TQObject* parent = 0, const char* name = 0 );
virtual ~K3bBurnJob();
/**
diff --git a/libk3b/core/k3bsimplejobhandler.cpp b/libk3b/core/k3bsimplejobhandler.cpp
index d48349e..554a621 100644
--- a/libk3b/core/k3bsimplejobhandler.cpp
+++ b/libk3b/core/k3bsimplejobhandler.cpp
@@ -16,8 +16,8 @@
#include "k3bsimplejobhandler.h"
-K3bSimpleJobHandler::K3bSimpleJobHandler( TQObject* tqparent )
- : TQObject( tqparent ),
+K3bSimpleJobHandler::K3bSimpleJobHandler( TQObject* parent )
+ : TQObject( parent ),
K3bJobHandler()
{
}
diff --git a/libk3b/core/k3bsimplejobhandler.h b/libk3b/core/k3bsimplejobhandler.h
index 60d4bf9..7657906 100644
--- a/libk3b/core/k3bsimplejobhandler.h
+++ b/libk3b/core/k3bsimplejobhandler.h
@@ -34,7 +34,7 @@ class LIBK3B_EXPORT K3bSimpleJobHandler : public TQObject, public K3bJobHandler
TQ_OBJECT
public:
- K3bSimpleJobHandler( TQObject* tqparent = 0 );
+ K3bSimpleJobHandler( TQObject* parent = 0 );
~K3bSimpleJobHandler();
/*
diff --git a/libk3b/core/k3bthreadjob.cpp b/libk3b/core/k3bthreadjob.cpp
index fcc192e..634aa91 100644
--- a/libk3b/core/k3bthreadjob.cpp
+++ b/libk3b/core/k3bthreadjob.cpp
@@ -23,15 +23,15 @@
-K3bThreadJob::K3bThreadJob( K3bJobHandler* jh, TQObject* tqparent, const char* name )
- : K3bJob( jh, tqparent, name ),
+K3bThreadJob::K3bThreadJob( K3bJobHandler* jh, TQObject* parent, const char* name )
+ : K3bJob( jh, parent, name ),
m_running(false)
{
}
-K3bThreadJob::K3bThreadJob( K3bThread* thread, K3bJobHandler* jh, TQObject* tqparent, const char* name )
- : K3bJob( jh, tqparent, name ),
+K3bThreadJob::K3bThreadJob( K3bThread* thread, K3bJobHandler* jh, TQObject* parent, const char* name )
+ : K3bJob( jh, parent, name ),
m_running(false)
{
setThread(thread);
diff --git a/libk3b/core/k3bthreadjob.h b/libk3b/core/k3bthreadjob.h
index 34b43fd..319e69f 100644
--- a/libk3b/core/k3bthreadjob.h
+++ b/libk3b/core/k3bthreadjob.h
@@ -43,8 +43,8 @@ class LIBK3B_EXPORT K3bThreadJob : public K3bJob
TQ_OBJECT
public:
- K3bThreadJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
- K3bThreadJob( K3bThread*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
+ K3bThreadJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 );
+ K3bThreadJob( K3bThread*, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 );
virtual ~K3bThreadJob();
void setThread( K3bThread* t );