Marked existing QtMinimal and QtMultiView as deprecated

Fwk/VizFwk/CMakeLists.txt

@@ -66,8 +66,8 @@ if (CEE_STAND_ALONE)
         add_subdirectory(Tests/SnippetsBasis)
 
         if (CEE_BUILD_GUI_QT)
-            add_subdirectory(TestApps/Qt/QtMinimal)
+            add_subdirectory(TestApps/Qt/QtMinimal_deprecated)
-            add_subdirectory(TestApps/Qt/QtMultiView)
+            add_subdirectory(TestApps/Qt/QtMultiView_deprecated)
             add_subdirectory(TestApps/Qt/QtSnippetRunner)
         endif()
 

Fwk/VizFwk/TestApps/Qt/QtMinimal_deprecated/CMakeLists.txt

@@ -1,4 +1,4 @@
-project(QtMinimal)
+project(QtMinimal_deprecated)
 
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${CEE_BASE_CXX_FLAGS}")
@@ -20,15 +20,15 @@ set(CEE_LIBS LibGuiQt LibViewing LibRender LibGeometry LibCore)
  
 
 set(CEE_SOURCE_FILES
-QMMain.cpp
+QMMain_deprecated.cpp
-QMMainWindow.cpp
+QMMainWindow_deprecated.cpp
-QMWidget.cpp
+QMWidget_deprecated.cpp
 )
 
 # Headers that need MOCing
 set(MOC_HEADER_FILES
-QMMainWindow.h
+QMMainWindow_deprecated.h
-QMWidget.h
+QMWidget_deprecated.h
 )
 
 # Qt

Fwk/VizFwk/TestApps/Qt/QtMinimal_deprecated/QMMainWindow_deprecated.cpp

@@ -40,8 +40,8 @@
 #include "cvfLibGeometry.h"
 #include "cvfLibViewing.h"
 
-#include "QMMainWindow.h"
+#include "QMMainWindow_deprecated.h"
-#include "QMWidget.h"
+#include "QMWidget_deprecated.h"
 
 #include <QFrame>
 #include <QHBoxLayout>
