Skip to content
Permalink
Browse files

rename relreference...to relationreference

  • Loading branch information
3nids committed Sep 15, 2014
1 parent 8a1220c commit 13eb726d39e607d163d830c9db05294504b560bd
@@ -82,10 +82,10 @@ editorwidgets/qgsrangeconfigdlg.cpp
editorwidgets/qgsrangewidgetwrapper.cpp
editorwidgets/qgsrangewidgetfactory.cpp
editorwidgets/qgsrelationwidgetwrapper.cpp
editorwidgets/qgsrelationreferenceconfigdlg.cpp
editorwidgets/qgsrelationreferencefactory.cpp
editorwidgets/qgsrelationreferencewidget.cpp
editorwidgets/qgsrelationreferencewidgetwrapper.cpp
editorwidgets/qgsrelreferenceconfigdlg.cpp
editorwidgets/qgstexteditconfigdlg.cpp
editorwidgets/qgstexteditwrapper.cpp
editorwidgets/qgstexteditwidgetfactory.cpp
@@ -300,10 +300,10 @@ editorwidgets/qgsphotoconfigdlg.h
editorwidgets/qgsphotowidgetwrapper.h
editorwidgets/qgsrangeconfigdlg.h
editorwidgets/qgsrangewidgetwrapper.h
editorwidgets/qgsrelationreferenceconfigdlg.h
editorwidgets/qgsrelationreferencewidget.h
editorwidgets/qgsrelationreferencewidgetwrapper.h
editorwidgets/qgsrelationwidgetwrapper.h
editorwidgets/qgsrelreferenceconfigdlg.h
editorwidgets/qgstexteditconfigdlg.h
editorwidgets/qgstexteditwrapper.h
editorwidgets/qgsuniquevaluesconfigdlg.h
@@ -531,11 +531,11 @@ editorwidgets/qgsphotowidgetfactory.h
editorwidgets/qgsrangeconfigdlg.h
editorwidgets/qgsrangewidgetwrapper.h
editorwidgets/qgsrangewidgetfactory.h
editorwidgets/qgsrelationreferenceconfigdlg.h
editorwidgets/qgsrelationreferencefactory.h
editorwidgets/qgsrelationreferencewidget.h
editorwidgets/qgsrelationreferencewidgetwrapper.h
editorwidgets/qgsrelationwidgetwrapper.h
editorwidgets/qgsrelreferenceconfigdlg.h
editorwidgets/qgstexteditconfigdlg.h
editorwidgets/qgstexteditwrapper.h
editorwidgets/qgstexteditwidgetfactory.h
@@ -1,5 +1,5 @@
/***************************************************************************
qgsrelreferenceconfigdlg.cpp
qgsrelationreferenceconfigdlg.cpp
--------------------------------------
Date : 21.4.2013
Copyright : (C) 2013 Matthias Kuhn
@@ -13,7 +13,7 @@
* *
***************************************************************************/

#include "qgsrelreferenceconfigdlg.h"
#include "qgsrelationreferenceconfigdlg.h"

#include "qgseditorwidgetfactory.h"
#include "qgsfield.h"
@@ -22,7 +22,7 @@
#include "qgsvectorlayer.h"
#include "qgsexpressionbuilderdialog.h"

QgsRelReferenceConfigDlg::QgsRelReferenceConfigDlg( QgsVectorLayer* vl, int fieldIdx, QWidget* parent )
QgsRelationReferenceConfigDlg::QgsRelationReferenceConfigDlg( QgsVectorLayer* vl, int fieldIdx, QWidget* parent )
: QgsEditorConfigWidget( vl, fieldIdx, parent )
{
setupUi( this );
@@ -38,7 +38,7 @@ QgsRelReferenceConfigDlg::QgsRelReferenceConfigDlg( QgsVectorLayer* vl, int fiel
}
}

void QgsRelReferenceConfigDlg::setConfig( const QMap<QString, QVariant>& config )
void QgsRelationReferenceConfigDlg::setConfig( const QMap<QString, QVariant>& config )
{
if ( config.contains( "AllowNULL" ) )
{
@@ -66,7 +66,7 @@ void QgsRelReferenceConfigDlg::setConfig( const QMap<QString, QVariant>& config
}
}

void QgsRelReferenceConfigDlg::relationChanged( int idx )
void QgsRelationReferenceConfigDlg::relationChanged( int idx )
{
QString relName = mComboRelation->itemData( idx ).toString();
QgsRelation rel = QgsProject::instance()->relationManager()->relation( relName );
@@ -80,7 +80,7 @@ void QgsRelReferenceConfigDlg::relationChanged( int idx )
}
}

