Fixed a typo, added GUI_EXPORT

wonder-sk · wonder-sk · commit bd5a31b51e7a · 2011-10-21T12:02:38.000-03:00
diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -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;
diff --git a/src/gui/qgsexpressionbuilderdialog.h b/src/gui/qgsexpressionbuilderdialog.h
@@ -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();
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -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 );
 
diff --git a/src/gui/qgsexpressionbuilderwidget.h b/src/gui/qgsexpressionbuilderwidget.h
@@ -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;
 };

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ class CORE_EXPORT QgsExpression`
`170`	`170`
`171`	`171`	`struct FunctionDef`
`172`	`172`	`{`
`173`		`- FunctionDef( QString fnname, int params, FcnEval fcn, QString group, QString helpText = "", bool usesGeometry = false )`
	`173`	`+ FunctionDef( QString fnname, int params, FcnEval fcn, QString group, QString helpText = QString(), bool usesGeometry = false )`
`174`	`174`	`: mName( fnname ), mParams( params ), mFcn( fcn ), mUsesGeometry( usesGeometry ), mGroup( group ), mHelpText( helpText ) {}`
`175`	`175`	`/** The name of the function. */`
`176`	`176`	`QString mName;`