#3752 CVF Code changes to build on Qt4 and Qt5

Fwk/VizFwk/LibGuiQt/cvfqtBasicAboutDialog.cpp

@@ -41,10 +41,16 @@
 #include "cvfqtBasicAboutDialog.h"
 
 #include <QtCore/QVariant>
+#include <QtCore/QString>
+#if QT_VERSION >= 0x050000
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#else
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QLabel>
 #include <QtGui/QPushButton>
-
+#endif
 namespace cvfqt {
 
 
@@ -212,7 +218,7 @@ void BasicAboutDialog::create()
             QLabel* appVersionLabel = new QLabel(this);
             QFont appVersionFont(appVersionLabel->font());
             appVersionFont.setPointSize(8);
-            appVersionFont.setBold(TRUE);
+            appVersionFont.setBold(true);
             appVersionLabel->setFont(appVersionFont); 
             appVersionLabel->setText(appVer);
             appInfoLayout->addWidget(appVersionLabel);
@@ -225,7 +231,7 @@ void BasicAboutDialog::create()
             appCopyrightLabel->setTextFormat(Qt::RichText);
             QFont appCopyrightFont(appCopyrightLabel->font());
             appCopyrightFont.setPointSize(8);
-            appCopyrightFont.setBold(TRUE);
+            appCopyrightFont.setBold(true);
             appCopyrightLabel->setFont(appCopyrightFont); 
             appCopyrightLabel->setText(m_appCopyright);
             appInfoLayout->addWidget(appCopyrightLabel);
@@ -306,8 +312,8 @@ void BasicAboutDialog::create()
     bottomLayout->addItem(spacer2);
 
     QPushButton* buttonOk = new QPushButton("&OK", this);
-    buttonOk->setAutoDefault(TRUE);
-    buttonOk->setDefault(TRUE);
+    buttonOk->setAutoDefault(true);
+    buttonOk->setDefault(true);
     buttonOk->setFocus();
     connect(buttonOk, SIGNAL(clicked()), this, SLOT(accept()) );
     bottomLayout->addWidget(buttonOk);

Fwk/VizFwk/LibGuiQt/cvfqtBasicAboutDialog.h

@@ -37,7 +37,12 @@
 
 #pragma once
 
+#include <QtCore/QString>
+#if QT_VERSION >= 0x050000
+#include <QDialog>
+#else
 #include <QtGui/QDialog>
+#endif
 
 class QGridLayout;
 

Fwk/VizFwk/LibGuiQt/cvfqtPerformanceInfoHud.cpp

@@ -42,7 +42,12 @@
 #include "cvfqtPerformanceInfoHud.h"
 #include "cvfOpenGLResourceManager.h"
 
+#include <QtCore/QString>
+#if QT_VERSION >= 0x050000
+#include <QPainter>
+#else
 #include <QtGui/QPainter>
+#endif
 #include <vector>
 
 namespace cvfqt {

Fwk/VizFwk/LibGuiQt/cvfqtUtils.h

@@ -41,7 +41,11 @@
 #include "cvfTextureImage.h"
 
 #include <QtCore/QString>
+#if QT_VERSION >= 0x050000
+#include <QImage>
+#else
 #include <QtGui/QImage>
+#endif
 
 namespace cvfqt {
 

Fwk/VizFwk/TestApps/Qt/QtMinimal/QMMainWindow.cpp

@@ -42,13 +42,19 @@
 
 #include "QMMainWindow.h"
 #include "QMWidget.h"
-
+#if QT_VERSION >= 0x050000
+#include <QFrame>
+#include <QHBoxLayout>
+#include <QAction>
+#include <QMenu>
+#include <QMenuBar>
+#else
 #include <QtGui/QFrame>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QAction>
 #include <QtGui/QMenu>
 #include <QtGui/QMenuBar>
-
+#endif
 using cvf::ref;
 
 

Fwk/VizFwk/TestApps/Qt/QtMinimal/QMMainWindow.h

@@ -40,7 +40,11 @@
 #include "cvfObject.h"
 #include "cvfOpenGLContextGroup.h"
 
+#if QT_VERSION >= 0x050000
+#include <QMainWindow>
+#else
 #include <QtGui/QMainWindow>
+#endif
 
 class QMWidget;
 

Fwk/VizFwk/TestApps/Qt/QtMinimal/QMWidget.cpp

@@ -44,7 +44,11 @@
 
 #include "cvfqtOpenGLContext.h"
 
+#if QT_VERSION >= 0x050000
+#include <QMouseEvent>
+#else
 #include <QtGui/QMouseEvent>
+#endif
 
 using cvf::ref;
 

Fwk/VizFwk/TestApps/Qt/QtMultiView/QMVMainWindow.cpp

@@ -45,6 +45,15 @@
 #include "QMVFactory.h"
 
 #include <QtCore/QTimer>
+#if QT_VERSION >= 0x050000
+#include <QFrame>
+#include <QHBoxLayout>
+#include <QAction>
+#include <QMenu>
+#include <QMenuBar>
+#include <QStatusBar>
+#include <QLabel>
+#else
 #include <QtGui/QFrame>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QAction>
@@ -52,6 +61,7 @@
 #include <QtGui/QMenuBar>
 #include <QtGui/QStatusBar>
 #include <QtGui/QLabel>
+#endif
 
 using cvf::ref;
 

Fwk/VizFwk/TestApps/Qt/QtMultiView/QMVMainWindow.h

@@ -41,7 +41,11 @@
 #include "cvfCollection.h"
 #include "cvfDrawableGeo.h"
 
+#if QT_VERSION >= 0x050000
+#include <QMainWindow
+#else
 #include <QtGui/QMainWindow>
+#endif
 
 class QMVWidget;
 

Fwk/VizFwk/TestApps/Qt/QtMultiView/QMVWidget.cpp

@@ -44,7 +44,11 @@
 
 #include "cvfqtOpenGLContext.h"
 
+#if QT_VERSION >= 0x050000
+#include <QMouseEvent>
+#else
 #include <QtGui/QMouseEvent>
+#endif
 
 using cvf::ref;
 

Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRMainWindow.h

@@ -45,7 +45,11 @@
 #include "cvfuTestSnippet.h"
 #include "cvfuSnippetFactory.h"
 
+#if QT_VERSION >= 0x050000
+#include <QMainWindow>
+#else
 #include <QtGui/QMainWindow>
+#endif
 
 
 class QSRSnippetWidget;

Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRPropertiesPanel.cpp

@@ -42,6 +42,17 @@
 #include "cvfuSnippetPropertyPublisher.h"
 #include "cvfqtUtils.h"
 
+#if QT_VERSION >= 0x050000
+#include <QTextBrowser>
+#include <QListWidget>
+#include <QVBoxLayout>
+#include <QFormLayout>
+#include <QLineEdit>
+#include <QCheckBox>
+#include <QDataWidgetMapper>
+#include <QLabel>
+#include <QDockWidget>
+#else
 #include <QtGui/QTextBrowser>
 #include <QtGui/QListWidget>
 #include <QtGui/QVBoxLayout>
@@ -51,7 +62,7 @@
 #include <QtGui/QDataWidgetMapper>
 #include <QtGui/QLabel>
 #include <QtGui/QDockWidget>
-
+#endif
 
 
 //==================================================================================================

Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRPropertiesPanel.h

@@ -45,7 +45,11 @@
 #include "cvfuSnippetPropertyPublisher.h"
 
 #include <QtCore/QPointer>
+#if QT_VERSION >= 0x050000
+#include <QWidget>
+#else
 #include <QtGui/QWidget>
+#endif
 
 class QSRSnippetWidget;
 class QComboBox;

Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRRunPanel.cpp

@@ -43,12 +43,19 @@
 #include "cvfuTestSnippet.h"
 #include "cvfqtUtils.h"
 
+#if QT_VERSION >= 0x050000
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QLineEdit>
+#else
 #include <QtGui/QGridLayout>
 #include <QtGui/QLabel>
 #include <QtGui/QPushButton>
 #include <QtGui/QSpacerItem>
 #include <QtGui/QLineEdit>
-
+#endif
 using cvfu::TestSnippet;
 using cvfu::SnippetInfo;
 using cvfu::SnippetRegistry;

Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRRunPanel.h

@@ -43,7 +43,11 @@
 
 #include "cvfuSnippetFactory.h"
 
+#if QT_VERSION >= 0x050000
+#include <QWidget>
+#else
 #include <QtGui/QWidget>
+#endif
 
 class QDockWidget;
 class QLabel;

Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRStdInclude.h

@@ -11,8 +11,11 @@
 #include "cvfuInputEvents.h"
 
 #include <QtCore/QtCore>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#else
 #include <QtGui/QtGui>
-
+#endif
 // Introduce name of commonly used classes (that are unlikely to create clashes) from the cvf namespace. 
 // We allow the use of using-declarations in this include file since its sole usage is as a precompiled header file.
 using cvf::ref;