Skip to content

Commit f1e2fce

Browse files
jef-njef-n
committedJun 24, 2013
more interface fixes (missing GUI_EXPORT and sip)
·
ltr-3_40archive/master_2
1 parent 0992180 commit f1e2fce

File tree

10 files changed

+32
-31
lines changed

10 files changed

+32
-31
lines changed
 

‎python/core/qgsgeometry.sip

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ class QgsGeometry
8282
/**
8383
* Returns the size of the WKB in asWkb().
8484
*/
85-
size_t wkbSize() const;
85+
size_t wkbSize();
8686

8787
/** Returns type of wkb (point / linestring / polygon etc.) */
88-
QGis::WkbType wkbType() const;
88+
QGis::WkbType wkbType();
8989

9090
/** Returns type of the vector */
9191
QGis::GeometryType type();
@@ -124,7 +124,7 @@ class QgsGeometry
124124
Returns the vertex closest to the given point, the corresponding vertex index, squared distance snap point / target point
125125
and the indices of the vertices before/after. The vertices before/after are -1 if not present
126126
*/
127-
QgsPoint closestVertex( const QgsPoint& point, int& atVertex /Out/, int& beforeVertex /Out/, int& afterVertex /Out/, double& sqrDist /Out/ ) const;
127+
QgsPoint closestVertex( const QgsPoint& point, int& atVertex /Out/, int& beforeVertex /Out/, int& afterVertex /Out/, double& sqrDist /Out/ );
128128

129129

130130
/**
@@ -253,41 +253,41 @@ class QgsGeometry
253253
QgsRectangle boundingBox();
254254

255255
/** Test for intersection with a rectangle (uses GEOS) */
256-
bool intersects( const QgsRectangle& r ) const;
256+
bool intersects( const QgsRectangle& r );
257257

258258
/** Test for intersection with a geometry (uses GEOS) */
259-
bool intersects( const QgsGeometry* geometry ) const;
259+
bool intersects( QgsGeometry* geometry );
260260

261261
/** Test for containment of a point (uses GEOS) */
262-
bool contains( const QgsPoint* p ) const;
262+
bool contains( QgsPoint* p );
263263

264264
/** Test for if geometry is contained in an other (uses GEOS)
265265
* @note added in 1.5 */
266-
bool contains( const QgsGeometry* geometry ) const;
266+
bool contains( QgsGeometry* geometry );
267267

268268
/** Test for if geometry is disjoint of an other (uses GEOS)
269269
* @note added in 1.5 */
270-
bool disjoint( const QgsGeometry* geometry ) const;
270+
bool disjoint( QgsGeometry* geometry );
271271

272272
/** Test for if geometry equals an other (uses GEOS)
273273
* @note added in 1.5 */
274-
bool equals( const QgsGeometry* geometry ) const;
274+
bool equals( QgsGeometry* geometry );
275275

276276
/** Test for if geometry touch an other (uses GEOS)
277277
* @note added in 1.5 */
278-
bool touches( const QgsGeometry* geometry ) const;
278+
bool touches( QgsGeometry* geometry );
279279

280280
/** Test for if geometry overlaps an other (uses GEOS)
281281
* @note added in 1.5 */
282-
bool overlaps( const QgsGeometry* geometry ) const;
282+
bool overlaps( QgsGeometry* geometry );
283283

284284
/** Test for if geometry is within an other (uses GEOS)
285285
* @note added in 1.5 */
286-
bool within( const QgsGeometry* geometry ) const;
286+
bool within( QgsGeometry* geometry );
287287

288288
/** Test for if geometry crosses an other (uses GEOS)
289289
* @note added in 1.5 */
290-
bool crosses( const QgsGeometry* geometry ) const;
290+
bool crosses( QgsGeometry* geometry );
291291

292292
/** Returns a buffer region around this geometry having the given width and with a specified number
293293
of segments used to approximate curves */
@@ -326,44 +326,44 @@ class QgsGeometry
326326
/** Exports the geometry to mWkt
327327
* @return true in case of success and false else
328328
*/
329-
QString exportToWkt() const;
329+
QString exportToWkt();
330330

331331
/** Exports the geometry to mGeoJSON
332332
* @return true in case of success and false else
333333
* @note added in 1.8
334334
* @note python binding added in 1.9
335335
*/
336-
QString exportToGeoJSON() const;
336+
QString exportToGeoJSON();
337337

338338
/* Accessor functions for getting geometry data */
339339

340340
/** return contents of the geometry as a point
341341
if wkbType is WKBPoint, otherwise returns [0,0] */
342-
QgsPoint asPoint() const;
342+
QgsPoint asPoint();
343343

344344
/** return contents of the geometry as a polyline
345345
if wkbType is WKBLineString, otherwise an empty list */
346-
QgsPolyline asPolyline() const;
346+
QgsPolyline asPolyline();
347347

348348
/** return contents of the geometry as a polygon
349349
if wkbType is WKBPolygon, otherwise an empty list */
350-
QgsPolygon asPolygon() const;
350+
QgsPolygon asPolygon();
351351

