ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/s10k/Vago/main.cpp
(Generate patch)

Comparing Vago/trunk/Vago/main.cpp (file contents):
Revision 790 by s10k, Sat Apr 6 20:54:26 2013 UTC vs.
Revision 999 by s10k, Sat Apr 26 12:40:47 2014 UTC

# Line 1 | Line 1
1 < #define USING_VM_TABLET_WARNING_FIX // Comment this line if not using a mac vm
1 > //#define USING_VM_TABLET_WARNING_FIX // Comment this line if not using a mac vm
2  
3   #ifdef USING_VM_TABLET_WARNING_FIX
4   #include <qapplication.h>
5 < void myMessageOutput(QtMsgType type, const char *msg);
5 > void myMessageOutput(QtMsgType type, const QMessageLogContext &, const QString & str);
6   #endif
7  
8 < #include <QtGui/QApplication>
8 > #include <QtWidgets/QApplication>
9   #include "mainwindow.h"
10  
11   int main(int argc, char *argv[])
12   {
13  
14   #ifdef USING_VM_TABLET_WARNING_FIX
15 <    qInstallMsgHandler(myMessageOutput);
15 >    qInstallMessageHandler(myMessageOutput);
16   #endif
17  
18      QApplication a(argc, argv);
# Line 24 | Line 24 | int main(int argc, char *argv[])
24   }
25  
26   #ifdef USING_VM_TABLET_WARNING_FIX
27 < void myMessageOutput(QtMsgType type, const char *msg)
27 > void myMessageOutput(QtMsgType type, const QMessageLogContext &, const QString & str)
28   {
29 +
30 +    const char * msg = str.toStdString().c_str();
31 +
32      switch (type) {
33      case QtWarningMsg:
34 <        if(QString(msg)=="QCocoaView handleTabletEvent: This tablet device is unknown (received no proximity event for it). Discarding event."){ // ignore this message
34 >        if(QString(msg)=="QNSView handleTabletEvent: This tablet device is unknown (received no proximity event for it). Discarding event."){ // ignore this message
35              return;
36          }
37          else{

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)