Skip to content
Permalink
Browse files

Fixed a typo, added GUI_EXPORT

  • Loading branch information
wonder-sk committed Oct 21, 2011
1 parent 188d733 commit bd5a31b51e7a4e70960b8f25f74d90f48537d97b
@@ -170,7 +170,7 @@ class CORE_EXPORT QgsExpression

struct FunctionDef
{
FunctionDef( QString fnname, int params, FcnEval fcn, QString group, QString helpText = "", bool usesGeometry = false )
FunctionDef( QString fnname, int params, FcnEval fcn, QString group, QString helpText = QString(), bool usesGeometry = false )
: mName( fnname ), mParams( params ), mFcn( fcn ), mUsesGeometry( usesGeometry ), mGroup( group ), mHelpText( helpText ) {}
/** The name of the function. */
QString mName;
@@ -19,10 +19,10 @@
#include <QDialog>
#include "ui_qgsexpressionbuilderdialogbase.h"

class QgsExpressionBuilderDialog : public QDialog, private Ui::QgsExpressionBuilderDialogBase
class GUI_EXPORT QgsExpressionBuilderDialog : public QDialog, private Ui::QgsExpressionBuilderDialogBase
{
public:
QgsExpressionBuilderDialog( QgsVectorLayer* layer, QString startText = "", QWidget* parent = NULL );
QgsExpressionBuilderDialog( QgsVectorLayer* layer, QString startText = QString(), QWidget* parent = NULL );

/** The builder widget that is used by the dialog */
QgsExpressionBuilderWidget* expressionBuilder();
@@ -29,7 +29,7 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
mValueListLabel->hide();

mModel = new QStandardItemModel( );
mProxyModel = new QgsExpressionItemSearhProxy();
mProxyModel = new QgsExpressionItemSearchProxy();
mProxyModel->setSourceModel( mModel );
expressionTree->setModel( mProxyModel );

@@ -28,10 +28,10 @@
* The default search for a tree model only searches top level this will handle one
* level down
*/
class QgsExpressionItemSearhProxy : public QSortFilterProxyModel
class QgsExpressionItemSearchProxy : public QSortFilterProxyModel
{
public:
QgsExpressionItemSearhProxy() { }
QgsExpressionItemSearchProxy() { }

bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const
{
@@ -102,7 +102,7 @@ class QgsExpressionItem : public QStandardItem
/** A reusable widget that can be used to build a expression string.
* See QgsExpressionBuilderDialog for exmaple of usage.
*/
class QgsExpressionBuilderWidget : public QWidget, private Ui::QgsExpressionBuilderWidgetBase
class GUI_EXPORT QgsExpressionBuilderWidget : public QWidget, private Ui::QgsExpressionBuilderWidgetBase
{
Q_OBJECT
public:
@@ -162,7 +162,7 @@ class QgsExpressionBuilderWidget : public QWidget, private Ui::QgsExpressionBuil

QgsVectorLayer *mLayer;
QStandardItemModel *mModel;
QgsExpressionItemSearhProxy *mProxyModel;
QgsExpressionItemSearchProxy *mProxyModel;
QMap<QString, QgsExpressionItem*> mExpressionGroups;
QgsFeature* mFeature;
};

0 comments on commit bd5a31b

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