Skip to content
Permalink
Browse files

fix windows build (missing CORE_EXPORT/GUI_EXPORT)

  • Loading branch information
jef-n committed May 7, 2014
1 parent b522991 commit 40df5603c941568d99994ee3a1e3d102004fbd31
@@ -64,7 +64,7 @@ def processAlgorithm(self, progress):
holes = self.getParameterValue(self.HOLES)
no_multigeom = self.getParameterValue(self.NO_MULTIGEOMETRY)
#Delaunay triangulation from input point layer
progress.setText('Creating Delaunay triangles ...')
progress.setText('Creating Delaunay triangles ...')
delone_triangles = processing.runalg("qgis:delaunaytriangulation", layer, None)['OUTPUT']
delaunay_layer = processing.getObject(delone_triangles)
#get max edge length from Delaunay triangles
@@ -21,7 +21,7 @@
#include <QtCore>
#include "qgsrendercontext.h"

class QgsMapUnitScale
class CORE_EXPORT QgsMapUnitScale
{
public:
QgsMapUnitScale() : minScale( 0.0 ), maxScale( 0.0 ) {}
@@ -161,7 +161,7 @@ QList<QgsMapToolIdentify::IdentifyResult> QgsMapToolIdentify::identify( int x, i
QAction* selectedAction = layerSelectionMenu.exec( globalPos );
if ( selectedAction )
{
if( selectedAction->data().toString().isEmpty() )
if ( selectedAction->data().toString().isEmpty() )
{
results = idResult;
}
@@ -674,7 +674,7 @@ void QgsMapToolIdentify::handleMenuHover()
}
else
{
for( QMap< QgsMapLayer*, QList<IdentifyResult> >::const_iterator lIt = mLayerIdResults.constBegin(); lIt != mLayerIdResults.constEnd(); ++lIt )
for ( QMap< QgsMapLayer*, QList<IdentifyResult> >::const_iterator lIt = mLayerIdResults.constBegin(); lIt != mLayerIdResults.constEnd(); ++lIt )
{
const QList<IdentifyResult>& idList = lIt.value();
QList<IdentifyResult>::const_iterator idListIt = idList.constBegin();
@@ -25,7 +25,7 @@


/** Dialog allowing the user to choose the minimum and maximum scale of an object in map units */
class QgsMapUnitScaleDialog : public QDialog, private Ui::QgsMapUnitScaleDialog
class GUI_EXPORT QgsMapUnitScaleDialog : public QDialog, private Ui::QgsMapUnitScaleDialog
{
Q_OBJECT

@@ -44,7 +44,7 @@ class QgsMapUnitScaleDialog : public QDialog, private Ui::QgsMapUnitScaleDialog

/** Widget displaying a combobox allowing the user to choose between millimeter and map units
* If the user chooses map units, a button appears allowing the specification of minimum and maximum scale */
class QgsUnitSelectionWidget : public QWidget, private Ui::QgsUnitSelectionWidget
class GUI_EXPORT QgsUnitSelectionWidget : public QWidget, private Ui::QgsUnitSelectionWidget
{
Q_OBJECT

@@ -76,6 +76,3 @@ class QgsUnitSelectionWidget : public QWidget, private Ui::QgsUnitSelectionWidge
};

#endif // QGSUNITSELECTIONWIDGET_H



@@ -78,7 +78,7 @@ void QgsEllipseSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
mSymbolWidthUnitWidget->setUnit( mLayer->symbolWidthUnit() );
mSymbolWidthUnitWidget->setMapUnitScale( mLayer->symbolWidthMapUnitScale() );
mOutlineWidthUnitWidget->setUnit( mLayer->outlineWidthUnit() );
mOutlineWidthUnitWidget->setMapUnitScale( mLayer->outlineWidthMapUnitScale());
mOutlineWidthUnitWidget->setMapUnitScale( mLayer->outlineWidthMapUnitScale() );
mSymbolHeightUnitWidget->setUnit( mLayer->symbolHeightUnit() );
mSymbolHeightUnitWidget->setMapUnitScale( mLayer->symbolHeightMapUnitScale() );
}
@@ -65,7 +65,7 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* sty
connect( viewSymbols->selectionModel(), SIGNAL( currentChanged( const QModelIndex &, const QModelIndex & ) ), this, SLOT( setSymbolFromStyle( const QModelIndex & ) ) );

connect( mStyle, SIGNAL( symbolSaved( QString, QgsSymbolV2* ) ), this, SLOT( symbolAddedToStyle( QString, QgsSymbolV2* ) ) );
connect( openStyleManagerButton, SIGNAL( pressed() ), this, SLOT( openStyleManager() ) );
connect( openStyleManagerButton, SIGNAL( pressed() ), this, SLOT( openStyleManager() ) );

lblSymbolName->setText( "" );
populateSymbolView();
@@ -206,7 +206,7 @@ void QgsSymbolsListWidget::setLineWidth( double width )
emit changed();
}

void QgsSymbolsListWidget::symbolAddedToStyle( QString name, QgsSymbolV2* symbol)
void QgsSymbolsListWidget::symbolAddedToStyle( QString name, QgsSymbolV2* symbol )
{
populateSymbolView();
}

0 comments on commit 40df560

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