summaryrefslogtreecommitdiffstats
path: root/lib/util
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
commit32b67ac0690de411b26b1d5e715b188c27442248 (patch)
tree43167816a3df6b3a877d71c9a7963ed270dcc8c9 /lib/util
parent330c33ab6f97b279737bf9527c9add7bb1475450 (diff)
downloadtdevelop-32b67ac0690de411b26b1d5e715b188c27442248.tar.gz
tdevelop-32b67ac0690de411b26b1d5e715b188c27442248.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/blockingkprocess.cpp4
-rw-r--r--lib/util/blockingkprocess.h2
-rw-r--r--lib/util/configwidgetproxy.h2
-rw-r--r--lib/util/domutil.h6
-rw-r--r--lib/util/execcommand.cpp4
-rw-r--r--lib/util/execcommand.h2
-rw-r--r--lib/util/kdevjobtimer.cpp4
-rw-r--r--lib/util/kdevjobtimer.h2
-rw-r--r--lib/util/kdevshellwidget.cpp4
-rw-r--r--lib/util/kdevshellwidget.h2
-rw-r--r--lib/util/kscriptactionmanager.cpp4
-rw-r--r--lib/util/kscriptactionmanager.h2
-rw-r--r--lib/util/urlutil.cpp12
-rw-r--r--lib/util/urlutil.h20
14 files changed, 35 insertions, 35 deletions
diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp
index 2a99f23b..51845a5c 100644
--- a/lib/util/blockingkprocess.cpp
+++ b/lib/util/blockingkprocess.cpp
@@ -14,8 +14,8 @@
#include <tqapplication.h>
#include <tqtimer.h>
-BlockingKProcess::BlockingKProcess(TQObject *tqparent, const char *name)
- : KProcess(tqparent, name)
+BlockingKProcess::BlockingKProcess(TQObject *parent, const char *name)
+ : KProcess(parent, name)
{
m_stdOut = "";
m_stdErr = "";
diff --git a/lib/util/blockingkprocess.h b/lib/util/blockingkprocess.h
index dd15002e..3db2c170 100644
--- a/lib/util/blockingkprocess.h
+++ b/lib/util/blockingkprocess.h
@@ -34,7 +34,7 @@ class BlockingKProcess : public KProcess
TQ_OBJECT
public:
- BlockingKProcess(TQObject *tqparent, const char *name=0);
+ BlockingKProcess(TQObject *parent, const char *name=0);
BlockingKProcess();
virtual ~BlockingKProcess();
diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h
index b91bf3f7..1c48d4c7 100644
--- a/lib/util/configwidgetproxy.h
+++ b/lib/util/configwidgetproxy.h
@@ -105,7 +105,7 @@ signals:
/**
* The proxy emits this signal to notify the client that a specific config page has been requested.
* @param dlg The settings dialog. The client should connect to its okClicked() signal.
- * @param page The setting page. The client should use this as tqparent to the config widget.
+ * @param page The setting page. The client should use this as parent to the config widget.
* @param pagenumber The identifier set in createGlobalConfigPage() or createProjectConfigPage(). Identifies the requested config page.
*/
void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber );
diff --git a/lib/util/domutil.h b/lib/util/domutil.h
index 394b3600..db9cd184 100644
--- a/lib/util/domutil.h
+++ b/lib/util/domutil.h
@@ -205,17 +205,17 @@ public:
static bool saveDOMFile(TQDomDocument &doc, TQString filename);
/**
- * Remove all child text nodes of tqparent described in pathExt
+ * Remove all child text nodes of parent described in pathExt
*/
static bool removeTextNodes(TQDomDocument doc,TQString pathExt);
/**
- * Add child text node to tqparent described in pathExt
+ * Add child text node to parent described in pathExt
*/
static bool appendText(TQDomDocument doc, TQString pathExt, TQString text);
/**
- * Replace all chilt text nodes of tqparent described in pathExt with one new.
+ * Replace all chilt text nodes of parent described in pathExt with one new.
*/
static bool replaceText(TQDomDocument doc, TQString pathExt, TQString text);
diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp
index e1236474..9692b29e 100644
--- a/lib/util/execcommand.cpp
+++ b/lib/util/execcommand.cpp
@@ -26,8 +26,8 @@
ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args,
const TQString& workingDir, const TQStringList& env,
- TQObject* tqparent, const char* name ):
- TQObject( tqparent, name ), out( "" ) /* make sure out is not TQString() since that would mean "error" */
+ TQObject* parent, const char* name ):
+ TQObject( parent, name ), out( "" ) /* make sure out is not TQString() since that would mean "error" */
{
progressDlg = 0;
diff --git a/lib/util/execcommand.h b/lib/util/execcommand.h
index 5be67682..ca403cfc 100644
--- a/lib/util/execcommand.h
+++ b/lib/util/execcommand.h
@@ -49,7 +49,7 @@ class ExecCommand : public TQObject
public:
ExecCommand( const TQString& executable, const TQStringList& args,
const TQString& workingDir = TQString(),
- const TQStringList& env = TQStringList(), TQObject* tqparent = 0, const char* name = 0 );
+ const TQStringList& env = TQStringList(), TQObject* parent = 0, const char* name = 0 );
~ExecCommand();
signals:
diff --git a/lib/util/kdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp
index a4ac7aa2..b0b78250 100644
--- a/lib/util/kdevjobtimer.cpp
+++ b/lib/util/kdevjobtimer.cpp
@@ -11,8 +11,8 @@
#include "kdevjobtimer.h"
-KDevJobTimer::KDevJobTimer( void * payload, TQObject *tqparent, const char *name)
- : TQTimer(tqparent, name)
+KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name)
+ : TQTimer(parent, name)
{
m_payload = payload;
connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) );
diff --git a/lib/util/kdevjobtimer.h b/lib/util/kdevjobtimer.h
index 5fb9dbba..09c325f3 100644
--- a/lib/util/kdevjobtimer.h
+++ b/lib/util/kdevjobtimer.h
@@ -25,7 +25,7 @@ signals:
void timeout(void*);
private:
- KDevJobTimer( void * payload, TQObject *tqparent = 0, const char *name = 0);
+ KDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0);
~KDevJobTimer();
private slots:
diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp
index 0ea05299..8d217274 100644
--- a/lib/util/kdevshellwidget.cpp
+++ b/lib/util/kdevshellwidget.cpp
@@ -20,8 +20,8 @@
#include "kdevshellwidget.h"
-KDevShellWidget::KDevShellWidget(TQWidget *tqparent, const char *name)
- : TQVBox(tqparent, name), m_doAutoActivate( false ), m_isRunning( false )
+KDevShellWidget::KDevShellWidget(TQWidget *parent, const char *name)
+ : TQVBox(parent, name), m_doAutoActivate( false ), m_isRunning( false )
{
}
diff --git a/lib/util/kdevshellwidget.h b/lib/util/kdevshellwidget.h
index 62dbf171..81e81eff 100644
--- a/lib/util/kdevshellwidget.h
+++ b/lib/util/kdevshellwidget.h
@@ -30,7 +30,7 @@ Q_OBJECT
TQ_OBJECT
public:
- KDevShellWidget(TQWidget *tqparent = 0, const char *name = 0);
+ KDevShellWidget(TQWidget *parent = 0, const char *name = 0);
virtual ~KDevShellWidget();
/**
diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/kscriptactionmanager.cpp
index 9b764a75..3c906902 100644
--- a/lib/util/kscriptactionmanager.cpp
+++ b/lib/util/kscriptactionmanager.cpp
@@ -100,7 +100,7 @@ void KScriptAction::activate( )
return;
}
}
- m_interface->run(tqparent(), TQVariant());
+ m_interface->run(parent(), TQVariant());
m_timeout->start(60000,FALSE); // after 1 minute unload
m_refs++;
}
@@ -119,7 +119,7 @@ void KScriptAction::scriptFinished()
m_refs--;
}
-KScriptActionManager::KScriptActionManager( TQObject *tqparent, KActionCollection * ac ) : TQObject(tqparent), m_ac(ac)
+KScriptActionManager::KScriptActionManager( TQObject *parent, KActionCollection * ac ) : TQObject(parent), m_ac(ac)
{
m_actions.setAutoDelete(true);
}
diff --git a/lib/util/kscriptactionmanager.h b/lib/util/kscriptactionmanager.h
index 69de43ac..fa2c53ed 100644
--- a/lib/util/kscriptactionmanager.h
+++ b/lib/util/kscriptactionmanager.h
@@ -99,7 +99,7 @@ public:
/**
* Create a script manager that is attached to an action collection.
*/
- KScriptActionManager( TQObject *tqparent, KActionCollection *ac );
+ KScriptActionManager( TQObject *parent, KActionCollection *ac );
~KScriptActionManager();
/**
diff --git a/lib/util/urlutil.cpp b/lib/util/urlutil.cpp
index d3cbc5e3..a31aa789 100644
--- a/lib/util/urlutil.cpp
+++ b/lib/util/urlutil.cpp
@@ -82,22 +82,22 @@ TQString URLUtil::getRelativePath(const TQString& basepath, const TQString& dest
///////////////////////////////////////////////////////////////////////////////
-TQString URLUtil::relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy) {
+TQString URLUtil::relativePath(const KURL & parent, const KURL & child, uint slashPolicy) {
bool slashPrefix = slashPolicy & SLASH_PREFIX;
bool slashSuffix = slashPolicy & SLASH_SUFFIX;
- if (tqparent.equals(child,true))
+ if (parent.equals(child,true))
return slashPrefix ? TQString("/") : TQString("");
- if (!tqparent.isParentOf(child)) return TQString();
+ if (!parent.isParentOf(child)) return TQString();
int a=slashPrefix ? -1 : 1;
int b=slashSuffix ? 1 : -1;
- return child.path(b).mid(tqparent.path(a).length());
+ return child.path(b).mid(parent.path(a).length());
}
///////////////////////////////////////////////////////////////////////////////
-TQString URLUtil::relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy) {
- return relativePath(KURL(tqparent), KURL(child), slashPolicy);
+TQString URLUtil::relativePath(const TQString & parent, const TQString & child, uint slashPolicy) {
+ return relativePath(KURL(parent), KURL(child), slashPolicy);
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/lib/util/urlutil.h b/lib/util/urlutil.h
index 39615858..4a063961 100644
--- a/lib/util/urlutil.h
+++ b/lib/util/urlutil.h
@@ -50,27 +50,27 @@ namespace URLUtil
*/
TQString directory(const TQString & pathName);
/**
- * @return The relative path between a tqparent and child URL, or blank if the specified
- * child is not a child of tqparent.
- * @param tqparent The tqparent URL.
+ * @return The relative path between a parent and child URL, or blank if the specified
+ * child is not a child of parent.
+ * @param parent The parent URL.
* @param child The child URL.
- * @param slashPolicy If tqparent and child are equal then the function returns "/" if
+ * @param slashPolicy If parent and child are equal then the function returns "/" if
* slashPolicy contains SLASH_PREFIX and otherwise "".\n"/" is appended to a result
* if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if
* slashPolicy contains SLASH_PREFIX.
*/
- TQString relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy = SLASH_PREFIX);
+ TQString relativePath(const KURL & parent, const KURL & child, uint slashPolicy = SLASH_PREFIX);
/**
- * @return The relative path between a tqparent and child URL, or blank if the specified
- * child is not a child of tqparent.
- * @param tqparent The tqparent URL.
+ * @return The relative path between a parent and child URL, or blank if the specified
+ * child is not a child of parent.
+ * @param parent The parent URL.
* @param child The child URL.
- * @param slashPolicy If tqparent and child are equal then the function returns "/" if
+ * @param slashPolicy If parent and child are equal then the function returns "/" if
* slashPolicy contains SLASH_PREFIX and otherwise "".\n"/" is appended to a result
* if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if
* slashPolicy contains SLASH_PREFIX.
*/
- TQString relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy = SLASH_PREFIX);
+ TQString relativePath(const TQString & parent, const TQString & child, uint slashPolicy = SLASH_PREFIX);
/**
* @return The relative path between a base path and destination path or.
* @param base The base Path.