--- Vago/trunk/Vago/main.cpp	2013/04/06 23:10:19	792
+++ Vago/trunk/Vago/main.cpp	2016/03/24 22:28:41	1035
@@ -1,20 +1,9 @@
-//#define USING_VM_TABLET_WARNING_FIX // Comment this line if not using a mac vm
-
-#ifdef USING_VM_TABLET_WARNING_FIX
-#include <qapplication.h>
-void myMessageOutput(QtMsgType type, const char *msg);
-#endif
-
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include "mainwindow.h"
 
 int main(int argc, char *argv[])
 {
 
-#ifdef USING_VM_TABLET_WARNING_FIX
-    qInstallMsgHandler(myMessageOutput);
-#endif
-
     QApplication a(argc, argv);
     MainWindow w;
     w.show();
@@ -23,24 +12,3 @@ int main(int argc, char *argv[])
     return a.exec();
 }
 
-#ifdef USING_VM_TABLET_WARNING_FIX
-void myMessageOutput(QtMsgType type, const char *msg)
-{
-    switch (type) {
-    case QtWarningMsg:
-        if(QString(msg)=="QCocoaView handleTabletEvent: This tablet device is unknown (received no proximity event for it). Discarding event."){ // ignore this message
-            return;
-        }
-        else{
-            fprintf(stderr, "%s\n", msg);
-            break;
-        }
-    case QtFatalMsg:
-        fprintf(stderr, "%s\n", msg);
-        abort();
-    default:
-        fprintf(stderr, "%s\n", msg);
-        break;
-    }
-}
-#endif