diff options
Diffstat (limited to 'src/core/kconfiggroup.cpp')
| -rw-r--r-- | src/core/kconfiggroup.cpp | 904 |
1 files changed, 473 insertions, 431 deletions
diff --git a/src/core/kconfiggroup.cpp b/src/core/kconfiggroup.cpp index ab7d494f..c720cc66 100644 --- a/src/core/kconfiggroup.cpp +++ b/src/core/kconfiggroup.cpp @@ -45,32 +45,34 @@ class KConfigGroupPrivate : public QSharedData { - public: - KConfigGroupPrivate(KConfig* owner, bool isImmutable, bool isConst, const QByteArray &name) +public: + KConfigGroupPrivate(KConfig *owner, bool isImmutable, bool isConst, const QByteArray &name) : mOwner(owner), mName(name), bImmutable(isImmutable), bConst(isConst) { } - KConfigGroupPrivate(const KSharedConfigPtr &owner, const QByteArray& name) + KConfigGroupPrivate(const KSharedConfigPtr &owner, const QByteArray &name) : sOwner(owner), mOwner(sOwner.data()), mName(name), - bImmutable(name.isEmpty()? owner->isImmutable(): owner->isGroupImmutable(name)), bConst(false) + bImmutable(name.isEmpty() ? owner->isImmutable() : owner->isGroupImmutable(name)), bConst(false) { } - KConfigGroupPrivate(KConfigGroup* parent, bool isImmutable, bool isConst, const QByteArray& name) + KConfigGroupPrivate(KConfigGroup *parent, bool isImmutable, bool isConst, const QByteArray &name) : sOwner(parent->d->sOwner), mOwner(parent->d->mOwner), mName(name), bImmutable(isImmutable), bConst(isConst) { - if (!parent->d->mName.isEmpty()) + if (!parent->d->mName.isEmpty()) { mParent = parent->d; + } } - KConfigGroupPrivate(const KConfigGroupPrivate* other, bool isImmutable, const QByteArray &name) + KConfigGroupPrivate(const KConfigGroupPrivate *other, bool isImmutable, const QByteArray &name) : sOwner(other->sOwner), mOwner(other->mOwner), mName(name), bImmutable(isImmutable), bConst(other->bConst) { - if (!other->mName.isEmpty()) + if (!other->mName.isEmpty()) { mParent = const_cast<KConfigGroupPrivate *>(other); + } } KSharedConfig::Ptr sOwner; @@ -79,8 +81,8 @@ class KConfigGroupPrivate : public QSharedData QByteArray mName; /* bitfield */ - const bool bImmutable:1; // is this group immutable? - const bool bConst:1; // is this group read-only? + const bool bImmutable: 1; // is this group immutable? + const bool bConst: 1; // is this group read-only? QByteArray fullName() const { @@ -92,28 +94,31 @@ class KConfigGroupPrivate : public QSharedData QByteArray name() const { - if (mName.isEmpty()) + if (mName.isEmpty()) { return "<default>"; + } return mName; } - QByteArray fullName(const QByteArray& aGroup) const + QByteArray fullName(const QByteArray &aGroup) const { - if (mName.isEmpty()) + if (mName.isEmpty()) { return aGroup; + } return fullName() + '\x1d' + aGroup; } static QExplicitlySharedDataPointer<KConfigGroupPrivate> create(KConfigBase *master, - const QByteArray &name, - bool isImmutable, - bool isConst) + const QByteArray &name, + bool isImmutable, + bool isConst) { QExplicitlySharedDataPointer<KConfigGroupPrivate> data; - if (dynamic_cast<KConfigGroup*>(master)) - data = new KConfigGroupPrivate(dynamic_cast<KConfigGroup*>(master), isImmutable, isConst, name); - else - data = new KConfigGroupPrivate(dynamic_cast<KConfig*>(master), isImmutable, isConst, name); + if (dynamic_cast<KConfigGroup *>(master)) { + data = new KConfigGroupPrivate(dynamic_cast<KConfigGroup *>(master), isImmutable, isConst, name); + } else { + data = new KConfigGroupPrivate(dynamic_cast<KConfig *>(master), isImmutable, isConst, name); + } return data; } @@ -141,8 +146,9 @@ QByteArray KConfigGroupPrivate::serializeList(const QList<QByteArray> &list) } // To be able to distinguish an empty list from a list with one empty element. - if (value.isEmpty()) + if (value.isEmpty()) { value = "\\0"; + } } return value; @@ -150,10 +156,12 @@ QByteArray KConfigGroupPrivate::serializeList(const QList<QByteArray> &list) QStringList KConfigGroupPrivate::deserializeList(const QString &data) { - if (data.isEmpty()) + if (data.isEmpty()) { return QStringList(); - if (data == QLatin1String("\\0")) + } + if (data == QLatin1String("\\0")) { return QStringList(QString()); + } QStringList value; QString val; val.reserve(data.size()); @@ -177,192 +185,199 @@ QStringList KConfigGroupPrivate::deserializeList(const QString &data) return value; } -static QList<int> asIntList(const QByteArray& string) +static QList<int> asIntList(const QByteArray &string) { QList<int> list; - Q_FOREACH(const QByteArray& s, string.split(',')) + Q_FOREACH (const QByteArray &s, string.split(',')) { list << s.toInt(); + } return list; } -static QList<qreal> asRealList(const QByteArray& string) +static QList<qreal> asRealList(const QByteArray &string) { QList<qreal> list; - Q_FOREACH(const QByteArray& s, string.split(',')) + Q_FOREACH (const QByteArray &s, string.split(',')) { list << s.toDouble(); + } return list; } -static QString errString( const char * pKey, const QByteArray & value, const QVariant & aDefault ) { +static QString errString(const char *pKey, const QByteArray &value, const QVariant &aDefault) +{ return QString::fromLatin1("\"%1\" - conversion of \"%3\" to %2 failed") - .arg(QString::fromLatin1(pKey)) - .arg(QString::fromLatin1(QVariant::typeToName(aDefault.type()))) - .arg(QString::fromLatin1(value)); + .arg(QString::fromLatin1(pKey)) + .arg(QString::fromLatin1(QVariant::typeToName(aDefault.type()))) + .arg(QString::fromLatin1(value)); } -static QString formatError( int expected, int got ) { - return QString::fromLatin1(" (wrong format: expected %1 items, got %2)").arg( expected ).arg( got ); +static QString formatError(int expected, int got) +{ + return QString::fromLatin1(" (wrong format: expected %1 items, got %2)").arg(expected).arg(got); } -QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray& value, const QVariant& aDefault) +QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray &value, const QVariant &aDefault) { // if a type handler is added here you must add a QVConversions definition // to conversion_check.h, or ConversionCheck::to_QVariant will not allow // readEntry<T> to convert to QVariant. - switch( aDefault.type() ) { - case QVariant::Invalid: - return QVariant(); - case QVariant::String: - // this should return the raw string not the dollar expanded string. - // imho if processed string is wanted should call - // readEntry(key, QString) not readEntry(key, QVariant) - return QString::fromUtf8(value); - case QVariant::List: - case QVariant::StringList: - return KConfigGroupPrivate::deserializeList(QString::fromUtf8(value)); - case QVariant::ByteArray: - return value; - case QVariant::Bool: { - const QByteArray lower(value.toLower()); - if (lower == "false" || lower == "no" || lower == "off" || lower == "0") - return false; - return true; + switch (aDefault.type()) { + case QVariant::Invalid: + return QVariant(); + case QVariant::String: + // this should return the raw string not the dollar expanded string. + // imho if processed string is wanted should call + // readEntry(key, QString) not readEntry(key, QVariant) + return QString::fromUtf8(value); + case QVariant::List: + case QVariant::StringList: + return KConfigGroupPrivate::deserializeList(QString::fromUtf8(value)); + case QVariant::ByteArray: + return value; + case QVariant::Bool: { + const QByteArray lower(value.toLower()); + if (lower == "false" || lower == "no" || lower == "off" || lower == "0") { + return false; } - case QVariant::Double: - case QMetaType::Float: - case QVariant::Int: - case QVariant::UInt: - case QVariant::LongLong: - case QVariant::ULongLong: { - QVariant tmp = value; - if ( !tmp.convert(aDefault.type()) ) - tmp = aDefault; - return tmp; + return true; + } + case QVariant::Double: + case QMetaType::Float: + case QVariant::Int: + case QVariant::UInt: + case QVariant::LongLong: + case QVariant::ULongLong: { + QVariant tmp = value; + if (!tmp.convert(aDefault.type())) { + tmp = aDefault; } - case QVariant::Point: { - const QList<int> list = asIntList(value); - - if ( list.count() != 2 ) { - qWarning() << errString( pKey, value, aDefault ) - << formatError( 2, list.count() ); - return aDefault; - } - return QPoint(list.at( 0 ), list.at( 1 )); + return tmp; + } + case QVariant::Point: { + const QList<int> list = asIntList(value); + + if (list.count() != 2) { + qWarning() << errString(pKey, value, aDefault) + << formatError(2, list.count()); + return aDefault; } - case QVariant::PointF: { - const QList<qreal> list = asRealList(value); - - if ( list.count() != 2 ) { - qWarning() << errString( pKey, value, aDefault ) - << formatError( 2, list.count() ); - return aDefault; - } - return QPointF(list.at( 0 ), list.at( 1 )); + return QPoint(list.at(0), list.at(1)); + } + case QVariant::PointF: { + const QList<qreal> list = asRealList(value); + + if (list.count() != 2) { + qWarning() << errString(pKey, value, aDefault) + << formatError(2, list.count()); + return aDefault; } - case QVariant::Rect: { - const QList<int> list = asIntList(value); - - if ( list.count() != 4 ) { - qWarning() << errString( pKey, value, aDefault ) - << formatError( 4, list.count() ); - return aDefault; - } - const QRect rect(list.at( 0 ), list.at( 1 ), list.at( 2 ), list.at( 3 )); - if ( !rect.isValid() ) { - qWarning() << errString( pKey, value, aDefault ); - return aDefault; - } - return rect; + return QPointF(list.at(0), list.at(1)); + } + case QVariant::Rect: { + const QList<int> list = asIntList(value); + + if (list.count() != 4) { + qWarning() << errString(pKey, value, aDefault) + << formatError(4, list.count()); + return aDefault; } - case QVariant::RectF: { - const QList<qreal> list = asRealList(value); - - if ( list.count() != 4 ) { - qWarning() << errString( pKey, value, aDefault ) - << formatError( 4, list.count() ); - return aDefault; - } - const QRectF rect(list.at( 0 ), list.at( 1 ), list.at( 2 ), list.at( 3 )); - if ( !rect.isValid() ) { - qWarning() << errString( pKey, value, aDefault ); - return aDefault; - } - return rect; + const QRect rect(list.at(0), list.at(1), list.at(2), list.at(3)); + if (!rect.isValid()) { + qWarning() << errString(pKey, value, aDefault); + return aDefault; } - case QVariant::Size: { - const QList<int> list = asIntList(value); - - if ( list.count() != 2 ) { - qWarning() << errString( pKey, value, aDefault ) - << formatError( 2, list.count() ); - return aDefault; - } - const QSize size(list.at( 0 ), list.at( 1 )); - if ( !size.isValid() ) { - qWarning() << errString( pKey, value, aDefault ); - return aDefault; - } - return size; + return rect; + } + case QVariant::RectF: { + const QList<qreal> list = asRealList(value); + + if (list.count() != 4) { + qWarning() << errString(pKey, value, aDefault) + << formatError(4, list.count()); + return aDefault; } - case QVariant::SizeF: { - const QList<qreal> list = asRealList(value); - - if ( list.count() != 2 ) { - qWarning() << errString( pKey, value, aDefault ) - << formatError( 2, list.count() ); - return aDefault; - } - const QSizeF size(list.at( 0 ), list.at( 1 )); - if ( !size.isValid() ) { - qWarning() << errString( pKey, value, aDefault ); - return aDefault; - } - return size; + const QRectF rect(list.at(0), list.at(1), list.at(2), list.at(3)); + if (!rect.isValid()) { + qWarning() << errString(pKey, value, aDefault); + return aDefault; } - case QVariant::DateTime: { - const QList<int> list = asIntList(value); - if ( list.count() != 6 ) { - qWarning() << errString( pKey, value, aDefault ) - << formatError( 6, list.count() ); - return aDefault; - } - const QDate date( list.at( 0 ), list.at( 1 ), list.at( 2 ) ); - const QTime time( list.at( 3 ), list.at( 4 ), list.at( 5 ) ); - const QDateTime dt( date, time ); - if ( !dt.isValid() ) { - qWarning() << errString( pKey, value, aDefault ); - return aDefault; - } - return dt; + return rect; + } + case QVariant::Size: { + const QList<int> list = asIntList(value); + + if (list.count() != 2) { + qWarning() << errString(pKey, value, aDefault) + << formatError(2, list.count()); + return aDefault; } - case QVariant::Date: { - QList<int> list = asIntList(value); - if ( list.count() == 6 ) - list = list.mid(0, 3); // don't break config files that stored QDate as QDateTime - if ( list.count() != 3 ) { - qWarning() << errString( pKey, value, aDefault ) - << formatError( 3, list.count() ); - return aDefault; - } - const QDate date( list.at( 0 ), list.at( 1 ), list.at( 2 ) ); - if ( !date.isValid() ) { - qWarning() << errString( pKey, value, aDefault ); - return aDefault; - } - return date; + const QSize size(list.at(0), list.at(1)); + if (!size.isValid()) { + qWarning() << errString(pKey, value, aDefault); + return aDefault; } - case QVariant::Color: - case QVariant::Font: - qWarning() << "KConfigGroup::readEntry was passed GUI type '" - << aDefault.typeName() - << "' but kdeui isn't linked! If it is linked to your program, " - "this is a platform bug. Please inform the KDE developers"; - break; - case QVariant::Url: - return QUrl(QString::fromUtf8(value)); + return size; + } + case QVariant::SizeF: { + const QList<qreal> list = asRealList(value); - default: - break; + if (list.count() != 2) { + qWarning() << errString(pKey, value, aDefault) + << formatError(2, list.count()); + return aDefault; + } + const QSizeF size(list.at(0), list.at(1)); + if (!size.isValid()) { + qWarning() << errString(pKey, value, aDefault); + return aDefault; + } + return size; + } + case QVariant::DateTime: { + const QList<int> list = asIntList(value); + if (list.count() != 6) { + qWarning() << errString(pKey, value, aDefault) + << formatError(6, list.count()); + return aDefault; + } + const QDate date(list.at(0), list.at(1), list.at(2)); + const QTime time(list.at(3), list.at(4), list.at(5)); + const QDateTime dt(date, time); + if (!dt.isValid()) { + qWarning() << errString(pKey, value, aDefault); + return aDefault; + } + return dt; + } + case QVariant::Date: { + QList<int> list = asIntList(value); + if (list.count() == 6) { + list = list.mid(0, 3); // don't break config files that stored QDate as QDateTime + } + if (list.count() != 3) { + qWarning() << errString(pKey, value, aDefault) + << formatError(3, list.count()); + return aDefault; + } + const QDate date(list.at(0), list.at(1), list.at(2)); + if (!date.isValid()) { + qWarning() << errString(pKey, value, aDefault); + return aDefault; + } + return date; + } + case QVariant::Color: + case QVariant::Font: + qWarning() << "KConfigGroup::readEntry was passed GUI type '" + << aDefault.typeName() + << "' but kdeui isn't linked! If it is linked to your program, " + "this is a platform bug. Please inform the KDE developers"; + break; + case QVariant::Url: + return QUrl(QString::fromUtf8(value)); + + default: + break; } qWarning() << "unhandled type " << aDefault.typeName(); @@ -373,68 +388,75 @@ QVariant KConfigGroup::convertToQVariant(const char *pKey, const QByteArray& val # include <QtCore/QDir> #endif -static bool cleanHomeDirPath( QString &path, const QString &homeDir ) +static bool cleanHomeDirPath(QString &path, const QString &homeDir) { #ifdef Q_OS_WIN //safer - if (!QDir::toNativeSeparators(path).startsWith(QDir::toNativeSeparators(homeDir))) + if (!QDir::toNativeSeparators(path).startsWith(QDir::toNativeSeparators(homeDir))) { return false; + } #else - if (!path.startsWith(homeDir)) + if (!path.startsWith(homeDir)) { return false; + } #endif - int len = homeDir.length(); - // replace by "$HOME" if possible - if (len && (path.length() == len || path[len] == QLatin1Char('/'))) { + int len = homeDir.length(); + // replace by "$HOME" if possible + if (len && (path.length() == len || path[len] == QLatin1Char('/'))) { path.replace(0, len, QString::fromLatin1("$HOME")); return true; - } else + } else { return false; + } } -static QString translatePath( QString path ) // krazy:exclude=passbyvalue +static QString translatePath(QString path) // krazy:exclude=passbyvalue { - if (path.isEmpty()) - return path; + if (path.isEmpty()) { + return path; + } - // only "our" $HOME should be interpreted - path.replace(QLatin1Char('$'), QLatin1String("$$")); + // only "our" $HOME should be interpreted + path.replace(QLatin1Char('$'), QLatin1String("$$")); - bool startsWithFile = path.startsWith(QLatin1String("file:"), Qt::CaseInsensitive); + bool startsWithFile = path.startsWith(QLatin1String("file:"), Qt::CaseInsensitive); - // return original path, if it refers to another type of URL (e.g. http:/), or - // if the path is already relative to another directory - if ((!startsWithFile && QFileInfo(path).isRelative()) || - (startsWithFile && QFileInfo(path.mid(5)).isRelative())) - return path; + // return original path, if it refers to another type of URL (e.g. http:/), or + // if the path is already relative to another directory + if ((!startsWithFile && QFileInfo(path).isRelative()) || + (startsWithFile && QFileInfo(path.mid(5)).isRelative())) { + return path; + } - if (startsWithFile) - path.remove(0,5); // strip leading "file:/" off the string + if (startsWithFile) { + path.remove(0, 5); // strip leading "file:/" off the string + } - // keep only one single '/' at the beginning - needed for cleanHomeDirPath() - while (path[0] == QLatin1Char('/') && path[1] == QLatin1Char('/')) - path.remove(0,1); + // keep only one single '/' at the beginning - needed for cleanHomeDirPath() + while (path[0] == QLatin1Char('/') && path[1] == QLatin1Char('/')) { + path.remove(0, 1); + } - // we can not use KGlobal::dirs()->relativeLocation("home", path) here, - // since it would not recognize paths without a trailing '/'. - // All of the 3 following functions to return the user's home directory - // can return different paths. We have to test all them. - const QString homeDir0 = QFile::decodeName(qgetenv("HOME")); - const QString homeDir1 = QDir::homePath(); - const QString homeDir2 = QDir(homeDir1).canonicalPath(); - if (cleanHomeDirPath(path, homeDir0) || - cleanHomeDirPath(path, homeDir1) || - cleanHomeDirPath(path, homeDir2) ) { - // qDebug() << "Path was replaced\n"; - } + // we can not use KGlobal::dirs()->relativeLocation("home", path) here, + // since it would not recognize paths without a trailing '/'. + // All of the 3 following functions to return the user's home directory + // can return different paths. We have to test all them. + const QString homeDir0 = QFile::decodeName(qgetenv("HOME")); + const QString homeDir1 = QDir::homePath(); + const QString homeDir2 = QDir(homeDir1).canonicalPath(); + if (cleanHomeDirPath(path, homeDir0) || + cleanHomeDirPath(path, homeDir1) || + cleanHomeDirPath(path, homeDir2)) { + // qDebug() << "Path was replaced\n"; + } - if (startsWithFile) - path.prepend(QString::fromLatin1("file://")); + if (startsWithFile) { + path.prepend(QString::fromLatin1("file://")); + } - return path; + return path; } - KConfigGroup::KConfigGroup() : d(0) { } @@ -445,20 +467,22 @@ bool KConfigGroup::isValid() const } KConfigGroupGui _kde_internal_KConfigGroupGui; -static inline bool readEntryGui(const QByteArray& data, const char* key, const QVariant &input, +static inline bool readEntryGui(const QByteArray &data, const char *key, const QVariant &input, QVariant &output) { - if (_kde_internal_KConfigGroupGui.readEntryGui) - return _kde_internal_KConfigGroupGui.readEntryGui(data, key, input, output); - return false; + if (_kde_internal_KConfigGroupGui.readEntryGui) { + return _kde_internal_KConfigGroupGui.readEntryGui(data, key, input, output); + } + return false; } -static inline bool writeEntryGui(KConfigGroup *cg, const char* key, const QVariant &input, +static inline bool writeEntryGui(KConfigGroup *cg, const char *key, const QVariant &input, KConfigGroup::WriteConfigFlags flags) { - if (_kde_internal_KConfigGroupGui.writeEntryGui) - return _kde_internal_KConfigGroupGui.writeEntryGui(cg, key, input, flags); - return false; + if (_kde_internal_KConfigGroupGui.writeEntryGui) { + return _kde_internal_KConfigGroupGui.writeEntryGui(cg, key, input, flags); + } + return false; } KConfigGroup::KConfigGroup(KConfigBase *master, const QString &_group) @@ -467,17 +491,17 @@ KConfigGroup::KConfigGroup(KConfigBase *master, const QString &_group) } KConfigGroup::KConfigGroup(KConfigBase *master, const char *_group) - : d(KConfigGroupPrivate::create(master, _group, master->isGroupImmutable(_group), false)) + : d(KConfigGroupPrivate::create(master, _group, master->isGroupImmutable(_group), false)) { } KConfigGroup::KConfigGroup(const KConfigBase *master, const QString &_group) - : d(KConfigGroupPrivate::create(const_cast<KConfigBase*>(master), _group.toUtf8(), master->isGroupImmutable(_group), true)) + : d(KConfigGroupPrivate::create(const_cast<KConfigBase *>(master), _group.toUtf8(), master->isGroupImmutable(_group), true)) { } -KConfigGroup::KConfigGroup(const KConfigBase *master, const char * _group) - : d(KConfigGroupPrivate::create(const_cast<KConfigBase*>(master), _group, master->isGroupImmutable(_group), true)) +KConfigGroup::KConfigGroup(const KConfigBase *master, const char *_group) + : d(KConfigGroupPrivate::create(const_cast<KConfigBase *>(master), _group, master->isGroupImmutable(_group), true)) { } @@ -486,7 +510,7 @@ KConfigGroup::KConfigGroup(const KSharedConfigPtr &master, const QString &_group { } -KConfigGroup::KConfigGroup(const KSharedConfigPtr &master, const char * _group) +KConfigGroup::KConfigGroup(const KSharedConfigPtr &master, const char *_group) : d(new KConfigGroupPrivate(master, _group)) { } @@ -507,7 +531,7 @@ KConfigGroup::~KConfigGroup() d = 0; } -KConfigGroup KConfigGroup::groupImpl(const QByteArray& aGroup) +KConfigGroup KConfigGroup::groupImpl(const QByteArray &aGroup) { Q_ASSERT_X(isValid(), "KConfigGroup::groupImpl", "accessing an invalid group"); Q_ASSERT_X(!aGroup.isEmpty(), "KConfigGroup::groupImpl", "can not have an unnamed child group"); @@ -519,14 +543,14 @@ KConfigGroup KConfigGroup::groupImpl(const QByteArray& aGroup) return newGroup; } -const KConfigGroup KConfigGroup::groupImpl(const QByteArray& aGroup) const +const KConfigGroup KConfigGroup::groupImpl(const QByteArray &aGroup) const { Q_ASSERT_X(isValid(), "KConfigGroup::groupImpl", "accessing an invalid group"); Q_ASSERT_X(!aGroup.isEmpty(), "KConfigGroup::groupImpl", "can not have an unnamed child group"); KConfigGroup newGroup; - newGroup.d = new KConfigGroupPrivate(const_cast<KConfigGroup*>(this), isGroupImmutableImpl(aGroup), + newGroup.d = new KConfigGroupPrivate(const_cast<KConfigGroup *>(this), isGroupImmutableImpl(aGroup), true, aGroup); return newGroup; @@ -558,7 +582,7 @@ void KConfigGroup::deleteGroup(WriteConfigFlags flags) } #ifndef KDE_NO_DEPRECATED -void KConfigGroup::changeGroup( const QString &group ) +void KConfigGroup::changeGroup(const QString &group) { Q_ASSERT_X(isValid(), "KConfigGroup::changeGroup", "accessing an invalid group"); d.detach(); @@ -567,7 +591,7 @@ void KConfigGroup::changeGroup( const QString &group ) #endif #ifndef KDE_NO_DEPRECATED -void KConfigGroup::changeGroup( const char *group ) +void KConfigGroup::changeGroup(const char *group) { Q_ASSERT_X(isValid(), "KConfigGroup::changeGroup", "accessing an invalid group"); d.detach(); @@ -586,15 +610,16 @@ bool KConfigGroup::exists() const { Q_ASSERT_X(isValid(), "KConfigGroup::exists", "accessing an invalid group"); - return config()->hasGroup( d->fullName() ); + return config()->hasGroup(d->fullName()); } bool KConfigGroup::sync() { Q_ASSERT_X(isValid(), "KConfigGroup::sync", "accessing an invalid group"); - if (!d->bConst) + if (!d->bConst) { return config()->sync(); + } return false; } @@ -606,59 +631,60 @@ QMap<QString, QString> KConfigGroup::entryMap() const return config()->entryMap(QString::fromUtf8(d->fullName())); } -KConfig* KConfigGroup::config() +KConfig *KConfigGroup::config() { Q_ASSERT_X(isValid(), "KConfigGroup::config", "accessing an invalid group"); return d->mOwner; } -const KConfig* KConfigGroup::config() const +const KConfig *KConfigGroup::config() const { Q_ASSERT_X(isValid(), "KConfigGroup::config", "accessing an invalid group"); return d->mOwner; } -bool KConfigGroup::isEntryImmutable(const char* key) const +bool KConfigGroup::isEntryImmutable(const char *key) const { Q_ASSERT_X(isValid(), "KConfigGroup::isEntryImmutable", "accessing an invalid group"); return (isImmutable() || - !config()->d_func()->canWriteEntry(d->fullName(), key, config()->readDefaults())); + !config()->d_func()->canWriteEntry(d->fullName(), key, config()->readDefaults())); } -bool KConfigGroup::isEntryImmutable(const QString& key) const +bool KConfigGroup::isEntryImmutable(const QString &key) const { return isEntryImmutable(key.toUtf8().constData()); } -QString KConfigGroup::readEntryUntranslated(const QString& pKey, const QString& aDefault) const +QString KConfigGroup::readEntryUntranslated(const QString &pKey, const QString &aDefault) const { return readEntryUntranslated(pKey.toUtf8().constData(), aDefault); } -QString KConfigGroup::readEntryUntranslated(const char *key, const QString& aDefault) const +QString KConfigGroup::readEntryUntranslated(const char *key, const QString &aDefault) const { Q_ASSERT_X(isValid(), "KConfigGroup::readEntryUntranslated", "accessing an invalid group"); QString result = config()->d_func()->lookupData(d->fullName(), key, KEntryMap::SearchFlags(), 0); - if (result.isNull()) + if (result.isNull()) { return aDefault; + } return result; } -QString KConfigGroup::readEntry(const char *key, const char* aDefault) const +QString KConfigGroup::readEntry(const char *key, const char *aDefault) const { return readEntry(key, QString::fromUtf8(aDefault)); } -QString KConfigGroup::readEntry(const QString &key, const char* aDefault) const +QString KConfigGroup::readEntry(const QString &key, const char *aDefault) const { return readEntry(key.toUtf8().constData(), aDefault); } -QString KConfigGroup::readEntry(const char* key, const QString& aDefault) const +QString KConfigGroup::readEntry(const char *key, const QString &aDefault) const { Q_ASSERT_X(isValid(), "KConfigGroup::readEntry", "accessing an invalid group"); @@ -666,89 +692,97 @@ QString KConfigGroup::readEntry(const char* key, const QString& aDefault) const // read value from the entry map QString aValue = config()->d_func()->lookupData(d->fullName(), key, KEntryMap::SearchLocalized, - &expand); - if (aValue.isNull()) + &expand); + if (aValue.isNull()) { aValue = aDefault; + } - if (expand) + if (expand) { return KConfigPrivate::expandString(aValue); + } return aValue; } -QString KConfigGroup::readEntry(const QString &key, const QString& aDefault) const +QString KConfigGroup::readEntry(const QString &key, const QString &aDefault) const { return readEntry(key.toUtf8().constData(), aDefault); } -QStringList KConfigGroup::readEntry(const char* key, const QStringList& aDefault) const +QStringList KConfigGroup::readEntry(const char *key, const QStringList &aDefault) const { Q_ASSERT_X(isValid(), "KConfigGroup::readEntry", "accessing an invalid group"); const QString data = readEntry(key, QString()); - if (data.isNull()) + if (data.isNull()) { return aDefault; + } return KConfigGroupPrivate::deserializeList(data); } -QStringList KConfigGroup::readEntry( const QString& key, const QStringList& aDefault) const +QStringList KConfigGroup::readEntry(const QString &key, const QStringList &aDefault) const { - return readEntry( key.toUtf8().constData(), aDefault ); + return readEntry(key.toUtf8().constData(), aDefault); } -QVariant KConfigGroup::readEntry( const char* key, const QVariant &aDefault ) const +QVariant KConfigGroup::readEntry(const char *key, const QVariant &aDefault) const { Q_ASSERT_X(isValid(), "KConfigGroup::readEntry", "accessing an invalid group"); const QByteArray data = config()->d_func()->lookupData(d->fullName(), key, KEntryMap::SearchLocalized); - if (data.isNull()) + if (data.isNull()) { return aDefault; + } QVariant value; - if (!readEntryGui( data, key, aDefault, value )) + if (!readEntryGui(data, key, aDefault, value)) { return convertToQVariant(key, data, aDefault); + } return value; } -QVariant KConfigGroup::readEntry( const QString& key, const QVariant& aDefault) const +QVariant KConfigGroup::readEntry(const QString &key, const QVariant &aDefault) const { - return readEntry( key.toUtf8().constData(), aDefault ); + return readEntry(key.toUtf8().constData(), aDefault); } -QVariantList KConfigGroup::readEntry( const char* key, const QVariantList& aDefault) const +QVariantList KConfigGroup::readEntry(const char *key, const QVariantList &aDefault) const { Q_ASSERT_X(isValid(), "KConfigGroup::readEntry", "accessing an invalid group"); const QString data = readEntry(key, QString()); - if (data.isNull()) + if (data.isNull()) { return aDefault; + } QVariantList value; - Q_FOREACH(const QString& v, KConfigGroupPrivate::deserializeList(data)) + Q_FOREACH (const QString &v, KConfigGroupPrivate::deserializeList(data)) { value << v; + } return value; } -QVariantList KConfigGroup::readEntry( const QString& key, const QVariantList& aDefault) const +QVariantList KConfigGroup::readEntry(const QString &key, const QVariantList &aDefault) const { - return readEntry( key.toUtf8().constData(), aDefault ); + return readEntry(key.toUtf8().constData(), aDefault); } -QStringList KConfigGroup::readXdgListEntry(const QString& key, const QStringList& aDefault) const +QStringList KConfigGroup::readXdgListEntry(const QString &key, const QStringList &aDefault) const { return readXdgListEntry(key.toUtf8().constData(), aDefault); } -QStringList KConfigGroup::readXdgListEntry(const char *key, const QStringList& aDefault) const +QStringList KConfigGroup::readXdgListEntry(const char *key, const QStringList &aDefault) const { Q_ASSERT_X(isValid(), "KConfigGroup::readXdgListEntry", "accessing an invalid group"); const QString data = readEntry(key, QString()); - if (data.isNull()) + if (data.isNull()) { return aDefault; + } QStringList value; QString val; @@ -777,42 +811,44 @@ QStringList KConfigGroup::readXdgListEntry(const char *key, const QStringList& a return value; } -QString KConfigGroup::readPathEntry(const QString& pKey, const QString & aDefault) const +QString KConfigGroup::readPathEntry(const QString &pKey, const QString &aDefault) const { return readPathEntry(pKey.toUtf8().constData(), aDefault); } -QString KConfigGroup::readPathEntry(const char *key, const QString & aDefault) const +QString KConfigGroup::readPathEntry(const char *key, const QString &aDefault) const { Q_ASSERT_X(isValid(), "KConfigGroup::readPathEntry", "accessing an invalid group"); bool expand = false; QString aValue = config()->d_func()->lookupData(d->fullName(), key, KEntryMap::SearchLocalized, - &expand); - if (aValue.isNull()) + &expand); + if (aValue.isNull()) { aValue = aDefault; + } return KConfigPrivate::expandString(aValue); } -QStringList KConfigGroup::readPathEntry(const QString& pKey, const QStringList& aDefault) const +QStringList KConfigGroup::readPathEntry(const QString &pKey, const QStringList &aDefault) const { return readPathEntry(pKey.toUtf8().constData(), aDefault); } -QStringList KConfigGroup::readPathEntry(const char *key, const QStringList& aDefault) const +QStringList KConfigGroup::readPathEntry(const char *key, const QStringList &aDefault) const { Q_ASSERT_X(isValid(), "KConfigGroup::readPathEntry", "accessing an invalid group"); const QString data = readPathEntry(key, QString()); - if (data.isNull()) + if (data.isNull()) { return aDefault; + } return KConfigGroupPrivate::deserializeList(data); } -void KConfigGroup::writeEntry( const char* key, const QString& value, WriteConfigFlags flags ) +void KConfigGroup::writeEntry(const char *key, const QString &value, WriteConfigFlags flags) { Q_ASSERT_X(isValid(), "KConfigGroup::writeEntry", "accessing an invalid group"); Q_ASSERT_X(!d->bConst, "KConfigGroup::writeEntry", "writing to a read-only group"); @@ -820,7 +856,7 @@ void KConfigGroup::writeEntry( const char* key, const QString& value, WriteConfi writeEntry(key, value.toUtf8(), flags); } -void KConfigGroup::writeEntry( const QString& key, const QString& value, WriteConfigFlags flags ) +void KConfigGroup::writeEntry(const QString &key, const QString &value, WriteConfigFlags flags) { writeEntry(key.toUtf8().constData(), value, flags); } @@ -838,209 +874,212 @@ void KConfigGroup::writeEntry(const char *key, const char *value, WriteConfigFla writeEntry(key, QVariant(QString::fromLatin1(value)), pFlags); } -void KConfigGroup::writeEntry( const char* key, const QByteArray& value, - WriteConfigFlags flags ) +void KConfigGroup::writeEntry(const char *key, const QByteArray &value, + WriteConfigFlags flags) { Q_ASSERT_X(isValid(), "KConfigGroup::writeEntry", "accessing an invalid group"); Q_ASSERT_X(!d->bConst, "KConfigGroup::writeEntry", "writing to a read-only group"); - config()->d_func()->putData(d->fullName(), key, value.isNull()? QByteArray(""): value, flags); + config()->d_func()->putData(d->fullName(), key, value.isNull() ? QByteArray("") : value, flags); } -void KConfigGroup::writeEntry(const QString& key, const QByteArray& value, +void KConfigGroup::writeEntry(const QString &key, const QByteArray &value, WriteConfigFlags pFlags) { writeEntry(key.toUtf8().constData(), value, pFlags); } -void KConfigGroup::writeEntry(const char* key, const QStringList &list, WriteConfigFlags flags) +void KConfigGroup::writeEntry(const char *key, const QStringList &list, WriteConfigFlags flags) { Q_ASSERT_X(isValid(), "KConfigGroup::writeEntry", "accessing an invalid group"); Q_ASSERT_X(!d->bConst, "KConfigGroup::writeEntry", "writing to a read-only group"); QList<QByteArray> balist; - Q_FOREACH(const QString &entry, list) + Q_FOREACH (const QString &entry, list) { balist.append(entry.toUtf8()); + } writeEntry(key, KConfigGroupPrivate::serializeList(balist), flags); } -void KConfigGroup::writeEntry(const QString& key, const QStringList &list, WriteConfigFlags flags) +void KConfigGroup::writeEntry(const QString &key, const QStringList &list, WriteConfigFlags flags) { writeEntry(key.toUtf8().constData(), list, flags); } -void KConfigGroup::writeEntry( const char* key, const QVariantList& list, WriteConfigFlags flags ) +void KConfigGroup::writeEntry(const char *key, const QVariantList &list, WriteConfigFlags flags) { Q_ASSERT_X(isValid(), "KConfigGroup::writeEntry", "accessing an invalid group"); Q_ASSERT_X(!d->bConst, "KConfigGroup::writeEntry", "writing to a read-only group"); QList<QByteArray> data; - Q_FOREACH(const QVariant& v, list) { - if (v.type() == QVariant::ByteArray) + Q_FOREACH (const QVariant &v, list) { + if (v.type() == QVariant::ByteArray) { data << v.toByteArray(); - else + } else { data << v.toString().toUtf8(); + } } writeEntry(key, KConfigGroupPrivate::serializeList(data), flags); } -void KConfigGroup::writeEntry( const char* key, const QVariant &value, - WriteConfigFlags flags ) +void KConfigGroup::writeEntry(const char *key, const QVariant &value, + WriteConfigFlags flags) { Q_ASSERT_X(isValid(), "KConfigGroup::writeEntry", "accessing an invalid group"); Q_ASSERT_X(!d->bConst, "KConfigGroup::writeEntry", "writing to a read-only group"); - if ( writeEntryGui( this, key, value, flags ) ) - return; // GUI type that was handled + if (writeEntryGui(this, key, value, flags)) { + return; // GUI type that was handled + } QByteArray data; // if a type handler is added here you must add a QVConversions definition // to conversion_check.h, or ConversionCheck::to_QVariant will not allow // writeEntry<T> to convert to QVariant. - switch( value.type() ) { - case QVariant::Invalid: - data = ""; - break; - case QVariant::ByteArray: - data = value.toByteArray(); - break; - case QVariant::String: - case QVariant::Int: - case QVariant::UInt: - case QVariant::Double: - case QMetaType::Float: - case QVariant::Bool: - case QVariant::LongLong: - case QVariant::ULongLong: - data = value.toString().toUtf8(); - break; - case QVariant::List: - if (!value.canConvert(QVariant::StringList)) - qWarning() << "not all types in \"" << key << "\" can convert to QString," - " information will be lost"; - case QVariant::StringList: - writeEntry( key, value.toList(), flags ); - return; - case QVariant::Point: { - QVariantList list; - const QPoint rPoint = value.toPoint(); - list.insert( 0, rPoint.x() ); - list.insert( 1, rPoint.y() ); - - writeEntry( key, list, flags ); - return; - } - case QVariant::PointF: { - QVariantList list; - const QPointF point = value.toPointF(); - list.insert( 0, point.x() ); - list.insert( 1, point.y() ); - - writeEntry( key, list, flags ); - return; - } - case QVariant::Rect:{ - QVariantList list; - const QRect rRect = value.toRect(); - list.insert( 0, rRect.left() ); - list.insert( 1, rRect.top() ); - list.insert( 2, rRect.width() ); - list.insert( 3, rRect.height() ); - - writeEntry( key, list, flags ); - return; - } - case QVariant::RectF:{ - QVariantList list; - const QRectF rRectF = value.toRectF(); - list.insert(0, rRectF.left()); - list.insert(1, rRectF.top()); - list.insert(2, rRectF.width()); - list.insert(3, rRectF.height()); - - writeEntry(key, list, flags); - return; - } - case QVariant::Size:{ - QVariantList list; - const QSize rSize = value.toSize(); - list.insert( 0, rSize.width() ); - list.insert( 1, rSize.height() ); - - writeEntry( key, list, flags ); - return; - } - case QVariant::SizeF:{ - QVariantList list; - const QSizeF rSizeF = value.toSizeF(); - list.insert(0, rSizeF.width()); - list.insert(1, rSizeF.height()); - - writeEntry(key, list, flags); - return; - } - case QVariant::Date: { - QVariantList list; - const QDate date = value.toDate(); + switch (value.type()) { + case QVariant::Invalid: + data = ""; + break; + case QVariant::ByteArray: + data = value.toByteArray(); + break; + case QVariant::String: + case QVariant::Int: + case QVariant::UInt: + case QVariant::Double: + case QMetaType::Float: + case QVariant::Bool: + case QVariant::LongLong: + case QVariant::ULongLong: + data = value.toString().toUtf8(); + break; + case QVariant::List: + if (!value.canConvert(QVariant::StringList)) + qWarning() << "not all types in \"" << key << "\" can convert to QString," + " information will be lost"; + case QVariant::StringList: + writeEntry(key, value.toList(), flags); + return; + case QVariant::Point: { + QVariantList list; + const QPoint rPoint = value.toPoint(); + list.insert(0, rPoint.x()); + list.insert(1, rPoint.y()); + + writeEntry(key, list, flags); + return; + } + case QVariant::PointF: { + QVariantList list; + const QPointF point = value.toPointF(); + list.insert(0, point.x()); + list.insert(1, point.y()); + + writeEntry(key, list, flags); + return; + } + case QVariant::Rect: { + QVariantList list; + const QRect rRect = value.toRect(); + list.insert(0, rRect.left()); + list.insert(1, rRect.top()); + list.insert(2, rRect.width()); + list.insert(3, rRect.height()); + + writeEntry(key, list, flags); + return; + } + case QVariant::RectF: { + QVariantList list; + const QRectF rRectF = value.toRectF(); + list.insert(0, rRectF.left()); + list.insert(1, rRectF.top()); + list.insert(2, rRectF.width()); + list.insert(3, rRectF.height()); + + writeEntry(key, list, flags); + return; + } + case QVariant::Size: { + QVariantList list; + const QSize rSize = value.toSize(); + list.insert(0, rSize.width()); + list.insert(1, rSize.height()); + + writeEntry(key, list, flags); + return; + } + case QVariant::SizeF: { + QVariantList list; + const QSizeF rSizeF = value.toSizeF(); + list.insert(0, rSizeF.width()); + list.insert(1, rSizeF.height()); + + writeEntry(key, list, flags); + return; + } + case QVariant::Date: { + QVariantList list; + const QDate date = value.toDate(); - list.insert( 0, date.year() ); - list.insert( 1, date.month() ); - list.insert( 2, date.day() ); + list.insert(0, date.year()); + list.insert(1, date.month()); + list.insert(2, date.day()); - writeEntry( key, list, flags ); - return; - } - case QVariant::DateTime: { - QVariantList list; - const QDateTime rDateTime = value.toDateTime(); + writeEntry(key, list, flags); + return; + } + case QVariant::DateTime: { + QVariantList list; + const QDateTime rDateTime = value.toDateTime(); - const QTime time = rDateTime.time(); - const QDate date = rDateTime.date(); + const QTime time = rDateTime.time(); + const QDate date = rDateTime.date(); - list.insert( 0, date.year() ); - list.insert( 1, date.month() ); - list.insert( 2, date.day() ); + list.insert(0, date.year()); + list.insert(1, date.month()); + list.insert(2, date.day()); - list.insert( 3, time.hour() ); - list.insert( 4, time.minute() ); - list.insert( 5, time.second() ); + list.insert(3, time.hour()); + list.insert(4, time.minute()); + list.insert(5, time.second()); - writeEntry( key, list, flags ); - return; - } + writeEntry(key, list, flags); + return; + } - case QVariant::Color: - case QVariant::Font: - qWarning() << "KConfigGroup::writeEntry was passed GUI type '" - << value.typeName() - << "' but kdeui isn't linked! If it is linked to your program, this is a platform bug. " - "Please inform the KDE developers"; - break; - case QVariant::Url: - data = QUrl(value.toUrl()).toString().toUtf8(); - break; - default: - qWarning() << "KConfigGroup::writeEntry - unhandled type" << value.typeName() << "in group" << name(); - } + case QVariant::Color: + case QVariant::Font: + qWarning() << "KConfigGroup::writeEntry was passed GUI type '" + << value.typeName() + << "' but kdeui isn't linked! If it is linked to your program, this is a platform bug. " + "Please inform the KDE developers"; + break; + case QVariant::Url: + data = QUrl(value.toUrl()).toString().toUtf8(); + break; + default: + qWarning() << "KConfigGroup::writeEntry - unhandled type" << value.typeName() << "in group" << name(); + } writeEntry(key, data, flags); } -void KConfigGroup::writeEntry( const QString& key, const QVariant& value, WriteConfigFlags flags ) +void KConfigGroup::writeEntry(const QString &key, const QVariant &value, WriteConfigFlags flags) { writeEntry(key.toUtf8().constData(), value, flags); } -void KConfigGroup::writeEntry(const QString& key, const QVariantList &list, WriteConfigFlags flags) +void KConfigGroup::writeEntry(const QString &key, const QVariantList &list, WriteConfigFlags flags) { writeEntry(key.toUtf8().constData(), list, flags); } -void KConfigGroup::writeXdgListEntry(const QString& key, const QStringList &value, WriteConfigFlags pFlags) +void KConfigGroup::writeXdgListEntry(const QString &key, const QStringList &value, WriteConfigFlags pFlags) { writeXdgListEntry(key.toUtf8().constData(), value, pFlags); } @@ -1067,12 +1106,12 @@ void KConfigGroup::writeXdgListEntry(const char *key, const QStringList &list, W writeEntry(key, value, flags); } -void KConfigGroup::writePathEntry(const QString& pKey, const QString & path, WriteConfigFlags pFlags) +void KConfigGroup::writePathEntry(const QString &pKey, const QString &path, WriteConfigFlags pFlags) { writePathEntry(pKey.toUtf8().constData(), path, pFlags); } -void KConfigGroup::writePathEntry(const char *pKey, const QString & path, WriteConfigFlags pFlags) +void KConfigGroup::writePathEntry(const char *pKey, const QString &path, WriteConfigFlags pFlags) { Q_ASSERT_X(isValid(), "KConfigGroup::writePathEntry", "accessing an invalid group"); Q_ASSERT_X(!d->bConst, "KConfigGroup::writePathEntry", "writing to a read-only group"); @@ -1080,7 +1119,7 @@ void KConfigGroup::writePathEntry(const char *pKey, const QString & path, WriteC config()->d_func()->putData(d->fullName(), pKey, translatePath(path).toUtf8(), pFlags, true); } -void KConfigGroup::writePathEntry(const QString& pKey, const QStringList &value, WriteConfigFlags pFlags) +void KConfigGroup::writePathEntry(const QString &pKey, const QStringList &value, WriteConfigFlags pFlags) { writePathEntry(pKey.toUtf8().constData(), value, pFlags); } @@ -1091,13 +1130,14 @@ void KConfigGroup::writePathEntry(const char *pKey, const QStringList &value, Wr Q_ASSERT_X(!d->bConst, "KConfigGroup::writePathEntry", "writing to a read-only group"); QList<QByteArray> list; - Q_FOREACH(const QString& path, value) + Q_FOREACH (const QString &path, value) { list << translatePath(path).toUtf8(); + } config()->d_func()->putData(d->fullName(), pKey, KConfigGroupPrivate::serializeList(list), pFlags, true); } -void KConfigGroup::deleteEntry( const char *key, WriteConfigFlags flags) +void KConfigGroup::deleteEntry(const char *key, WriteConfigFlags flags) { Q_ASSERT_X(isValid(), "KConfigGroup::deleteEntry", "accessing an invalid group"); Q_ASSERT_X(!d->bConst, "KConfigGroup::deleteEntry", "deleting from a read-only group"); @@ -1105,7 +1145,7 @@ void KConfigGroup::deleteEntry( const char *key, WriteConfigFlags flags) config()->d_func()->putData(d->fullName(), key, QByteArray(), flags); } -void KConfigGroup::deleteEntry( const QString& key, WriteConfigFlags flags) +void KConfigGroup::deleteEntry(const QString &key, WriteConfigFlags flags) { deleteEntry(key.toUtf8().constData(), flags); } @@ -1127,7 +1167,7 @@ bool KConfigGroup::hasDefault(const char *key) const { Q_ASSERT_X(isValid(), "KConfigGroup::hasDefault", "accessing an invalid group"); - KEntryMap::SearchFlags flags = KEntryMap::SearchDefaults|KEntryMap::SearchLocalized; + KEntryMap::SearchFlags flags = KEntryMap::SearchDefaults | KEntryMap::SearchLocalized; return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); } @@ -1142,15 +1182,16 @@ bool KConfigGroup::hasKey(const char *key) const Q_ASSERT_X(isValid(), "KConfigGroup::hasKey", "accessing an invalid group"); KEntryMap::SearchFlags flags = KEntryMap::SearchLocalized; - if ( config()->readDefaults() ) + if (config()->readDefaults()) { flags |= KEntryMap::SearchDefaults; + } return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); } bool KConfigGroup::hasKey(const QString &key) const { - return hasKey(key.toUtf8().constData()); + return hasKey(key.toUtf8().constData()); } bool KConfigGroup::isImmutable() const @@ -1188,7 +1229,7 @@ KConfigGroup::AccessMode KConfigGroup::accessMode() const return config()->accessMode(); } -bool KConfigGroup::hasGroupImpl(const QByteArray & b) const +bool KConfigGroup::hasGroupImpl(const QByteArray &b) const { Q_ASSERT_X(isValid(), "KConfigGroup::hasGroupImpl", "accessing an invalid group"); @@ -1198,29 +1239,30 @@ bool KConfigGroup::hasGroupImpl(const QByteArray & b) const void KConfigGroup::deleteGroupImpl(const QByteArray &b, WriteConfigFlags flags) { Q_ASSERT_X(isValid(), "KConfigGroup::deleteGroupImpl", "accessing an invalid group"); - Q_ASSERT_X(!d->bConst,"KConfigGroup::deleteGroupImpl", "deleting from a read-only group"); + Q_ASSERT_X(!d->bConst, "KConfigGroup::deleteGroupImpl", "deleting from a read-only group"); config()->deleteGroup(d->fullName(b), flags); } -bool KConfigGroup::isGroupImmutableImpl(const QByteArray& b) const +bool KConfigGroup::isGroupImmutableImpl(const QByteArray &b) const { Q_ASSERT_X(isValid(), "KConfigGroup::isGroupImmutableImpl", "accessing an invalid group"); - if (!hasGroupImpl(b)) // group doesn't exist yet - return d->bImmutable; // child groups are immutable if the parent is immutable. + if (!hasGroupImpl(b)) { // group doesn't exist yet + return d->bImmutable; // child groups are immutable if the parent is immutable. + } return config()->isGroupImmutable(d->fullName(b)); } -void KConfigGroup::copyTo(KConfigBase* other, WriteConfigFlags pFlags) const +void KConfigGroup::copyTo(KConfigBase *other, WriteConfigFlags pFlags) const { Q_ASSERT_X(isValid(), "KConfigGroup::copyTo", "accessing an invalid group"); Q_ASSERT(other != 0); - if (KConfigGroup *otherGroup = dynamic_cast<KConfigGroup*>(other)) { + if (KConfigGroup *otherGroup = dynamic_cast<KConfigGroup *>(other)) { config()->d_func()->copyGroup(d->fullName(), otherGroup->d->fullName(), otherGroup, pFlags); - } else if (KConfig* otherConfig = dynamic_cast<KConfig*>(other)) { + } else if (KConfig *otherConfig = dynamic_cast<KConfig *>(other)) { KConfigGroup newGroup = otherConfig->group(d->fullName()); otherConfig->d_func()->copyGroup(d->fullName(), d->fullName(), &newGroup, pFlags); } else { @@ -1228,7 +1270,7 @@ void KConfigGroup::copyTo(KConfigBase* other, WriteConfigFlags pFlags) const } } -void KConfigGroup::reparent(KConfigBase* parent, WriteConfigFlags pFlags) +void KConfigGroup::reparent(KConfigBase *parent, WriteConfigFlags pFlags) { Q_ASSERT_X(isValid(), "KConfigGroup::reparent", "accessing an invalid group"); Q_ASSERT_X(!d->bConst, "KConfigGroup::reparent", "reparenting a read-only group"); |