rock-core · haider8645 · Mar 28, 2022 · Mar 28, 2022
diff --git a/src/2dvis/WaterwallDisplayPlugin.h b/src/2dvis/WaterwallDisplayPlugin.h
@@ -2,7 +2,7 @@
 #ifndef WATERFALLDISPLAYPLUGIN_H
 #define WATERFALLDISPLAYPLUGIN_H
 
-#include <QtGui/QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class WaterfallDisplayPlugin : public QObject , public QDesignerCustomWidgetInterface

diff --git a/src/2dvis/qwaterfalldisplay.h b/src/2dvis/qwaterfalldisplay.h
@@ -3,7 +3,7 @@
 
 #include <QtWidgets>
 
-#include <QDesignerExportWidget>
+#include <QtUiPlugin/QDesignerExportWidget>
 
 #include <list>
 #include <vector>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 #find_package(Qt4 REQUIRED QtCore QtGui QtOpengl QtDesigner )
-rock_find_qt5(Widgets PrintSupport OpenGL Gui Designer REQUIRED)
+rock_find_qt5(Core Gui Widgets UiPlugin PrintSupport OpenGL Designer REQUIRED)
 
 option(USE_VTK "Use VTK for additional Widgets" FALSE)
 option(USE_GST "Use GStreamer in GstImageView" OFF)
@@ -23,10 +23,9 @@ endif()
 
 
 include_directories(multi_view/ generic_widgets/)
-#include_directories(${QT_INCLUDE_DIR})
-#include_directories(${QT_QTCORE_INCLUDE_DIR})
-#include_directories(${QT_QTGUI_INCLUDE_DIR})
-
+INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Qt5Gui_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 

diff --git a/src/artificial_horizon/artificialhorizonplugin.h b/src/artificial_horizon/artificialhorizonplugin.h
@@ -2,7 +2,7 @@
 #ifndef ARTIFICIALHORIZONGETPLUGIN_H
 #define ARTIFICIALHORIZONGETPLUGIN_H
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class ArtificialHorizonPlugin : public QObject , public QDesignerCustomWidgetInterface

diff --git a/src/artificial_horizon/compassplugin.h b/src/artificial_horizon/compassplugin.h
@@ -2,7 +2,7 @@
 #ifndef _COMPASSPLUGIN_H
 #define _COMPASSPLUGIN_H
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class CompassPlugin : public QObject , public QDesignerCustomWidgetInterface

diff --git a/src/artificial_horizon/orientationplugin.h b/src/artificial_horizon/orientationplugin.h
@@ -2,7 +2,7 @@
 #ifndef _ORIENTATIONPLUGIN_H
 #define _ORIENTATIONPLUGIN_H
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class OrientationPlugin : public QObject , public QDesignerCustomWidgetInterface

diff --git a/src/generic_widgets/RockSliderPlugin.h b/src/generic_widgets/RockSliderPlugin.h
@@ -2,7 +2,7 @@
 #ifndef _ROCKSLIDERPLUGIN_H
 #define _ROCKSLIDERPLUGIN_H
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class RockSliderPlugin : public QObject , public QDesignerCustomWidgetInterface

diff --git a/src/image_view/GraphicsPointsItem.h b/src/image_view/GraphicsPointsItem.h
@@ -1,7 +1,7 @@
 #ifndef GRAPHICSPOINTSITEM_H__
 #define GRAPHICSPOINTSITEM_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtCore>
 #include <QGraphicsItem>
 

diff --git a/src/image_view/ImageView.h b/src/image_view/ImageView.h
@@ -5,7 +5,7 @@
 #ifndef IMAGE_VIEW_H
 #define IMAGE_VIEW_H
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtCore>
 #include <QMenu>
 

diff --git a/src/image_view/ImageViewPlugin.h b/src/image_view/ImageViewPlugin.h
@@ -1,13 +1,14 @@
 #ifndef GSTIMAGEVIEWPLUGIN_H
 #define GSTIMAGEVIEWPLUGIN_H
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class ImageViewPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
-
+    Q_INTERFACES(QDesignerCustomWidgetInterface)
+
 public:
     ImageViewPlugin(QObject *parent = 0);
     virtual ~ImageViewPlugin();

diff --git a/src/image_view/main.cpp b/src/image_view/main.cpp
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 
 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
 #include <QtOpenGL/QGLWidget>
 #include <QApplication>
 

diff --git a/src/image_view_old/ImageViewOld.h b/src/image_view_old/ImageViewOld.h
@@ -19,7 +19,7 @@
 #include <QFileDialog>
 #include <QMenu>
 #include <QString>
-#include <QDesignerExportWidget>
+#include <QtUiPlugin/QDesignerExportWidget>
 
 #include <iostream>
 #include <frame_helper/FrameQImageConverter.h>

diff --git a/src/image_view_old/ImageViewOldPlugin.h b/src/image_view_old/ImageViewOldPlugin.h
@@ -2,7 +2,7 @@
 #ifndef IMAGEVIEWOLDPLUGIN_H
 #define IMAGEVIEWOLDPLUGIN_H
 
