Skip to content
Permalink
Browse files

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

  • Loading branch information
3nids committed Aug 19, 2014
1 parent 797cd47 commit 92058f4daffb3582e93690b4724d0287a8582979
Showing with 273 additions and 273 deletions.
  1. +42 −42 src/gui/CMakeLists.txt
  2. +2 −2 src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp
  3. +7 −7 src/gui/editorwidgets/{qgscheckboxwidget.cpp → qgscheckboxwidgetwrapper.cpp}
  4. +6 −6 src/gui/editorwidgets/{qgscheckboxwidget.h → qgscheckboxwidgetwrapper.h}
  5. +7 −7 src/gui/editorwidgets/{qgsclassificationwidget.cpp → qgsclassificationwidgetwrapper.cpp}
  6. +6 −6 src/gui/editorwidgets/{qgsclassificationwidget.h → qgsclassificationwidgetwrapper.h}
  7. +2 −2 src/gui/editorwidgets/qgsclassificationwidgetwrapperfactory.cpp
  8. +2 −2 src/gui/editorwidgets/qgscolorwidgetfactory.cpp
  9. +7 −7 src/gui/editorwidgets/{qgscolorwidget.cpp → qgscolorwidgetwrapper.cpp}
  10. +6 −6 src/gui/editorwidgets/{qgscolorwidget.h → qgscolorwidgetwrapper.h}
  11. +2 −2 src/gui/editorwidgets/qgsenumerationwidgetfactory.cpp
  12. +7 −7 src/gui/editorwidgets/{qgsenumerationwidget.cpp → qgsenumerationwidgetwrapper.cpp}
  13. +6 −6 src/gui/editorwidgets/{qgsenumerationwidget.h → qgsenumerationwidgetwrapper.h}
  14. +2 −2 src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp
  15. +8 −8 src/gui/editorwidgets/{qgsfilenamewidget.cpp → qgsfilenamewidgetwrapper.cpp}
  16. +6 −6 src/gui/editorwidgets/{qgsfilenamewidget.h → qgsfilenamewidgetwrapper.h}
  17. +2 −2 src/gui/editorwidgets/qgshiddenwidgetfactory.cpp
  18. +7 −7 src/gui/editorwidgets/{qgshiddenwidget.cpp → qgshiddenwidgetwrapper.cpp}
  19. +6 −6 src/gui/editorwidgets/{qgshiddenwidget.h → qgshiddenwidgetwrapper.h}
  20. +2 −2 src/gui/editorwidgets/qgsphotowidgetfactory.cpp
  21. +10 −10 src/gui/editorwidgets/{qgsphotowidget.cpp → qgsphotowidgetwrapper.cpp}
  22. +6 −6 src/gui/editorwidgets/{qgsphotowidget.h → qgsphotowidgetwrapper.h}
  23. +2 −2 src/gui/editorwidgets/qgsrangewidgetfactory.cpp
  24. +7 −7 src/gui/editorwidgets/{qgsrangewidget.cpp → qgsrangewidgetwrapper.cpp}
  25. +6 −6 src/gui/editorwidgets/{qgsrangewidget.h → qgsrangewidgetwrapper.h}
  26. +2 −2 src/gui/editorwidgets/qgstexteditwidgetfactory.cpp
  27. +8 −8 src/gui/editorwidgets/{qgstexteditwidget.cpp → qgstexteditwrapper.cpp}
  28. +6 −6 src/gui/editorwidgets/{qgstexteditwidget.h → qgstexteditwrapper.h}
  29. +2 −2 src/gui/editorwidgets/qgsuniquevaluewidgetfactory.cpp
  30. +7 −7 src/gui/editorwidgets/{qgsuniquevaluewidget.cpp → qgsuniquevaluewidgetwrapper.cpp}
  31. +6 −6 src/gui/editorwidgets/{qgsuniquevaluewidget.h → qgsuniquevaluewidgetwrapper.h}
  32. +2 −2 src/gui/editorwidgets/qgsuuidwidgetfactory.cpp
  33. +8 −8 src/gui/editorwidgets/{qgsuuidwidget.cpp → qgsuuidwidgetwrapper.cpp}
  34. +6 −6 src/gui/editorwidgets/{qgsuuidwidget.h → qgsuuidwidgetwrapper.h}
  35. +2 −2 src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp
  36. +7 −7 src/gui/editorwidgets/{qgsvaluemapwidget.cpp → qgsvaluemapwidgetwrapper.cpp}
  37. +6 −6 src/gui/editorwidgets/{qgsvaluemapwidget.h → qgsvaluemapwidgetwrapper.h}
  38. +7 −7 src/gui/editorwidgets/qgsvaluerelationwidgetfactory.cpp
  39. +1 −1 src/gui/editorwidgets/qgsvaluerelationwidgetfactory.h
  40. +12 −12 src/gui/editorwidgets/{qgsvaluerelationwidget.cpp → qgsvaluerelationwidgetwrapper.cpp}
  41. +7 −7 src/gui/editorwidgets/{qgsvaluerelationwidget.h → qgsvaluerelationwidgetwrapper.h}
  42. +2 −2 src/gui/editorwidgets/qgswebviewwidgetfactory.cpp
  43. +10 −10 src/gui/editorwidgets/{qgswebviewwidget.cpp → qgswebviewwidgetwrapper.cpp}
  44. +6 −6 src/gui/editorwidgets/{qgswebviewwidget.h → qgswebviewwidgetwrapper.h}
@@ -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
@@ -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
@@ -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 )
{
@@ -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
@@ -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 ) );
}
@@ -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
@@ -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

0 comments on commit 92058f4

Please sign in to comment.
You can’t perform that action at this time.