diff options
| author | Javier S. Pedro <dev.git@javispedro.com> | 2014-11-25 23:09:03 +0100 |
|---|---|---|
| committer | Javier S. Pedro <dev.git@javispedro.com> | 2014-11-25 23:09:03 +0100 |
| commit | 68c1cd6ac3eb077101ef9a5ca560d1d7cbb82c7e (patch) | |
| tree | 5c6ccbeb89753568a69d8e53cdf03c6ac8ea3c77 | |
| parent | 2d3ce285e77ec02ed6dfb92bda273fc99164f9f4 (diff) | |
| download | salmeta-68c1cd6ac3eb077101ef9a5ca560d1d7cbb82c7e.tar.gz salmeta-68c1cd6ac3eb077101ef9a5ca560d1d7cbb82c7e.zip | |
minor style fixes
| -rw-r--r-- | src/controller.cpp | 2 | ||||
| -rw-r--r-- | src/salmeta.cpp | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/controller.cpp b/src/controller.cpp index 35d6dae..745f921 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -107,7 +107,7 @@ void Controller::connectToDevice() _address = address; if (_address.isEmpty()) { - qDebug() << "Empty address, doing nothing except wasting memory"; + qDebug() << "Empty address, will do nothing until address is set in config"; return; } diff --git a/src/salmeta.cpp b/src/salmeta.cpp index f782b83..9ccfeae 100644 --- a/src/salmeta.cpp +++ b/src/salmeta.cpp @@ -11,9 +11,6 @@ #include "widgetinfomodel.h" #include "availablewidgetsmodel.h" -static bool launch_daemon = false; -static QString settings_key_prefix("/apps/salmeta/watch0"); - int main(int argc, char *argv[]) { QGuiApplication *app = SailfishApp::application(argc, argv); @@ -25,11 +22,12 @@ int main(int argc, char *argv[]) QCommandLineOption opt_daemon("daemon", "start background daemon instead of settings UI"); QCommandLineOption opt_root("root", "dconf path to the settings to use", "/apps/salmeta/watchX", "/apps/salmeta/watch0"); parser.addOption(opt_daemon); + parser.addOption(opt_root); parser.process(*app); - launch_daemon = parser.isSet(opt_daemon); - settings_key_prefix = parser.value(opt_root); + bool launch_daemon = parser.isSet(opt_daemon); + QString settings_key_prefix = parser.value(opt_root); qmlRegisterUncreatableType<WidgetInfo>("com.javispedro.salmeta", 1, 0, "WidgetInfo", "Use the models, not this"); @@ -56,4 +54,3 @@ int main(int argc, char *argv[]) return app->exec(); } - |