Remove SERVER_AS_DLL

I doubt this has been used anywhere in long time. Also for email client
example it feels a bit strange. And there's was nothing setting it
enabled on the example.

Change-Id: I7a408ed490a84789000f2db8eebfa8324b493846
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>

4 files changed, 2 insertions, 95 deletions

diff --git a/examples/qtmail/emailclient.cpp b/examples/qtmail/emailclient.cpp
index 2ad7905f..90d30668 100644
--- a/examples/qtmail/emailclient.cpp
+++ b/examples/qtmail/emailclient.cpp
@@ -73,9 +73,6 @@
 #include "statusmonitor.h"
 #include <qtmailnamespace.h>
 #include <qmaildisconnected.h>
-#if defined(SERVER_AS_DLL)
-#include "messageserver.h"
-#endif
 
 static const unsigned int StatusBarHeight = 20;
 #ifdef LOAD_DEBUG_VERSION
@@ -467,11 +464,7 @@ EmailClient::EmailClient(QWidget *parent, Qt::WindowFlags f)
       autoGetMail(false),
       initialAction(None),
       preSearchWidgetId(-1),
-#if defined(SERVER_AS_DLL)
-      m_messageServerThread(0),
-#else
       m_messageServerProcess(0),
-#endif
       m_contextMenu(0),
       m_transmitAction(0),
       m_retrievalAction(0),
@@ -560,14 +553,6 @@ void EmailClient::resumeInterruptedComposition()
 
 bool EmailClient::startMessageServer()
 {
-#if defined(SERVER_AS_DLL)
-    m_messageServerThread = new MessageServerThread();
-    m_messageServerThread->start();
-    QEventLoop loop;
-    QObject::connect(m_messageServerThread, SIGNAL(messageServerStarted()), &loop, SLOT(quit()));
-    loop.exec();
-    return true;
-#else
     qMailLog(Messaging) << "Starting messageserver child process...";
     if(m_messageServerProcess) delete m_messageServerProcess;
     m_messageServerProcess = new QProcess(this);
@@ -582,17 +567,10 @@ bool EmailClient::startMessageServer()
 
 	m_messageServerProcess->start(QMail::messageServerPath() + binary);
     return m_messageServerProcess->waitForStarted();
-#endif
 }
 
 bool EmailClient::waitForMessageServer()
 {
-#if defined(SERVER_AS_DLL)
-    if (m_messageServerThread) {
-        delete m_messageServerThread;
-        m_messageServerThread = 0;
-    }
-#else
     if(m_messageServerProcess)
     {
         qMailLog(Messaging) << "Shutting down messageserver child process..";
@@ -600,7 +578,6 @@ bool EmailClient::waitForMessageServer()
         delete m_messageServerProcess; m_messageServerProcess = 0;
         return result;
     }
-#endif
     return true;
 }
 
@@ -2375,12 +2352,6 @@ void EmailClient::quit()
         }
     }
     
-#if defined(SERVER_AS_DLL)
-    if (m_messageServerThread) {
-        m_messageServerThread->quit();
-        QTimer::singleShot(0,qApp,SLOT(quit()));
-    }
-#else
     if(m_messageServerProcess)
     {
         //we started the messageserver, direct it to shut down
@@ -2389,7 +2360,6 @@ void EmailClient::quit()
         server.shutdown();
         QTimer::singleShot(0,qApp,SLOT(quit()));
     }
-#endif
     else QApplication::quit();
 }
 
@@ -3015,33 +2985,5 @@ void NotificationTray::messagesAdded(const QMailMessageIdList &ids)
 }
 #endif // QT_NO_SYSTEMTRAYICON
 
-#if defined(SERVER_AS_DLL)
-MessageServerThread::MessageServerThread()
-{
-}
-
-MessageServerThread::~MessageServerThread()
-{
-    // Tell the thread's event loop to exit
-    // => thread returns from the call to exec()
-    exit();
-
-    // Wait until this thread has finished execution
-    // <=> waits until thread returns from run()
-    wait();
-}
-
-void MessageServerThread::run()
-{
-    // Start messageserver
-    MessageServer server;
-
-    emit messageServerStarted();
-
-    // Enter the thread event loop
-    (void) exec();
-}
-#endif
-
 #include <emailclient.moc>
 
diff --git a/examples/qtmail/emailclient.h b/examples/qtmail/emailclient.h
index 8b4fabba..8dea6992 100644
--- a/examples/qtmail/emailclient.h
+++ b/examples/qtmail/emailclient.h
@@ -44,9 +44,6 @@
 #include <QSystemTrayIcon>
 #include <QTime>
 #include <QTimer>
-#if defined(SERVER_AS_DLL)
-#include <QThread>
-#endif
 #include <QProcess>
 
 class EmailFolderModel;
@@ -437,11 +434,7 @@ private:
 
     QMailMessageId lastDraftId;
 
-#if defined(SERVER_AS_DLL)
-    QThread* m_messageServerThread;
-#else
     QProcess* m_messageServerProcess;
-#endif
     QSet<QMailMessageId> flagMessageIds;
     QMenu* m_contextMenu;
     QToolBar* m_toolBar;
@@ -456,22 +449,6 @@ private:
     QList<QMailMessage> m_outboxingMessages;
 };
 
-#if defined(SERVER_AS_DLL)
-class MessageServerThread : public QThread
-{
-    Q_OBJECT
-
-public:
-    MessageServerThread();
-    ~MessageServerThread();
-
-    void run();
-
-signals:
-    void messageServerStarted();
-};
-#endif
-
 #ifndef QT_NO_SYSTEMTRAYICON
 class NotificationTray : public QSystemTrayIcon {
     Q_OBJECT
diff --git a/src/tools/messageserver/messageserver.h b/src/tools/messageserver/messageserver.h
index 0a1347bb..fbfc243b 100644
--- a/src/tools/messageserver/messageserver.h
+++ b/src/tools/messageserver/messageserver.h
@@ -46,11 +46,7 @@ class QMailMessageMetaData;
 class QNetworkState;
 class NewCountNotifier;
 
-#if defined(SERVER_AS_DLL)
-class QMFUTIL_EXPORT MessageServer : public QObject
-#else
 class MessageServer : public QObject
-#endif
 {
     Q_OBJECT
 
diff --git a/src/tools/messageserver/messageserver.pro b/src/tools/messageserver/messageserver.pro
index 349d5a17..70b20f49 100644
--- a/src/tools/messageserver/messageserver.pro
+++ b/src/tools/messageserver/messageserver.pro
@@ -1,10 +1,4 @@
-SERVER_AS_DLL: {
-    DEFINES += SERVER_AS_DLL
-    DEFINES += QMFUTIL_INTERNAL
-    TEMPLATE = lib
-} else {
-    TEMPLATE = app
-}
+TEMPLATE = app
 
 TARGET = messageserver5
 QT = core dbus qmfclient qmfclient-private qmfmessageserver
@@ -33,9 +27,7 @@ mailservice.files = ../../libraries/qmfclient/qmailservice.xml
 mailservice.header_flags = -i qmailid.h -i qmailaction.h -i qmailserviceaction.h -i qmailstore.h
 DBUS_ADAPTORS += mailservice
 
-!SERVER_AS_DLL: {
-    SOURCES += main.cpp
-}
+SOURCES += main.cpp
 
 TRANSLATIONS += messageserver-ar.ts \
                 messageserver-de.ts \