port to sailfish with qt 5.2

1 files changed, 19 insertions, 4 deletions

diff --git a/main.cc b/main.cc
index b30e9b5..feb0acb 100644
--- a/main.cc
+++ b/main.cc
@@ -1,5 +1,6 @@
 #include <iostream>
 #include <QtCore/QCoreApplication>
+#include <QtCore/QSettings>
 #include <QtCore/QStringList>
 #include "sapmanager.h"
 #include "sapbtlistener.h"
@@ -18,8 +19,24 @@ int main(int argc, char *argv[])
 	app.setOrganizationDomain("com.javispedro");
 	app.setApplicationName("sapd");
 
-	if (app.arguments().size() != 2) {
-		cerr << "Usage:: sapd <bt address>" << endl;
+	QBluetoothAddress address;
+	QSettings settings;
+	QString address_from_settings = settings.value("device/address").toString();
+	if (!address_from_settings.isEmpty()) {
+		address = QBluetoothAddress(address_from_settings);
+	}
+
+	if (app.arguments().size() >= 2) {
+		// Get the address from the command line.
+		address = QBluetoothAddress(app.arguments().at(1));
+	}
+
+	if (address.isNull()) {
+		cerr << "Usage: sapd <bt address>" << endl;
+		cerr << "If you don't want to specify the BT address every time, put it in "
+			 << qPrintable(settings.fileName())
+			 << endl;
+		settings.setValue("device/address", QString());
 		return EXIT_FAILURE;
 	}
 
@@ -31,8 +48,6 @@ int main(int argc, char *argv[])
 
 	QScopedPointer<SAPBTListener> sap_listener(new SAPBTListener);
 
-	QBluetoothAddress address = QBluetoothAddress(app.arguments().at(1));
-
 	sap_listener->start();
 	sap_listener->nudge(address);