-#include <QtGui/QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 /*!
@@ -11,6 +11,7 @@
 class ImageViewOldPlugin : public QObject , public QDesignerCustomWidgetInterface
 {
   Q_OBJECT
+  Q_INTERFACES(QDesignerCustomWidgetInterface)
 
  public:
    ImageViewOldPlugin(QObject *parent = 0);

diff --git a/src/multi_view/MultiViewPlugin.h b/src/multi_view/MultiViewPlugin.h
@@ -10,9 +10,9 @@
 
 #include "MultiViewWidget.h"
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
-#include <QtDesigner/QDesignerFormWindowInterface>
+#include <QDesignerFormWindowInterface>
 
 #include <vector>
 
@@ -26,7 +26,7 @@ class MultiViewPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
 
     Q_OBJECT
-
+    Q_INTERFACES(QDesignerCustomWidgetInterface)
 public:
     /**
      * Simple constructor

diff --git a/src/multi_view/MultiViewWidget.cc b/src/multi_view/MultiViewWidget.cc
@@ -192,6 +192,8 @@ void MultiViewWidget::addWidget(const QString &name, QWidget* widget_, const QIc
 	    case WidgetButton::Bottom:
                 bottom->addWidget(widgetButton);
                 break;
+        default:
+                break;
         }
     }else{
         switch(currentWidget->getPosition())
@@ -208,6 +210,8 @@ void MultiViewWidget::addWidget(const QString &name, QWidget* widget_, const QIc
             case WidgetButton::Top:
                 top->addWidget(widgetButton);
                 break;
+            default:
+                break;
         }
     }
 

diff --git a/src/multi_view/MultiWidget.h b/src/multi_view/MultiWidget.h
@@ -8,7 +8,7 @@
 class QDESIGNER_WIDGET_EXPORT MultiWidget : public PaintWidget 
 {
 	Q_OBJECT
-  Q_CLASSINFO("Author", "Matthias Goldhoorn")
+    Q_CLASSINFO("Author", "Matthias Goldhoorn")
 	Q_PROPERTY(bool hideWhenMinimized READ isHiddenWhenMinimized WRITE hideWhenMin USER false)
 	Q_PROPERTY(QString minimizedLabel READ getMinimizedLabel WRITE setMinimizedLabel)
 

diff --git a/src/multi_view/MultiWidgetPlugin.h b/src/multi_view/MultiWidgetPlugin.h
@@ -2,13 +2,14 @@
 #ifndef MULTIWIDGETPLUGIN_H
 #define MULTIWIDGETPLUGIN_H 
 
-#include <QtGui/QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class MultiWidgetPlugin : public QObject , public QDesignerCustomWidgetInterface
 {
   Q_OBJECT
-
+  Q_INTERFACES(QDesignerCustomWidgetInterface)
+
  public:
    MultiWidgetPlugin(QObject *parent = 0);
    virtual ~MultiWidgetPlugin();

diff --git a/src/multi_view/WidgetButtonPlugin.h b/src/multi_view/WidgetButtonPlugin.h
@@ -2,13 +2,14 @@
 #ifndef WIDGETBUTTONPLUGIN_H
 #define WIDGETBUTTONPLUGIN_H 
 
-#include <QtGui/QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class WidgetButtonPlugin : public QObject , public QDesignerCustomWidgetInterface
 {
   Q_OBJECT
-
+  Q_INTERFACES(QDesignerCustomWidgetInterface)
+
  public:
    WidgetButtonPlugin(QObject *parent = 0);
    virtual ~WidgetButtonPlugin();

diff --git a/src/plot2d/Plot2d.h b/src/plot2d/Plot2d.h
@@ -4,7 +4,7 @@
 
 #include <QString>
 #include <QList>
-#include <QDesignerExportWidget>
+#include <QtUiPlugin/QDesignerExportWidget>
 #include <QWidget>
 
 #include <iostream>

diff --git a/src/plot2d/Plot2dPlugin.h b/src/plot2d/Plot2dPlugin.h
@@ -2,13 +2,14 @@
 #ifndef PLOT2DPLUGIN_H
 #define PLOT2DPLUGIN_H 
 
-#include <QtGui/QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class Plot2dPlugin : public QObject , public QDesignerCustomWidgetInterface
 {
   Q_OBJECT
-
+  Q_INTERFACES(QDesignerCustomWidgetInterface)
+
  public:
    Plot2dPlugin(QObject *parent = 0);
    virtual ~Plot2dPlugin();

diff --git a/src/progress_indicator/ProgressIndicatorPlugin.h b/src/progress_indicator/ProgressIndicatorPlugin.h
@@ -1,13 +1,13 @@
 #ifndef PROGRESSINDICATORPLUGIN_H
 #define PROGRESSINDICATORPLUGIN_H
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class ProgressIndicatorPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
-
+    Q_INTERFACES(QDesignerCustomWidgetInterface)
 public:
     ProgressIndicatorPlugin(QObject *parent = 0);
     virtual ~ProgressIndicatorPlugin();

diff --git a/src/range_view/RangeViewGL.cc b/src/range_view/RangeViewGL.cc
@@ -204,7 +204,7 @@ void RangeViewGL::paintGL(){
 	glVertex3f(0,0,0);	
 	glPointSize(1);
 	qglColor(color);
-	for(int i=0;i<data.size();i++){
+	for(unsigned int i=0;i<data.size();i++){
 		glVertex3f(data[i][0],data[i][1],data[i][2]);
 	}
 	glEnd();

diff --git a/src/range_view/RangeViewPlugin.h b/src/range_view/RangeViewPlugin.h
@@ -2,13 +2,13 @@
 #ifndef RANGEVIEWPLUGIN_H
 #define RANGEVIEWPLUGIN_H 
 
-#include <QtGui/QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class RangeViewPlugin : public QObject , public QDesignerCustomWidgetInterface
 {
   Q_OBJECT
-
+  Q_INTERFACES(QDesignerCustomWidgetInterface)
  public:
    RangeViewPlugin(QObject *parent = 0);
    virtual ~RangeViewPlugin();

diff --git a/src/sonar_view/SonarViewPlugin.h b/src/sonar_view/SonarViewPlugin.h
@@ -2,13 +2,13 @@
 #ifndef SONARVIEWPLUGIN_H
 #define SONARVIEWPLUGIN_H 
 
-#include <QtGui/QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class SonarViewPlugin : public QObject , public QDesignerCustomWidgetInterface
 {
   Q_OBJECT
-
+  Q_INTERFACES(QDesignerCustomWidgetInterface)
  public:
    SonarViewPlugin(QObject *parent = 0);
    virtual ~SonarViewPlugin();

diff --git a/src/sonar_widget/SonarPlot.h b/src/sonar_widget/SonarPlot.h
@@ -1,7 +1,7 @@
 #ifndef SONARPLOT_H
 #define SONARPLOT_H
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QFrame>
 #include <base/samples/Sonar.hpp>
 #include <frame_helper/ColorGradient.h>

diff --git a/src/sonar_widget/SonarWidget.h b/src/sonar_widget/SonarWidget.h
@@ -1,7 +1,7 @@
 #ifndef SONARWIDGET_H
 #define SONARWIDGET_H
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QWidget>
 #include <base/samples/SonarScan.hpp>
 #include <base/samples/Sonar.hpp>

diff --git a/src/sonar_widget/SonarWidgetPlugin.h b/src/sonar_widget/SonarWidgetPlugin.h
@@ -1,13 +1,13 @@
 #ifndef SONARWIDGETPLUGIN_H
 #define SONARWIDGETPLUGIN_H
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class SonarWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
-
+    Q_INTERFACES(QDesignerCustomWidgetInterface) 
 public:
     SonarWidgetPlugin(QObject *parent = 0);
     virtual ~SonarWidgetPlugin();

diff --git a/src/stream_aligner_widget/StreamAlignerWidgetPlugin.h b/src/stream_aligner_widget/StreamAlignerWidgetPlugin.h
@@ -2,11 +2,12 @@
 #define STREAMALIGNERWIDGETPLUGIN_H
 
 #include <QObject>
-#include <QtDesigner/QDesignerCustomWidgetInterface>
+#include <QtUiPlugin/QDesignerCustomWidgetInterface>
 
 class StreamAlignerWidgetPlugin : public QObject , public QDesignerCustomWidgetInterface
 {
 	Q_OBJECT
+	Q_INTERFACES(QDesignerCustomWidgetInterface)
 
     public:
 	StreamAlignerWidgetPlugin(QObject *parent = 0);
@@ -33,7 +34,8 @@ class AggregatorCollection: public QObject, public QDesignerCustomWidgetCollecti
 {
    Q_OBJECT
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface")
-
+   Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)	
+
 public:
    AggregatorCollection(QObject *parent = 0);
    virtual QList<QDesignerCustomWidgetInterface*> customWidgets() const;

diff --git a/src/timeline/SlideBarItem.cc b/src/timeline/SlideBarItem.cc
@@ -1,6 +1,6 @@
 #include "SlideBarItem.h"
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QGraphicsSceneMouseEvent>
 #include <QStyle>
 

diff --git a/src/timeline/Slider.h b/src/timeline/Slider.h
@@ -1,7 +1,7 @@
 #ifndef SLIDER_H
 #define	SLIDER_H
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QGraphicsItem>
 
 class Slider : public QObject, public QGraphicsPixmapItem

diff --git a/src/timeline/TestWidget.h b/src/timeline/TestWidget.h
@@ -1,7 +1,7 @@
 #ifndef TESTWIDGET_H
 #define	TESTWIDGET_H
 
-#include <QtGui>
+#include <QtWidgets>
 #include "Timeline.h"
 #include <iostream>
 #include <QLabel>