diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:57 -0600 |
| commit | c29685c8eeefc745ebaadfd532962f4e3a7d55ea (patch) | |
| tree | 41dcdd85f157152fd7d2aadeb645324352c1b2b9 | |
| parent | ab51f6a1367bd94d17209f6d8b327ab5e7eec56f (diff) | |
| download | dbus-1-tqt-c29685c8.tar.gz dbus-1-tqt-c29685c8.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit ab51f6a1367bd94d17209f6d8b327ab5e7eec56f.
| -rw-r--r-- | tools/dbusxml2qt3/classgen.cpp | 10 | ||||
| -rw-r--r-- | tools/dbusxml2qt3/main.cpp | 2 | ||||
| -rw-r--r-- | tools/dbusxml2qt3/methodgen.cpp | 2 | ||||
| -rw-r--r-- | tqdbusconnection.cpp | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/tools/dbusxml2qt3/classgen.cpp b/tools/dbusxml2qt3/classgen.cpp index 577053a..af2de88 100644 --- a/tools/dbusxml2qt3/classgen.cpp +++ b/tools/dbusxml2qt3/classgen.cpp @@ -24,7 +24,7 @@ #include <tqdom.h> #include <tqfile.h> #include <tqstringlist.h> -#include <textstream.h> +#include <tqtextstream.h> // local includes #include "classgen.h" @@ -945,13 +945,13 @@ bool ClassGenerator::finishStreams(const TQString& baseName, writeFileFooter(headerStream); writeFileFooter(sourceStream); - TQIODevice* device = headerStream.device(); + TQIODevice* tqdevice = headerStream.tqdevice(); headerStream.unsetDevice(); - delete device; + delete tqdevice; - device = sourceStream.device(); + tqdevice = sourceStream.tqdevice(); sourceStream.unsetDevice(); - delete device; + delete tqdevice; return true; } diff --git a/tools/dbusxml2qt3/main.cpp b/tools/dbusxml2qt3/main.cpp index b58f5cf..cdc0a98 100644 --- a/tools/dbusxml2qt3/main.cpp +++ b/tools/dbusxml2qt3/main.cpp @@ -28,7 +28,7 @@ #include <tqdom.h> #include <tqfile.h> #include <tqmap.h> -#include <textstream.h> +#include <tqtextstream.h> // local includes #include "classgen.h" diff --git a/tools/dbusxml2qt3/methodgen.cpp b/tools/dbusxml2qt3/methodgen.cpp index 475d5e4..ec569ab 100644 --- a/tools/dbusxml2qt3/methodgen.cpp +++ b/tools/dbusxml2qt3/methodgen.cpp @@ -22,7 +22,7 @@ // TQt includes #include <tqdom.h> -#include <textstream.h> +#include <tqtextstream.h> // local includes #include "methodgen.h" diff --git a/tqdbusconnection.cpp b/tqdbusconnection.cpp index a755610..4727549 100644 --- a/tqdbusconnection.cpp +++ b/tqdbusconnection.cpp @@ -63,7 +63,7 @@ TQT_DBusConnectionManager* manager() { TQT_DBusConnectionPrivate *TQT_DBusConnectionManager::connection(const TQString &name) const { - if (name == TQString::fromLatin1(TQT_DBusConnection::default_connection_name)) + if (name == TQString::tqfromLatin1(TQT_DBusConnection::default_connection_name)) return default_connection; ConnectionHash::const_iterator it = connectionHash.find(name); @@ -74,7 +74,7 @@ TQT_DBusConnectionPrivate *TQT_DBusConnectionManager::connection(const TQString void TQT_DBusConnectionManager::removeConnection(const TQString &name) { TQT_DBusConnectionPrivate *d = 0; - if (name == TQString::fromLatin1(TQT_DBusConnection::default_connection_name)) { + if (name == TQString::tqfromLatin1(TQT_DBusConnection::default_connection_name)) { d = default_connection; default_connection = 0; } else { @@ -132,7 +132,7 @@ void qDBusBindToApplication() void TQT_DBusConnectionManager::setConnection(const TQString &name, TQT_DBusConnectionPrivate *c) { - if (name == TQString::fromLatin1(TQT_DBusConnection::default_connection_name)) + if (name == TQString::tqfromLatin1(TQT_DBusConnection::default_connection_name)) default_connection = c; else connectionHash[name] = c; |