diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-06-27 09:44:05 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-27 09:44:05 +0000 |
| commit | ab30724b00adb76879f4c5865ae4eb1ba828453f (patch) | |
| tree | ff11836debb28f13ce9440259edf272c0a6f6178 /src/plugins/cpptools/cppcodestylesettings.h | |
| parent | ff66f5c62f20e55375852c353bdf21509377a9cf (diff) | |
| parent | 07fccfe9f1e25a8b3e45788f754b83206a590044 (diff) | |
| download | qt-creator-ab30724b00adb76879f4c5865ae4eb1ba828453f.tar.gz | |
Merge "Merge remote-tracking branch 'origin/master' into 4.1" into 4.1
Diffstat (limited to 'src/plugins/cpptools/cppcodestylesettings.h')
| -rw-r--r-- | src/plugins/cpptools/cppcodestylesettings.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppcodestylesettings.h b/src/plugins/cpptools/cppcodestylesettings.h index 60dcc2fbf6..f69d72d0ab 100644 --- a/src/plugins/cpptools/cppcodestylesettings.h +++ b/src/plugins/cpptools/cppcodestylesettings.h @@ -80,6 +80,8 @@ public: // b bool alignAssignments; + bool preferGetterNameWithoutGetPrefix; + void toSettings(const QString &category, QSettings *s) const; void fromSettings(const QString &category, const QSettings *s); @@ -90,6 +92,9 @@ public: bool operator==(const CppCodeStyleSettings &s) const { return equals(s); } bool operator!=(const CppCodeStyleSettings &s) const { return !equals(s); } + static CppCodeStyleSettings currentProjectCodeStyle(); + static CppCodeStyleSettings currentGlobalCodeStyle(); + /*! Returns an Overview configured by the current project's code style. If no current project is available or an error occurs when getting the |