From 91c7e5261b3c66cea07d6c47c0b4706d7d1784d2 Mon Sep 17 00:00:00 2001
From: Gerry Boland <gerry.boland@canonical.com>
Date: Mon, 18 May 2015 13:39:42 -0500
Subject: Clean up shutdown codepath further. run/stop return void

---
 src/platforms/mirserver/qmirserver.cpp | 26 ++++++--------------------
 src/platforms/mirserver/qmirserver.h   |  6 ++----
 2 files changed, 8 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/platforms/mirserver/qmirserver.cpp b/src/platforms/mirserver/qmirserver.cpp
index 61ea1ba..df7d262 100644
--- a/src/platforms/mirserver/qmirserver.cpp
+++ b/src/platforms/mirserver/qmirserver.cpp
@@ -45,7 +45,7 @@ QMirServer::QMirServer(const QStringList &arguments, QObject *parent)
 
     d->serverThread = new MirServerThread(d->server);
 
-    connect(d->serverThread, &MirServerThread::stopped, this, &QMirServer::serverStopped);
+    connect(d->serverThread, &MirServerThread::stopped, this, &QMirServer::stopped);
 }
 
 QMirServer::~QMirServer()
@@ -53,7 +53,7 @@ QMirServer::~QMirServer()
     stop();
 }
 
-bool QMirServer::start()
+void QMirServer::start()
 {
     Q_D(QMirServer);
 
@@ -62,14 +62,13 @@ bool QMirServer::start()
     if (!d->serverThread->waitForMirStartup())
     {
         qCritical() << "ERROR: QMirServer - Mir failed to start";
-        return false;
+        return;
     }
 
     Q_EMIT started();
-    return true;
 }
 
-bool QMirServer::stop()
+void QMirServer::stop()
 {
     Q_D(QMirServer);
 
@@ -79,10 +78,10 @@ bool QMirServer::stop()
             // do something to indicate fail during shutdown
             qCritical() << "ERROR: QMirServer - Mir failed to shut down correctly, terminating it";
             d->serverThread->terminate();
-            return false;
+            return;
         }
     }
-    return true;
+    return;
 }
 
 bool QMirServer::isRunning() const
@@ -91,19 +90,6 @@ bool QMirServer::isRunning() const
     return d->serverThread->isRunning();
 }
 
-void QMirServer::serverStopped()
-{
-    Q_D(QMirServer);
-
-    if (d->serverThread->isRunning())
-        d->serverThread->quit();
-
-    // if unexpected mir server stop, better quit the QApplication
-    if (!QCoreApplication::closingDown()) {
-        QCoreApplication::quit();
-    }
-}
-
 QWeakPointer<MirServer> QMirServer::mirServer() const
 {
     Q_D(const QMirServer);
diff --git a/src/platforms/mirserver/qmirserver.h b/src/platforms/mirserver/qmirserver.h
index e3f5f22..0f98131 100644
--- a/src/platforms/mirserver/qmirserver.h
+++ b/src/platforms/mirserver/qmirserver.h
@@ -32,8 +32,8 @@ public:
     QMirServer(const QStringList &arguments, QObject* parent=0);
     virtual ~QMirServer();
 
-    bool start();
-    Q_SLOT bool stop();
+    void start();
+    Q_SLOT void stop();
     bool isRunning() const;
 
     QWeakPointer<MirServer> mirServer() const;
@@ -45,8 +45,6 @@ Q_SIGNALS:
 protected:
     QMirServerPrivate * const d_ptr;
 
-    Q_SLOT void serverStopped();
-
 private:
     Q_DISABLE_COPY(QMirServer)
     Q_DECLARE_PRIVATE(QMirServer)
-- 
cgit v1.2.3