diff options
| -rw-r--r-- | autotests/kconfig_compiler/test11_types.h | 7 | ||||
| -rw-r--r-- | autotests/kconfigtest.h | 4 | ||||
| -rw-r--r-- | src/core/kconfig.h | 2 | ||||
| -rw-r--r-- | src/core/kconfigbackend_p.h | 4 | ||||
| -rw-r--r-- | src/core/kconfigbase.h | 8 | ||||
| -rw-r--r-- | src/core/kconfigdata.h | 4 | ||||
| -rw-r--r-- | src/core/kconfigini_p.h | 2 | ||||
| -rw-r--r-- | src/core/kcoreconfigskeleton.h | 6 | ||||
| -rw-r--r-- | src/core/kemailsettings.h | 2 | ||||
| -rw-r--r-- | src/gui/kstandardshortcut.h | 2 | ||||
| -rw-r--r-- | src/kconfig_compiler/KConfigCodeGeneratorBase.h | 2 | ||||
| -rw-r--r-- | src/kconfig_compiler/KConfigParameters.h | 2 | 
12 files changed, 29 insertions, 16 deletions
| diff --git a/autotests/kconfig_compiler/test11_types.h b/autotests/kconfig_compiler/test11_types.h index b6aa5d80..553ae54a 100644 --- a/autotests/kconfig_compiler/test11_types.h +++ b/autotests/kconfig_compiler/test11_types.h @@ -10,7 +10,12 @@  class TimePeriod  {  public: -    enum Units { Minutes, HoursMinutes, Days, Weeks }; +    enum Units { +        Minutes, +        HoursMinutes, +        Days, +        Weeks, +    };  };  #endif diff --git a/autotests/kconfigtest.h b/autotests/kconfigtest.h index 1a248c74..cb6e3712 100644 --- a/autotests/kconfigtest.h +++ b/autotests/kconfigtest.h @@ -14,9 +14,9 @@ class KConfigTest : public QObject      Q_OBJECT  public: -    enum Testing { Ones = 1, Tens = 10, Hundreds = 100}; +    enum Testing { Ones = 1, Tens = 10, Hundreds = 100,};      Q_ENUM(Testing) -    enum bits { bit0 = 1, bit1 = 2, bit2 = 4, bit3 = 8 }; +    enum bits { bit0 = 1, bit1 = 2, bit2 = 4, bit3 = 8, };      Q_DECLARE_FLAGS(Flags, bits)      Q_FLAG(Flags) diff --git a/src/core/kconfig.h b/src/core/kconfig.h index ccea1bce..4b652059 100644 --- a/src/core/kconfig.h +++ b/src/core/kconfig.h @@ -86,7 +86,7 @@ public:          SimpleConfig    = 0x00, ///< Just a single config file.          NoCascade       = IncludeGlobals, ///< Include user's globals, but omit system settings.          NoGlobals       = CascadeConfig, ///< Cascade to system settings, but omit user's globals. -        FullConfig      = IncludeGlobals | CascadeConfig ///< Fully-fledged config, including globals and cascading to system settings +        FullConfig      = IncludeGlobals | CascadeConfig, ///< Fully-fledged config, including globals and cascading to system settings      };      /**       * Stores a combination of #OpenFlag values. diff --git a/src/core/kconfigbackend_p.h b/src/core/kconfigbackend_p.h index 5f8b61b5..7eb1774e 100644 --- a/src/core/kconfigbackend_p.h +++ b/src/core/kconfigbackend_p.h @@ -70,7 +70,7 @@ public:      enum ParseOption {          ParseGlobal = 1, /// entries should be marked as @em global          ParseDefaults = 2, /// entries should be marked as @em default -        ParseExpansions = 4 /// entries are allowed to be marked as @em expandable +        ParseExpansions = 4, /// entries are allowed to be marked as @em expandable      };      Q_FLAG(ParseOption)      /// @typedef typedef QFlags<ParseOption> ParseOptions @@ -88,7 +88,7 @@ public:      enum ParseInfo {          ParseOk, /// the configuration was opened read/write          ParseImmutable, /// the configuration is @em immutable -        ParseOpenError /// the configuration could not be opened +        ParseOpenError, /// the configuration could not be opened      };      /** diff --git a/src/core/kconfigbase.h b/src/core/kconfigbase.h index 0682a6b5..a7693275 100644 --- a/src/core/kconfigbase.h +++ b/src/core/kconfigbase.h @@ -54,7 +54,7 @@ public:           * Implied persistent           * @since 5.51           */ -        Normal = Persistent +        Normal = Persistent,          /**<          * Save the entry to the application specific config file without          * a locale tag. This is the default. @@ -172,7 +172,11 @@ public:      /**       * Possible return values for accessMode().       */ -    enum AccessMode { NoAccess, ReadOnly, ReadWrite }; +    enum AccessMode { +        NoAccess, +        ReadOnly, +        ReadWrite, +    };      /**       * Returns the access mode of the app-config object. diff --git a/src/core/kconfigdata.h b/src/core/kconfigdata.h index 2f36b1bb..36d90335 100644 --- a/src/core/kconfigdata.h +++ b/src/core/kconfigdata.h @@ -154,7 +154,7 @@ class KEntryMap : public QMap<KEntryKey, KEntry>  public:      enum SearchFlag {          SearchDefaults = 1, -        SearchLocalized = 2 +        SearchLocalized = 2,      };      Q_DECLARE_FLAGS(SearchFlags, SearchFlag) @@ -168,7 +168,7 @@ public:          EntryLocalizedCountry = 64,          EntryNotify = 128,          EntryDefault = (SearchDefaults << 16), -        EntryLocalized = (SearchLocalized << 16) +        EntryLocalized = (SearchLocalized << 16),      };      Q_DECLARE_FLAGS(EntryOptions, EntryOption) diff --git a/src/core/kconfigini_p.h b/src/core/kconfigini_p.h index 923ddb32..d760170d 100644 --- a/src/core/kconfigini_p.h +++ b/src/core/kconfigini_p.h @@ -52,7 +52,7 @@ protected:      enum StringType {          GroupString = 0,          KeyString = 1, -        ValueString = 2 +        ValueString = 2,      };      // Warning: this modifies data in-place. Other BufferFragment objects referencing the same buffer      // fragment will get their data modified too. diff --git a/src/core/kcoreconfigskeleton.h b/src/core/kcoreconfigskeleton.h index 69f52060..e7b814e8 100644 --- a/src/core/kcoreconfigskeleton.h +++ b/src/core/kcoreconfigskeleton.h @@ -543,7 +543,11 @@ public:      class KCONFIGCORE_EXPORT ItemString: public KConfigSkeletonGenericItem < QString >      {      public: -        enum Type { Normal, Password, Path }; +        enum Type { +            Normal, +            Password, +            Path, +        };          /** @enum Type              The type of string that is held in this item diff --git a/src/core/kemailsettings.h b/src/core/kemailsettings.h index 876b569e..30f9942c 100644 --- a/src/core/kemailsettings.h +++ b/src/core/kemailsettings.h @@ -91,7 +91,7 @@ public:      enum Extension {          POP3,          SMTP, -        OTHER +        OTHER,      };      /** diff --git a/src/gui/kstandardshortcut.h b/src/gui/kstandardshortcut.h index c37712b3..3757a593 100644 --- a/src/gui/kstandardshortcut.h +++ b/src/gui/kstandardshortcut.h @@ -144,7 +144,7 @@ enum StandardShortcut {      CreateFolder, ///< Create a folder. @since 5.74      // Insert new items here! -    StandardShortcutCount // number of standard shortcuts +    StandardShortcutCount, // number of standard shortcuts  };  /** diff --git a/src/kconfig_compiler/KConfigCodeGeneratorBase.h b/src/kconfig_compiler/KConfigCodeGeneratorBase.h index 6059e26f..e9d2a955 100644 --- a/src/kconfig_compiler/KConfigCodeGeneratorBase.h +++ b/src/kconfig_compiler/KConfigCodeGeneratorBase.h @@ -28,7 +28,7 @@ struct ParseResult;  /* This class manages the base of writing a C - Based code */  class KConfigCodeGeneratorBase {  public: -    enum ScopeFinalizer {None, Semicolon}; +    enum ScopeFinalizer {None, Semicolon,};      KConfigCodeGeneratorBase(          const QString &inputFileName,  // The kcfg file diff --git a/src/kconfig_compiler/KConfigParameters.h b/src/kconfig_compiler/KConfigParameters.h index 1984bb96..f8619b2a 100644 --- a/src/kconfig_compiler/KConfigParameters.h +++ b/src/kconfig_compiler/KConfigParameters.h @@ -29,7 +29,7 @@ public:  public:      enum TranslationSystem {          QtTranslation, -        KdeTranslation +        KdeTranslation,      };      // These are read from the .kcfgc configuration file | 
