git.iko.soy/unity8
on xenial help sign in
simplify
commitad4743ed7ec1d2bf57f3c40fa314581664f6f3b8 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 25 Jul 2013, 19:06 (13 years ago) parent9c6c813
3 files changed+10−18
compare with xenial
unifiedsplit
tests/mocks/GSettings/fake_gsettings.cpp+7−11 tests/mocks/GSettings/fake_gsettings.h+2−6 tests/mocks/GSettings/plugin.cpp+1−1
tests/mocks/GSettings/fake_gsettings.cpp+7−11
@@ -25,24 +25,20 @@ struct GSettingsQmlPrivate {
2525 GSettingsSchemaQml *schema;
2626};
2727
28−bool GSettingsControllerQml::instance_exists;
29−GSettingsControllerQml* GSettingsControllerQml::_controllerInstance;
28+GSettingsControllerQml* GSettingsControllerQml::s_controllerInstance = 0;
3029
3130GSettingsControllerQml::GSettingsControllerQml() {
3231}
3332
3433GSettingsControllerQml::~GSettingsControllerQml() {
35− instance_exists = false;
34+ s_controllerInstance = 0;
3635}
3736
38−GSettingsControllerQml* GSettingsControllerQml::getInstance() {
39− if(!instance_exists) {
40− _controllerInstance = new GSettingsControllerQml();
41− instance_exists = true;
42− return _controllerInstance;
43− } else {
44− return _controllerInstance;
37+GSettingsControllerQml* GSettingsControllerQml::instance() {
38+ if(!s_controllerInstance) {
39+ s_controllerInstance = new GSettingsControllerQml();
4540 }
41+ return s_controllerInstance;
4642}
4743
4844GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {
@@ -80,7 +76,7 @@ void GSettingsSchemaQml::setPath(const QByteArray &path) {
8076}
8177
8278GSettingsQml::GSettingsQml(QObject *parent): QObject(parent) {
83− GSettingsControllerQml::getInstance();
79+ GSettingsControllerQml::instance();
8480 priv = new GSettingsQmlPrivate;
8581 priv->schema = new GSettingsSchemaQml(this);
8682}
tests/mocks/GSettings/fake_gsettings.h+2−6
@@ -25,17 +25,13 @@ class GSettingsControllerQml: public QObject
2525 Q_OBJECT
2626
2727public:
28− static GSettingsControllerQml* getInstance();
28+ static GSettingsControllerQml* instance();
2929 ~GSettingsControllerQml();
3030
3131private:
3232 GSettingsControllerQml();
33− GSettingsControllerQml(const GSettingsControllerQml&);
34− GSettingsControllerQml& operator=(const GSettingsControllerQml&);
3533
36− static bool instance_exists;
37−
38− static GSettingsControllerQml* _controllerInstance;
34+ static GSettingsControllerQml* s_controllerInstance;
3935};
4036
4137class GSettingsSchemaQml: public QObject
tests/mocks/GSettings/plugin.cpp+1−1
@@ -21,7 +21,7 @@
2121
2222static QObject* controllerProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
2323{
24− return GSettingsControllerQml::getInstance();
24+ return GSettingsControllerQml::instance();
2525}
2626
2727void FakeGSettingsQmlPlugin::registerTypes(const char *uri)