Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/dbus/qdbusutil.cpp

    r2 r561  
    22**
    33** 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)
    56**
    67** This file is part of the QtDBus module of the Qt Toolkit.
     
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    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.
    2727**
    2828** GNU General Public License Usage
     
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** 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.
    3838** $QT_END_LICENSE$
    3939**
     
    4242#include "qdbusutil_p.h"
    4343
    44 #include <qdbus_symbols_p.h>
     44#include "qdbus_symbols_p.h"
    4545
    4646#include <QtCore/qstringlist.h>
     
    8181
    8282    if (argType == QVariant::StringList) {
    83         out += QLatin1String("{");
     83        out += QLatin1Char('{');
    8484        QStringList list = arg.toStringList();
    8585        foreach (QString item, list)
     
    8787        if (!list.isEmpty())
    8888            out.chop(2);
    89         out += QLatin1String("}");
     89        out += QLatin1Char('}');
    9090    } else if (argType == QVariant::ByteArray) {
    91         out += QLatin1String("{");
     91        out += QLatin1Char('{');
    9292        QByteArray list = arg.toByteArray();
    9393        for (int i = 0; i < list.count(); ++i) {
     
    9797        if (!list.isEmpty())
    9898            out.chop(2);
    99         out += QLatin1String("}");
     99        out += QLatin1Char('}');
    100100    } else if (argType == QVariant::List) {
    101         out += QLatin1String("{");
     101        out += QLatin1Char('{');
    102102        QList<QVariant> list = arg.toList();
    103103        foreach (QVariant item, list) {
     
    108108        if (!list.isEmpty())
    109109            out.chop(2);
    110         out += QLatin1String("}");
     110        out += QLatin1Char('}');
    111111    } else if (argType == QMetaType::Char || argType == QMetaType::Short || argType == QMetaType::Int
    112112               || argType == QMetaType::Long || argType == QMetaType::LongLong) {
     
    143143        out += QLatin1Char(']');
    144144    } else if (arg.canConvert(QVariant::String)) {
    145         out += QLatin1String("\"") + arg.toString() + QLatin1String("\"");
     145        out += QLatin1Char('\"') + arg.toString() + QLatin1Char('\"');
    146146    } else {
    147147        out += QLatin1Char('[');
     
    227227    if (elementType != QDBusArgument::BasicType && elementType != QDBusArgument::VariantType
    228228            && elementType != QDBusArgument::MapEntryType)
    229         out += QLatin1String("]");
     229        out += QLatin1Char(']');
    230230
    231231    return true;
Note: See TracChangeset for help on using the changeset viewer.