Code reformatted using kde-dev-scripts/astyle-kdelibs.

Use git blame -w 867e7a5 to show authorship as it was before this commit.

1 files changed, 42 insertions, 31 deletions

diff --git a/src/core/kconfig_p.h b/src/core/kconfig_p.h
index e6fb1ca0..b93c8167 100644
--- a/src/core/kconfig_p.h
+++ b/src/core/kconfig_p.h
@@ -40,27 +40,27 @@ public:
     KConfig::OpenFlags openFlags;
     QStandardPaths::StandardLocation resourceType;
 
-    void changeFileName(const QString& fileName);
+    void changeFileName(const QString &fileName);
 
     // functions for KConfigGroup
-    bool canWriteEntry(const QByteArray& group, const char* key, bool isDefault=false) const;
-    QString lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags,
-                       bool* expand) const;
-    QByteArray lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags) const;
-
-    void putData(const QByteArray& group, const char* key, const QByteArray& value,
-                 KConfigBase::WriteConfigFlags flags, bool expand=false);
-    void revertEntry(const QByteArray& group, const char* key);
-    QStringList groupList(const QByteArray& group) const;
+    bool canWriteEntry(const QByteArray &group, const char *key, bool isDefault = false) const;
+    QString lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags,
+                       bool *expand) const;
+    QByteArray lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags) const;
+
+    void putData(const QByteArray &group, const char *key, const QByteArray &value,
+                 KConfigBase::WriteConfigFlags flags, bool expand = false);
+    void revertEntry(const QByteArray &group, const char *key);
+    QStringList groupList(const QByteArray &group) const;
     // copies the entries from @p source to @p otherGroup changing all occurrences
     // of @p source with @p destination
-    void copyGroup(const QByteArray& source, const QByteArray& destination,
+    void copyGroup(const QByteArray &source, const QByteArray &destination,
                    KConfigGroup *otherGroup, KConfigBase::WriteConfigFlags flags) const;
-    QStringList keyListImpl(const QByteArray& theGroup) const;
-    QSet<QByteArray> allSubGroups(const QByteArray& parentGroup) const;
-    bool hasNonDeletedEntries(const QByteArray& group) const;
+    QStringList keyListImpl(const QByteArray &theGroup) const;
+    QSet<QByteArray> allSubGroups(const QByteArray &parentGroup) const;
+    bool hasNonDeletedEntries(const QByteArray &group) const;
 
-    static QString expandString(const QString& value);
+    static QString expandString(const QString &value);
 
 protected:
     QExplicitlySharedDataPointer<KConfigBackend> mBackend;
@@ -72,18 +72,17 @@ protected:
     {
     }
 
-    bool bDynamicBackend:1; // do we own the backend?
+    bool bDynamicBackend: 1; // do we own the backend?
 private:
-    bool bDirty:1;
-    bool bLocaleInitialized:1;
-    bool bReadDefaults:1;
-    bool bFileImmutable:1;
-    bool bForceGlobal:1;
-    bool bSuppressGlobal:1;
-
-   QString sGlobalFileName;
-   static bool mappingsRegistered;
+    bool bDirty: 1;
+    bool bLocaleInitialized: 1;
+    bool bReadDefaults: 1;
+    bool bFileImmutable: 1;
+    bool bForceGlobal: 1;
+    bool bSuppressGlobal: 1;
 
+    QString sGlobalFileName;
+    static bool mappingsRegistered;
 
     KEntryMap entryMap;
     QString backendType;
@@ -94,16 +93,28 @@ private:
     QString etc_kderc;
     KConfigBase::AccessMode configState;
 
-    bool wantGlobals() const { return openFlags&KConfig::IncludeGlobals && !bSuppressGlobal; }
-    bool wantDefaults() const { return openFlags&KConfig::CascadeConfig; }
-    bool isSimple() const { return openFlags == KConfig::SimpleConfig; }
-    bool isReadOnly() const { return configState == KConfig::ReadOnly; }
+    bool wantGlobals() const
+    {
+        return openFlags & KConfig::IncludeGlobals && !bSuppressGlobal;
+    }
+    bool wantDefaults() const
+    {
+        return openFlags & KConfig::CascadeConfig;
+    }
+    bool isSimple() const
+    {
+        return openFlags == KConfig::SimpleConfig;
+    }
+    bool isReadOnly() const
+    {
+        return configState == KConfig::ReadOnly;
+    }
 
-    bool setLocale(const QString& aLocale);
+    bool setLocale(const QString &aLocale);
     QStringList getGlobalFiles() const;
     void parseGlobalFiles();
     void parseConfigFiles();
-    void initCustomized(KConfig*);
+    void initCustomized(KConfig *);
     bool lockLocal();
 };