Skip to content
Permalink
Browse files

Fix build

  • Loading branch information
nyalldawson committed Feb 3, 2015
1 parent b456f4d commit b05e789c575879ab793bf05b74e5097ce88c3a8d
@@ -72,7 +72,7 @@ class QgsDataItem : QObject
Fertile, //!< Can create children. Even items without this capability may have children, but cannot create them, it means that children are created by item ancestors.
Fast //!< createChildren() is fast enough to be run in main thread when refreshing items, most root items (wms,wfs,wcs,postgres...) are considered fast because they are reading data only from QSettings
};
typedef QFlags<QgsDataItem::Capabilities> Capability;
typedef QFlags<QgsDataItem::Capability> Capabilities;

// This will _write_ selected crs in data source
virtual bool setCrs( QgsCoordinateReferenceSystem crs );
@@ -151,6 +151,8 @@ class QgsDataItem : QObject
void endRemoveItems();
};

QFlags<QgsDataItem::Capability> operator|(QgsDataItem::Capability f1, QFlags<QgsDataItem::Capability> f2);

/** Item that represents a layer that can be opened with one of the providers */
class QgsLayerItem : QgsDataItem
{
@@ -246,20 +248,18 @@ class QgsDirectoryItem : QgsDataCollectionItem
QgsDirectoryItem( QgsDataItem* parent, QString name, QString path );
~QgsDirectoryItem();

virtual void setState( State state ) override;
virtual void setState( State state );

QVector<QgsDataItem*> createChildren();

QString dirPath() const;
virtual bool equal( const QgsDataItem *other );
virtual QIcon icon();
virtual QWidget *paramWidget();
virtual QWidget *paramWidget() /Factory/;

/* static QVector<QgsDataProvider*> mProviders; */
//! @note not available via python bindings
// static QVector<QLibrary*> mLibraries;

virtual QWidget *paramWidget() /Factory/;
};

/**
@@ -47,7 +47,7 @@ class QgsVectorDataProvider : QgsDataProvider
/** supports topological simplification of geometries on provider side according to a distance tolerance */
SimplifyGeometriesWithTopologicalValidation,
/** supports transactions*/
TransactionSupport = 1 << 16
TransactionSupport
};

/** bitmask of all provider's editing capabilities */
@@ -129,7 +129,7 @@ class QgsRasterDataProvider : QgsDataProvider, QgsRasterInterface
* \param visibleExtent Visible extent for providers supporting contextual legends, in layer CRS
* \note visibleExtent parameter added in 2.8 (no available in python bindings)
*/
virtual QImage getLegendGraphic( double scale = 0, bool forceRefresh = false, const );
virtual QImage getLegendGraphic( double scale = 0, bool forceRefresh = false, const QgsRectangle * visibleExtent = 0 );

/**
* \brief Get an image downloader for the raster legend
@@ -15,8 +15,8 @@ class QgsRasterDrawer
@param viewPort view port to draw to
@param img image to draw
@param topLeftCol Left position relative to left border of viewport
@param topLeftRow Top position relative to top border of viewport */
@param topLeftRow Top position relative to top border of viewport
@param mapToPixel map to device coordinate transformation info
(not available in python bindings) */
void drawImage( QPainter* p, QgsRasterViewPort* viewPort, const QImage& img, int topLeftCol, int topLeftRow ) const;
//void drawImage( QPainter* p, QgsRasterViewPort* viewPort, const QImage& img, int topLeftCol, int topLeftRow ) const;
};
@@ -70,13 +70,4 @@ class QgsRasterFileWriter
void setPyramidsConfigOptions( const QStringList& list );
QStringList pyramidsConfigOptions() const;


void setMaxTileHeight( int h );
int maxTileHeight() const;

void setCreateOptions( const QStringList& list );
QStringList createOptions() const;

void setPyramidsConfigOptions( const QStringList& list );
QStringList pyramidsConfigOptions() const;
};
@@ -169,15 +169,15 @@ class QgsAttributeTableModel : QAbstractTableModel
*
* @param context The context
*/
void setEditorContext( const QgsAttributeEditorContext& context ) { mEditorContext = context; }
void setEditorContext( const QgsAttributeEditorContext& context );

/**
* Returns the context in which this table is shown.
* Will be forwarded to any editor widget created when editing data on this model.
*
* @return The context
*/
const QgsAttributeEditorContext& editorContext() const { return mEditorContext; }
const QgsAttributeEditorContext& editorContext() const;

signals:
/**
@@ -96,7 +96,7 @@ class QgsFeatureListView : QListView
*/
void displayExpressionChanged( const QString expression );

void aboutToChangeEditSelection( bool& ok );
//void aboutToChangeEditSelection( bool& ok );

public slots:
/**
@@ -110,8 +110,6 @@ class QgsEditorWidgetWrapper : QObject
*/
virtual void setValue( const QVariant& value ) = 0;

virtual void setEnabled( bool enabled );

protected slots:
/**
* If you emit to this slot in your implementation, an appropriate change notification

0 comments on commit b05e789

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