From f7ceb2957839027e8027a9a4c0dfff730cb9b704 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/common/global/log.cpp | 10 +++++----- src/common/global/log.h | 4 ++-- src/common/global/process.cpp | 4 ++-- src/common/global/process.h | 10 +++++----- src/common/global/progress_monitor.cpp | 4 ++-- src/common/global/progress_monitor.h | 2 +- src/common/global/xml_data_file.cpp | 16 ++++++++-------- 7 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src/common/global') diff --git a/src/common/global/log.cpp b/src/common/global/log.cpp index 1ab42d0..62955da 100644 --- a/src/common/global/log.cpp +++ b/src/common/global/log.cpp @@ -72,17 +72,17 @@ bool Log::StringView::askContinue(const TQString &message) } //----------------------------------------------------------------------------- -Log::Base::Base(Base *tqparent) +Log::Base::Base(Base *parent) : _parent(0), _data(0) { - setParent(tqparent); + setParent(parent); } -void Log::Base::setParent(Base *tqparent) +void Log::Base::setParent(Base *parent) { delete _data; - _parent = tqparent; - _data = (tqparent ? 0 : new LogData); + _parent = parent; + _data = (parent ? 0 : new LogData); } Log::Base::~Base() diff --git a/src/common/global/log.h b/src/common/global/log.h index eff0b88..f38543d 100644 --- a/src/common/global/log.h +++ b/src/common/global/log.h @@ -85,9 +85,9 @@ private: class Base : public Generic { public: - Base(Base *tqparent = 0); + Base(Base *parent = 0); virtual ~Base(); - void setParent(Base *tqparent); + void setParent(Base *parent); void setView(View *view); View *view() { return logData()->view; } diff --git a/src/common/global/process.cpp b/src/common/global/process.cpp index 1efe715..ed63f86 100644 --- a/src/common/global/process.cpp +++ b/src/common/global/process.cpp @@ -31,8 +31,8 @@ Process::State Process::runSynchronously(Base &process, RunActions actions, uint } //---------------------------------------------------------------------------- -Process::Base::Base(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), _state(Stopped) +Process::Base::Base(TQObject *parent, const char *name) + : TQObject(parent, name), _state(Stopped) { _process = new KProcess(this); connect(_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(exited())); diff --git a/src/common/global/process.h b/src/common/global/process.h index d4e7db0..daa8513 100644 --- a/src/common/global/process.h +++ b/src/common/global/process.h @@ -33,7 +33,7 @@ class Base : public TQObject Q_OBJECT TQ_OBJECT public: - Base(TQObject *tqparent, const char *name); + Base(TQObject *parent, const char *name); virtual ~Base(); void setup(const TQString &executable, const TQStringList &options, bool withWine); TQStringList arguments() const; @@ -77,7 +77,7 @@ class StringOutput : public Base Q_OBJECT TQ_OBJECT public: - StringOutput(TQObject *tqparent = 0, const char *name = 0) : Base(tqparent, name) {} + StringOutput(TQObject *parent = 0, const char *name = 0) : Base(parent, name) {} TQString sout() const { return _stdout; } TQString serr() const { return _stderr; } @@ -92,7 +92,7 @@ class LineBase : public Base Q_OBJECT TQ_OBJECT public: - LineBase(TQObject *tqparent = 0, const char *name = 0) : Base(tqparent, name) {} + LineBase(TQObject *parent = 0, const char *name = 0) : Base(parent, name) {} private slots: virtual void receivedStdout(KProcess *, char *buffer, int len); @@ -109,7 +109,7 @@ class LineOutput : public LineBase Q_OBJECT TQ_OBJECT public: - LineOutput(TQObject *tqparent = 0, const char *name = 0) : LineBase(tqparent, name) {} + LineOutput(TQObject *parent = 0, const char *name = 0) : LineBase(parent, name) {} virtual bool start(uint timeout); TQStringList sout() const { return _stdoutLines; } TQStringList serr() const { return _stderrLines; } @@ -127,7 +127,7 @@ class LineSignal : public LineBase Q_OBJECT TQ_OBJECT public: - LineSignal(TQObject *tqparent = 0, const char *name = 0) : LineBase(tqparent, name) {} + LineSignal(TQObject *parent = 0, const char *name = 0) : LineBase(parent, name) {} signals: void logStdoutLine(const TQString &line); diff --git a/src/common/global/progress_monitor.cpp b/src/common/global/progress_monitor.cpp index f86d236..0b3044d 100644 --- a/src/common/global/progress_monitor.cpp +++ b/src/common/global/progress_monitor.cpp @@ -8,8 +8,8 @@ ***************************************************************************/ #include "progress_monitor.h" -ProgressMonitor::ProgressMonitor(TQObject* tqparent) - : TQObject(tqparent, "progress_monitor") +ProgressMonitor::ProgressMonitor(TQObject* parent) + : TQObject(parent, "progress_monitor") { _current = _tasks.end(); } diff --git a/src/common/global/progress_monitor.h b/src/common/global/progress_monitor.h index 1cff202..03628f7 100644 --- a/src/common/global/progress_monitor.h +++ b/src/common/global/progress_monitor.h @@ -16,7 +16,7 @@ class ProgressMonitor : public TQObject Q_OBJECT TQ_OBJECT public: - ProgressMonitor(TQObject *tqparent = 0); + ProgressMonitor(TQObject *parent = 0); void clear(); void appendTask(const TQString &label, uint nbSteps); void insertTask(const TQString &label, uint nbSteps); diff --git a/src/common/global/xml_data_file.cpp b/src/common/global/xml_data_file.cpp index 30d42cd..528f8e7 100644 --- a/src/common/global/xml_data_file.cpp +++ b/src/common/global/xml_data_file.cpp @@ -52,28 +52,28 @@ bool XmlDataFile::save(TQString &error) const return ok; } -TQDomElement XmlDataFile::findChildElement(TQDomElement tqparent, const TQString &name) const +TQDomElement XmlDataFile::findChildElement(TQDomElement parent, const TQString &name) const { - TQDomNodeList list = tqparent.elementsByTagName(name); + TQDomNodeList list = parent.elementsByTagName(name); return list.item(0).toElement(); } -TQDomElement XmlDataFile::createChildElement(TQDomElement tqparent, const TQString &name) +TQDomElement XmlDataFile::createChildElement(TQDomElement parent, const TQString &name) { - TQDomNodeList list = tqparent.elementsByTagName(name); + TQDomNodeList list = parent.elementsByTagName(name); if ( list.count()==0 ) { TQDomElement element = _document.createElement(name); - tqparent.appendChild(element); + parent.appendChild(element); return element; } return list.item(0).toElement(); } -void XmlDataFile::removeChilds(TQDomNode tqparent) const +void XmlDataFile::removeChilds(TQDomNode parent) const { - TQDomNodeList list = tqparent.childNodes(); + TQDomNodeList list = parent.childNodes(); for (uint i=0; i