From 6d66f801dc680a1532e85e242e57ec42106968ef Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:15:41 -0600 Subject: Rename old tq methods that no longer need a unique name (cherry picked from commit f2d20e882b86b554edb6653eeeb524a38d1caa9a) --- tqdbusconnection.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tqdbusconnection.cpp b/tqdbusconnection.cpp index b191f53..d4449d7 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::tqfromLatin1(TQT_DBusConnection::default_connection_name)) + if (name == TQString::fromLatin1(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::tqfromLatin1(TQT_DBusConnection::default_connection_name)) { + if (name == TQString::fromLatin1(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::tqfromLatin1(TQT_DBusConnection::default_connection_name)) + if (name == TQString::fromLatin1(TQT_DBusConnection::default_connection_name)) default_connection = c; else connectionHash[name] = c; -- cgit v1.2.3