Skip to content

Commit

Permalink
remove QT_VERSION test in custom widgets
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Jan 24, 2017
1 parent f7dbc05 commit b3e8d82
Show file tree
Hide file tree
Showing 22 changed files with 2 additions and 110 deletions.
3 changes: 1 addition & 2 deletions src/customwidgets/qgiscustomwidgets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ QList<QDesignerCustomWidgetInterface*> QgisCustomWidgets::customWidgets() const
return mWidgets;
}

#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( customwidgetsplugin, QgisCustomWidgets )
#endif



6 changes: 0 additions & 6 deletions src/customwidgets/qgiscustomwidgets.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,14 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#else
#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
#endif
#include <qplugin.h>


class QgisCustomWidgets : public QObject, public QDesignerCustomWidgetCollectionInterface
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA( IID "org.qgis.customwidgets" )
#endif
Q_INTERFACES( QDesignerCustomWidgetCollectionInterface )

public:
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgscollapsiblegroupboxplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif

class CUSTOMWIDGETS_EXPORT QgsCollapsibleGroupBoxPlugin : public QObject, public QDesignerCustomWidgetInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgscolorbuttonplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsColorButtonPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsdatadefinedbuttonplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsDataDefinedButtonPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsdatetimeeditplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsDateTimeEditPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsdockwidgetplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif

class CUSTOMWIDGETS_EXPORT QgsDockWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsdoublespinboxplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsDoubleSpinBoxPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsexpressionbuilderwidgetplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsExpressionBuilderWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsextentgroupboxplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsExtentGroupBoxPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsexternalresourcewidgetplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsExternalResourceWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsfieldcomboboxplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsFieldComboBoxPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsfieldexpressionwidgetplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsFieldExpressionWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
6 changes: 1 addition & 5 deletions src/customwidgets/qgsfilewidgetplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,10 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif



class CUSTOMWIDGETS_EXPORT QgsFileWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsfilterlineeditplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsFilterLineEditPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsmaplayercomboboxplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsMapLayerComboBoxPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
6 changes: 0 additions & 6 deletions src/customwidgets/qgsprojectionselectionwidgetplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsProjectionSelectionWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
{
Expand Down
6 changes: 0 additions & 6 deletions src/customwidgets/qgsrelationeditorwidgetplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsRelationEditorWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsrelationreferencewidgetplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsRelationReferenceWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsscalerangewidgetplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsScaleRangeWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsscalewidgetplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@


#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsScaleWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down
5 changes: 0 additions & 5 deletions src/customwidgets/qgsspinboxplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,9 @@
#define QGSSPINBOXPLUGIN_H

#include <QtGlobal>
#if QT_VERSION < 0x050000
#include <QDesignerCustomWidgetCollectionInterface>
#include <QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
#include <QtUiPlugin/QDesignerExportWidget>
#include "qgis_customwidgets.h"
#endif


class CUSTOMWIDGETS_EXPORT QgsSpinBoxPlugin : public QObject, public QDesignerCustomWidgetInterface
Expand Down

0 comments on commit b3e8d82

Please sign in to comment.