Qt4/Qt5 neutral changes:

+ add missing header files/remove old headers + fix flaws in use of timer
FreeCAD · Dec 12, 2016 · ad7234f · ad7234f
1 parent 4933e17
commit ad7234f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
@@ -291,7 +291,7 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags f)
     d->activityTimer = new QTimer(this);
     d->activityTimer->setObjectName(QString::fromLatin1("activityTimer"));
     connect(d->activityTimer, SIGNAL(timeout()),this, SLOT(updateActions()));
-    d->activityTimer->setSingleShot(true);
+    d->activityTimer->setSingleShot(false);
     d->activityTimer->start(300);
 
     // show main window timer
@@ -1088,15 +1088,9 @@ void MainWindow::appendRecentFile(const QString& filename)
 
 void MainWindow::updateActions()
 {
-    static QTime cLastCall;
-
-    if (cLastCall.elapsed() > 250 && isVisible()) {
+    if (isVisible()) {
         Application::Instance->commandManager().testActive();
-        cLastCall.start();
     }
-
-    d->activityTimer->setSingleShot(true);
-    d->activityTimer->start(300);	
 }
 
 void MainWindow::switchToTopLevelMode()

diff --git a/src/Gui/Qt4All.h b/src/Gui/Qt4All.h
@@ -71,6 +71,7 @@
 #include <QDesktopWidget>
 #include <QDialogButtonBox>
 #include <QDockWidget>
+#include <QDrag>
 #include <qdrawutil.h>
 #include <qevent.h>
 #include <QFileDialog>
@@ -97,7 +98,7 @@
 #include <QMainWindow>
 #include <qmenubar.h>
 #include <qmessagebox.h>
-#include <qmime.h>
+#include <QMimeData>
 #include <qmovie.h>
 #include <qpainter.h>
 #include <qpalette.h>
@@ -147,12 +148,8 @@
 #include <qobject.h>
 #include <QMdiArea>
 #include <QMdiSubWindow>
-#include <QWorkspace> // obsolete
 // QtNetwork
-#include <QFtp>
-#include <QHttp>
-#include <QHttpResponseHeader>
-#include <QHttpRequestHeader>
+#include <QNetworkAccessManager>
 #include <QTcpServer>
 #include <QTcpSocket>
 // QtOpenGL