blob: 0e017d248588deb996ff0a54203a551cb2c255fb (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
--- GUISupport/Qt/vtkQtConnection.h.orig 2013-02-18 14:31:05.000000000 +0100
+++ GUISupport/Qt/vtkQtConnection.h 2013-02-18 14:30:33.000000000 +0100
@@ -33,7 +33,7 @@
#include "vtkObject.h"
#include "vtkCommand.h" // for event defines
-#include "qobject.h"
+#include <QObject>
class QObject;
class vtkCallbackCommand;
--- GUISupport/Qt/QVTKWidget.cxx.orig 2013-02-18 14:31:29.000000000 +0100
+++ GUISupport/Qt/QVTKWidget.cxx 2013-02-18 14:34:52.000000000 +0100
@@ -38,11 +38,12 @@
#include "QVTKInteractorAdapter.h"
#include "QVTKInteractor.h"
-#include "qevent.h"
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qsignalmapper.h"
-#include "qtimer.h"
+#include <QEvent>
+#include <QKeyEvent>
+#include <QApplication>
+#include <QPainter>
+#include <QSignalMapper>
+#include <QTimer>
#if defined(Q_WS_X11)
#include "qx11info_x11.h"
#endif
--- GUISupport/Qt/vtkQtSQLQuery.cxx.orig 2013-02-18 14:39:23.000000000 +0100
+++ GUISupport/Qt/vtkQtSQLQuery.cxx 2013-02-18 14:39:53.000000000 +0100
@@ -19,7 +19,7 @@
-------------------------------------------------------------------------*/
// Check for Qt SQL module before defining this class.
-#include <qglobal.h>
+#include <Qt/qglobal.h>
#if (QT_EDITION & QT_MODULE_SQL)
#include "vtkQtSQLQuery.h"
--- GUISupport/Qt/vtkQtConnection.cxx.orig 2013-02-18 14:43:41.000000000 +0100
+++ GUISupport/Qt/vtkQtConnection.cxx 2013-02-18 14:43:54.000000000 +0100
@@ -28,8 +28,8 @@
#include "vtkEventQtSlotConnect.h"
#include "vtkCallbackCommand.h"
-#include <qobject.h>
-#include <qmetaobject.h>
+#include <QObject>
+#include <QMetaObject>
// constructor
vtkQtConnection::vtkQtConnection(vtkEventQtSlotConnect* owner)
--- GUISupport/Qt/vtkQtSQLDatabase.cxx.orig 2013-02-18 14:44:08.000000000 +0100
+++ GUISupport/Qt/vtkQtSQLDatabase.cxx 2013-02-18 14:44:16.000000000 +0100
@@ -19,7 +19,7 @@
-------------------------------------------------------------------------*/
// Check for Qt SQL module before defining this class.
-#include <qglobal.h>
+#include <Qt/qglobal.h>
#if (QT_EDITION & QT_MODULE_SQL)
#include "vtkQtSQLDatabase.h"
|
