Merge pull request #1342 from Susurrus/changes

Couple o' changes

src/GAudioOutput.cc

@@ -54,8 +54,8 @@ GAudioOutput::GAudioOutput(QObject *parent) :
     muted |= qgcApp()->runningUnitTests();
     
     worker->moveToThread(thread);
-    connect(this, SIGNAL(textToSpeak(QString,int)), worker, SLOT(say(QString,int)));
+    connect(this, &GAudioOutput::textToSpeak, worker, &QGCAudioWorker::say);
-    connect(this, SIGNAL(beepOnce()), worker, SLOT(beep()));
+    connect(this, &GAudioOutput::beepOnce, worker, &QGCAudioWorker::beep);
     thread->start();
 }
 

src/ui/MainWindow.cc

@@ -1346,9 +1346,8 @@ void MainWindow::restoreLastUsedConnection()
     QSettings settings;
     QString key(MAIN_SETTINGS_GROUP);
     key += "/LAST_CONNECTION";
-    QString connection;
     if(settings.contains(key)) {
-        connection = settings.value(connection).toString();
+        QString connection = settings.value(key).toString();
         // Create a link for it
         LinkInterface* link = LinkManager::instance()->createLink(connection);
         if(link) {