Changeset 561 for trunk/src/dbus/qdbusutil.cpp
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/dbus/qdbusutil.cpp
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the QtDBus module of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 42 42 #include "qdbusutil_p.h" 43 43 44 #include <qdbus_symbols_p.h>44 #include "qdbus_symbols_p.h" 45 45 46 46 #include <QtCore/qstringlist.h> … … 81 81 82 82 if (argType == QVariant::StringList) { 83 out += QLatin1 String("{");83 out += QLatin1Char('{'); 84 84 QStringList list = arg.toStringList(); 85 85 foreach (QString item, list) … … 87 87 if (!list.isEmpty()) 88 88 out.chop(2); 89 out += QLatin1 String("}");89 out += QLatin1Char('}'); 90 90 } else if (argType == QVariant::ByteArray) { 91 out += QLatin1 String("{");91 out += QLatin1Char('{'); 92 92 QByteArray list = arg.toByteArray(); 93 93 for (int i = 0; i < list.count(); ++i) { … … 97 97 if (!list.isEmpty()) 98 98 out.chop(2); 99 out += QLatin1 String("}");99 out += QLatin1Char('}'); 100 100 } else if (argType == QVariant::List) { 101 out += QLatin1 String("{");101 out += QLatin1Char('{'); 102 102 QList<QVariant> list = arg.toList(); 103 103 foreach (QVariant item, list) { … … 108 108 if (!list.isEmpty()) 109 109 out.chop(2); 110 out += QLatin1 String("}");110 out += QLatin1Char('}'); 111 111 } else if (argType == QMetaType::Char || argType == QMetaType::Short || argType == QMetaType::Int 112 112 || argType == QMetaType::Long || argType == QMetaType::LongLong) { … … 143 143 out += QLatin1Char(']'); 144 144 } else if (arg.canConvert(QVariant::String)) { 145 out += QLatin1 String("\"") + arg.toString() + QLatin1String("\"");145 out += QLatin1Char('\"') + arg.toString() + QLatin1Char('\"'); 146 146 } else { 147 147 out += QLatin1Char('['); … … 227 227 if (elementType != QDBusArgument::BasicType && elementType != QDBusArgument::VariantType 228 228 && elementType != QDBusArgument::MapEntryType) 229 out += QLatin1 String("]");229 out += QLatin1Char(']'); 230 230 231 231 return true;
Note:
See TracChangeset
for help on using the changeset viewer.