diff options
Diffstat (limited to 'src/plugins/cpptools/cppcodestylepreferences.h')
-rw-r--r-- | src/plugins/cpptools/cppcodestylepreferences.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/cpptools/cppcodestylepreferences.h b/src/plugins/cpptools/cppcodestylepreferences.h index 022d623e5f..2e43a94e84 100644 --- a/src/plugins/cpptools/cppcodestylepreferences.h +++ b/src/plugins/cpptools/cppcodestylepreferences.h @@ -35,35 +35,34 @@ #include "cpptools_global.h" #include "cppcodestylesettings.h" -#include <texteditor/ifallbackpreferences.h> +#include <texteditor/icodestylepreferences.h> namespace CppTools { -class CPPTOOLS_EXPORT CppCodeStylePreferences : public TextEditor::IFallbackPreferences +class CPPTOOLS_EXPORT CppCodeStylePreferences : public TextEditor::ICodeStylePreferences { Q_OBJECT public: explicit CppCodeStylePreferences( - const QList<TextEditor::IFallbackPreferences *> &fallbacks, QObject *parent = 0); virtual QVariant value() const; virtual void setValue(const QVariant &); - CppCodeStyleSettings settings() const; + CppCodeStyleSettings codeStyleSettings() const; // tracks parent hierarchy until currentParentSettings is null - CppCodeStyleSettings currentSettings() const; + CppCodeStyleSettings currentCodeStyleSettings() const; virtual void toMap(const QString &prefix, QVariantMap *map) const; virtual void fromMap(const QString &prefix, const QVariantMap &map); public slots: - void setSettings(const CppTools::CppCodeStyleSettings &data); + void setCodeStyleSettings(const CppTools::CppCodeStyleSettings &data); signals: - void settingsChanged(const CppTools::CppCodeStyleSettings &); - void currentSettingsChanged(const CppTools::CppCodeStyleSettings &); + void codeStyleSettingsChanged(const CppTools::CppCodeStyleSettings &); + void currentCodeStyleSettingsChanged(const CppTools::CppCodeStyleSettings &); protected: virtual QString settingsSuffix() const; |