352352
/** return contents of the geometry as a multi point
353353
if wkbType is WKBMultiPoint, otherwise an empty list */
354-
QgsMultiPoint asMultiPoint() const;
354+
QgsMultiPoint asMultiPoint();
355355

356356
/** return contents of the geometry as a multi linestring
357357
if wkbType is WKBMultiLineString, otherwise an empty list */
358-
QgsMultiPolyline asMultiPolyline() const;
358+
QgsMultiPolyline asMultiPolyline();
359359

360360
/** return contents of the geometry as a multi polygon
361361
if wkbType is WKBMultiPolygon, otherwise an empty list */
362-
QgsMultiPolygon asMultiPolygon() const;
362+
QgsMultiPolygon asMultiPolygon();
363363

364364
/** return contents of the geometry as a list of geometries
365365
@note added in version 1.1 */
366-
QList<QgsGeometry*> asGeometryCollection() const /Factory/;
366+
QList<QgsGeometry*> asGeometryCollection() /Factory/;
367367

368368
/** delete a ring in polygon or multipolygon.
369369
Ring 0 is outer ring and can't be deleted.
@@ -386,6 +386,7 @@ class QgsGeometry
386386
* 1 if geometry is not of polygon type,
387387
* 2 if avoid intersection would change the geometry type,
388388
* 3 other error during intersection removal
389+
* @param ignoreFeatures possibility to give a list of features where intersections should be ignored (not available in python bindings)
389390
* @note added in 1.5
390391
*/
391392
int avoidIntersections();

‎src/app/qgsattributetabledialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
119119
// info from table to application
120120
connect( this, SIGNAL( saveEdits( QgsMapLayer * ) ), QgisApp::instance(), SLOT( saveEdits( QgsMapLayer * ) ) );
121121

122-
connect( mMainView, SIGNAL( currentChanged( int ) ), mMainViewButtonGroup, SLOT() );
122+
connect( mMainView, SIGNAL( currentChanged( int ) ), mMainViewButtonGroup, SLOT( currentChanged( int ) ) );
123123

124124
bool myDockFlag = settings.value( "/qgis/dockAttributeTable", false ).toBool();
125125
if ( myDockFlag )

‎src/core/qgsgeometrycache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "qgsvectorlayer.h"
77

8-
class QgsGeometryCache
8+
class CORE_EXPORT QgsGeometryCache
99
{
1010
public:
1111
QgsGeometryCache( QgsVectorLayer* layer );

‎src/gui/attributetable/qgsattributetabledelegate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class QgsAttributeTableView;
2929
* QItemDelegate).
3030
*/
3131

32-
class QgsAttributeTableDelegate : public QItemDelegate
32+
class GUI_EXPORT QgsAttributeTableDelegate : public QItemDelegate
3333
{
3434
Q_OBJECT;
3535

‎src/gui/attributetable/qgsdualview.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas
216216
friend class TestQgsDualView;
217217
};
218218

219-
class QgsAttributeTableAction : public QAction
219+
class GUI_EXPORT QgsAttributeTableAction : public QAction
220220
{
221221
Q_OBJECT
222222

‎src/gui/attributetable/qgsfeaturelistmodel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class QgsAttributeTableFilterModel;
1414
class QgsAttributeTableModel;
1515
class QgsVectorLayerCache;
1616

17-
class QgsFeatureListModel : public QAbstractProxyModel, public QgsFeatureModel
17+
class GUI_EXPORT QgsFeatureListModel : public QAbstractProxyModel, public QgsFeatureModel
1818
{
1919
Q_OBJECT
2020

‎src/gui/attributetable/qgsfeaturelistviewdelegate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class QgsFeatureListModel;
1111
class QgsFeatureSelectionModel;
1212
class QPosition;
1313

14-
class QgsFeatureListViewDelegate : public QItemDelegate
14+
class GUI_EXPORT QgsFeatureListViewDelegate : public QItemDelegate
1515
{
1616
Q_OBJECT
1717

‎src/gui/attributetable/qgsfeatureselectionmodel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class QgsVectorLayer;
99
class QgsFeatureModel;
1010

11-
class QgsFeatureSelectionModel : public QItemSelectionModel
11+
class GUI_EXPORT QgsFeatureSelectionModel : public QItemSelectionModel
1212
{
1313
Q_OBJECT
1414
public:

‎src/gui/qgsattributeeditor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class GUI_EXPORT QgsAttributeEditor : public QObject
9393
int mIdx;
9494
};
9595

96-
class QgsStringRelay : public QObject
96+
class GUI_EXPORT QgsStringRelay : public QObject
9797
{
9898
Q_OBJECT
9999

‎src/gui/symbology-ng/qgscolorrampcombobox.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class QgsStyleV2;
2121
class QgsVectorColorRampV2;
2222

23-
class QgsColorRampComboBox : public QComboBox
23+
class GUI_EXPORT QgsColorRampComboBox : public QComboBox
2424
{
2525
Q_OBJECT
2626
public:

0 commit comments

Comments
 (0)
Please sign in to comment.