Skip to content

Commit 8f02ced

Browse files
author
mhugent
committed
Remove the private members from the composer sip files as they cannot be used from Python anyway
git-svn-id: http://svn.osgeo.org/qgis/trunk@10275 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 80ef91d commit 8f02ced

File tree

6 files changed

+2
-61
lines changed

6 files changed

+2
-61
lines changed

python/core/qgscomposerlegend.sip

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -71,27 +71,4 @@ class QgsComposerLegend: QObject, QgsComposerItem
7171
public slots:
7272
/**Data changed*/
7373
void synchronizeWithModel();
74-
75-
protected:
76-
77-
78-
private:
79-
QgsComposerLegend(); //forbidden
80-
81-
/**Draws child items of a layer item
82-
@param layerItem parent model item (layer)
83-
@param currentYCoord in/out: current y position of legend item
84-
@param maxXCoord in/out: maximum x-coordinate of the whole legend
85-
*/
86-
void drawLayerChildItems( QPainter* p, QStandardItem* layerItem, double& currentYCoord, double& maxXCoord );
87-
88-
/**Draws a symbol at the current y position and returns the new x position. Returns real symbol height, because for points,
89-
it is possible that it differs from mSymbolHeight*/
90-
void drawSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition, double& symbolHeight ) const;
91-
void drawPointSymbol( QPainter*, QgsSymbol* s, double currentYCoord, double& currentXPosition, double& symbolHeight ) const;
92-
void drawLineSymbol( QPainter*, QgsSymbol* s, double currentYCoord, double& currentXPosition ) const;
93-
void drawPolygonSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition ) const;
94-
95-
/**Helper function that lists ids of layers contained in map canvas*/
96-
QStringList layerIdList() const;
9774
};

python/core/qgscomposermap.sip

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,4 @@ class QgsComposerMap : QObject, QgsComposerItem
105105
signals:
106106
/**Is emitted when width/height is changed as a result of user interaction*/
107107
void extentChanged();
108-
109-
private:
110-
111-
/**Establishes signal/slot connection for update in case of layer change*/
112-
void connectUpdateSlot();
113-
114-
/**Returns the zoom factor of the graphics view. If no
115-
graphics view exists, the default 1 is returned*/
116-
double horizontalViewScaleFactor() const;
117108
};

python/core/qgscomposerpicture.sip

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ class QgsComposerPicture: QObject, QgsComposerItem
3838
*/
3939
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
4040

41-
private:
42-
43-
//default constructor is forbidden
44-
QgsComposerPicture();
45-
/**Updates content of current image using svg generator*/
46-
void updateImageFromSvg();
47-
4841
signals:
4942
/**Tell the configuration widget that the settings need to be updated*/
5043
void settingsChanged();

python/core/qgscomposition.sip

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -125,19 +125,4 @@ class QgsComposition: QGraphicsScene
125125

126126
/**Snaps a scene coordinate point to grid*/
127127
QPointF snapPointToGrid( const QPointF& scenePoint ) const;
128-
129-
private:
130-
131-
132-
QgsComposition(); //default constructor is forbidden
133-
134-
/**Reset z-values of items based on position in z list*/
135-
void updateZValues();
136-
137-
/**Returns the bounding rectangle of the selected items in scene coordinates
138-
@return 0 in case of success*/
139-
int boundingRectOfSelectedItems( QRectF& bRect );
140-
141-
void loadGridAppearanceSettings();
142-
void saveGridAppearanceSettings();
143-
};
128+
};

python/core/qgsscalebarstyle.sip

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,4 @@ class QgsScaleBarStyle
1818
virtual QRectF calculateBoxSize() const; //default implementation provided
1919
virtual QString name() const = 0; //return name of the style
2020
//virtual QIcon styleIcon() const = 0;
21-
22-
private:
23-
QgsScaleBarStyle(); //default constructor forbidden
24-
};
21+
};

python/gui/qgscomposerview.sip

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ class QgsComposerView: QGraphicsView
6464
void keyReleaseEvent( QKeyEvent * e );
6565

6666
void wheelEvent( QWheelEvent* event );
67-
68-
private:
6967

7068

7169
public slots:

0 commit comments

Comments
 (0)