diff options
| author | David Faure <faure@kde.org> | 2013-12-18 09:53:59 +0100 | 
|---|---|---|
| committer | David Faure <faure@kde.org> | 2013-12-18 09:53:59 +0100 | 
| commit | 159963832457e6307282308455330acc7b5bd153 (patch) | |
| tree | ce1cc0234d37e9afc75bc86d734beb963ed57d02 /src/core/ksharedconfig.cpp | |
| parent | 867e7a50e6396338ab4fe9aa22ad141e4cd344d2 (diff) | |
| download | kconfig-159963832457e6307282308455330acc7b5bd153.tar.gz kconfig-159963832457e6307282308455330acc7b5bd153.tar.bz2 | |
Code reformatted using kde-dev-scripts/astyle-kdelibs.
Use git blame -w 867e7a5 to show authorship as it was before this commit.
Diffstat (limited to 'src/core/ksharedconfig.cpp')
| -rw-r--r-- | src/core/ksharedconfig.cpp | 34 | 
1 files changed, 17 insertions, 17 deletions
| diff --git a/src/core/ksharedconfig.cpp b/src/core/ksharedconfig.cpp index 0e5d1959..4f0e8d69 100644 --- a/src/core/ksharedconfig.cpp +++ b/src/core/ksharedconfig.cpp @@ -27,7 +27,7 @@  void _k_globalMainConfigSync(); -class GlobalSharedConfigList : public QList<KSharedConfig*> +class GlobalSharedConfigList : public QList<KSharedConfig *>  {  public:      GlobalSharedConfigList() @@ -44,19 +44,18 @@ public:      KSharedConfigPtr mainConfig;  }; -  Q_GLOBAL_STATIC(GlobalSharedConfigList, globalSharedConfigList)  void _k_globalMainConfigSync()  { -    if (globalSharedConfigList->mainConfig) +    if (globalSharedConfigList->mainConfig) {          globalSharedConfigList->mainConfig->sync(); +    }  } - -KSharedConfigPtr KSharedConfig::openConfig(const QString& _fileName, -                                           OpenFlags flags, -                                           QStandardPaths::StandardLocation resType) +KSharedConfigPtr KSharedConfig::openConfig(const QString &_fileName, +        OpenFlags flags, +        QStandardPaths::StandardLocation resType)  {      QString fileName(_fileName);      GlobalSharedConfigList *list = globalSharedConfigList(); @@ -66,10 +65,10 @@ KSharedConfigPtr KSharedConfig::openConfig(const QString& _fileName,      }      if (list) { -        for(QList<KSharedConfig*>::ConstIterator it = list->constBegin(); it != list->constEnd(); ++it) { -            if ( (*it)->name() == fileName && -                 (*it)->d_ptr->openFlags == flags && -                 (*it)->locationType() == resType +        for (QList<KSharedConfig *>::ConstIterator it = list->constBegin(); it != list->constEnd(); ++it) { +            if ((*it)->name() == fileName && +                    (*it)->d_ptr->openFlags == flags && +                    (*it)->locationType() == resType  //                 (*it)->backEnd()->type() == backEnd                 ) {                  return KSharedConfigPtr(*it); @@ -85,8 +84,9 @@ KSharedConfigPtr KSharedConfig::openConfig(const QString& _fileName,              userWarned = true;              QByteArray readOnly = qgetenv("KDE_HOME_READONLY");              if (readOnly.isEmpty() && QCoreApplication::applicationName() != QLatin1String("kdialog")) { -                if (ptr->group("General").readEntry(QLatin1String("warn_unwritable_config"), true)) +                if (ptr->group("General").readEntry(QLatin1String("warn_unwritable_config"), true)) {                      ptr->isConfigWritable(true); +                }              }          }      } @@ -94,7 +94,6 @@ KSharedConfigPtr KSharedConfig::openConfig(const QString& _fileName,      return ptr;  } -  KSharedConfig::KSharedConfig(const QString &fileName,                               OpenFlags flags,                               QStandardPaths::StandardLocation resType) @@ -105,18 +104,19 @@ KSharedConfig::KSharedConfig(const QString &fileName,  KSharedConfig::~KSharedConfig()  { -    if (!globalSharedConfigList.isDestroyed()) +    if (!globalSharedConfigList.isDestroyed()) {          globalSharedConfigList()->removeAll(this); +    }  }  KConfigGroup KSharedConfig::groupImpl(const QByteArray &groupName)  {      KSharedConfigPtr ptr(this); -    return KConfigGroup( ptr, groupName.constData()); +    return KConfigGroup(ptr, groupName.constData());  }  const KConfigGroup KSharedConfig::groupImpl(const QByteArray &groupName) const  { -    const KSharedConfigPtr ptr(const_cast<KSharedConfig*>(this)); -    return KConfigGroup( ptr, groupName.constData()); +    const KSharedConfigPtr ptr(const_cast<KSharedConfig *>(this)); +    return KConfigGroup(ptr, groupName.constData());  } | 
