From 43483029af9085776484bd2fe43e4701b565ebd7 Mon Sep 17 00:00:00 2001 From: Thomas Flueeli Date: Thu, 28 Oct 2010 15:39:18 +0200 Subject: [PATCH 3/5] fix string initialisation --- TelepathyQt4/channel.h | 2 +- TelepathyQt4/optional-interface-factory.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TelepathyQt4/channel.h b/TelepathyQt4/channel.h index 1252291..ef9993f 100644 --- a/TelepathyQt4/channel.h +++ b/TelepathyQt4/channel.h @@ -241,7 +241,7 @@ public: InterfaceSupportedChecking check = CheckInterfaceSupported) const { // Check for the remote object having the correct channel type - QString name(QLatin1String(Interface::staticInterfaceName())); + QString name = QLatin1String(Interface::staticInterfaceName()); if (check == CheckInterfaceSupported && channelType() != name) return 0; diff --git a/TelepathyQt4/optional-interface-factory.h b/TelepathyQt4/optional-interface-factory.h index e39ca87..be6558b 100644 --- a/TelepathyQt4/optional-interface-factory.h +++ b/TelepathyQt4/optional-interface-factory.h @@ -97,7 +97,7 @@ public: InterfaceSupportedChecking check = CheckInterfaceSupported) const { // Check for the remote object supporting the interface - QString name(QLatin1String(Interface::staticInterfaceName())); + QString name = QLatin1String(Interface::staticInterfaceName()); if (check == CheckInterfaceSupported && !mInterfaces.contains(name)) { return 0; } @@ -113,7 +113,7 @@ public: Q_UNUSED(interfaceMustBeASubclassOfAbstractInterface); // If there is a interface cached already, return it - QString name(QLatin1String(Interface::staticInterfaceName())); + QString name = QLatin1String(Interface::staticInterfaceName()); AbstractInterface *cached = getCached(name); if (cached) return static_cast(cached); -- 1.7.2.3