Removed support for very outdated Qt3, relying only on Qt4.0 now

src/ui/map3D/QOSGWidget.cc

@@ -19,22 +19,13 @@
 #include "QOSGWidget.h"
 
 QOSGWidget::QOSGWidget( QWidget * parent, const char * name, WindowFlags f, bool overrideTraits):
-#if USE_QT4
     QWidget(parent, f), _overrideTraits (overrideTraits)
-#else
-    QWidget(parent, name, f), _overrideTraits (overrideTraits)
-#endif
 {
     createContext();
     
-
-#if USE_QT4
     setAttribute(Qt::WA_PaintOnScreen);
     setAttribute(Qt::WA_NoSystemBackground);
     setFocusPolicy(Qt::ClickFocus);   
-#else
-    setBackgroundMode(Qt::NoBackground);
-#endif    
 }
 
 void QOSGWidget::createContext()
@@ -106,9 +97,7 @@ void QOSGWidget::destroyEvent(bool destroyWindow, bool destroySubWindows)
 
 void QOSGWidget::closeEvent( QCloseEvent * event )
 {
-#ifndef USE_QT4
     event->accept();
-#endif
 
     _gw->getEventQueue()->closeWindow();
 }
@@ -123,20 +112,12 @@ void QOSGWidget::resizeEvent( QResizeEvent * event )
 
 void QOSGWidget::keyPressEvent( QKeyEvent* event )
 {
-#if USE_QT4
     _gw->getEventQueue()->keyPress( (osgGA::GUIEventAdapter::KeySymbol) *(event->text().toAscii().data() ) );
-#else
-    _gw->getEventQueue()->keyPress( (osgGA::GUIEventAdapter::KeySymbol) event->ascii() );
-#endif
 }
 
 void QOSGWidget::keyReleaseEvent( QKeyEvent* event )
 {
-#if USE_QT4
     int c = *event->text().toAscii().data();
-#else
-    int c = event->ascii();
-#endif
 
     _gw->getEventQueue()->keyRelease( (osgGA::GUIEventAdapter::KeySymbol) (c) );
 }
@@ -229,8 +210,6 @@ void CompositeViewerQOSG::RemoveView()
   Tile();
 }
 
-
-#if USE_QT4
 // we use this wrapper for CompositeViewer ONLY because of the timer
 // NOTE: this is a workaround because we're not using QT's moc precompiler here.
 //
@@ -259,7 +238,6 @@ class QViewerTimer : public QWidget
         QTimer _timer;
 
 };
-#endif
 
 void setupHandlers(osgViewer::View * viewer)
 {

src/ui/map3D/QOSGWidget.h

@@ -19,31 +19,17 @@
 #include <osg/Config>
 
 #if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
-    // disable warning "'QtConcurrent::BlockSizeManager' : assignment operator could not be generated"
-    #pragma warning( disable : 4512 )
-#endif
-
-#if QT_VERSION >= 400
-
-    #include <QtCore/QString>
-    #include <QtCore/QTimer>
-    #include <QtGui/QKeyEvent>
-    #include <QtGui/QApplication>
-    #include <QtGui/QtGui>
-    #include <QtGui/QWidget>
-    using Qt::WindowFlags;
-
-#else
-
-    class QWidget;
-    #include <qtimer.h>
-    #include <qgl.h>
-    #include <qapplication.h>
-
-    #define WindowFlags WFlags
-
+// disable warning "'QtConcurrent::BlockSizeManager' : assignment operator could not be generated"
+#pragma warning( disable : 4512 )
 #endif
 
+#include <QtCore/QString>
+#include <QtCore/QTimer>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QtGui>
+#include <QtGui/QWidget>
+using Qt::WindowFlags;
 
 #include <osgViewer/Viewer>
 #include <osgViewer/CompositeViewer>
@@ -85,7 +71,7 @@ typedef osgViewer::GraphicsWindowX11::WindowData WindowData;
 
 class QOSGWidget : public QWidget
 {
-    public:
+public:
 
     QOSGWidget( QWidget * parent = 0, const char * name = 0, WindowFlags f = 0, bool overrideTraits = false);
 
@@ -94,7 +80,7 @@ class QOSGWidget : public QWidget
     osgViewer::GraphicsWindow* getGraphicsWindow() { return _gw.get(); }
     const osgViewer::GraphicsWindow* getGraphicsWindow() const { return _gw.get(); }
 
-    protected:
+protected:
 
     void init();
     void createContext();
@@ -119,7 +105,7 @@ class QOSGWidget : public QWidget
 
 class ViewerQOSG : public osgViewer::Viewer, public QOSGWidget
 {
-    public:
+public:
 
     ViewerQOSG(QWidget * parent = 0, const char * name = 0, WindowFlags f = 0, int fps = 20):
             QOSGWidget( parent, name, f )
@@ -139,7 +125,7 @@ class ViewerQOSG : public osgViewer::Viewer, public QOSGWidget
 
     virtual void paintEvent( QPaintEvent * event ) { frame(); }
 
-    protected:
+protected:
 
     QTimer _timer;
 };
@@ -147,7 +133,7 @@ class ViewerQOSG : public osgViewer::Viewer, public QOSGWidget
 
 class CompositeViewerQOSG : public osgViewer::CompositeViewer, public QOSGWidget
 {
-    public:
+public:
     CompositeViewerQOSG(QWidget * parent = 0, const char * name = 0, WindowFlags f = 0, int fps = 20)
         : QOSGWidget( parent, name, f )
     {
@@ -196,7 +182,7 @@ class CompositeViewerQOSG : public osgViewer::CompositeViewer, public QOSGWidget
 
     osg::ref_ptr< osg::Node > _scene;
 
-    protected:
+protected:
     QTimer _timer;
 };