QgsEditorWidgetConfig QgsRelReferenceConfigDlg::config()
QgsEditorWidgetConfig QgsRelationReferenceConfigDlg::config()
{
QgsEditorWidgetConfig myConfig;
myConfig.insert( "AllowNULL", mCbxAllowNull->isChecked() );
@@ -1,5 +1,5 @@
/***************************************************************************
qgsrelreferenceconfigdlgbase.h
qgsrelationreferenceconfigdlgbase.h
--------------------------------------
Date : 21.4.2013
Copyright : (C) 2013 Matthias Kuhn
@@ -13,23 +13,23 @@
* *
***************************************************************************/

#ifndef QGSRELREFERENCECONFIGDLGBASE_H
#define QGSRELREFERENCECONFIGDLGBASE_H
#ifndef QGSRELATIONREFERENCECONFIGDLGBASE_H
#define QGSRELATIONREFERENCECONFIGDLGBASE_H

#include "ui_qgsrelreferenceconfigdlgbase.h"

This comment has been minimized.

Copy link
@arnaud-morvan

arnaud-morvan Sep 16, 2014

Contributor

Should be renamed too, build don't pass

This comment has been minimized.

Copy link
@3nids

3nids Sep 16, 2014

Author Member

I can successfully compile here.
Try a clean build.

This comment has been minimized.

Copy link
@arnaud-morvan

arnaud-morvan via email Sep 16, 2014

Contributor

This comment has been minimized.

Copy link
@3nids

3nids Sep 16, 2014

Author Member

sorry, my fault, this is fixed

This comment has been minimized.

Copy link
@3nids

3nids Sep 16, 2014

Author Member

crossed commits with Jürgen, fixed anyway

#include "qgseditorconfigwidget.h"

class GUI_EXPORT QgsRelReferenceConfigDlg : public QgsEditorConfigWidget, private Ui::QgsRelReferenceConfigDlgBase
class GUI_EXPORT QgsRelationReferenceConfigDlg : public QgsEditorConfigWidget, private Ui::QgsRelReferenceConfigDlgBase
{
Q_OBJECT

public:
explicit QgsRelReferenceConfigDlg( QgsVectorLayer* vl, int fieldIdx, QWidget* parent );
explicit QgsRelationReferenceConfigDlg( QgsVectorLayer* vl, int fieldIdx, QWidget* parent );
virtual QgsEditorWidgetConfig config();
virtual void setConfig( const QgsEditorWidgetConfig& config );

private slots:
void relationChanged( int idx );
};

#endif // QGSRELREFERENCECONFIGDLGBASE_H
#endif // QGSRELATIONREFERENCECONFIGDLGBASE_H
@@ -16,7 +16,7 @@
#include "qgsrelationreferencefactory.h"

#include "qgsrelationreferencewidgetwrapper.h"
#include "qgsrelreferenceconfigdlg.h"
#include "qgsrelationreferenceconfigdlg.h"

QgsRelationReferenceFactory::QgsRelationReferenceFactory( QString name, QgsMapCanvas* canvas, QgsMessageBar* messageBar )
: QgsEditorWidgetFactory( name )
@@ -32,7 +32,7 @@ QgsEditorWidgetWrapper* QgsRelationReferenceFactory::create( QgsVectorLayer* vl,

QgsEditorConfigWidget* QgsRelationReferenceFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const
{
return new QgsRelReferenceConfigDlg( vl, fieldIdx, parent );
return new QgsRelationReferenceConfigDlg( vl, fieldIdx, parent );
}

QgsEditorWidgetConfig QgsRelationReferenceFactory::readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx )
@@ -30,7 +30,7 @@
#include "qgsgeometry.h"
#include "qgsmapcanvas.h"
#include "qgsmessagebar.h"
#include "qgsrelreferenceconfigdlg.h"
#include "qgsrelationreferenceconfigdlg.h"
#include "qgsvectorlayer.h"


0 comments on commit 13eb726

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