@@ -56,14 +56,14 @@ using cvf::ref;
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QMMainWindow::QMMainWindow()
+QMMainWindow_deprecated::QMMainWindow_deprecated()
 {
     QFrame* mainFrame = new QFrame;
     QHBoxLayout* frameLayout = new QHBoxLayout(mainFrame);
     setCentralWidget(mainFrame);
 
     m_contextGroup = new cvf::OpenGLContextGroup;
-    m_vizWidget = new QMWidget(m_contextGroup.p(), mainFrame);
+    m_vizWidget = new QMWidget_deprecated(m_contextGroup.p(), mainFrame);
 
     m_vizWidget->setFocus();
     frameLayout->addWidget(m_vizWidget);
@@ -86,7 +86,7 @@ QMMainWindow::QMMainWindow()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMMainWindow::slotCreateDefaultScene()
+void QMMainWindow_deprecated::slotCreateDefaultScene()
 {
     ref<cvf::ModelBasicList> model = new cvf::ModelBasicList;
 
@@ -133,7 +133,7 @@ void QMMainWindow::slotCreateDefaultScene()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMMainWindow::slotClearScene()
+void QMMainWindow_deprecated::slotClearScene()
 {
     CVF_ASSERT(m_vizWidget);
     m_vizWidget->setScene(NULL);
@@ -143,7 +143,7 @@ void QMMainWindow::slotClearScene()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMMainWindow::closeEvent(QCloseEvent* /*event*/)
+void QMMainWindow_deprecated::closeEvent(QCloseEvent* /*event*/)
 {
     CVF_ASSERT(m_contextGroup.notNull());
     CVF_ASSERT(m_vizWidget);

Fwk/VizFwk/TestApps/Qt/QtMinimal_deprecated/QMMainWindow_deprecated.h

@@ -43,7 +43,7 @@
 #include <QtGlobal>
 #include <QMainWindow>
 
-class QMWidget;
+class QMWidget_deprecated;
 
 
 //==================================================================================================
@@ -51,12 +51,12 @@ class QMWidget;
 // 
 //
 //==================================================================================================
-class QMMainWindow : public QMainWindow
+class QMMainWindow_deprecated : public QMainWindow
 {
     Q_OBJECT
 
 public:
-    QMMainWindow();
+    QMMainWindow_deprecated();
 
 private slots:
     void    slotCreateDefaultScene();
@@ -67,7 +67,7 @@ private:
 
 private:
     cvf::ref<cvf::OpenGLContextGroup>   m_contextGroup;
-    QMWidget*                           m_vizWidget;
+    QMWidget_deprecated*                m_vizWidget;
     QAction*                            m_createDefaultSceneAction;
     QAction*                            m_clearSceneAction;
 };

Fwk/VizFwk/TestApps/Qt/QtMinimal_deprecated/QMMain_deprecated.cpp

@@ -37,7 +37,7 @@
 
 #include "cvfLibCore.h"
 
-#include "QMMainWindow.h"
+#include "QMMainWindow_deprecated.h"
 
 #include <QtGlobal>
 #include <QApplication>
@@ -55,9 +55,9 @@ int main(int argc, char *argv[])
     // On Linux, Qt will use the system locale, force number formatting settings back to "C" locale
     setlocale(LC_NUMERIC,"C");
 
-    QMMainWindow window;
+    QMMainWindow_deprecated window;
     QString platform = cvf::System::is64Bit() ? "(64bit)" : "(32bit)";
-    window.setWindowTitle("Qt Minimal " + platform);
+    window.setWindowTitle("Qt Minimal deprecated" + platform);
     window.resize(1000, 800);;
     window.show();
 

Fwk/VizFwk/TestApps/Qt/QtMinimal_deprecated/QMWidget_deprecated.cpp

@@ -40,7 +40,7 @@
 #include "cvfLibGeometry.h"
 #include "cvfLibViewing.h"
 
-#include "QMWidget.h"
+#include "QMWidget_deprecated.h"
 
 #include <QMouseEvent>
 
@@ -51,7 +51,7 @@ using cvf::ref;
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QMWidget::QMWidget(cvf::OpenGLContextGroup* contextGroup, QWidget* parent)
+QMWidget_deprecated::QMWidget_deprecated(cvf::OpenGLContextGroup* contextGroup, QWidget* parent)
 :   cvfqt::GLWidget_deprecated(contextGroup, QGLFormat(), parent)
 {
     m_camera = new cvf::Camera;
@@ -71,7 +71,7 @@ QMWidget::QMWidget(cvf::OpenGLContextGroup* contextGroup, QWidget* parent)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QMWidget::~QMWidget()
+QMWidget_deprecated::~QMWidget_deprecated()
 {
 }
 
@@ -79,7 +79,7 @@ QMWidget::~QMWidget()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMWidget::setScene(cvf::Scene* scene)
+void QMWidget_deprecated::setScene(cvf::Scene* scene)
 {
     ref<cvf::Rendering> rendering = m_renderSequence->firstRendering();
     CVF_ASSERT(rendering.notNull());
@@ -103,7 +103,7 @@ void QMWidget::setScene(cvf::Scene* scene)
 //--------------------------------------------------------------------------------------------------
 ///  
 //--------------------------------------------------------------------------------------------------
-void QMWidget::resizeGL(int width, int height)
+void QMWidget_deprecated::resizeGL(int width, int height)
 {
     if (m_camera.notNull())
     {
@@ -116,7 +116,7 @@ void QMWidget::resizeGL(int width, int height)
 //--------------------------------------------------------------------------------------------------
 ///  
 //--------------------------------------------------------------------------------------------------
-void QMWidget::paintEvent(QPaintEvent* /*event*/)
+void QMWidget_deprecated::paintEvent(QPaintEvent* /*event*/)
 {
     QPainter painter(this);
 
@@ -144,7 +144,7 @@ void QMWidget::paintEvent(QPaintEvent* /*event*/)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMWidget::mouseMoveEvent(QMouseEvent* event)
+void QMWidget_deprecated::mouseMoveEvent(QMouseEvent* event)
 {
     if (m_renderSequence.isNull()) return;
 
@@ -182,7 +182,7 @@ void QMWidget::mouseMoveEvent(QMouseEvent* event)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMWidget::mousePressEvent(QMouseEvent* event)
+void QMWidget_deprecated::mousePressEvent(QMouseEvent* event)
 {
     if (m_renderSequence.isNull()) return;
 
@@ -209,7 +209,7 @@ void QMWidget::mousePressEvent(QMouseEvent* event)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMWidget::mouseReleaseEvent(QMouseEvent* /*event*/)
+void QMWidget_deprecated::mouseReleaseEvent(QMouseEvent* /*event*/)
 {
     m_trackball->endNavigation();
 }

Fwk/VizFwk/TestApps/Qt/QtMinimal_deprecated/QMWidget_deprecated.h

@@ -53,13 +53,13 @@
 // 
 //
 //==================================================================================================
-class QMWidget : public cvfqt::GLWidget_deprecated
+class QMWidget_deprecated : public cvfqt::GLWidget_deprecated
 {
     Q_OBJECT
 
 public:
-    QMWidget(cvf::OpenGLContextGroup* contextGroup, QWidget* parent);
+    QMWidget_deprecated(cvf::OpenGLContextGroup* contextGroup, QWidget* parent);
-    ~QMWidget();
+    ~QMWidget_deprecated();
 
     void    setScene(cvf::Scene* scene);
 

Fwk/VizFwk/TestApps/Qt/QtMultiView_deprecated/CMakeLists.txt

@@ -1,4 +1,4 @@
-project(QtMultiView)
+project(QtMultiView_deprecated)
 
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${CEE_BASE_CXX_FLAGS}")
@@ -21,16 +21,16 @@ set(CEE_LIBS LibUtilities LibGuiQt LibViewing LibRender LibGeometry LibIo LibCor
 set(EXTERNAL_LIBS)
 
 set(CEE_SOURCE_FILES
-QMVFactory.cpp
+QMVFactory_deprecated.cpp
-QMVMain.cpp
+QMVMain_deprecated.cpp
-QMVMainWindow.cpp
+QMVMainWindow_deprecated.cpp
-QMVWidget.cpp
+QMVWidget_deprecated.cpp
 )
 
 # Headers that need MOCing
 set(MOC_HEADER_FILES
-QMVMainWindow.h
+QMVMainWindow_deprecated.h
-QMVWidget.h
+QMVWidget_deprecated.h
 )
 
 # Qt

Fwk/VizFwk/TestApps/Qt/QtMultiView_deprecated/QMVFactory_deprecated.cpp

@@ -42,7 +42,7 @@
 
 #include "cvfuPartCompoundGenerator.h"
 
-#include "QMVFactory.h"
+#include "QMVFactory_deprecated.h"
 
 
 
@@ -56,7 +56,7 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QMVModelFactory::QMVModelFactory(bool useShaders)
+QMVModelFactory_deprecated::QMVModelFactory_deprecated(bool useShaders)
 :   m_useShaders(useShaders)
 {
 }
@@ -65,7 +65,7 @@ QMVModelFactory::QMVModelFactory(bool useShaders)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-ref<cvf::Model> QMVModelFactory::createSphereAndBox()
+ref<cvf::Model> QMVModelFactory_deprecated::createSphereAndBox()
 {
     ref<cvf::ModelBasicList> model = new cvf::ModelBasicList;
 
@@ -120,7 +120,7 @@ ref<cvf::Model> QMVModelFactory::createSphereAndBox()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-ref<cvf::Model> QMVModelFactory::createSpheres() 
+ref<cvf::Model> QMVModelFactory_deprecated::createSpheres() 
 {
     cvfu::PartCompoundGenerator gen;
     gen.setPartDistribution(cvf::Vec3i(5, 5, 5));
@@ -158,7 +158,7 @@ ref<cvf::Model> QMVModelFactory::createSpheres()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-ref<cvf::Model> QMVModelFactory::createBoxes() 
+ref<cvf::Model> QMVModelFactory_deprecated::createBoxes() 
 {
     cvfu::PartCompoundGenerator gen;
     gen.setPartDistribution(cvf::Vec3i(5, 5, 5));
@@ -196,7 +196,7 @@ ref<cvf::Model> QMVModelFactory::createBoxes()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-ref<cvf::Model> QMVModelFactory::createTriangles() 
+ref<cvf::Model> QMVModelFactory_deprecated::createTriangles() 
 {
     cvfu::PartCompoundGenerator gen;
     gen.setPartDistribution(cvf::Vec3i(5, 5, 5));
@@ -234,7 +234,7 @@ ref<cvf::Model> QMVModelFactory::createTriangles()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-ref<cvf::ShaderProgram> QMVModelFactory::createProgramStandardHeadlightColor()
+ref<cvf::ShaderProgram> QMVModelFactory_deprecated::createProgramStandardHeadlightColor()
 {
     cvf::ShaderProgramGenerator gen("StandardHeadlightColor", cvf::ShaderSourceProvider::instance());
     gen.configureStandardHeadlightColor();
@@ -246,7 +246,7 @@ ref<cvf::ShaderProgram> QMVModelFactory::createProgramStandardHeadlightColor()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-ref<cvf::ShaderProgram> QMVModelFactory::createProgramUnlit()
+ref<cvf::ShaderProgram> QMVModelFactory_deprecated::createProgramUnlit()
 {
     cvf::ShaderProgramGenerator gen("Unlit", cvf::ShaderSourceProvider::instance());
     gen.addVertexCode(cvf::ShaderSourceRepository::vs_Standard);
@@ -266,7 +266,7 @@ ref<cvf::ShaderProgram> QMVModelFactory::createProgramUnlit()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QMVSceneFactory::QMVSceneFactory(QMVModelFactory* modelFactory)
+QMVSceneFactory::QMVSceneFactory(QMVModelFactory_deprecated* modelFactory)
 :   m_modelFactory(modelFactory)
 {
 }

Fwk/VizFwk/TestApps/Qt/QtMultiView_deprecated/QMVFactory_deprecated.h

@@ -45,10 +45,10 @@ using cvf::ref;
 // 
 //
 //==================================================================================================
-class QMVModelFactory
+class QMVModelFactory_deprecated
 {
 public:
-    QMVModelFactory(bool useShaders);
+    QMVModelFactory_deprecated(bool useShaders);
 
     ref<cvf::Model>   createSphereAndBox();
     ref<cvf::Model>   createSpheres();
@@ -73,13 +73,13 @@ private:
 class QMVSceneFactory
 {
 public:
-    QMVSceneFactory(QMVModelFactory* modelFactory);
+    QMVSceneFactory(QMVModelFactory_deprecated* modelFactory);
 
     ref<cvf::Scene>   createNumberedScene(int sceneNumber);
     ref<cvf::Scene>   createFromModel(cvf::Model* model);
 
 private:
-    QMVModelFactory*  m_modelFactory;
+    QMVModelFactory_deprecated*  m_modelFactory;
 };
 
 

Fwk/VizFwk/TestApps/Qt/QtMultiView_deprecated/QMVMainWindow_deprecated.cpp

@@ -40,9 +40,9 @@
 #include "cvfLibGeometry.h"
 #include "cvfLibViewing.h"
 
-#include "QMVMainWindow.h"
+#include "QMVMainWindow_deprecated.h"
-#include "QMVWidget.h"
+#include "QMVWidget_deprecated.h"
-#include "QMVFactory.h"
+#include "QMVFactory_deprecated.h"
 
 #include <QTimer>
 #include <QFrame>
@@ -60,7 +60,7 @@ using cvf::ref;
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QMVMainWindow::QMVMainWindow()
+QMVMainWindow_deprecated::QMVMainWindow_deprecated()
 {
     memset(m_vizWidgets, 0, sizeof(m_vizWidgets));
 
@@ -169,7 +169,7 @@ QMVMainWindow::QMVMainWindow()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QMVMainWindow::~QMVMainWindow()
+QMVMainWindow_deprecated::~QMVMainWindow_deprecated()
 {
 }
 
@@ -177,7 +177,7 @@ QMVMainWindow::~QMVMainWindow()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-int QMVMainWindow::vizWidgetCount()
+int QMVMainWindow_deprecated::vizWidgetCount()
 {
     int count = 0;
 
@@ -197,7 +197,7 @@ int QMVMainWindow::vizWidgetCount()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::createVizWidgets(int numWidgets, bool software, bool recycleScenes)
+void QMVMainWindow_deprecated::createVizWidgets(int numWidgets, bool software, bool recycleScenes)
 {
     CVF_ASSERT(numWidgets <= MAX_NUM_WIDGETS);
 
@@ -223,19 +223,19 @@ void QMVMainWindow::createVizWidgets(int numWidgets, bool software, bool recycle
     CVF_ASSERT(m_contextGroup.notNull());
     CVF_ASSERT(m_contextGroup->contextCount() == 0);
     
-    QMVWidget* shareWidget = NULL;
+    QMVWidget_deprecated* shareWidget = NULL;
     
     int i;
     for (i = 0; i < numWidgets; i++)
     {
-        QMVWidget* newWidget = NULL;
+        QMVWidget_deprecated* newWidget = NULL;
         if (shareWidget)
         {
-            newWidget = new QMVWidget(shareWidget, parentWidget);
+            newWidget = new QMVWidget_deprecated(shareWidget, parentWidget);
         }
         else
         {
-            newWidget = new QMVWidget(m_contextGroup.p(), oglFormat, parentWidget);
+            newWidget = new QMVWidget_deprecated(m_contextGroup.p(), oglFormat, parentWidget);
             shareWidget = newWidget;
         }
 
@@ -256,7 +256,7 @@ void QMVMainWindow::createVizWidgets(int numWidgets, bool software, bool recycle
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::deleteAllOpenGLResourcesInAllVizWidgets()
+void QMVMainWindow_deprecated::deleteAllOpenGLResourcesInAllVizWidgets()
 {
     cvf::OpenGLResourceManager* resourceManager = m_contextGroup.notNull() ? m_contextGroup->resourceManager() : NULL;
 
@@ -265,7 +265,7 @@ void QMVMainWindow::deleteAllOpenGLResourcesInAllVizWidgets()
     int i;
     for (i = 0; i < MAX_NUM_WIDGETS; i++)
     {
-        QMVWidget* vizWidget = m_vizWidgets[i];
+        QMVWidget_deprecated* vizWidget = m_vizWidgets[i];
         if (vizWidget)
         {
             vizWidget->makeCurrent();
@@ -289,7 +289,7 @@ void QMVMainWindow::deleteAllOpenGLResourcesInAllVizWidgets()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::deleteAllVizWidgets()
+void QMVMainWindow_deprecated::deleteAllVizWidgets()
 {
     QWidget* parentWidget = centralWidget();
     QLayout* layout = parentWidget->layout();
@@ -314,7 +314,7 @@ void QMVMainWindow::deleteAllVizWidgets()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::setSceneInAllVizWidgets(cvf::Scene* scene)
+void QMVMainWindow_deprecated::setSceneInAllVizWidgets(cvf::Scene* scene)
 {
     QMVRenderSequenceFactory factory;
 
@@ -335,14 +335,14 @@ void QMVMainWindow::setSceneInAllVizWidgets(cvf::Scene* scene)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::spreadScenesAcrossVizWidgets(cvf::Collection<cvf::Scene>* sceneCollection)
+void QMVMainWindow_deprecated::spreadScenesAcrossVizWidgets(cvf::Collection<cvf::Scene>* sceneCollection)
 {
     QMVRenderSequenceFactory factory;
 
     cvf::uint i;
     for (i = 0; i < static_cast<cvf::uint>(MAX_NUM_WIDGETS); i++)
     {
-        QMVWidget* vizWidget = m_vizWidgets[i];
+        QMVWidget_deprecated* vizWidget = m_vizWidgets[i];
         if (vizWidget)
         {
             cvf::Scene* scene = (sceneCollection->size() > i) ? sceneCollection->at(i) : NULL;
@@ -359,7 +359,7 @@ void QMVMainWindow::spreadScenesAcrossVizWidgets(cvf::Collection<cvf::Scene>* sc
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::gatherAllScenes(cvf::Collection<cvf::Scene>* sceneCollection)
+void QMVMainWindow_deprecated::gatherAllScenes(cvf::Collection<cvf::Scene>* sceneCollection)
 {
     int i;
     for (i = 0; i < MAX_NUM_WIDGETS; i++)
@@ -381,7 +381,7 @@ void QMVMainWindow::gatherAllScenes(cvf::Collection<cvf::Scene>* sceneCollection
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::redrawAllVizWidgets()
+void QMVMainWindow_deprecated::redrawAllVizWidgets()
 {
     int i;
     for (i = 0; i < MAX_NUM_WIDGETS; i++)
@@ -397,7 +397,7 @@ void QMVMainWindow::redrawAllVizWidgets()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::setRenderModeInAllModels(cvf::DrawableGeo::RenderMode renderMode)
+void QMVMainWindow_deprecated::setRenderModeInAllModels(cvf::DrawableGeo::RenderMode renderMode)
 {
     int i;
     for (i = 0; i < MAX_NUM_WIDGETS; i++)
@@ -437,7 +437,7 @@ void QMVMainWindow::setRenderModeInAllModels(cvf::DrawableGeo::RenderMode render
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::closeEvent(QCloseEvent*)
+void QMVMainWindow_deprecated::closeEvent(QCloseEvent*)
 {
     deleteAllOpenGLResourcesInAllVizWidgets();
 }
@@ -446,7 +446,7 @@ void QMVMainWindow::closeEvent(QCloseEvent*)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::slotSoftwareRenderingWidgets(bool software)
+void QMVMainWindow_deprecated::slotSoftwareRenderingWidgets(bool software)
 {
     int currNumWidgets = vizWidgetCount();
 
@@ -458,7 +458,7 @@ void QMVMainWindow::slotSoftwareRenderingWidgets(bool software)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::slotConfigNumWidgets()
+void QMVMainWindow_deprecated::slotConfigNumWidgets()
 {
     QObject* senderAct = sender();
 
@@ -475,9 +475,9 @@ void QMVMainWindow::slotConfigNumWidgets()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::slotCreateSphereAndBoxScene()
+void QMVMainWindow_deprecated::slotCreateSphereAndBoxScene()
 {
-    QMVModelFactory modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
+    QMVModelFactory_deprecated modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
     QMVSceneFactory sceneFactory(&modelFactory);
 
     ref<cvf::Model> model = modelFactory.createSphereAndBox();
@@ -490,9 +490,9 @@ void QMVMainWindow::slotCreateSphereAndBoxScene()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::slotCreateSpheresScene()
+void QMVMainWindow_deprecated::slotCreateSpheresScene()
 {
-    QMVModelFactory modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
+    QMVModelFactory_deprecated modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
     QMVSceneFactory sceneFactory(&modelFactory);
 
     ref<cvf::Model> model = modelFactory.createSpheres();
@@ -505,9 +505,9 @@ void QMVMainWindow::slotCreateSpheresScene()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::slotCreateBoxesScene()
+void QMVMainWindow_deprecated::slotCreateBoxesScene()
 {
-    QMVModelFactory modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
+    QMVModelFactory_deprecated modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
     QMVSceneFactory sceneFactory(&modelFactory);
 
     ref<cvf::Model> model = modelFactory.createBoxes();
@@ -520,9 +520,9 @@ void QMVMainWindow::slotCreateBoxesScene()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::slotCreateTrianglesScene()
+void QMVMainWindow_deprecated::slotCreateTrianglesScene()
 {
-    QMVModelFactory modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
+    QMVModelFactory_deprecated modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
     QMVSceneFactory sceneFactory(&modelFactory);
 
     ref<cvf::Model> model = modelFactory.createTriangles();
@@ -535,9 +535,9 @@ void QMVMainWindow::slotCreateTrianglesScene()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::slotAllWidgetsDifferentScene()
+void QMVMainWindow_deprecated::slotAllWidgetsDifferentScene()
 {
-    QMVModelFactory modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
+    QMVModelFactory_deprecated modelFactory(!m_softwareRenderingWidgetsAction->isChecked());
     QMVSceneFactory sceneFactory(&modelFactory);
     QMVRenderSequenceFactory renderSeqFactory;
 
@@ -559,7 +559,7 @@ void QMVMainWindow::slotAllWidgetsDifferentScene()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::slotClearScene()
+void QMVMainWindow_deprecated::slotClearScene()
 {
     int i;
     for (i = 0; i < MAX_NUM_WIDGETS; i++)
@@ -576,7 +576,7 @@ void QMVMainWindow::slotClearScene()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::slotUseBufferObjects()
+void QMVMainWindow_deprecated::slotUseBufferObjects()
 {
     setRenderModeInAllModels(cvf::DrawableGeo::BUFFER_OBJECT);
     redrawAllVizWidgets();
@@ -585,7 +585,7 @@ void QMVMainWindow::slotUseBufferObjects()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::slotUseClientVertexArrays()
+void QMVMainWindow_deprecated::slotUseClientVertexArrays()
 {
     setRenderModeInAllModels(cvf::DrawableGeo::VERTEX_ARRAY);
     redrawAllVizWidgets();
@@ -595,14 +595,14 @@ void QMVMainWindow::slotUseClientVertexArrays()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::slotDeleteAllResourcesInResourceManager()
+void QMVMainWindow_deprecated::slotDeleteAllResourcesInResourceManager()
 {
     if (m_contextGroup.notNull())
     {
         cvf::OpenGLResourceManager* rcMgr = m_contextGroup->resourceManager();
         CVF_ASSERT(rcMgr);
 
-        QMVWidget* vizWidget = m_vizWidgets[0];
+        QMVWidget_deprecated* vizWidget = m_vizWidgets[0];
         cvf::OpenGLContext* oglContext = vizWidget ? vizWidget->cvfOpenGLContext() : NULL;
         if (oglContext)
         {
@@ -618,7 +618,7 @@ void QMVMainWindow::slotDeleteAllResourcesInResourceManager()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVMainWindow::slotUpdateStatusbar()
+void QMVMainWindow_deprecated::slotUpdateStatusbar()
 {
     cvf::OpenGLResourceManager* resourceManager = m_contextGroup.notNull() ? m_contextGroup->resourceManager() : NULL;
 
@@ -633,7 +633,7 @@ void QMVMainWindow::slotUpdateStatusbar()
     int i;
     for (i = 0; i < MAX_NUM_WIDGETS; i++)
     {
-        QMVWidget* vizWidget = m_vizWidgets[i];
+        QMVWidget_deprecated* vizWidget = m_vizWidgets[i];
         if (vizWidget)
         {
             cvf::RenderSequence* renderSeq = vizWidget->renderSequence();

Fwk/VizFwk/TestApps/Qt/QtMultiView_deprecated/QMVMainWindow_deprecated.h

@@ -44,7 +44,7 @@
 #include <QtGlobal>
 #include <QMainWindow>
 
-class QMVWidget;
+class QMVWidget_deprecated;
 
 namespace cvf {
     class View;
@@ -60,13 +60,13 @@ namespace cvf {
 // 
 //
 //==================================================================================================
-class QMVMainWindow : public QMainWindow
+class QMVMainWindow_deprecated : public QMainWindow
 {
     Q_OBJECT
 
 public:
-    QMVMainWindow();
+    QMVMainWindow_deprecated();
-    ~QMVMainWindow();
+    ~QMVMainWindow_deprecated();
 
 private:
     int                         vizWidgetCount();
@@ -104,7 +104,7 @@ private slots:
 private:
     static const int                    MAX_NUM_WIDGETS = 4;
     cvf::ref<cvf::OpenGLContextGroup>   m_contextGroup;
-    QMVWidget*                          m_vizWidgets[MAX_NUM_WIDGETS];
+    QMVWidget_deprecated*               m_vizWidgets[MAX_NUM_WIDGETS];
 
     QAction*                            m_recycleScenesInWidgetConfigAction;
     QAction*                            m_softwareRenderingWidgetsAction;

Fwk/VizFwk/TestApps/Qt/QtMultiView_deprecated/QMVMain_deprecated.cpp

@@ -37,7 +37,7 @@
 
 #include "cvfLibCore.h"
 
-#include "QMVMainWindow.h"
+#include "QMVMainWindow_deprecated.h"
 
 #include <QApplication>
 #include "QtOpenGL/qgl.h"
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
     // On Linux, Qt will use the system locale, force number formatting settings back to "C" locale
     setlocale(LC_NUMERIC,"C");
 
-    QMVMainWindow window;
+    QMVMainWindow_deprecated window;
     QString platform = cvf::System::is64Bit() ? "(64bit)" : "(32bit)";
     window.setWindowTitle("Qt MultiView " + platform);
     window.resize(1000, 800);;

Fwk/VizFwk/TestApps/Qt/QtMultiView_deprecated/QMVWidget_deprecated.cpp

@@ -40,7 +40,7 @@
 #include "cvfLibGeometry.h"
 #include "cvfLibViewing.h"
 
-#include "QMVWidget.h"
+#include "QMVWidget_deprecated.h"
 
 #include <QMouseEvent>
 
@@ -51,7 +51,7 @@ using cvf::ref;
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QMVWidget::QMVWidget(cvf::OpenGLContextGroup* contextGroup, const QGLFormat& format, QWidget* parent)
+QMVWidget_deprecated::QMVWidget_deprecated(cvf::OpenGLContextGroup* contextGroup, const QGLFormat& format, QWidget* parent)
 :   cvfqt::GLWidget_deprecated(contextGroup, format, parent)
 {
     m_trackball = new cvf::ManipulatorTrackball;
@@ -61,7 +61,7 @@ QMVWidget::QMVWidget(cvf::OpenGLContextGroup* contextGroup, const QGLFormat& for
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QMVWidget::QMVWidget(QMVWidget* shareWidget, QWidget* parent)
+QMVWidget_deprecated::QMVWidget_deprecated(QMVWidget_deprecated* shareWidget, QWidget* parent)
 :   cvfqt::GLWidget_deprecated(shareWidget, parent)
 {
     m_trackball = new cvf::ManipulatorTrackball;
@@ -71,7 +71,7 @@ QMVWidget::QMVWidget(QMVWidget* shareWidget, QWidget* parent)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QMVWidget::~QMVWidget()
+QMVWidget_deprecated::~QMVWidget_deprecated()
 {
     cvfShutdownOpenGLContext();
 }
@@ -80,7 +80,7 @@ QMVWidget::~QMVWidget()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVWidget::setRenderSequence(cvf::RenderSequence* renderSequence)
+void QMVWidget_deprecated::setRenderSequence(cvf::RenderSequence* renderSequence)
 {
     m_trackball->setCamera(NULL);
     m_renderSequence = renderSequence;
@@ -106,7 +106,7 @@ void QMVWidget::setRenderSequence(cvf::RenderSequence* renderSequence)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-cvf::RenderSequence* QMVWidget::renderSequence()
+cvf::RenderSequence* QMVWidget_deprecated::renderSequence()
 {
     return m_renderSequence.p();
 }
@@ -115,7 +115,7 @@ cvf::RenderSequence* QMVWidget::renderSequence()
 //--------------------------------------------------------------------------------------------------
 ///  
 //--------------------------------------------------------------------------------------------------
-void QMVWidget::resizeGL(int width, int height)
+void QMVWidget_deprecated::resizeGL(int width, int height)
 {
     cvf::Camera* camera = currentCamera();
     if (camera)
@@ -133,7 +133,7 @@ void QMVWidget::resizeGL(int width, int height)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVWidget::paintGL()
+void QMVWidget_deprecated::paintGL()
 {
     cvf::OpenGLContext* currentOglContext = cvfOpenGLContext();
     CVF_ASSERT(currentOglContext);
@@ -158,7 +158,7 @@ void QMVWidget::paintGL()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-cvf::Camera* QMVWidget::currentCamera()
+cvf::Camera* QMVWidget_deprecated::currentCamera()
 {
     if (m_renderSequence.notNull())
     {
@@ -176,7 +176,7 @@ cvf::Camera* QMVWidget::currentCamera()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVWidget::mouseMoveEvent(QMouseEvent* event)
+void QMVWidget_deprecated::mouseMoveEvent(QMouseEvent* event)
 {
     if (m_renderSequence.isNull()) return;
 
@@ -214,7 +214,7 @@ void QMVWidget::mouseMoveEvent(QMouseEvent* event)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVWidget::mousePressEvent(QMouseEvent* event)
+void QMVWidget_deprecated::mousePressEvent(QMouseEvent* event)
 {
     if (m_renderSequence.isNull()) return;
 
@@ -241,7 +241,7 @@ void QMVWidget::mousePressEvent(QMouseEvent* event)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void QMVWidget::mouseReleaseEvent(QMouseEvent* /*event*/)
+void QMVWidget_deprecated::mouseReleaseEvent(QMouseEvent* /*event*/)
 {
     m_trackball->endNavigation();
 }

Fwk/VizFwk/TestApps/Qt/QtMultiView_deprecated/QMVWidget_deprecated.h

@@ -48,14 +48,14 @@
 // 
 //
 //==================================================================================================
-class QMVWidget : public cvfqt::GLWidget_deprecated
+class QMVWidget_deprecated : public cvfqt::GLWidget_deprecated
 {
     Q_OBJECT
 
 public:
-    QMVWidget(cvf::OpenGLContextGroup* contextGroup, const QGLFormat& format, QWidget* parent);
+    QMVWidget_deprecated(cvf::OpenGLContextGroup* contextGroup, const QGLFormat& format, QWidget* parent);
-    QMVWidget(QMVWidget* shareWidget, QWidget* parent);
+    QMVWidget_deprecated(QMVWidget_deprecated* shareWidget, QWidget* parent);
-    ~QMVWidget();
+    ~QMVWidget_deprecated();
 
     void                    setRenderSequence(cvf::RenderSequence* renderSequence);
     cvf::RenderSequence*    renderSequence();