diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index d7b269e55e0c..34c83667b103 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -58,27 +58,27 @@ editorwidgets/core/qgseditorwidgetwrapper.cpp editorwidgets/core/qgswidgetwrapper.cpp editorwidgets/qgscheckboxconfigdlg.cpp -editorwidgets/qgscheckboxwidget.cpp +editorwidgets/qgscheckboxwidgetwrapper.cpp editorwidgets/qgscheckboxwidgetfactory.cpp -editorwidgets/qgsclassificationwidget.cpp +editorwidgets/qgsclassificationwidgetwrapper.cpp editorwidgets/qgsclassificationwidgetwrapperfactory.cpp -editorwidgets/qgscolorwidget.cpp +editorwidgets/qgscolorwidgetwrapper.cpp editorwidgets/qgscolorwidgetfactory.cpp editorwidgets/qgsdatetimeeditfactory.cpp editorwidgets/qgsdatetimeeditconfig.cpp editorwidgets/qgsdatetimeeditwrapper.cpp editorwidgets/qgsdummyconfigdlg.cpp -editorwidgets/qgsenumerationwidget.cpp +editorwidgets/qgsenumerationwidgetwrapper.cpp editorwidgets/qgsenumerationwidgetfactory.cpp -editorwidgets/qgsfilenamewidget.cpp +editorwidgets/qgsfilenamewidgetwrapper.cpp editorwidgets/qgsfilenamewidgetfactory.cpp -editorwidgets/qgshiddenwidget.cpp +editorwidgets/qgshiddenwidgetwrapper.cpp editorwidgets/qgshiddenwidgetfactory.cpp editorwidgets/qgsphotoconfigdlg.cpp -editorwidgets/qgsphotowidget.cpp +editorwidgets/qgsphotowidgetwrapper.cpp editorwidgets/qgsphotowidgetfactory.cpp editorwidgets/qgsrangeconfigdlg.cpp -editorwidgets/qgsrangewidget.cpp +editorwidgets/qgsrangewidgetwrapper.cpp editorwidgets/qgsrangewidgetfactory.cpp editorwidgets/qgsrelationwidgetwrapper.cpp editorwidgets/qgsrelationreferencefactory.cpp @@ -86,21 +86,21 @@ editorwidgets/qgsrelationreferencewidget.cpp editorwidgets/qgsrelationreferencewidgetwrapper.cpp editorwidgets/qgsrelreferenceconfigdlg.cpp editorwidgets/qgstexteditconfigdlg.cpp -editorwidgets/qgstexteditwidget.cpp +editorwidgets/qgstexteditwrapper.cpp editorwidgets/qgstexteditwidgetfactory.cpp editorwidgets/qgsuniquevaluesconfigdlg.cpp -editorwidgets/qgsuniquevaluewidget.cpp +editorwidgets/qgsuniquevaluewidgetwrapper.cpp editorwidgets/qgsuniquevaluewidgetfactory.cpp -editorwidgets/qgsuuidwidget.cpp +editorwidgets/qgsuuidwidgetwrapper.cpp editorwidgets/qgsuuidwidgetfactory.cpp editorwidgets/qgsvaluemapconfigdlg.cpp -editorwidgets/qgsvaluemapwidget.cpp +editorwidgets/qgsvaluemapwidgetwrapper.cpp editorwidgets/qgsvaluemapwidgetfactory.cpp editorwidgets/qgsvaluerelationconfigdlg.cpp -editorwidgets/qgsvaluerelationwidget.cpp +editorwidgets/qgsvaluerelationwidgetwrapper.cpp editorwidgets/qgsvaluerelationwidgetfactory.cpp editorwidgets/qgswebviewconfigdlg.cpp -editorwidgets/qgswebviewwidget.cpp +editorwidgets/qgswebviewwidgetwrapper.cpp editorwidgets/qgswebviewwidgetfactory.cpp editorwidgets/qgswebviewwidgetfactory.cpp @@ -286,34 +286,34 @@ editorwidgets/core/qgseditorwidgetregistry.h editorwidgets/core/qgseditorwidgetwrapper.h editorwidgets/core/qgswidgetwrapper.h editorwidgets/qgscheckboxconfigdlg.h -editorwidgets/qgscheckboxwidget.h -editorwidgets/qgsclassificationwidget.h -editorwidgets/qgscolorwidget.h +editorwidgets/qgscheckboxwidgetwrapper.h +editorwidgets/qgsclassificationwidgetwrapper.h +editorwidgets/qgscolorwidgetwrapper.h editorwidgets/qgsdatetimeeditconfig.h editorwidgets/qgsdatetimeeditwrapper.h editorwidgets/qgsdummyconfigdlg.h -editorwidgets/qgsenumerationwidget.h -editorwidgets/qgsfilenamewidget.h -editorwidgets/qgshiddenwidget.h +editorwidgets/qgsenumerationwidgetwrapper.h +editorwidgets/qgsfilenamewidgetwrapper.h +editorwidgets/qgshiddenwidgetwrapper.h editorwidgets/qgsphotoconfigdlg.h -editorwidgets/qgsphotowidget.h +editorwidgets/qgsphotowidgetwrapper.h editorwidgets/qgsrangeconfigdlg.h -editorwidgets/qgsrangewidget.h +editorwidgets/qgsrangewidgetwrapper.h editorwidgets/qgsrelationreferencewidget.h editorwidgets/qgsrelationreferencewidgetwrapper.h editorwidgets/qgsrelationwidgetwrapper.h editorwidgets/qgsrelreferenceconfigdlg.h editorwidgets/qgstexteditconfigdlg.h -editorwidgets/qgstexteditwidget.h +editorwidgets/qgstexteditwrapper.h editorwidgets/qgsuniquevaluesconfigdlg.h -editorwidgets/qgsuniquevaluewidget.h -editorwidgets/qgsuuidwidget.h +editorwidgets/qgsuniquevaluewidgetwrapper.h +editorwidgets/qgsuuidwidgetwrapper.h editorwidgets/qgsvaluemapconfigdlg.h -editorwidgets/qgsvaluemapwidget.h +editorwidgets/qgsvaluemapwidgetwrapper.h editorwidgets/qgsvaluerelationconfigdlg.h -editorwidgets/qgsvaluerelationwidget.h +editorwidgets/qgsvaluerelationwidgetwrapper.h editorwidgets/qgswebviewconfigdlg.h -editorwidgets/qgswebviewwidget.h +editorwidgets/qgswebviewwidgetwrapper.h layertree/qgscustomlayerorderwidget.h layertree/qgslayertreemapcanvasbridge.h @@ -506,27 +506,27 @@ editorwidgets/core/qgseditorwidgetwrapper.h editorwidgets/core/qgswidgetwrapper.h editorwidgets/qgscheckboxconfigdlg.h -editorwidgets/qgscheckboxwidget.h +editorwidgets/qgscheckboxwidgetwrapper.h editorwidgets/qgscheckboxwidgetfactory.h -editorwidgets/qgsclassificationwidget.h +editorwidgets/qgsclassificationwidgetwrapper.h editorwidgets/qgsclassificationwidgetwrapperfactory.h -editorwidgets/qgscolorwidget.h +editorwidgets/qgscolorwidgetwrapper.h editorwidgets/qgscolorwidgetfactory.h editorwidgets/qgsdatetimeeditfactory.h editorwidgets/qgsdatetimeeditconfig.h editorwidgets/qgsdatetimeeditwrapper.h editorwidgets/qgsdummyconfigdlg.h -editorwidgets/qgsenumerationwidget.h +editorwidgets/qgsenumerationwidgetwrapper.h editorwidgets/qgsenumerationwidgetfactory.h -editorwidgets/qgsfilenamewidget.h +editorwidgets/qgsfilenamewidgetwrapper.h editorwidgets/qgsfilenamewidgetfactory.h -editorwidgets/qgshiddenwidget.h +editorwidgets/qgshiddenwidgetwrapper.h editorwidgets/qgshiddenwidgetfactory.h editorwidgets/qgsphotoconfigdlg.h -editorwidgets/qgsphotowidget.h +editorwidgets/qgsphotowidgetwrapper.h editorwidgets/qgsphotowidgetfactory.h editorwidgets/qgsrangeconfigdlg.h -editorwidgets/qgsrangewidget.h +editorwidgets/qgsrangewidgetwrapper.h editorwidgets/qgsrangewidgetfactory.h editorwidgets/qgsrelationreferencefactory.h editorwidgets/qgsrelationreferencewidget.h @@ -534,21 +534,21 @@ editorwidgets/qgsrelationreferencewidgetwrapper.h editorwidgets/qgsrelationwidgetwrapper.h editorwidgets/qgsrelreferenceconfigdlg.h editorwidgets/qgstexteditconfigdlg.h -editorwidgets/qgstexteditwidget.h +editorwidgets/qgstexteditwrapper.h editorwidgets/qgstexteditwidgetfactory.h editorwidgets/qgsuniquevaluesconfigdlg.h -editorwidgets/qgsuniquevaluewidget.h +editorwidgets/qgsuniquevaluewidgetwrapper.h editorwidgets/qgsuniquevaluewidgetfactory.h -editorwidgets/qgsuuidwidget.h +editorwidgets/qgsuuidwidgetwrapper.h editorwidgets/qgsuuidwidgetfactory.h editorwidgets/qgsvaluemapconfigdlg.h -editorwidgets/qgsvaluemapwidget.h +editorwidgets/qgsvaluemapwidgetwrapper.h editorwidgets/qgsvaluemapwidgetfactory.h editorwidgets/qgsvaluerelationconfigdlg.h -editorwidgets/qgsvaluerelationwidget.h +editorwidgets/qgsvaluerelationwidgetwrapper.h editorwidgets/qgsvaluerelationwidgetfactory.h editorwidgets/qgswebviewconfigdlg.h -editorwidgets/qgswebviewwidget.h +editorwidgets/qgswebviewwidgetwrapper.h editorwidgets/qgswebviewwidgetfactory.h layertree/qgscustomlayerorderwidget.h diff --git a/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp b/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp index dc9b953d2f4a..9d2618ef731a 100644 --- a/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp @@ -15,7 +15,7 @@ #include "qgscheckboxwidgetfactory.h" -#include "qgscheckboxwidget.h" +#include "qgscheckboxwidgetwrapper.h" #include "qgscheckboxconfigdlg.h" QgsCheckboxWidgetFactory::QgsCheckboxWidgetFactory( const QString& name ) : @@ -25,7 +25,7 @@ QgsCheckboxWidgetFactory::QgsCheckboxWidgetFactory( const QString& name ) : QgsEditorWidgetWrapper* QgsCheckboxWidgetFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsCheckboxWidget( vl, fieldIdx, editor, parent ); + return new QgsCheckboxWidgetWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget* QgsCheckboxWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const diff --git a/src/gui/editorwidgets/qgscheckboxwidget.cpp b/src/gui/editorwidgets/qgscheckboxwidgetwrapper.cpp similarity index 80% rename from src/gui/editorwidgets/qgscheckboxwidget.cpp rename to src/gui/editorwidgets/qgscheckboxwidgetwrapper.cpp index 1cf8e7ab3315..b2e31a2fa799 100644 --- a/src/gui/editorwidgets/qgscheckboxwidget.cpp +++ b/src/gui/editorwidgets/qgscheckboxwidgetwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgscheckboxwidget.cpp + qgscheckboxwidgetwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,15 +13,15 @@ * * ***************************************************************************/ -#include "qgscheckboxwidget.h" +#include "qgscheckboxwidgetwrapper.h" -QgsCheckboxWidget::QgsCheckboxWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) +QgsCheckboxWidgetWrapper::QgsCheckboxWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) { } -QVariant QgsCheckboxWidget::value() +QVariant QgsCheckboxWidgetWrapper::value() { QVariant v; @@ -35,12 +35,12 @@ QVariant QgsCheckboxWidget::value() return v; } -QWidget* QgsCheckboxWidget::createWidget( QWidget* parent ) +QWidget* QgsCheckboxWidgetWrapper::createWidget( QWidget* parent ) { return new QCheckBox( parent ); } -void QgsCheckboxWidget::initWidget( QWidget* editor ) +void QgsCheckboxWidgetWrapper::initWidget( QWidget* editor ) { mCheckBox = qobject_cast( editor ); mGroupBox = qobject_cast( editor ); @@ -51,7 +51,7 @@ void QgsCheckboxWidget::initWidget( QWidget* editor ) connect( mGroupBox, SIGNAL( toggled( bool ) ), this, SLOT( valueChanged( bool ) ) ); } -void QgsCheckboxWidget::setValue( const QVariant& value ) +void QgsCheckboxWidgetWrapper::setValue( const QVariant& value ) { if ( mGroupBox ) { diff --git a/src/gui/editorwidgets/qgscheckboxwidget.h b/src/gui/editorwidgets/qgscheckboxwidgetwrapper.h similarity index 79% rename from src/gui/editorwidgets/qgscheckboxwidget.h rename to src/gui/editorwidgets/qgscheckboxwidgetwrapper.h index 17520d3acd1e..543874f33e92 100644 --- a/src/gui/editorwidgets/qgscheckboxwidget.h +++ b/src/gui/editorwidgets/qgscheckboxwidgetwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgscheckboxwidget.h + qgscheckboxwidgetwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,19 +13,19 @@ * * ***************************************************************************/ -#ifndef QGSCHECKBOXWIDGET_H -#define QGSCHECKBOXWIDGET_H +#ifndef QGSCHECKBOXWIDGETWRAPPER_H +#define QGSCHECKBOXWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" #include #include -class GUI_EXPORT QgsCheckboxWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsCheckboxWidgetWrapper : public QgsEditorWidgetWrapper { Q_OBJECT public: - explicit QgsCheckboxWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); + explicit QgsCheckboxWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); // QgsEditorWidgetWrapper interface public: @@ -43,4 +43,4 @@ class GUI_EXPORT QgsCheckboxWidget : public QgsEditorWidgetWrapper QGroupBox* mGroupBox; }; -#endif // QGSCHECKBOXWIDGET_H +#endif // QGSCHECKBOXWIDGETWRAPPER_H diff --git a/src/gui/editorwidgets/qgsclassificationwidget.cpp b/src/gui/editorwidgets/qgsclassificationwidgetwrapper.cpp similarity index 79% rename from src/gui/editorwidgets/qgsclassificationwidget.cpp rename to src/gui/editorwidgets/qgsclassificationwidgetwrapper.cpp index e3ad98e6c6f3..0ac34aa83eb4 100644 --- a/src/gui/editorwidgets/qgsclassificationwidget.cpp +++ b/src/gui/editorwidgets/qgsclassificationwidgetwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsclassificationwidget.cpp + qgsclassificationwidgetwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,27 +13,27 @@ * * ***************************************************************************/ -#include "qgsclassificationwidget.h" +#include "qgsclassificationwidgetwrapper.h" #include "qgscategorizedsymbolrendererv2.h" #include "qgsvectorlayer.h" -QgsClassificationWidget::QgsClassificationWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) +QgsClassificationWidgetWrapper::QgsClassificationWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) { } -QVariant QgsClassificationWidget::value() +QVariant QgsClassificationWidgetWrapper::value() { return mComboBox->itemData( mComboBox->currentIndex() ); } -QWidget*QgsClassificationWidget::createWidget( QWidget* parent ) +QWidget*QgsClassificationWidgetWrapper::createWidget( QWidget* parent ) { return new QComboBox( parent ); } -void QgsClassificationWidget::initWidget( QWidget* editor ) +void QgsClassificationWidgetWrapper::initWidget( QWidget* editor ) { mComboBox = qobject_cast( editor ); @@ -58,7 +58,7 @@ void QgsClassificationWidget::initWidget( QWidget* editor ) } } -void QgsClassificationWidget::setValue( const QVariant& value ) +void QgsClassificationWidgetWrapper::setValue( const QVariant& value ) { mComboBox->setCurrentIndex( mComboBox->findData( value ) ); } diff --git a/src/gui/editorwidgets/qgsclassificationwidget.h b/src/gui/editorwidgets/qgsclassificationwidgetwrapper.h similarity index 77% rename from src/gui/editorwidgets/qgsclassificationwidget.h rename to src/gui/editorwidgets/qgsclassificationwidgetwrapper.h index 5cd0f76f8efa..17eb4795f8a9 100644 --- a/src/gui/editorwidgets/qgsclassificationwidget.h +++ b/src/gui/editorwidgets/qgsclassificationwidgetwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsclassificationwidget.h + qgsclassificationwidgetwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,18 +13,18 @@ * * ***************************************************************************/ -#ifndef QGSCLASSIFICATIONWIDGET_H -#define QGSCLASSIFICATIONWIDGET_H +#ifndef QGSCLASSIFICATIONWIDGETWRAPPER_H +#define QGSCLASSIFICATIONWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" #include -class GUI_EXPORT QgsClassificationWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsClassificationWidgetWrapper : public QgsEditorWidgetWrapper { Q_OBJECT public: - explicit QgsClassificationWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); + explicit QgsClassificationWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); // QgsEditorWidgetWrapper interface public: @@ -41,4 +41,4 @@ class GUI_EXPORT QgsClassificationWidget : public QgsEditorWidgetWrapper QComboBox* mComboBox; }; -#endif // QGSCLASSIFICATIONWIDGET_H +#endif // QGSCLASSIFICATIONWIDGETWRAPPER_H diff --git a/src/gui/editorwidgets/qgsclassificationwidgetwrapperfactory.cpp b/src/gui/editorwidgets/qgsclassificationwidgetwrapperfactory.cpp index f26ea985dd1f..cfed61178f17 100644 --- a/src/gui/editorwidgets/qgsclassificationwidgetwrapperfactory.cpp +++ b/src/gui/editorwidgets/qgsclassificationwidgetwrapperfactory.cpp @@ -15,7 +15,7 @@ #include "qgsclassificationwidgetwrapperfactory.h" -#include "qgsclassificationwidget.h" +#include "qgsclassificationwidgetwrapper.h" #include "qgsdummyconfigdlg.h" QgsClassificationWidgetWrapperFactory::QgsClassificationWidgetWrapperFactory( const QString& name ) @@ -26,7 +26,7 @@ QgsClassificationWidgetWrapperFactory::QgsClassificationWidgetWrapperFactory( co QgsEditorWidgetWrapper*QgsClassificationWidgetWrapperFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsClassificationWidget( vl, fieldIdx, editor, parent ); + return new QgsClassificationWidgetWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget*QgsClassificationWidgetWrapperFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const diff --git a/src/gui/editorwidgets/qgscolorwidgetfactory.cpp b/src/gui/editorwidgets/qgscolorwidgetfactory.cpp index 3ec781616538..996fb7c7f902 100644 --- a/src/gui/editorwidgets/qgscolorwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgscolorwidgetfactory.cpp @@ -15,7 +15,7 @@ #include "qgscolorwidgetfactory.h" -#include "qgscolorwidget.h" +#include "qgscolorwidgetwrapper.h" #include "qgsdummyconfigdlg.h" QgsColorWidgetFactory::QgsColorWidgetFactory( const QString& name ) @@ -26,7 +26,7 @@ QgsColorWidgetFactory::QgsColorWidgetFactory( const QString& name ) QgsEditorWidgetWrapper* QgsColorWidgetFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsColorWidget( vl, fieldIdx, editor, parent ); + return new QgsColorWidgetWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget* QgsColorWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const diff --git a/src/gui/editorwidgets/qgscolorwidget.cpp b/src/gui/editorwidgets/qgscolorwidgetwrapper.cpp similarity index 76% rename from src/gui/editorwidgets/qgscolorwidget.cpp rename to src/gui/editorwidgets/qgscolorwidgetwrapper.cpp index 5aad8a863f28..f05521c25fa0 100644 --- a/src/gui/editorwidgets/qgscolorwidget.cpp +++ b/src/gui/editorwidgets/qgscolorwidgetwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgscolorwidget.cpp + qgscolorwidgetwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,15 +13,15 @@ * * ***************************************************************************/ -#include "qgscolorwidget.h" +#include "qgscolorwidgetwrapper.h" -QgsColorWidget::QgsColorWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : +QgsColorWidgetWrapper::QgsColorWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) { } -QVariant QgsColorWidget::value() +QVariant QgsColorWidgetWrapper::value() { QVariant v; @@ -31,19 +31,19 @@ QVariant QgsColorWidget::value() return v; } -QWidget*QgsColorWidget::createWidget( QWidget* parent ) +QWidget* QgsColorWidgetWrapper::createWidget( QWidget* parent ) { return new QgsColorButton( parent ); } -void QgsColorWidget::initWidget( QWidget* editor ) +void QgsColorWidgetWrapper::initWidget( QWidget* editor ) { mColorButton = qobject_cast( editor ); connect( mColorButton, SIGNAL( colorChanged( QColor ) ), this, SLOT( valueChanged() ) ); } -void QgsColorWidget::setValue( const QVariant& value ) +void QgsColorWidgetWrapper::setValue( const QVariant& value ) { if ( mColorButton ) mColorButton->setColor( QColor( value.toString() ) ); diff --git a/src/gui/editorwidgets/qgscolorwidget.h b/src/gui/editorwidgets/qgscolorwidgetwrapper.h similarity index 80% rename from src/gui/editorwidgets/qgscolorwidget.h rename to src/gui/editorwidgets/qgscolorwidgetwrapper.h index 4a093f54f804..a4df6df7d3b7 100644 --- a/src/gui/editorwidgets/qgscolorwidget.h +++ b/src/gui/editorwidgets/qgscolorwidgetwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgscolorwidget.h + qgscolorwidgetwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,18 +13,18 @@ * * ***************************************************************************/ -#ifndef QGSCOLORWIDGET_H -#define QGSCOLORWIDGET_H +#ifndef QGSCOLORWIDGETWRAPPER_H +#define QGSCOLORWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" #include "qgscolorbutton.h" -class GUI_EXPORT QgsColorWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsColorWidgetWrapper : public QgsEditorWidgetWrapper { Q_OBJECT public: - explicit QgsColorWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); + explicit QgsColorWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); // QgsEditorWidgetWrapper interface public: @@ -41,4 +41,4 @@ class GUI_EXPORT QgsColorWidget : public QgsEditorWidgetWrapper QgsColorButton* mColorButton; }; -#endif // QGSCOLORWIDGET_H +#endif // QGSCOLORWIDGETWRAPPER_H diff --git a/src/gui/editorwidgets/qgsenumerationwidgetfactory.cpp b/src/gui/editorwidgets/qgsenumerationwidgetfactory.cpp index 3445592451a3..85a7211d4b91 100644 --- a/src/gui/editorwidgets/qgsenumerationwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsenumerationwidgetfactory.cpp @@ -15,7 +15,7 @@ #include "qgsenumerationwidgetfactory.h" -#include "qgsenumerationwidget.h" +#include "qgsenumerationwidgetwrapper.h" #include "qgsdummyconfigdlg.h" #include "qgsvectorlayer.h" #include "qgsvectordataprovider.h" @@ -27,7 +27,7 @@ QgsEnumerationWidgetFactory::QgsEnumerationWidgetFactory( const QString& name ) QgsEditorWidgetWrapper* QgsEnumerationWidgetFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsEnumerationWidget( vl, fieldIdx, editor, parent ); + return new QgsEnumerationWidgetWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget* QgsEnumerationWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const diff --git a/src/gui/editorwidgets/qgsenumerationwidget.cpp b/src/gui/editorwidgets/qgsenumerationwidgetwrapper.cpp similarity index 78% rename from src/gui/editorwidgets/qgsenumerationwidget.cpp rename to src/gui/editorwidgets/qgsenumerationwidgetwrapper.cpp index 1e1197783a3f..2fdeb4b61a18 100644 --- a/src/gui/editorwidgets/qgsenumerationwidget.cpp +++ b/src/gui/editorwidgets/qgsenumerationwidgetwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsenumerationwidget.cpp + qgsenumerationwidgetwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,18 +13,18 @@ * * ***************************************************************************/ -#include "qgsenumerationwidget.h" +#include "qgsenumerationwidgetwrapper.h" #include "qgsvectorlayer.h" #include "qgsvectordataprovider.h" -QgsEnumerationWidget::QgsEnumerationWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) +QgsEnumerationWidgetWrapper::QgsEnumerationWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) { } -QVariant QgsEnumerationWidget::value() +QVariant QgsEnumerationWidgetWrapper::value() { QVariant value; @@ -34,12 +34,12 @@ QVariant QgsEnumerationWidget::value() return value; } -QWidget* QgsEnumerationWidget::createWidget( QWidget* parent ) +QWidget* QgsEnumerationWidgetWrapper::createWidget( QWidget* parent ) { return new QComboBox( parent ); } -void QgsEnumerationWidget::initWidget( QWidget* editor ) +void QgsEnumerationWidgetWrapper::initWidget( QWidget* editor ) { mComboBox = qobject_cast( editor ); @@ -56,7 +56,7 @@ void QgsEnumerationWidget::initWidget( QWidget* editor ) } } -void QgsEnumerationWidget::setValue( const QVariant& value ) +void QgsEnumerationWidgetWrapper::setValue( const QVariant& value ) { if ( mComboBox ) { diff --git a/src/gui/editorwidgets/qgsenumerationwidget.h b/src/gui/editorwidgets/qgsenumerationwidgetwrapper.h similarity index 78% rename from src/gui/editorwidgets/qgsenumerationwidget.h rename to src/gui/editorwidgets/qgsenumerationwidgetwrapper.h index 1c4c70c5815c..4738be870690 100644 --- a/src/gui/editorwidgets/qgsenumerationwidget.h +++ b/src/gui/editorwidgets/qgsenumerationwidgetwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsenumerationwidget.h + qgsenumerationwidgetwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,18 +13,18 @@ * * ***************************************************************************/ -#ifndef QGSENUMERATIONWIDGET_H -#define QGSENUMERATIONWIDGET_H +#ifndef QGSENUMERATIONWIDGETWRAPPER_H +#define QGSENUMERATIONWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" #include -class GUI_EXPORT QgsEnumerationWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsEnumerationWidgetWrapper : public QgsEditorWidgetWrapper { Q_OBJECT public: - explicit QgsEnumerationWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); + explicit QgsEnumerationWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); // QgsEditorWidgetWrapper interface public: @@ -41,4 +41,4 @@ class GUI_EXPORT QgsEnumerationWidget : public QgsEditorWidgetWrapper QComboBox* mComboBox; }; -#endif // QGSENUMERATIONWIDGET_H +#endif // QGSENUMERATIONWIDGETWRAPPER_H diff --git a/src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp b/src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp index d02e66ec9112..fc73f07b3f32 100644 --- a/src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp @@ -15,7 +15,7 @@ #include "qgsfilenamewidgetfactory.h" -#include "qgsfilenamewidget.h" +#include "qgsfilenamewidgetwrapper.h" #include "qgsdummyconfigdlg.h" QgsFileNameWidgetFactory::QgsFileNameWidgetFactory( const QString& name ) : @@ -25,7 +25,7 @@ QgsFileNameWidgetFactory::QgsFileNameWidgetFactory( const QString& name ) : QgsEditorWidgetWrapper* QgsFileNameWidgetFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsFileNameWidget( vl, fieldIdx, editor, parent ); + return new QgsFileNameWidgetWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget* QgsFileNameWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const diff --git a/src/gui/editorwidgets/qgsfilenamewidget.cpp b/src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp similarity index 84% rename from src/gui/editorwidgets/qgsfilenamewidget.cpp rename to src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp index d39c6facab04..675b789a9917 100644 --- a/src/gui/editorwidgets/qgsfilenamewidget.cpp +++ b/src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsfilenamewidget.cpp + qgsfilenamewidgetwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,19 +13,19 @@ * * ***************************************************************************/ -#include "qgsfilenamewidget.h" +#include "qgsfilenamewidgetwrapper.h" #include "qgsfilterlineedit.h" #include #include -QgsFileNameWidget::QgsFileNameWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) +QgsFileNameWidgetWrapper::QgsFileNameWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) { } -QVariant QgsFileNameWidget::value() +QVariant QgsFileNameWidgetWrapper::value() { QVariant value; @@ -38,7 +38,7 @@ QVariant QgsFileNameWidget::value() return value; } -QWidget* QgsFileNameWidget::createWidget( QWidget* parent ) +QWidget* QgsFileNameWidgetWrapper::createWidget( QWidget* parent ) { QWidget* container = new QWidget( parent ); container->setBackgroundRole( QPalette::Window ); @@ -57,7 +57,7 @@ QWidget* QgsFileNameWidget::createWidget( QWidget* parent ) return container; } -void QgsFileNameWidget::initWidget( QWidget* editor ) +void QgsFileNameWidgetWrapper::initWidget( QWidget* editor ) { mLineEdit = qobject_cast( editor ); if ( !mLineEdit ) @@ -76,7 +76,7 @@ void QgsFileNameWidget::initWidget( QWidget* editor ) connect( mLineEdit, SIGNAL( textChanged( QString ) ), this, SLOT( valueChanged( QString ) ) ); } -void QgsFileNameWidget::setValue( const QVariant& value ) +void QgsFileNameWidgetWrapper::setValue( const QVariant& value ) { if ( mLineEdit ) mLineEdit->setText( value.toString() ); @@ -85,7 +85,7 @@ void QgsFileNameWidget::setValue( const QVariant& value ) mLabel->setText( value.toString() ); } -void QgsFileNameWidget::selectFileName() +void QgsFileNameWidgetWrapper::selectFileName() { QString text; diff --git a/src/gui/editorwidgets/qgsfilenamewidget.h b/src/gui/editorwidgets/qgsfilenamewidgetwrapper.h similarity index 80% rename from src/gui/editorwidgets/qgsfilenamewidget.h rename to src/gui/editorwidgets/qgsfilenamewidgetwrapper.h index f575c65ca8b3..d8f5ed75f3e4 100644 --- a/src/gui/editorwidgets/qgsfilenamewidget.h +++ b/src/gui/editorwidgets/qgsfilenamewidgetwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsfilenamewidget.h + qgsfilenamewidgetwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#ifndef QGSFILENAMEWIDGET_H -#define QGSFILENAMEWIDGET_H +#ifndef QGSFILENAMEWIDGETWRAPPER_H +#define QGSFILENAMEWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" @@ -22,11 +22,11 @@ #include #include -class GUI_EXPORT QgsFileNameWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsFileNameWidgetWrapper : public QgsEditorWidgetWrapper { Q_OBJECT public: - explicit QgsFileNameWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); + explicit QgsFileNameWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); private slots: void selectFileName(); @@ -48,4 +48,4 @@ class GUI_EXPORT QgsFileNameWidget : public QgsEditorWidgetWrapper QLabel* mLabel; }; -#endif // QGSFILENAMEWIDGET_H +#endif // QGSFILENAMEWIDGETWRAPPER_H diff --git a/src/gui/editorwidgets/qgshiddenwidgetfactory.cpp b/src/gui/editorwidgets/qgshiddenwidgetfactory.cpp index b005961d5e1c..531189568662 100644 --- a/src/gui/editorwidgets/qgshiddenwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgshiddenwidgetfactory.cpp @@ -15,7 +15,7 @@ #include "qgshiddenwidgetfactory.h" -#include "qgshiddenwidget.h" +#include "qgshiddenwidgetwrapper.h" #include "qgsdummyconfigdlg.h" QgsHiddenWidgetFactory::QgsHiddenWidgetFactory( const QString& name ) @@ -25,7 +25,7 @@ QgsHiddenWidgetFactory::QgsHiddenWidgetFactory( const QString& name ) QgsEditorWidgetWrapper* QgsHiddenWidgetFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsHiddenWidget( vl, fieldIdx, editor, parent ); + return new QgsHiddenWidgetWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget* QgsHiddenWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const diff --git a/src/gui/editorwidgets/qgshiddenwidget.cpp b/src/gui/editorwidgets/qgshiddenwidgetwrapper.cpp similarity index 73% rename from src/gui/editorwidgets/qgshiddenwidget.cpp rename to src/gui/editorwidgets/qgshiddenwidgetwrapper.cpp index 292cf43537f7..5f2b8f2eb460 100644 --- a/src/gui/editorwidgets/qgshiddenwidget.cpp +++ b/src/gui/editorwidgets/qgshiddenwidgetwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgshiddenwidget.cpp + qgshiddenwidgetwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,34 +13,34 @@ * * ***************************************************************************/ -#include "qgshiddenwidget.h" +#include "qgshiddenwidgetwrapper.h" #include -QgsHiddenWidget::QgsHiddenWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) +QgsHiddenWidgetWrapper::QgsHiddenWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) { } -QVariant QgsHiddenWidget::value() +QVariant QgsHiddenWidgetWrapper::value() { return mValue; } -QWidget* QgsHiddenWidget::createWidget( QWidget* parent ) +QWidget* QgsHiddenWidgetWrapper::createWidget( QWidget* parent ) { QWidget* wdg = new QWidget( parent ); wdg->setVisible( false ); return wdg; } -void QgsHiddenWidget::initWidget( QWidget* editor ) +void QgsHiddenWidgetWrapper::initWidget( QWidget* editor ) { editor->setVisible( false ); } -void QgsHiddenWidget::setValue( const QVariant& value ) +void QgsHiddenWidgetWrapper::setValue( const QVariant& value ) { mValue = value; } diff --git a/src/gui/editorwidgets/qgshiddenwidget.h b/src/gui/editorwidgets/qgshiddenwidgetwrapper.h similarity index 79% rename from src/gui/editorwidgets/qgshiddenwidget.h rename to src/gui/editorwidgets/qgshiddenwidgetwrapper.h index cbfd89e05090..dc369d713eec 100644 --- a/src/gui/editorwidgets/qgshiddenwidget.h +++ b/src/gui/editorwidgets/qgshiddenwidgetwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgshiddenwidget.h + qgshiddenwidgetwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,16 +13,16 @@ * * ***************************************************************************/ -#ifndef QGSHIDDENWIDGET_H -#define QGSHIDDENWIDGET_H +#ifndef QGSHIDDENWIDGETWRAPPER_H +#define QGSHIDDENWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" -class GUI_EXPORT QgsHiddenWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsHiddenWidgetWrapper : public QgsEditorWidgetWrapper { Q_OBJECT public: - explicit QgsHiddenWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); + explicit QgsHiddenWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); // QgsEditorWidgetWrapper interface public: @@ -39,4 +39,4 @@ class GUI_EXPORT QgsHiddenWidget : public QgsEditorWidgetWrapper QVariant mValue; }; -#endif // QGSHIDDENWIDGET_H +#endif // QGSHIDDENWIDGETWRAPPER_H diff --git a/src/gui/editorwidgets/qgsphotowidgetfactory.cpp b/src/gui/editorwidgets/qgsphotowidgetfactory.cpp index 5688bf20a396..19c02bbb7539 100644 --- a/src/gui/editorwidgets/qgsphotowidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsphotowidgetfactory.cpp @@ -15,7 +15,7 @@ #include "qgsphotowidgetfactory.h" -#include "qgsphotowidget.h" +#include "qgsphotowidgetwrapper.h" #include "qgsphotoconfigdlg.h" QgsPhotoWidgetFactory::QgsPhotoWidgetFactory( const QString& name ) @@ -26,7 +26,7 @@ QgsPhotoWidgetFactory::QgsPhotoWidgetFactory( const QString& name ) QgsEditorWidgetWrapper* QgsPhotoWidgetFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsPhotoWidget( vl, fieldIdx, editor, parent ); + return new QgsPhotoWidgetWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget* QgsPhotoWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const diff --git a/src/gui/editorwidgets/qgsphotowidget.cpp b/src/gui/editorwidgets/qgsphotowidgetwrapper.cpp similarity index 86% rename from src/gui/editorwidgets/qgsphotowidget.cpp rename to src/gui/editorwidgets/qgsphotowidgetwrapper.cpp index c7420d8f6082..845f338acd5d 100644 --- a/src/gui/editorwidgets/qgsphotowidget.cpp +++ b/src/gui/editorwidgets/qgsphotowidgetwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsphotowidget.cpp + qgsphotowidgetwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include "qgsphotowidget.h" +#include "qgsphotowidgetwrapper.h" #include #include @@ -21,12 +21,12 @@ #include "qgsfilterlineedit.h" -QgsPhotoWidget::QgsPhotoWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) +QgsPhotoWidgetWrapper::QgsPhotoWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) { } -void QgsPhotoWidget::selectFileName() +void QgsPhotoWidgetWrapper::selectFileName() { if ( mLineEdit ) { @@ -36,7 +36,7 @@ void QgsPhotoWidget::selectFileName() } } -void QgsPhotoWidget::loadPixmap( const QString &fileName ) +void QgsPhotoWidgetWrapper::loadPixmap( const QString &fileName ) { QPixmap pm( fileName ); if ( !pm.isNull() && mPhotoLabel ) @@ -59,7 +59,7 @@ void QgsPhotoWidget::loadPixmap( const QString &fileName ) } } -QVariant QgsPhotoWidget::value() +QVariant QgsPhotoWidgetWrapper::value() { QVariant v; @@ -69,7 +69,7 @@ QVariant QgsPhotoWidget::value() return v; } -QWidget* QgsPhotoWidget::createWidget( QWidget* parent ) +QWidget* QgsPhotoWidgetWrapper::createWidget( QWidget* parent ) { QWidget* container = new QWidget( parent ); QGridLayout* layout = new QGridLayout( container ); @@ -88,7 +88,7 @@ QWidget* QgsPhotoWidget::createWidget( QWidget* parent ) return container; } -void QgsPhotoWidget::initWidget( QWidget* editor ) +void QgsPhotoWidgetWrapper::initWidget( QWidget* editor ) { QWidget* container; @@ -120,7 +120,7 @@ void QgsPhotoWidget::initWidget( QWidget* editor ) } } -void QgsPhotoWidget::setValue( const QVariant& value ) +void QgsPhotoWidgetWrapper::setValue( const QVariant& value ) { if ( mLineEdit ) mLineEdit->setText( value.toString() ); @@ -128,7 +128,7 @@ void QgsPhotoWidget::setValue( const QVariant& value ) } -void QgsPhotoWidget::setEnabled( bool enabled ) +void QgsPhotoWidgetWrapper::setEnabled( bool enabled ) { if ( mLineEdit ) mLineEdit->setEnabled( enabled ); diff --git a/src/gui/editorwidgets/qgsphotowidget.h b/src/gui/editorwidgets/qgsphotowidgetwrapper.h similarity index 84% rename from src/gui/editorwidgets/qgsphotowidget.h rename to src/gui/editorwidgets/qgsphotowidgetwrapper.h index 070e2172da2c..c11e4e16b9a1 100644 --- a/src/gui/editorwidgets/qgsphotowidget.h +++ b/src/gui/editorwidgets/qgsphotowidgetwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsphotowidget.h + qgsphotowidgetwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#ifndef QGSPHOTOWIDGET_H -#define QGSPHOTOWIDGET_H +#ifndef QGSPHOTOWIDGETWRAPPER_H +#define QGSPHOTOWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" @@ -22,11 +22,11 @@ #include #include -class GUI_EXPORT QgsPhotoWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsPhotoWidgetWrapper : public QgsEditorWidgetWrapper { Q_OBJECT public: - explicit QgsPhotoWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); + explicit QgsPhotoWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); // QgsEditorWidgetWrapper interface public: @@ -53,4 +53,4 @@ class GUI_EXPORT QgsPhotoWidget : public QgsEditorWidgetWrapper QPushButton* mButton; }; -#endif // QGSPHOTOWIDGET_H +#endif // QGSPHOTOWIDGETWRAPPER_H diff --git a/src/gui/editorwidgets/qgsrangewidgetfactory.cpp b/src/gui/editorwidgets/qgsrangewidgetfactory.cpp index 4deb580f5624..59e9ac00116f 100644 --- a/src/gui/editorwidgets/qgsrangewidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsrangewidgetfactory.cpp @@ -15,7 +15,7 @@ #include "qgsrangewidgetfactory.h" #include "qgsrangeconfigdlg.h" -#include "qgsrangewidget.h" +#include "qgsrangewidgetwrapper.h" #include "qgsvectorlayer.h" @@ -26,7 +26,7 @@ QgsRangeWidgetFactory::QgsRangeWidgetFactory( QString name ) QgsEditorWidgetWrapper* QgsRangeWidgetFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsRangeWidget( vl, fieldIdx, editor, parent ); + return new QgsRangeWidgetWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget* QgsRangeWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const diff --git a/src/gui/editorwidgets/qgsrangewidget.cpp b/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp similarity index 90% rename from src/gui/editorwidgets/qgsrangewidget.cpp rename to src/gui/editorwidgets/qgsrangewidgetwrapper.cpp index 9433c5454219..c8e32728fb7f 100644 --- a/src/gui/editorwidgets/qgsrangewidget.cpp +++ b/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsrangewidget.cpp + qgsrangewidgetwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,11 +13,11 @@ * * ***************************************************************************/ -#include "qgsrangewidget.h" +#include "qgsrangewidgetwrapper.h" #include "qgsvectorlayer.h" -QgsRangeWidget::QgsRangeWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) +QgsRangeWidgetWrapper::QgsRangeWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) , mIntSpinBox( 0 ) , mDoubleSpinBox( 0 ) @@ -26,7 +26,7 @@ QgsRangeWidget::QgsRangeWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* edito { } -QWidget* QgsRangeWidget::createWidget( QWidget* parent ) +QWidget* QgsRangeWidgetWrapper::createWidget( QWidget* parent ) { QWidget* editor = 0; @@ -66,7 +66,7 @@ QWidget* QgsRangeWidget::createWidget( QWidget* parent ) return editor; } -void QgsRangeWidget::initWidget( QWidget* editor ) +void QgsRangeWidgetWrapper::initWidget( QWidget* editor ) { mDoubleSpinBox = qobject_cast( editor ); mIntSpinBox = qobject_cast( editor ); @@ -107,7 +107,7 @@ void QgsRangeWidget::initWidget( QWidget* editor ) } -QVariant QgsRangeWidget::value() +QVariant QgsRangeWidgetWrapper::value() { QVariant value; @@ -131,7 +131,7 @@ QVariant QgsRangeWidget::value() return value; } -void QgsRangeWidget::setValue( const QVariant& value ) +void QgsRangeWidgetWrapper::setValue( const QVariant& value ) { if ( mDoubleSpinBox ) { diff --git a/src/gui/editorwidgets/qgsrangewidget.h b/src/gui/editorwidgets/qgsrangewidgetwrapper.h similarity index 82% rename from src/gui/editorwidgets/qgsrangewidget.h rename to src/gui/editorwidgets/qgsrangewidgetwrapper.h index 4535850cb7e4..cb54025896a7 100644 --- a/src/gui/editorwidgets/qgsrangewidget.h +++ b/src/gui/editorwidgets/qgsrangewidgetwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsrangewidget.h + qgsrangewidgetwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#ifndef QGSRANGEWIDGET_H -#define QGSRANGEWIDGET_H +#ifndef QGSRANGEWIDGETWRAPPER_H +#define QGSRANGEWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" @@ -24,11 +24,11 @@ #include "qgsdial.h" #include "qgsslider.h" -class GUI_EXPORT QgsRangeWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsRangeWidgetWrapper : public QgsEditorWidgetWrapper { Q_OBJECT public: - explicit QgsRangeWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent = 0 ); + explicit QgsRangeWidgetWrapper ( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent = 0 ); // QgsEditorWidgetWrapper interface public: @@ -48,4 +48,4 @@ class GUI_EXPORT QgsRangeWidget : public QgsEditorWidgetWrapper QDial* mDial; }; -#endif // QGSRANGEWIDGET_H +#endif // QGSRANGEWIDGETWRAPPER_H diff --git a/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp b/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp index a94ac0204423..17771ee3ed68 100644 --- a/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp @@ -15,7 +15,7 @@ #include "qgstexteditwidgetfactory.h" -#include "qgstexteditwidget.h" +#include "qgstexteditwrapper.h" #include "qgstexteditconfigdlg.h" QgsTextEditWidgetFactory::QgsTextEditWidgetFactory( const QString& name ) @@ -25,7 +25,7 @@ QgsTextEditWidgetFactory::QgsTextEditWidgetFactory( const QString& name ) QgsEditorWidgetWrapper* QgsTextEditWidgetFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsTextEditWidget( vl, fieldIdx, editor, parent ); + return new QgsTextEditWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget* QgsTextEditWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const diff --git a/src/gui/editorwidgets/qgstexteditwidget.cpp b/src/gui/editorwidgets/qgstexteditwrapper.cpp similarity index 89% rename from src/gui/editorwidgets/qgstexteditwidget.cpp rename to src/gui/editorwidgets/qgstexteditwrapper.cpp index e233e9f6620c..34c4c7198f0c 100644 --- a/src/gui/editorwidgets/qgstexteditwidget.cpp +++ b/src/gui/editorwidgets/qgstexteditwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgstexteditwidget.cpp + qgstexteditwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include "qgstexteditwidget.h" +#include "qgstexteditwrapper.h" #include "qgsfield.h" #include "qgsfieldvalidator.h" @@ -21,12 +21,12 @@ #include -QgsTextEditWidget::QgsTextEditWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) +QgsTextEditWrapper::QgsTextEditWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) { } -QVariant QgsTextEditWidget::value() +QVariant QgsTextEditWrapper::value() { QString v; @@ -59,7 +59,7 @@ QVariant QgsTextEditWidget::value() return QVariant( v ); } -QWidget* QgsTextEditWidget::createWidget( QWidget* parent ) +QWidget* QgsTextEditWrapper::createWidget( QWidget* parent ) { if ( config( "IsMultiline" ).toBool() ) { @@ -78,7 +78,7 @@ QWidget* QgsTextEditWidget::createWidget( QWidget* parent ) } } -void QgsTextEditWidget::initWidget( QWidget* editor ) +void QgsTextEditWrapper::initWidget( QWidget* editor ) { mTextEdit = qobject_cast( editor ); mPlainTextEdit = qobject_cast( editor ); @@ -104,7 +104,7 @@ void QgsTextEditWidget::initWidget( QWidget* editor ) } } -void QgsTextEditWidget::setValue( const QVariant& value ) +void QgsTextEditWrapper::setValue( const QVariant& value ) { QString v; if ( value.isNull() ) @@ -130,7 +130,7 @@ void QgsTextEditWidget::setValue( const QVariant& value ) mLineEdit->setText( v ); } -void QgsTextEditWidget::setEnabled( bool enabled ) +void QgsTextEditWrapper::setEnabled( bool enabled ) { if ( mTextEdit ) mTextEdit->setReadOnly( !enabled ); diff --git a/src/gui/editorwidgets/qgstexteditwidget.h b/src/gui/editorwidgets/qgstexteditwrapper.h similarity index 82% rename from src/gui/editorwidgets/qgstexteditwidget.h rename to src/gui/editorwidgets/qgstexteditwrapper.h index 0f04feaf4d04..431dbae5efea 100644 --- a/src/gui/editorwidgets/qgstexteditwidget.h +++ b/src/gui/editorwidgets/qgstexteditwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgstexteditwidget.h + qgstexteditwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#ifndef QGSTEXTEDITWIDGET_H -#define QGSTEXTEDITWIDGET_H +#ifndef QGSTEXTEDITWRAPPER_H +#define QGSTEXTEDITWRAPPER_H #include "qgseditorwidgetwrapper.h" @@ -22,11 +22,11 @@ #include #include -class GUI_EXPORT QgsTextEditWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsTextEditWrapper : public QgsEditorWidgetWrapper { Q_OBJECT public: - explicit QgsTextEditWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); + explicit QgsTextEditWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); // QgsEditorWidgetWrapper interface public: @@ -46,4 +46,4 @@ class GUI_EXPORT QgsTextEditWidget : public QgsEditorWidgetWrapper QLineEdit* mLineEdit; }; -#endif // QGSTEXTEDITWIDGET_H +#endif // QGSTEXTEDITWRAPPER_H diff --git a/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.cpp b/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.cpp index c1017895bb54..36572b1d2443 100644 --- a/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.cpp @@ -15,7 +15,7 @@ #include "qgsuniquevaluewidgetfactory.h" -#include "qgsuniquevaluewidget.h" +#include "qgsuniquevaluewidgetwrapper.h" #include "qgsuniquevaluesconfigdlg.h" QgsUniqueValueWidgetFactory::QgsUniqueValueWidgetFactory( const QString& name ) @@ -26,7 +26,7 @@ QgsUniqueValueWidgetFactory::QgsUniqueValueWidgetFactory( const QString& name ) QgsEditorWidgetWrapper* QgsUniqueValueWidgetFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsUniqueValuesWidget( vl, fieldIdx, editor, parent ); + return new QgsUniqueValuesWidgetWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget* QgsUniqueValueWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const diff --git a/src/gui/editorwidgets/qgsuniquevaluewidget.cpp b/src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.cpp similarity index 82% rename from src/gui/editorwidgets/qgsuniquevaluewidget.cpp rename to src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.cpp index 13f34ef6f728..f7519a46b6b0 100644 --- a/src/gui/editorwidgets/qgsuniquevaluewidget.cpp +++ b/src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsuniquevaluewidget.cpp + qgsuniquevaluewidgetwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,18 +13,18 @@ * * ***************************************************************************/ -#include "qgsuniquevaluewidget.h" +#include "qgsuniquevaluewidgetwrapper.h" #include "qgsvectorlayer.h" #include -QgsUniqueValuesWidget::QgsUniqueValuesWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) +QgsUniqueValuesWidgetWrapper::QgsUniqueValuesWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) { } -QVariant QgsUniqueValuesWidget::value() +QVariant QgsUniqueValuesWidgetWrapper::value() { QVariant value; @@ -37,7 +37,7 @@ QVariant QgsUniqueValuesWidget::value() return value; } -QWidget* QgsUniqueValuesWidget::createWidget( QWidget* parent ) +QWidget* QgsUniqueValuesWidgetWrapper::createWidget( QWidget* parent ) { if ( config( "Editable" ).toBool() ) return new QLineEdit( parent ); @@ -45,7 +45,7 @@ QWidget* QgsUniqueValuesWidget::createWidget( QWidget* parent ) return new QComboBox( parent ); } -void QgsUniqueValuesWidget::initWidget( QWidget* editor ) +void QgsUniqueValuesWidgetWrapper::initWidget( QWidget* editor ) { mComboBox = qobject_cast( editor ); mLineEdit = qobject_cast( editor ); @@ -81,7 +81,7 @@ void QgsUniqueValuesWidget::initWidget( QWidget* editor ) } } -void QgsUniqueValuesWidget::setValue( const QVariant& value ) +void QgsUniqueValuesWidgetWrapper::setValue( const QVariant& value ) { if ( mComboBox ) { diff --git a/src/gui/editorwidgets/qgsuniquevaluewidget.h b/src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.h similarity index 78% rename from src/gui/editorwidgets/qgsuniquevaluewidget.h rename to src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.h index 53e19ab8414d..cfa9c8ba480e 100644 --- a/src/gui/editorwidgets/qgsuniquevaluewidget.h +++ b/src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsuniquevaluewidget.h + qgsuniquevaluewidgetwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,19 +13,19 @@ * * ***************************************************************************/ -#ifndef QGSUNIQUEVALUEWIDGET_H -#define QGSUNIQUEVALUEWIDGET_H +#ifndef QGSUNIQUEVALUEWIDGETWRAPPER_H +#define QGSUNIQUEVALUEWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" #include #include -class GUI_EXPORT QgsUniqueValuesWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsUniqueValuesWidgetWrapper : public QgsEditorWidgetWrapper { Q_OBJECT public: - explicit QgsUniqueValuesWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); + explicit QgsUniqueValuesWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); // QgsEditorWidgetWrapper interface public: @@ -43,4 +43,4 @@ class GUI_EXPORT QgsUniqueValuesWidget : public QgsEditorWidgetWrapper QLineEdit* mLineEdit; }; -#endif // QGSUNIQUEVALUEWIDGET_H +#endif // QGSUNIQUEVALUEWIDGETWRAPPER_H diff --git a/src/gui/editorwidgets/qgsuuidwidgetfactory.cpp b/src/gui/editorwidgets/qgsuuidwidgetfactory.cpp index f117534d8b78..cf6187ae828f 100644 --- a/src/gui/editorwidgets/qgsuuidwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsuuidwidgetfactory.cpp @@ -15,7 +15,7 @@ #include "qgsuuidwidgetfactory.h" -#include "qgsuuidwidget.h" +#include "qgsuuidwidgetwrapper.h" #include "qgsdummyconfigdlg.h" QgsUuidWidgetFactory::QgsUuidWidgetFactory( const QString& name ) @@ -26,7 +26,7 @@ QgsUuidWidgetFactory::QgsUuidWidgetFactory( const QString& name ) QgsEditorWidgetWrapper*QgsUuidWidgetFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsUuidWidget( vl, fieldIdx, editor, parent ); + return new QgsUuidWidgetWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget*QgsUuidWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const diff --git a/src/gui/editorwidgets/qgsuuidwidget.cpp b/src/gui/editorwidgets/qgsuuidwidgetwrapper.cpp similarity index 79% rename from src/gui/editorwidgets/qgsuuidwidget.cpp rename to src/gui/editorwidgets/qgsuuidwidgetwrapper.cpp index 2abe4c2d48e6..94fe53b65c88 100644 --- a/src/gui/editorwidgets/qgsuuidwidget.cpp +++ b/src/gui/editorwidgets/qgsuuidwidgetwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsuuidwidget.cpp + qgsuuidwidgetwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,16 +13,16 @@ * * ***************************************************************************/ -#include "qgsuuidwidget.h" +#include "qgsuuidwidgetwrapper.h" #include -QgsUuidWidget::QgsUuidWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) +QgsUuidWidgetWrapper::QgsUuidWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) { } -QVariant QgsUuidWidget::value() +QVariant QgsUuidWidgetWrapper::value() { QVariant v; @@ -34,12 +34,12 @@ QVariant QgsUuidWidget::value() return v; } -QWidget* QgsUuidWidget::createWidget( QWidget* parent ) +QWidget* QgsUuidWidgetWrapper::createWidget( QWidget* parent ) { return new QLineEdit( parent ); } -void QgsUuidWidget::initWidget( QWidget* editor ) +void QgsUuidWidgetWrapper::initWidget( QWidget* editor ) { mLineEdit = qobject_cast( editor ); mLabel = qobject_cast( editor ); @@ -47,7 +47,7 @@ void QgsUuidWidget::initWidget( QWidget* editor ) mLineEdit->setEnabled( false ); } -void QgsUuidWidget::setValue( const QVariant& value ) +void QgsUuidWidgetWrapper::setValue( const QVariant& value ) { if ( value.isNull() ) { @@ -67,7 +67,7 @@ void QgsUuidWidget::setValue( const QVariant& value ) } } -void QgsUuidWidget::setEnabled( bool enabled ) +void QgsUuidWidgetWrapper::setEnabled( bool enabled ) { Q_UNUSED( enabled ) // Do nothing... it is always disabled diff --git a/src/gui/editorwidgets/qgsuuidwidget.h b/src/gui/editorwidgets/qgsuuidwidgetwrapper.h similarity index 81% rename from src/gui/editorwidgets/qgsuuidwidget.h rename to src/gui/editorwidgets/qgsuuidwidgetwrapper.h index 8bbea68013d8..74ed1cb73673 100644 --- a/src/gui/editorwidgets/qgsuuidwidget.h +++ b/src/gui/editorwidgets/qgsuuidwidgetwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsuuidwidget.h + qgsuuidwidgetwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,19 +13,19 @@ * * ***************************************************************************/ -#ifndef QGSUUIDWIDGET_H -#define QGSUUIDWIDGET_H +#ifndef QGSUUIDWIDGETWRAPPER_H +#define QGSUUIDWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" #include #include -class GUI_EXPORT QgsUuidWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsUuidWidgetWrapper : public QgsEditorWidgetWrapper { Q_OBJECT public: - explicit QgsUuidWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); + explicit QgsUuidWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); // QgsEditorWidgetWrapper interface public: @@ -44,4 +44,4 @@ class GUI_EXPORT QgsUuidWidget : public QgsEditorWidgetWrapper QLineEdit* mLineEdit; }; -#endif // QGSUUIDWIDGET_H +#endif // QGSUUIDWIDGETWRAPPER_H diff --git a/src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp b/src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp index 4aea143b8340..cda7c44f0a09 100644 --- a/src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp @@ -15,7 +15,7 @@ #include "qgsvaluemapwidgetfactory.h" -#include "qgsvaluemapwidget.h" +#include "qgsvaluemapwidgetwrapper.h" #include "qgsvaluemapconfigdlg.h" QgsValueMapWidgetFactory::QgsValueMapWidgetFactory( const QString& name ) @@ -26,7 +26,7 @@ QgsValueMapWidgetFactory::QgsValueMapWidgetFactory( const QString& name ) QgsEditorWidgetWrapper* QgsValueMapWidgetFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsValueMapWidget( vl, fieldIdx, editor, parent ); + return new QgsValueMapWidgetWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget* QgsValueMapWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const diff --git a/src/gui/editorwidgets/qgsvaluemapwidget.cpp b/src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp similarity index 78% rename from src/gui/editorwidgets/qgsvaluemapwidget.cpp rename to src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp index 99cd245e8f56..35ecffe3980a 100644 --- a/src/gui/editorwidgets/qgsvaluemapwidget.cpp +++ b/src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsvaluemapwidget.cpp + qgsvaluemapwidgetwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,15 +13,15 @@ * * ***************************************************************************/ -#include "qgsvaluemapwidget.h" +#include "qgsvaluemapwidgetwrapper.h" -QgsValueMapWidget::QgsValueMapWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) +QgsValueMapWidgetWrapper::QgsValueMapWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) { } -QVariant QgsValueMapWidget::value() +QVariant QgsValueMapWidgetWrapper::value() { QVariant v; @@ -31,12 +31,12 @@ QVariant QgsValueMapWidget::value() return v; } -QWidget* QgsValueMapWidget::createWidget( QWidget* parent ) +QWidget* QgsValueMapWidgetWrapper::createWidget( QWidget* parent ) { return new QComboBox( parent ); } -void QgsValueMapWidget::initWidget( QWidget* editor ) +void QgsValueMapWidgetWrapper::initWidget( QWidget* editor ) { mComboBox = qobject_cast( editor ); @@ -54,7 +54,7 @@ void QgsValueMapWidget::initWidget( QWidget* editor ) } } -void QgsValueMapWidget::setValue( const QVariant& value ) +void QgsValueMapWidgetWrapper::setValue( const QVariant& value ) { if ( mComboBox ) mComboBox->setCurrentIndex( mComboBox->findData( value ) ); diff --git a/src/gui/editorwidgets/qgsvaluemapwidget.h b/src/gui/editorwidgets/qgsvaluemapwidgetwrapper.h similarity index 79% rename from src/gui/editorwidgets/qgsvaluemapwidget.h rename to src/gui/editorwidgets/qgsvaluemapwidgetwrapper.h index f663a8b4068b..0cb897ccf5de 100644 --- a/src/gui/editorwidgets/qgsvaluemapwidget.h +++ b/src/gui/editorwidgets/qgsvaluemapwidgetwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsvaluemapwidget.h + qgsvaluemapwidgetwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,18 +13,18 @@ * * ***************************************************************************/ -#ifndef QGSVALUEMAPWIDGET_H -#define QGSVALUEMAPWIDGET_H +#ifndef QGSVALUEMAPWIDGETWRAPPER_H +#define QGSVALUEMAPWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" #include -class GUI_EXPORT QgsValueMapWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsValueMapWidgetWrapper : public QgsEditorWidgetWrapper { Q_OBJECT public: - explicit QgsValueMapWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); + explicit QgsValueMapWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); // QgsEditorWidgetWrapper interface public: @@ -41,4 +41,4 @@ class GUI_EXPORT QgsValueMapWidget : public QgsEditorWidgetWrapper QComboBox* mComboBox; }; -#endif // QGSVALUEMAPWIDGET_H +#endif // QGSVALUEMAPWIDGETWRAPPER_H diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.cpp b/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.cpp index 7c57380380f9..0ef46cd088ec 100644 --- a/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.cpp @@ -31,7 +31,7 @@ QgsValueRelationWidgetFactory::QgsValueRelationWidgetFactory( const QString& nam QgsEditorWidgetWrapper* QgsValueRelationWidgetFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsValueRelationWidget( vl, fieldIdx, editor, parent ); + return new QgsValueRelationWidgetWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget* QgsValueRelationWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const @@ -77,15 +77,15 @@ QString QgsValueRelationWidgetFactory::representValue( QgsVectorLayer* vl, int f Q_UNUSED( vl ) Q_UNUSED( fieldIdx ) - QgsValueRelationWidget::ValueRelationCache vrCache; + QgsValueRelationWidgetWrapper::ValueRelationCache vrCache; if ( cache.isValid() ) { - vrCache = cache.value(); + vrCache = cache.value(); } else { - vrCache = QgsValueRelationWidget::createCache( config ); + vrCache = QgsValueRelationWidgetWrapper::createCache( config ); } if ( config.value( "AllowMulti" ).toBool() ) @@ -93,7 +93,7 @@ QString QgsValueRelationWidgetFactory::representValue( QgsVectorLayer* vl, int f QStringList keyList = value.toString().remove( QChar( '{' ) ).remove( QChar( '}' ) ).split( "," ); QStringList valueList; - Q_FOREACH( const QgsValueRelationWidget::ValueRelationItem& item, vrCache ) + Q_FOREACH( const QgsValueRelationWidgetWrapper::ValueRelationItem& item, vrCache ) { if ( keyList.contains( item.first.toString() ) ) { @@ -111,7 +111,7 @@ QString QgsValueRelationWidgetFactory::representValue( QgsVectorLayer* vl, int f return settings.value( "qgis/nullValue", "NULL" ).toString(); } - Q_FOREACH( const QgsValueRelationWidget::ValueRelationItem& item, vrCache ) + Q_FOREACH( const QgsValueRelationWidgetWrapper::ValueRelationItem& item, vrCache ) { if ( item.first == value ) { @@ -128,6 +128,6 @@ QVariant QgsValueRelationWidgetFactory::createCache( QgsVectorLayer* vl, int fie Q_UNUSED( vl ) Q_UNUSED( fieldIdx ) - return QVariant::fromValue( QgsValueRelationWidget::createCache( config ) ); + return QVariant::fromValue( QgsValueRelationWidgetWrapper::createCache( config ) ); } diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.h b/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.h index 6773bf706600..72a405e015f7 100644 --- a/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.h +++ b/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.h @@ -17,7 +17,7 @@ #define QGSVALUERELATIONWIDGETFACTORY_H #include "qgseditorwidgetfactory.h" -#include "qgsvaluerelationwidget.h" +#include "qgsvaluerelationwidgetwrapper.h" #include diff --git a/src/gui/editorwidgets/qgsvaluerelationwidget.cpp b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp similarity index 85% rename from src/gui/editorwidgets/qgsvaluerelationwidget.cpp rename to src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp index bf65c5bf0519..c7509fb36283 100644 --- a/src/gui/editorwidgets/qgsvaluerelationwidget.cpp +++ b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsvaluerelationwidget.cpp + qgsvaluerelationwidgetwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,15 +13,15 @@ * * ***************************************************************************/ -#include "qgsvaluerelationwidget.h" +#include "qgsvaluerelationwidgetwrapper.h" #include "qgsfield.h" #include "qgsmaplayerregistry.h" #include "qgsvaluerelationwidgetfactory.h" #include "qgsvectorlayer.h" -bool orderByKeyLessThan( const QgsValueRelationWidget::ValueRelationItem& p1 - , const QgsValueRelationWidget::ValueRelationItem& p2 ) +bool orderByKeyLessThan( const QgsValueRelationWidgetWrapper::ValueRelationItem& p1 + , const QgsValueRelationWidgetWrapper::ValueRelationItem& p2 ) { switch ( p1.first.type() ) { @@ -39,19 +39,19 @@ bool orderByKeyLessThan( const QgsValueRelationWidget::ValueRelationItem& p1 } } -bool orderByValueLessThan( const QgsValueRelationWidget::ValueRelationItem& p1 - , const QgsValueRelationWidget::ValueRelationItem& p2 ) +bool orderByValueLessThan( const QgsValueRelationWidgetWrapper::ValueRelationItem& p1 + , const QgsValueRelationWidgetWrapper::ValueRelationItem& p2 ) { return p1.second < p2.second; } -QgsValueRelationWidget::QgsValueRelationWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) +QgsValueRelationWidgetWrapper::QgsValueRelationWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) { } -QVariant QgsValueRelationWidget::value() +QVariant QgsValueRelationWidgetWrapper::value() { QVariant v; @@ -80,7 +80,7 @@ QVariant QgsValueRelationWidget::value() return v; } -QWidget* QgsValueRelationWidget::createWidget( QWidget* parent ) +QWidget* QgsValueRelationWidgetWrapper::createWidget( QWidget* parent ) { if ( config( "AllowMulti" ).toBool() ) { @@ -92,7 +92,7 @@ QWidget* QgsValueRelationWidget::createWidget( QWidget* parent ) } } -void QgsValueRelationWidget::initWidget( QWidget* editor ) +void QgsValueRelationWidgetWrapper::initWidget( QWidget* editor ) { mCache = createCache( config() ); @@ -127,7 +127,7 @@ void QgsValueRelationWidget::initWidget( QWidget* editor ) } } -void QgsValueRelationWidget::setValue( const QVariant& value ) +void QgsValueRelationWidgetWrapper::setValue( const QVariant& value ) { if ( mListWidget ) { @@ -153,7 +153,7 @@ void QgsValueRelationWidget::setValue( const QVariant& value ) } -QgsValueRelationWidget::ValueRelationCache QgsValueRelationWidget::createCache( const QgsEditorWidgetConfig& config ) +QgsValueRelationWidgetWrapper::ValueRelationCache QgsValueRelationWidgetWrapper::createCache( const QgsEditorWidgetConfig& config ) { ValueRelationCache cache; diff --git a/src/gui/editorwidgets/qgsvaluerelationwidget.h b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.h similarity index 79% rename from src/gui/editorwidgets/qgsvaluerelationwidget.h rename to src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.h index 84b5de81b597..474154b09b3c 100644 --- a/src/gui/editorwidgets/qgsvaluerelationwidget.h +++ b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsvaluerelationwidget.h + qgsvaluerelationwidgetwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#ifndef QGSVALUERELATIONWIDGET_H -#define QGSVALUERELATIONWIDGET_H +#ifndef QGSVALUERELATIONWIDGETWRAPPER_H +#define QGSVALUERELATIONWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" @@ -23,7 +23,7 @@ class QgsValueRelationWidgetFactory; -class GUI_EXPORT QgsValueRelationWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsValueRelationWidgetWrapper : public QgsEditorWidgetWrapper { Q_OBJECT @@ -32,7 +32,7 @@ class GUI_EXPORT QgsValueRelationWidget : public QgsEditorWidgetWrapper typedef QVector < ValueRelationItem > ValueRelationCache; public: - explicit QgsValueRelationWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); + explicit QgsValueRelationWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); // QgsEditorWidgetWrapper interface @@ -57,6 +57,6 @@ class GUI_EXPORT QgsValueRelationWidget : public QgsEditorWidgetWrapper friend class QgsValueRelationWidgetFactory; }; -Q_DECLARE_METATYPE( QgsValueRelationWidget::ValueRelationCache ) +Q_DECLARE_METATYPE( QgsValueRelationWidgetWrapper::ValueRelationCache ) -#endif // QGSVALUERELATIONWIDGET_H +#endif // QGSVALUERELATIONWIDGETWRAPPER_H diff --git a/src/gui/editorwidgets/qgswebviewwidgetfactory.cpp b/src/gui/editorwidgets/qgswebviewwidgetfactory.cpp index 44d80d2b0d80..1f3eb476f6b1 100644 --- a/src/gui/editorwidgets/qgswebviewwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgswebviewwidgetfactory.cpp @@ -15,7 +15,7 @@ #include "qgswebviewwidgetfactory.h" -#include "qgswebviewwidget.h" +#include "qgswebviewwidgetwrapper.h" #include "qgswebviewconfigdlg.h" QgsWebViewWidgetFactory::QgsWebViewWidgetFactory( const QString& name ) @@ -26,7 +26,7 @@ QgsWebViewWidgetFactory::QgsWebViewWidgetFactory( const QString& name ) QgsEditorWidgetWrapper* QgsWebViewWidgetFactory::create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const { - return new QgsWebViewWidget( vl, fieldIdx, editor, parent ); + return new QgsWebViewWidgetWrapper( vl, fieldIdx, editor, parent ); } QgsEditorConfigWidget* QgsWebViewWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const diff --git a/src/gui/editorwidgets/qgswebviewwidget.cpp b/src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp similarity index 85% rename from src/gui/editorwidgets/qgswebviewwidget.cpp rename to src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp index 3b4d1b8f3135..7d340ae06e29 100644 --- a/src/gui/editorwidgets/qgswebviewwidget.cpp +++ b/src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgswebviewwidget.cpp + qgswebviewwidgetwrapper.cpp -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include "qgswebviewwidget.h" +#include "qgswebviewwidgetwrapper.h" #include "qgsfilterlineedit.h" #include "qgsnetworkaccessmanager.h" @@ -21,18 +21,18 @@ #include #include -QgsWebViewWidget::QgsWebViewWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) +QgsWebViewWidgetWrapper::QgsWebViewWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) { } -void QgsWebViewWidget::loadUrl( const QString &url ) +void QgsWebViewWidgetWrapper::loadUrl( const QString &url ) { if ( mWebView ) mWebView->load( url ); } -QVariant QgsWebViewWidget::value() +QVariant QgsWebViewWidgetWrapper::value() { QVariant v; @@ -42,7 +42,7 @@ QVariant QgsWebViewWidget::value() return v; } -QWidget* QgsWebViewWidget::createWidget( QWidget* parent ) +QWidget* QgsWebViewWidgetWrapper::createWidget( QWidget* parent ) { QWidget* container = new QWidget( parent ); QGridLayout* layout = new QGridLayout( container ); @@ -61,7 +61,7 @@ QWidget* QgsWebViewWidget::createWidget( QWidget* parent ) return container; } -void QgsWebViewWidget::initWidget( QWidget* editor ) +void QgsWebViewWidgetWrapper::initWidget( QWidget* editor ) { QWidget* container; @@ -105,7 +105,7 @@ void QgsWebViewWidget::initWidget( QWidget* editor ) } } -void QgsWebViewWidget::setValue( const QVariant& value ) +void QgsWebViewWidgetWrapper::setValue( const QVariant& value ) { if ( mLineEdit ) mLineEdit->setText( value.toString() ); @@ -113,7 +113,7 @@ void QgsWebViewWidget::setValue( const QVariant& value ) loadUrl( value.toString() ); } -void QgsWebViewWidget::setEnabled( bool enabled ) +void QgsWebViewWidgetWrapper::setEnabled( bool enabled ) { if ( mLineEdit ) mLineEdit->setEnabled( enabled ); @@ -122,7 +122,7 @@ void QgsWebViewWidget::setEnabled( bool enabled ) mButton->setEnabled( enabled ); } -void QgsWebViewWidget::selectFileName() +void QgsWebViewWidgetWrapper::selectFileName() { QString text; diff --git a/src/gui/editorwidgets/qgswebviewwidget.h b/src/gui/editorwidgets/qgswebviewwidgetwrapper.h similarity index 83% rename from src/gui/editorwidgets/qgswebviewwidget.h rename to src/gui/editorwidgets/qgswebviewwidgetwrapper.h index 7b7fb4fadb24..e54e1fdcd3fe 100644 --- a/src/gui/editorwidgets/qgswebviewwidget.h +++ b/src/gui/editorwidgets/qgswebviewwidgetwrapper.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgswebviewwidget.h + qgswebviewwidgetwrapper.h -------------------------------------- Date : 5.1.2014 Copyright : (C) 2014 Matthias Kuhn @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#ifndef QGSWEBVIEWWIDGET_H -#define QGSWEBVIEWWIDGET_H +#ifndef QGSWEBVIEWWIDGETWRAPPER_H +#define QGSWEBVIEWWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" @@ -22,11 +22,11 @@ #include #include -class GUI_EXPORT QgsWebViewWidget : public QgsEditorWidgetWrapper +class GUI_EXPORT QgsWebViewWidgetWrapper : public QgsEditorWidgetWrapper { Q_OBJECT public: - explicit QgsWebViewWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); + explicit QgsWebViewWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor = 0, QWidget* parent = 0 ); // QgsEditorWidgetWrapper interface @@ -54,4 +54,4 @@ class GUI_EXPORT QgsWebViewWidget : public QgsEditorWidgetWrapper QPushButton* mButton; }; -#endif // QGSWEBVIEWWIDGET_H +#endif // QGSWEBVIEWWIDGETWRAPPER_H