From 501d489d46c5458357f4d9d16ae6e67c1cb15aee Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: [PATCH] rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/dbus-1-tqt@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- tools/dbusxml2qt3/classgen.cpp | 2 +- tools/dbusxml2qt3/methodgen.cpp | 4 ++-- tqdbusconnection_p.h | 2 +- tqdbusintegrator.cpp | 4 ++-- tqdbusobjectpath.h | 6 +++--- tqdbusproxy.cpp | 12 ++++++------ tqdbusproxy.h | 12 ++++++------ tqdbusserver.cpp | 4 ++-- tqdbusserver.h | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/dbusxml2qt3/classgen.cpp b/tools/dbusxml2qt3/classgen.cpp index fbe622b..af2de88 100644 --- a/tools/dbusxml2qt3/classgen.cpp +++ b/tools/dbusxml2qt3/classgen.cpp @@ -401,7 +401,7 @@ static void openClassDeclaration(const Class& classData, stream << " TQ_OBJECT" << endl; stream << "public:" << endl; stream << " " << classData.name - << "(const TQString& service, const TQString& path, TQObject* tqparent = 0, const char* name = 0);" << endl; + << "(const TQString& service, const TQString& path, TQObject* parent = 0, const char* name = 0);" << endl; stream << endl; stream << " virtual ~" << classData.name << "();" << endl; diff --git a/tools/dbusxml2qt3/methodgen.cpp b/tools/dbusxml2qt3/methodgen.cpp index 39d6952..ec569ab 100644 --- a/tools/dbusxml2qt3/methodgen.cpp +++ b/tools/dbusxml2qt3/methodgen.cpp @@ -1124,8 +1124,8 @@ void MethodGenerator::writeSignalHandler(const Class& classData, void MethodGenerator::writeProxyBegin(const Class& classData, TQTextStream& stream) { stream << classData.name << "::" << classData.name - << "(const TQString& service, const TQString& path, TQObject* tqparent, const char* name)" << endl; - stream << " : TQObject(tqparent, name)," << endl; + << "(const TQString& service, const TQString& path, TQObject* parent, const char* name)" << endl; + stream << " : TQObject(parent, name)," << endl; stream << " m_baseProxy(new TQT_DBusProxy())" << endl; stream << "{" << endl; stream << " m_baseProxy->setInterface(\"" diff --git a/tqdbusconnection_p.h b/tqdbusconnection_p.h index d43ee9a..c96a2cb 100644 --- a/tqdbusconnection_p.h +++ b/tqdbusconnection_p.h @@ -62,7 +62,7 @@ class TQT_DBusConnectionPrivate: public TQObject TQ_OBJECT public: - TQT_DBusConnectionPrivate(TQObject *tqparent = 0); + TQT_DBusConnectionPrivate(TQObject *parent = 0); ~TQT_DBusConnectionPrivate(); void bindToApplication(); diff --git a/tqdbusintegrator.cpp b/tqdbusintegrator.cpp index 6083805..eba7498 100644 --- a/tqdbusintegrator.cpp +++ b/tqdbusintegrator.cpp @@ -271,8 +271,8 @@ int TQT_DBusConnectionPrivate::registerMessageMetaType() return tp; } -TQT_DBusConnectionPrivate::TQT_DBusConnectionPrivate(TQObject *tqparent) - : TQObject(tqparent), ref(1), mode(InvalidMode), connection(0), server(0), +TQT_DBusConnectionPrivate::TQT_DBusConnectionPrivate(TQObject *parent) + : TQObject(parent), ref(1), mode(InvalidMode), connection(0), server(0), dispatcher(0) { static const int msgType = registerMessageMetaType(); diff --git a/tqdbusobjectpath.h b/tqdbusobjectpath.h index 119e1f8..fb5f046 100644 --- a/tqdbusobjectpath.h +++ b/tqdbusobjectpath.h @@ -58,7 +58,7 @@ public: TQT_DBusObjectPath(const TQCString& other); /** - * @brief Creates an object path for an object as a child of the tqparent node + * @brief Creates an object path for an object as a child of the parent node * * This is basically like specifying a directory and a file name to create * the file's full path. @@ -90,11 +90,11 @@ public: bool isValid() const; /** - * @brief Returns the object path of this path's tqparent node + * @brief Returns the object path of this path's parent node * * This is basically like getting the directory of an file path * - * @return the tqparent node's object path or an empty and invalid object + * @return the parent node's object path or an empty and invalid object * if this is already the root node */ TQT_DBusObjectPath parentNode() const; diff --git a/tqdbusproxy.cpp b/tqdbusproxy.cpp index 605481e..7ca6118 100644 --- a/tqdbusproxy.cpp +++ b/tqdbusproxy.cpp @@ -48,15 +48,15 @@ public: TQT_DBusError error; }; -TQT_DBusProxy::TQT_DBusProxy(TQObject* tqparent, const char* name) - : TQObject(tqparent, (name ? name : "TQT_DBusProxy")), +TQT_DBusProxy::TQT_DBusProxy(TQObject* parent, const char* name) + : TQObject(parent, (name ? name : "TQT_DBusProxy")), d(new Private()) { } TQT_DBusProxy::TQT_DBusProxy(const TQT_DBusConnection& connection, - TQObject* tqparent, const char* name) - : TQObject(tqparent, (name ? name : "TQT_DBusProxy")), + TQObject* parent, const char* name) + : TQObject(parent, (name ? name : "TQT_DBusProxy")), d(new Private()) { setConnection(connection); @@ -64,8 +64,8 @@ TQT_DBusProxy::TQT_DBusProxy(const TQT_DBusConnection& connection, TQT_DBusProxy::TQT_DBusProxy(const TQString& service, const TQString& path, const TQString& interface, const TQT_DBusConnection& connection, - TQObject* tqparent, const char* name) - : TQObject(tqparent, (name ? name : "TQT_DBusProxy")), + TQObject* parent, const char* name) + : TQObject(parent, (name ? name : "TQT_DBusProxy")), d(new Private()) { setConnection(connection); diff --git a/tqdbusproxy.h b/tqdbusproxy.h index ae31f40..7cf2e52 100644 --- a/tqdbusproxy.h +++ b/tqdbusproxy.h @@ -245,10 +245,10 @@ public: * This basic constructor allows to create a proxy and specify the peer * object and interface later on. * - * @param tqparent TQObject tqparent + * @param parent TQObject parent * @param name TQObject name */ - TQT_DBusProxy(TQObject* tqparent = 0, const char* name = 0); + TQT_DBusProxy(TQObject* parent = 0, const char* name = 0); /** * @brief Creates a proxy on a given connection without binding it to a @@ -262,10 +262,10 @@ public: * filtering for a specific peer. * * @param connection the D-Bus connection to work on - * @param tqparent TQObject tqparent + * @param parent TQObject parent * @param name TQObject name */ - TQT_DBusProxy(const TQT_DBusConnection& connection, TQObject* tqparent = 0, + TQT_DBusProxy(const TQT_DBusConnection& connection, TQObject* parent = 0, const char* name = 0); /** @@ -279,12 +279,12 @@ public: * @param path the peer object's path within its host application * @param interface the interface to work with * @param connection the D-Bus connection to work on - * @param tqparent TQObject tqparent + * @param parent TQObject parent * @param name TQObject name */ TQT_DBusProxy(const TQString& service, const TQString& path, const TQString& interface, const TQT_DBusConnection& connection, - TQObject* tqparent = 0, const char* name = 0); + TQObject* parent = 0, const char* name = 0); /** * @brief Destroys the proxy instance diff --git a/tqdbusserver.cpp b/tqdbusserver.cpp index 628fdc9..6bad746 100644 --- a/tqdbusserver.cpp +++ b/tqdbusserver.cpp @@ -24,8 +24,8 @@ #include "tqdbusserver.h" #include "tqdbusconnection_p.h" -TQT_DBusServer::TQT_DBusServer(const TQString &addr, TQObject *tqparent) - : TQObject(tqparent) +TQT_DBusServer::TQT_DBusServer(const TQString &addr, TQObject *parent) + : TQObject(parent) { d = new TQT_DBusConnectionPrivate(this); diff --git a/tqdbusserver.h b/tqdbusserver.h index eec27b1..41a599b 100644 --- a/tqdbusserver.h +++ b/tqdbusserver.h @@ -38,7 +38,7 @@ class TQDBUS_EXPORT TQT_DBusServer: public TQObject Q_OBJECT TQ_OBJECT public: - TQT_DBusServer(const TQString &address, TQObject *tqparent = 0); + TQT_DBusServer(const TQString &address, TQObject *parent = 0); bool isConnected() const; TQT_DBusError lastError() const;