[patch] a guess about a port

mico-qt5.patch (text/plain), 1.63 KB, created by Rafał Mużyło on 2017-12-07 18:41:31 UTC

--- a/include/mico/qtmico.h	2008-07-25 15:41:44.000000000 +0200
+++ b/include/mico/qtmico.h	2017-12-07 18:32:14.026561891 +0100
@@ -27,17 +27,9 @@
 #ifndef __MICO_QT_H__
 #define __MICO_QT_H__
 
-#ifdef HAVE_QAPPLICATION_H
-#include <qapplication.h>
-#else // HAVE_QAPPLICATION_H
-#include <qapp.h>
-#endif // HAVE_QAPPLICATION_H
+#include <qcoreapplication.h>
 
-#ifdef HAVE_QSOCKETNOTIFIER_H
 #include <qsocketnotifier.h>
-#else // HAVE_QSOCKETNOTIFIER_H
-#include <qsocknot.h>
-#endif // HAVE_QSOCKETNOTIFIER_H
 
 #include <qtimer.h>
 #include <CORBA.h>
@@ -45,7 +37,7 @@
 class QTDispatcher; // forward
 
 class CApp
-    : public QApplication
+    : public QCoreApplication
 {
     Q_OBJECT
     QTDispatcher* qtd_;
--- a/auxdir/qtmico.cc	2008-07-25 15:41:39.000000000 +0200
+++ b/auxdir/qtmico.cc	2017-12-07 18:47:36.364613226 +0100
@@ -36,7 +36,7 @@ using namespace std;
 // CApp
 //
 CApp::CApp(int argc, char *argv[])
-    : QApplication (argc,argv)
+    : QCoreApplication (argc,argv)
 {
     qtd_ = new QTDispatcher (this);
     connect(this, SIGNAL(aboutToQuit()), this, SLOT(shutdown()));
@@ -92,7 +92,8 @@ TimerEvent::TimerEvent
     : xid_(new QTimer()), cb_(cb), disp_(disp)
 {
     QObject::connect(xid_, SIGNAL (timeout()), this, SLOT (timeout()));
-    xid_->start(tmout, TRUE);
+    xid_->setSingleShot(true);
+    xid_->start(tmout);
 }
 
 void
@@ -196,9 +197,10 @@ QTDispatcher::remove(TimerEvent *t)
 void
 QTDispatcher::run(CORBA::Boolean infinite)
 {
-    do {
-	ctx_->processOneEvent();
-    } while (infinite);
+    if (infinite)
+      ctx_->processEvents(QEventLoop::WaitForMoreEvents);
+    else
+      ctx_->processEvents();
 }
 
 void