From 1b4c7f28bebb4fe9a042a5869f4e40a0b77ed7f6 Mon Sep 17 00:00:00 2001 From: mlodhi Date: Mon, 28 Mar 2022 16:07:44 +0200 Subject: [PATCH 1/2] Update headers for qt5 --- src/2dvis/WaterwallDisplayPlugin.h | 2 +- src/2dvis/qwaterfalldisplay.h | 2 +- src/artificial_horizon/artificialhorizonplugin.h | 2 +- src/artificial_horizon/compassplugin.h | 2 +- src/artificial_horizon/orientationplugin.h | 2 +- src/generic_widgets/RockSliderPlugin.h | 2 +- src/image_view/GraphicsPointsItem.h | 2 +- src/image_view/ImageView.h | 2 +- src/image_view/main.cpp | 2 +- src/image_view_old/ImageViewOld.h | 2 +- src/plot2d/Plot2d.h | 2 +- src/progress_indicator/ProgressIndicatorPlugin.h | 4 ++-- src/sonar_widget/SonarPlot.h | 2 +- src/sonar_widget/SonarWidget.h | 2 +- src/timeline/SlideBarItem.cc | 2 +- src/timeline/Slider.h | 2 +- src/timeline/TestWidget.h | 2 +- src/timeline/Timeline.h | 2 +- src/timeline/main.cpp | 2 +- src/virtual_joystick/VirtualJoystick.h | 2 +- src/vtk/sonar_display/SonarDisplay.h | 14 +++++++------- src/vtk/vectorfield3D/vectorfield3D.h | 2 +- 22 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/2dvis/WaterwallDisplayPlugin.h b/src/2dvis/WaterwallDisplayPlugin.h index f694f1b..3caf6fb 100644 --- a/src/2dvis/WaterwallDisplayPlugin.h +++ b/src/2dvis/WaterwallDisplayPlugin.h @@ -2,7 +2,7 @@ #ifndef WATERFALLDISPLAYPLUGIN_H #define WATERFALLDISPLAYPLUGIN_H -#include +#include #include class WaterfallDisplayPlugin : public QObject , public QDesignerCustomWidgetInterface diff --git a/src/2dvis/qwaterfalldisplay.h b/src/2dvis/qwaterfalldisplay.h index 0d80087..9c0e70f 100644 --- a/src/2dvis/qwaterfalldisplay.h +++ b/src/2dvis/qwaterfalldisplay.h @@ -3,7 +3,7 @@ #include -#include +#include #include #include diff --git a/src/artificial_horizon/artificialhorizonplugin.h b/src/artificial_horizon/artificialhorizonplugin.h index 8e84fcb..c3c77e3 100644 --- a/src/artificial_horizon/artificialhorizonplugin.h +++ b/src/artificial_horizon/artificialhorizonplugin.h @@ -2,7 +2,7 @@ #ifndef ARTIFICIALHORIZONGETPLUGIN_H #define ARTIFICIALHORIZONGETPLUGIN_H -#include +#include #include class ArtificialHorizonPlugin : public QObject , public QDesignerCustomWidgetInterface diff --git a/src/artificial_horizon/compassplugin.h b/src/artificial_horizon/compassplugin.h index 9bd55c8..13940df 100644 --- a/src/artificial_horizon/compassplugin.h +++ b/src/artificial_horizon/compassplugin.h @@ -2,7 +2,7 @@ #ifndef _COMPASSPLUGIN_H #define _COMPASSPLUGIN_H -#include +#include #include class CompassPlugin : public QObject , public QDesignerCustomWidgetInterface diff --git a/src/artificial_horizon/orientationplugin.h b/src/artificial_horizon/orientationplugin.h index 0e77586..a6e318c 100644 --- a/src/artificial_horizon/orientationplugin.h +++ b/src/artificial_horizon/orientationplugin.h @@ -2,7 +2,7 @@ #ifndef _ORIENTATIONPLUGIN_H #define _ORIENTATIONPLUGIN_H -#include +#include #include class OrientationPlugin : public QObject , public QDesignerCustomWidgetInterface diff --git a/src/generic_widgets/RockSliderPlugin.h b/src/generic_widgets/RockSliderPlugin.h index 9a4eac1..f976499 100644 --- a/src/generic_widgets/RockSliderPlugin.h +++ b/src/generic_widgets/RockSliderPlugin.h @@ -2,7 +2,7 @@ #ifndef _ROCKSLIDERPLUGIN_H #define _ROCKSLIDERPLUGIN_H -#include +#include #include class RockSliderPlugin : public QObject , public QDesignerCustomWidgetInterface diff --git a/src/image_view/GraphicsPointsItem.h b/src/image_view/GraphicsPointsItem.h index 6048066..eada367 100644 --- a/src/image_view/GraphicsPointsItem.h +++ b/src/image_view/GraphicsPointsItem.h @@ -1,7 +1,7 @@ #ifndef GRAPHICSPOINTSITEM_H__ #define GRAPHICSPOINTSITEM_H__ -#include +#include #include #include diff --git a/src/image_view/ImageView.h b/src/image_view/ImageView.h index 2c3a70a..dc0b3f2 100644 --- 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 +#include #include #include diff --git a/src/image_view/main.cpp b/src/image_view/main.cpp index cb297c8..3604c9c 100644 --- a/src/image_view/main.cpp +++ b/src/image_view/main.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/src/image_view_old/ImageViewOld.h b/src/image_view_old/ImageViewOld.h index 0116bee..54530eb 100644 --- a/src/image_view_old/ImageViewOld.h +++ b/src/image_view_old/ImageViewOld.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/plot2d/Plot2d.h b/src/plot2d/Plot2d.h index f92ffd8..5d42517 100644 --- a/src/plot2d/Plot2d.h +++ b/src/plot2d/Plot2d.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/src/progress_indicator/ProgressIndicatorPlugin.h b/src/progress_indicator/ProgressIndicatorPlugin.h index 307130e..1355a39 100644 --- a/src/progress_indicator/ProgressIndicatorPlugin.h +++ b/src/progress_indicator/ProgressIndicatorPlugin.h @@ -1,13 +1,13 @@ #ifndef PROGRESSINDICATORPLUGIN_H #define PROGRESSINDICATORPLUGIN_H -#include +#include #include class ProgressIndicatorPlugin : public QObject, public QDesignerCustomWidgetInterface { Q_OBJECT - + Q_INTERFACES(QDesignerCustomWidgetInterface) public: ProgressIndicatorPlugin(QObject *parent = 0); virtual ~ProgressIndicatorPlugin(); diff --git a/src/sonar_widget/SonarPlot.h b/src/sonar_widget/SonarPlot.h index 6b0a3d3..0120127 100644 --- a/src/sonar_widget/SonarPlot.h +++ b/src/sonar_widget/SonarPlot.h @@ -1,7 +1,7 @@ #ifndef SONARPLOT_H #define SONARPLOT_H -#include +#include #include #include #include diff --git a/src/sonar_widget/SonarWidget.h b/src/sonar_widget/SonarWidget.h index 883c37c..2570324 100644 --- a/src/sonar_widget/SonarWidget.h +++ b/src/sonar_widget/SonarWidget.h @@ -1,7 +1,7 @@ #ifndef SONARWIDGET_H #define SONARWIDGET_H -#include +#include #include #include #include diff --git a/src/timeline/SlideBarItem.cc b/src/timeline/SlideBarItem.cc index 09faa90..71be4a7 100644 --- a/src/timeline/SlideBarItem.cc +++ b/src/timeline/SlideBarItem.cc @@ -1,6 +1,6 @@ #include "SlideBarItem.h" -#include +#include #include #include diff --git a/src/timeline/Slider.h b/src/timeline/Slider.h index 7602bdf..28a8441 100644 --- a/src/timeline/Slider.h +++ b/src/timeline/Slider.h @@ -1,7 +1,7 @@ #ifndef SLIDER_H #define SLIDER_H -#include +#include #include class Slider : public QObject, public QGraphicsPixmapItem diff --git a/src/timeline/TestWidget.h b/src/timeline/TestWidget.h index 5a9b154..8a524ac 100644 --- a/src/timeline/TestWidget.h +++ b/src/timeline/TestWidget.h @@ -1,7 +1,7 @@ #ifndef TESTWIDGET_H #define TESTWIDGET_H -#include +#include #include "Timeline.h" #include #include diff --git a/src/timeline/Timeline.h b/src/timeline/Timeline.h index 8a7cf7d..341214a 100644 --- a/src/timeline/Timeline.h +++ b/src/timeline/Timeline.h @@ -9,7 +9,7 @@ #ifndef TIMELINE_H #define TIMELINE_H -#include +#include #include #include "BoundarySlider.h" #include "SlideBarItem.h" diff --git a/src/timeline/main.cpp b/src/timeline/main.cpp index 4164386..4dee15d 100644 --- a/src/timeline/main.cpp +++ b/src/timeline/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/virtual_joystick/VirtualJoystick.h b/src/virtual_joystick/VirtualJoystick.h index 7f51a0e..7302def 100644 --- a/src/virtual_joystick/VirtualJoystick.h +++ b/src/virtual_joystick/VirtualJoystick.h @@ -1,7 +1,7 @@ #ifndef _VIRTUAL_JOYSTICK_WIDGET_H #define _VIRTUAL_JOYSTICK_WIDGET_H -#include +#include #include #include diff --git a/src/vtk/sonar_display/SonarDisplay.h b/src/vtk/sonar_display/SonarDisplay.h index d346753..5a39872 100644 --- a/src/vtk/sonar_display/SonarDisplay.h +++ b/src/vtk/sonar_display/SonarDisplay.h @@ -9,15 +9,15 @@ #define SONARDISPLAY_H #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include -#include +#include +#include #include #include diff --git a/src/vtk/vectorfield3D/vectorfield3D.h b/src/vtk/vectorfield3D/vectorfield3D.h index a473959..cc82a14 100644 --- a/src/vtk/vectorfield3D/vectorfield3D.h +++ b/src/vtk/vectorfield3D/vectorfield3D.h @@ -10,7 +10,7 @@ #ifndef VECTORFIELD3D_H #define VECTORFIELD3D_H -#include +#include #include #include #include From a86645547fb7263ae4de0309208891b8a903c38f Mon Sep 17 00:00:00 2001 From: mlodhi Date: Mon, 28 Mar 2022 16:08:39 +0200 Subject: [PATCH 2/2] Add Q_INTERFACES back and handle warnings --- src/CMakeLists.txt | 9 ++++----- src/image_view/ImageViewPlugin.h | 5 +++-- src/image_view_old/ImageViewOldPlugin.h | 3 ++- src/multi_view/MultiViewPlugin.h | 6 +++--- src/multi_view/MultiViewWidget.cc | 4 ++++ src/multi_view/MultiWidget.h | 2 +- src/multi_view/MultiWidgetPlugin.h | 5 +++-- src/multi_view/WidgetButtonPlugin.h | 5 +++-- src/plot2d/Plot2dPlugin.h | 5 +++-- src/range_view/RangeViewGL.cc | 2 +- src/range_view/RangeViewPlugin.h | 4 ++-- src/sonar_view/SonarViewPlugin.h | 4 ++-- src/sonar_widget/SonarWidgetPlugin.h | 4 ++-- src/stream_aligner_widget/StreamAlignerWidgetPlugin.h | 6 ++++-- src/timeline/TimelinePlugin.h | 5 +++-- src/virtual_joystick/VirtualJoystickPlugin.h | 4 ++-- src/vtk/plot2d/Plot2dPlugin.h | 5 +++-- src/vtk/sonar_display/SonarDisplayPlugin.h | 4 ++-- src/vtk/vectorfield3D/vectorfield3DPlugin.h | 4 ++-- 19 files changed, 49 insertions(+), 37 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 80b5309..7a8a5ee 100644 --- 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/image_view/ImageViewPlugin.h b/src/image_view/ImageViewPlugin.h index 7020537..4a99123 100644 --- a/src/image_view/ImageViewPlugin.h +++ b/src/image_view/ImageViewPlugin.h @@ -1,13 +1,14 @@ #ifndef GSTIMAGEVIEWPLUGIN_H #define GSTIMAGEVIEWPLUGIN_H -#include +#include #include class ImageViewPlugin : public QObject, public QDesignerCustomWidgetInterface { Q_OBJECT - + Q_INTERFACES(QDesignerCustomWidgetInterface) + public: ImageViewPlugin(QObject *parent = 0); virtual ~ImageViewPlugin(); diff --git a/src/image_view_old/ImageViewOldPlugin.h b/src/image_view_old/ImageViewOldPlugin.h index a8187e3..513abee 100644 --- 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 +#include #include /*! @@ -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 index 6aedb99..de03c3f 100644 --- a/src/multi_view/MultiViewPlugin.h +++ b/src/multi_view/MultiViewPlugin.h @@ -10,9 +10,9 @@ #include "MultiViewWidget.h" -#include +#include #include -#include +#include #include @@ -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 index 214e7cd..09555c5 100644 --- 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 index 2e253c9..4f3a8e2 100644 --- 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 index 31eb714..75f7235 100644 --- a/src/multi_view/MultiWidgetPlugin.h +++ b/src/multi_view/MultiWidgetPlugin.h @@ -2,13 +2,14 @@ #ifndef MULTIWIDGETPLUGIN_H #define MULTIWIDGETPLUGIN_H -#include +#include #include 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 index afe4f24..6b37230 100644 --- a/src/multi_view/WidgetButtonPlugin.h +++ b/src/multi_view/WidgetButtonPlugin.h @@ -2,13 +2,14 @@ #ifndef WIDGETBUTTONPLUGIN_H #define WIDGETBUTTONPLUGIN_H -#include +#include #include class WidgetButtonPlugin : public QObject , public QDesignerCustomWidgetInterface { Q_OBJECT - + Q_INTERFACES(QDesignerCustomWidgetInterface) + public: WidgetButtonPlugin(QObject *parent = 0); virtual ~WidgetButtonPlugin(); diff --git a/src/plot2d/Plot2dPlugin.h b/src/plot2d/Plot2dPlugin.h index bf7c286..97c3841 100644 --- a/src/plot2d/Plot2dPlugin.h +++ b/src/plot2d/Plot2dPlugin.h @@ -2,13 +2,14 @@ #ifndef PLOT2DPLUGIN_H #define PLOT2DPLUGIN_H -#include +#include #include class Plot2dPlugin : public QObject , public QDesignerCustomWidgetInterface { Q_OBJECT - + Q_INTERFACES(QDesignerCustomWidgetInterface) + public: Plot2dPlugin(QObject *parent = 0); virtual ~Plot2dPlugin(); diff --git a/src/range_view/RangeViewGL.cc b/src/range_view/RangeViewGL.cc index e9c70cd..a885176 100644 --- 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 +#include #include 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 index eaec800..f2ca625 100644 --- a/src/sonar_view/SonarViewPlugin.h +++ b/src/sonar_view/SonarViewPlugin.h @@ -2,13 +2,13 @@ #ifndef SONARVIEWPLUGIN_H #define SONARVIEWPLUGIN_H -#include +#include #include class SonarViewPlugin : public QObject , public QDesignerCustomWidgetInterface { Q_OBJECT - + Q_INTERFACES(QDesignerCustomWidgetInterface) public: SonarViewPlugin(QObject *parent = 0); virtual ~SonarViewPlugin(); diff --git a/src/sonar_widget/SonarWidgetPlugin.h b/src/sonar_widget/SonarWidgetPlugin.h index 6e581cf..363ea1d 100644 --- a/src/sonar_widget/SonarWidgetPlugin.h +++ b/src/sonar_widget/SonarWidgetPlugin.h @@ -1,13 +1,13 @@ #ifndef SONARWIDGETPLUGIN_H #define SONARWIDGETPLUGIN_H -#include +#include #include 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 index 2284e76..17e3c81 100644 --- a/src/stream_aligner_widget/StreamAlignerWidgetPlugin.h +++ b/src/stream_aligner_widget/StreamAlignerWidgetPlugin.h @@ -2,11 +2,12 @@ #define STREAMALIGNERWIDGETPLUGIN_H #include -#include +#include 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 customWidgets() const; diff --git a/src/timeline/TimelinePlugin.h b/src/timeline/TimelinePlugin.h index be59e98..b60be50 100644 --- a/src/timeline/TimelinePlugin.h +++ b/src/timeline/TimelinePlugin.h @@ -1,14 +1,15 @@ #ifndef TIMELINEPLUGIN_H #define TIMELINEPLUGIN_H -#include +#include #include #include "Timeline.h" class TimelinePlugin : public QObject , public QDesignerCustomWidgetInterface { Q_OBJECT - + Q_INTERFACES(QDesignerCustomWidgetInterface) + public: TimelinePlugin(QObject *parent = 0); virtual ~TimelinePlugin(); diff --git a/src/virtual_joystick/VirtualJoystickPlugin.h b/src/virtual_joystick/VirtualJoystickPlugin.h index 1a7dd83..702273a 100644 --- a/src/virtual_joystick/VirtualJoystickPlugin.h +++ b/src/virtual_joystick/VirtualJoystickPlugin.h @@ -1,13 +1,13 @@ #ifndef VIRTUALJOYSTICKPLUGIN_H #define VIRTUALJOYSTICKPLUGIN_H -#include +#include #include class VirtualJoystickPlugin : public QObject , public QDesignerCustomWidgetInterface { Q_OBJECT - + Q_INTERFACES(QDesignerCustomWidgetInterface) public: VirtualJoystickPlugin(QObject *parent = 0); virtual ~VirtualJoystickPlugin(); diff --git a/src/vtk/plot2d/Plot2dPlugin.h b/src/vtk/plot2d/Plot2dPlugin.h index bf7c286..97c3841 100644 --- a/src/vtk/plot2d/Plot2dPlugin.h +++ b/src/vtk/plot2d/Plot2dPlugin.h @@ -2,13 +2,14 @@ #ifndef PLOT2DPLUGIN_H #define PLOT2DPLUGIN_H -#include +#include #include class Plot2dPlugin : public QObject , public QDesignerCustomWidgetInterface { Q_OBJECT - + Q_INTERFACES(QDesignerCustomWidgetInterface) + public: Plot2dPlugin(QObject *parent = 0); virtual ~Plot2dPlugin(); diff --git a/src/vtk/sonar_display/SonarDisplayPlugin.h b/src/vtk/sonar_display/SonarDisplayPlugin.h index 6cfc7ae..aaf76db 100644 --- a/src/vtk/sonar_display/SonarDisplayPlugin.h +++ b/src/vtk/sonar_display/SonarDisplayPlugin.h @@ -2,13 +2,13 @@ #ifndef SONARDISPLAYPLUGIN_H #define SONARDISPLAYPLUGIN_H -#include +#include #include class SonarDisplayPlugin : public QObject , public QDesignerCustomWidgetInterface { Q_OBJECT - + Q_INTERFACES(QDesignerCustomWidgetInterface) public: SonarDisplayPlugin(QObject *parent = 0); virtual ~SonarDisplayPlugin(); diff --git a/src/vtk/vectorfield3D/vectorfield3DPlugin.h b/src/vtk/vectorfield3D/vectorfield3DPlugin.h index 868a8ec..0191635 100644 --- a/src/vtk/vectorfield3D/vectorfield3DPlugin.h +++ b/src/vtk/vectorfield3D/vectorfield3DPlugin.h @@ -1,13 +1,13 @@ #ifndef VECTORFIELD3DPLUGIN_H #define VECTORFIELD3DPLUGIN_H -#include +#include #include class Vectorfield3DPlugin : public QObject, public QDesignerCustomWidgetInterface { Q_OBJECT - + Q_INTERFACES(QDesignerCustomWidgetInterface) public: Vectorfield3DPlugin(QObject *parent = 0); virtual ~Vectorfield3DPlugin();