aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/tools/settingsmodel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/corelib/tools/settingsmodel.cpp')
-rw-r--r--src/lib/corelib/tools/settingsmodel.cpp31
1 files changed, 1 insertions, 30 deletions
diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp
index bb98c3512..4defb46b9 100644
--- a/src/lib/corelib/tools/settingsmodel.cpp
+++ b/src/lib/corelib/tools/settingsmodel.cpp
@@ -37,8 +37,8 @@
**
****************************************************************************/
#include "settingsmodel.h"
+#include "settingsrepresentation.h"
-#include <tools/jsliterals.h>
#include <tools/profile.h>
#include <tools/qttools.h>
#include <tools/settings.h>
@@ -51,9 +51,6 @@
#include <QtGui/qbrush.h>
#endif
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptvalue.h>
-
#include <memory>
namespace qbs {
@@ -394,30 +391,4 @@ Node *SettingsModel::SettingsModelPrivate::indexToNode(const QModelIndex &index)
}
-QString settingsValueToRepresentation(const QVariant &value)
-{
- return toJSLiteral(value);
-}
-
-static QVariant variantFromString(const QString &str, bool &ok)
-{
- // ### use Qt5's JSON reader at some point.
- QScriptEngine engine;
- QScriptValue sv = engine.evaluate(QLatin1String("(function(){return ")
- + str + QLatin1String(";})()"));
- ok = !sv.isError();
- return sv.toVariant();
-}
-
-QVariant representationToSettingsValue(const QString &representation)
-{
- bool ok;
- const QVariant variant = variantFromString(representation, ok);
- if (ok)
- return variant;
-
- // If it's not valid JavaScript, interpret the value as a string.
- return representation;
-}
-
} // namespace qbs