editor widgets: rename to wrapper to distinguish from the real widgets

src/gui/CMakeLists.txt

@@ -58,49 +58,49 @@ 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
 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,49 +506,49 @@ 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
 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

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

src/gui/editorwidgets/qgscheckboxwidget.cpp → 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<QCheckBox*>( editor );
   mGroupBox = qobject_cast<QGroupBox*>( 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 )
   {

src/gui/editorwidgets/qgscheckboxwidget.h → 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 <QCheckBox>
 #include <QGroupBox>
 
-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

src/gui/editorwidgets/qgsclassificationwidget.cpp → 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<QComboBox*>( 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 ) );
 }

src/gui/editorwidgets/qgsclassificationwidget.h → 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 <QComboBox>
 
-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

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