Move wm_close handling to a shared library

Ryan Huffman committed 12 years ago

Commit c27bee21 parent 444a9746 files · +69 −19Browse files

Showing the changes to assignment-client/src/AssignmentClient.cpp (1 of 6 files). Show all

Unified · Split

 AssignmentClient::AssignmentClient(int &argc, char **argv) :
     QCoreApplication(argc, argv),
-    _assignmentServerHostname(DEFAULT_ASSIGNMENT_SERVER_HOSTNAME)
+    _assignmentServerHostname(DEFAULT_ASSIGNMENT_SERVER_HOSTNAME),
+    _shutdownEventListener(this)
 {
 #ifdef Q_OS_WIN
     setApplicationName("assignment-client");
     QSettings::setDefaultFormat(QSettings::IniFormat);
-    installNativeEventFilter(this);
+    installNativeEventFilter(&_shutdownEventListener);
+    connect(&_shutdownEventListener, SIGNAL(receivedCloseEvent()), SLOT(quit()));
     // set the logging target to the the CHILD_TARGET_NAME
     Logging::setTargetName(ASSIGNMENT_CLIENT_TARGET_NAME);
     NetworkAccessManager::getInstance();
 }
-bool AssignmentClient::nativeEventFilter(const QByteArray &eventType, void* msg, long* result) {
-#ifdef Q_OS_WIN
-    if (eventType == "windows_generic_MSG") {
-        MSG* message = (MSG*)msg;
-        if (message->message == WM_CLOSE) {
-            qDebug() << "Received WM_CLOSE message, closing";
-            quit();
-            return false;
-        }
-    }
-#endif
-    return true;
-}
 void AssignmentClient::sendAssignmentRequest() {
     if (!_currentAssignment) {
         NodeList::getInstance()->sendAssignment(_requestAssignment);