C++ indenter: Make CppCodeStyleSettings a class.

Also register it with the meta type system.

Change-Id: Id720e43d19765283765e7dbbd46820ba9cfb1be7
Reviewed-on: http://codereview.qt.nokia.com/172
Reviewed-by: Bill King <bill.king@nokia.com>

diff --git a/src/plugins/cpptools/cppcodestylesettings.h b/src/plugins/cpptools/cppcodestylesettings.h
index 20651ed..320c994 100644 (file)
--- a/src/plugins/cpptools/cppcodestylesettings.h
+++ b/src/plugins/cpptools/cppcodestylesettings.h
@@ -12,8 +12,9 @@ QT_END_NAMESPACE
 
 namespace CppTools {
 
-struct CPPTOOLS_EXPORT CppCodeStyleSettings
+class CPPTOOLS_EXPORT CppCodeStyleSettings
 {
+public:
     CppCodeStyleSettings();
 
     bool indentBlockBraces;

diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index cf27626..39144d0 100644 (file)
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -44,6 +44,7 @@
 #include "cppcompletionassist.h"
 #include "cpptoolssettings.h"
 #include "cppcodestylesettingsfactory.h"
+#include "cppcodestylesettings.h"
 
 #include <extensionsystem/pluginmanager.h>
 
@@ -105,6 +106,9 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
 {
     Q_UNUSED(arguments)
     Q_UNUSED(error)
+
+    qRegisterMetaType<CppTools::CppCodeStyleSettings>("CppTools::CppCodeStyleSettings");
+
     Core::ICore *core = Core::ICore::instance();
     Core::ActionManager *am = core->actionManager();