sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-24 00:04:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

indentation update and typo fixes

Browse Source
This commit is contained in:
Juergen E. Fischer 2014-11-13 23:13:13 +01:00
parent 701f4644d0
commit d4f64d9bde
69 changed files with 269 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS
View File

@ -1,6 +1,6 @@
QGIS News QGIS News
Change history for the QGIS Project Change history for the QGIS Project
Thursday October 23, 2014 Thursday November 13, 2014
------------------------------------------------------------------------ ------------------------------------------------------------------------
@ -34,8 +34,8 @@ Thursday October 23, 2014
------------------------------------------------------------------------ ------------------------------------------------------------------------
Last Updated: Thursday October 23, 2014 Last Updated: Thursday November 13, 2014
Last Change : Thursday October 23, 2014 Last Change : Thursday November 13, 2014
1. What's new in Version 2.6.0 'Brighton'? 1. What's new in Version 2.6.0 'Brighton'?
@ -60,7 +60,7 @@ This is a minor release increment with the following new features:
- New Composer Item tree panel - New Composer Item tree panel
- More control over appearance of composer arrow/line items - More control over appearance of composer arrow/line items
- Data defined control of composer items - Data defined control of composer items
- Composer images can be specifed as remote URLS - Composer images can be specified as remote URLS
- Composer Table improvements (header fonts / colors, better pagination support, filter to atlas feature etc.) - Composer Table improvements (header fonts / colors, better pagination support, filter to atlas feature etc.)
- Composer improvements - Composer improvements
- Improved item snapping - Improved item snapping

8
doc/news.html
View File

@ -77,7 +77,7 @@ label{ background-color: #FFFFCC;
<DIV CLASS="header" ID="header"> <DIV CLASS="header" ID="header">
<H1>QGIS News</H1> <H1>QGIS News</H1>
<H2>Change history for the QGIS Project</H2> <H2>Change history for the QGIS Project</H2>
<H3>Thursday October 23, 2014</H3> <H3>Thursday November 13, 2014</H3>
</DIV> </DIV>
<DIV CLASS="toc"> <DIV CLASS="toc">
@ -111,8 +111,8 @@ label{ background-color: #FFFFCC;
</DIV> </DIV>
<DIV CLASS="body" ID="body"> <DIV CLASS="body" ID="body">
<P> <P>
Last Updated: Thursday October 23, 2014 Last Updated: Thursday November 13, 2014
Last Change : Thursday October 23, 2014 Last Change : Thursday November 13, 2014
</P> </P>
<A NAME="toc1"></A> <A NAME="toc1"></A>
@ -140,7 +140,7 @@ This is a minor release increment with the following new features:
<LI>New Composer Item tree panel <LI>New Composer Item tree panel
<LI>More control over appearance of composer arrow/line items <LI>More control over appearance of composer arrow/line items
<LI>Data defined control of composer items <LI>Data defined control of composer items
<LI>Composer images can be specifed as remote URLS <LI>Composer images can be specified as remote URLS
<LI>Composer Table improvements (header fonts / colors, better pagination support, filter to atlas feature etc.) <LI>Composer Table improvements (header fonts / colors, better pagination support, filter to atlas feature etc.)
<LI>Composer improvements <LI>Composer improvements
<LI>Improved item snapping <LI>Improved item snapping

2
doc/news.t2t
View File

@ -59,7 +59,7 @@ This is a minor release increment with the following new features:
- New Composer Item tree panel - New Composer Item tree panel
- More control over appearance of composer arrow/line items - More control over appearance of composer arrow/line items
- Data defined control of composer items - Data defined control of composer items
- Composer images can be specifed as remote URLS - Composer images can be specified as remote URLS
- Composer Table improvements (header fonts / colors, better pagination support, filter to atlas feature etc.) - Composer Table improvements (header fonts / colors, better pagination support, filter to atlas feature etc.)
- Composer improvements - Composer improvements
- Improved item snapping - Improved item snapping

2
python/console/console_editor.py
View File

@ -851,7 +851,7 @@ class EditorTabWidget(QTabWidget):
def __init__(self, parent): def __init__(self, parent):
QTabWidget.__init__(self, parent=None) QTabWidget.__init__(self, parent=None)
self.parent = parent self.parent = parent
self.settings = QSettings() self.settings = QSettings()
self.idx = -1 self.idx = -1

4
python/core/composer/qgscomposerattributetablemodelv2.sip
View File

@ -33,7 +33,7 @@ class QgsComposerAttributeTableColumnModelV2: QAbstractTableModel
bool insertRows( int row, int count, const QModelIndex &parent = QModelIndex() ); bool insertRows( int row, int count, const QModelIndex &parent = QModelIndex() );
QModelIndex index( int row, int column, const QModelIndex &parent ) const; QModelIndex index( int row, int column, const QModelIndex &parent ) const;
QModelIndex parent( const QModelIndex &child ) const; QModelIndex parent( const QModelIndex &child ) const;
/**Moves the specified row up or down in the model. Used for rearranging the attribute tables /**Moves the specified row up or down in the model. Used for rearranging the attribute tables
* columns. * columns.
* @returns true if the move is allowed * @returns true if the move is allowed
@ -48,7 +48,7 @@ class QgsComposerAttributeTableColumnModelV2: QAbstractTableModel
* @note added in 2.3 * @note added in 2.3
*/ */
void resetToLayer(); void resetToLayer();
/**Returns the QgsComposerTableColumn corresponding to an index in the model. /**Returns the QgsComposerTableColumn corresponding to an index in the model.
* @returns QgsComposerTableColumn for specified index * @returns QgsComposerTableColumn for specified index
* @param index a QModelIndex * @param index a QModelIndex

22
python/core/composer/qgscomposerattributetablev2.sip
View File

@ -9,7 +9,7 @@ class QgsComposerAttributeTableCompareV2
public: public:
QgsComposerAttributeTableCompareV2(); QgsComposerAttributeTableCompareV2();
bool operator()( const QgsComposerTableRow& m1, const QgsComposerTableRow& m2 ); bool operator()( const QgsComposerTableRow& m1, const QgsComposerTableRow& m2 );
/**Sets column number to sort by /**Sets column number to sort by
@ -32,7 +32,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
%End %End
public: public:
/*! Specifies the content source for the attribute table /*! Specifies the content source for the attribute table
*/ */
enum ContentSource enum ContentSource
@ -44,7 +44,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
QgsComposerAttributeTableV2( QgsComposition* composition /TransferThis/, bool createUndoCommands ); QgsComposerAttributeTableV2( QgsComposition* composition /TransferThis/, bool createUndoCommands );
~QgsComposerAttributeTableV2(); ~QgsComposerAttributeTableV2();
virtual QString displayName() const; virtual QString displayName() const;
/**Writes properties specific to attribute tables /**Writes properties specific to attribute tables
@ -74,14 +74,14 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
* @see setSource * @see setSource
*/ */
ContentSource source() const; ContentSource source() const;
/**Returns the source layer for the table, considering the table source mode. Eg, /**Returns the source layer for the table, considering the table source mode. Eg,
* if the table is set to atlas feature mode, then the source layer will be the * if the table is set to atlas feature mode, then the source layer will be the
* atlas coverage layer. If the table is set to layer attributes mode, then * atlas coverage layer. If the table is set to layer attributes mode, then
* the source layer will be the user specified vector layer. * the source layer will be the user specified vector layer.
* @returns actual source layer * @returns actual source layer
*/ */
QgsVectorLayer* sourceLayer(); QgsVectorLayer* sourceLayer();
/**Sets the vector layer from which to display feature attributes /**Sets the vector layer from which to display feature attributes
* @param layer Vector layer for attribute table * @param layer Vector layer for attribute table
@ -94,7 +94,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
* @see setVectorLayer * @see setVectorLayer
*/ */
QgsVectorLayer* vectorLayer() const; QgsVectorLayer* vectorLayer() const;
/**Sets the relation id from which to display child features /**Sets the relation id from which to display child features
* @param relationId id for relation to display child features from * @param relationId id for relation to display child features from
* @see relationId * @see relationId
@ -109,7 +109,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
* @see source * @see source
* @note only used if table source is set to RelationChildren * @note only used if table source is set to RelationChildren
*/ */
QString relationId() const; QString relationId() const;
/**Resets the attribute table's columns to match the vector layer's fields /**Resets the attribute table's columns to match the vector layer's fields
* @see setVectorLayer * @see setVectorLayer
@ -134,7 +134,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
* @see displayOnlyVisibleFeatures * @see displayOnlyVisibleFeatures
*/ */
const QgsComposerMap* composerMap() const; const QgsComposerMap* composerMap() const;
/**Sets the maximum number of features shown by the table. Changing this setting may result /**Sets the maximum number of features shown by the table. Changing this setting may result
* in the attribute table changing its size to accommodate the new number of rows, and requires * in the attribute table changing its size to accommodate the new number of rows, and requires
* the table to refetch features from its vector layer. * the table to refetch features from its vector layer.
@ -148,7 +148,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
* @see setMaximumNumberOfFeatures * @see setMaximumNumberOfFeatures
*/ */
int maximumNumberOfFeatures() const; int maximumNumberOfFeatures() const;
/**Sets attribute table to only show unique rows. /**Sets attribute table to only show unique rows.
* @param uniqueOnly set to true to show only unique rows. Duplicate rows * @param uniqueOnly set to true to show only unique rows. Duplicate rows
* will be stripped from the table. * will be stripped from the table.
@ -162,7 +162,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
* @see setUniqueRowsOnly * @see setUniqueRowsOnly
*/ */
bool uniqueRowsOnly() const; bool uniqueRowsOnly() const;
/**Sets attribute table to only show features which are visible in a composer map item. Changing /**Sets attribute table to only show features which are visible in a composer map item. Changing
* this setting forces the table to refetch features from its vector layer, and may result in * this setting forces the table to refetch features from its vector layer, and may result in
* the table changing size to accommodate the new displayed feature attributes. * the table changing size to accommodate the new displayed feature attributes.
@ -179,7 +179,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
* @see setDisplayOnlyVisibleFeatures * @see setDisplayOnlyVisibleFeatures
*/ */
bool displayOnlyVisibleFeatures() const; bool displayOnlyVisibleFeatures() const;
/**Sets attribute table to only show features which intersect the current atlas /**Sets attribute table to only show features which intersect the current atlas
* feature. * feature.
* @param filterToAtlas set to true to show only features which intersect * @param filterToAtlas set to true to show only features which intersect

16
python/core/composer/qgscomposerframe.sip
View File

@ -15,25 +15,25 @@ class QgsComposerFrame: QgsComposerItem
* @see extent * @see extent
*/ */
void setContentSection( const QRectF& section ); void setContentSection( const QRectF& section );
/**Returns the parent multiframe for the frame. /**Returns the parent multiframe for the frame.
* @returns parent multiframe * @returns parent multiframe
*/ */
QgsComposerMultiFrame* multiFrame() const; QgsComposerMultiFrame* multiFrame() const;
//Overriden to allow multiframe to set display name //Overriden to allow multiframe to set display name
virtual QString displayName() const; virtual QString displayName() const;
//Overriden to handle fixed frame sizes set by multi frame //Overriden to handle fixed frame sizes set by multi frame
void setSceneRect( const QRectF& rectangle ); void setSceneRect( const QRectF& rectangle );
void paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget ); void paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget );
void beginItemCommand( const QString& text ); void beginItemCommand( const QString& text );
void endItemCommand(); void endItemCommand();
bool writeXML( QDomElement& elem, QDomDocument & doc ) const; bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool readXML( const QDomElement& itemElem, const QDomDocument& doc ); bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
int type() const; int type() const;
/**Returns the visible portion of the multi frame's content which /**Returns the visible portion of the multi frame's content which
* is shown in this frame. * is shown in this frame.
* @returns extent of visible portion * @returns extent of visible portion
@ -41,7 +41,7 @@ class QgsComposerFrame: QgsComposerItem
* @see setContentSection * @see setContentSection
*/ */
QRectF extent() const; QRectF extent() const;
/**Returns whether the page should be hidden (ie, not included in composer exports) if this frame is empty /**Returns whether the page should be hidden (ie, not included in composer exports) if this frame is empty
* @returns true if page should be hidden if frame is empty * @returns true if page should be hidden if frame is empty
* @note added in QGIS 2.5 * @note added in QGIS 2.5
@ -55,7 +55,7 @@ class QgsComposerFrame: QgsComposerItem
* @see hidePageIfEmpty * @see hidePageIfEmpty
*/ */
void setHidePageIfEmpty( const bool hidePageIfEmpty ); void setHidePageIfEmpty( const bool hidePageIfEmpty );
/**Returns whether the background and frame border should be hidden if this frame is empty /**Returns whether the background and frame border should be hidden if this frame is empty
* @returns true if background and border should be hidden if frame is empty * @returns true if background and border should be hidden if frame is empty
* @note added in QGIS 2.5 * @note added in QGIS 2.5

12
python/core/composer/qgscomposeritem.sip
View File

@ -32,7 +32,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
case QgsComposerItem::ComposerArrow: case QgsComposerItem::ComposerArrow:
sipClass = sipClass_QgsComposerArrow; sipClass = sipClass_QgsComposerArrow;
*sipCppRet = static_cast<QgsComposerArrow*>(sipCpp); *sipCppRet = static_cast<QgsComposerArrow*>(sipCpp);
break; break;
case QgsComposerItem::ComposerItemGroup: case QgsComposerItem::ComposerItemGroup:
sipClass = sipClass_QgsComposerItemGroup; sipClass = sipClass_QgsComposerItemGroup;
*sipCppRet = static_cast<QgsComposerItemGroup*>(sipCpp); *sipCppRet = static_cast<QgsComposerItemGroup*>(sipCpp);
@ -163,7 +163,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
/** return correct graphics item type. Added in v1.7 */ /** return correct graphics item type. Added in v1.7 */
virtual int type() const; virtual int type() const;
/**Returns whether this item has been removed from the composition. Items removed /**Returns whether this item has been removed from the composition. Items removed
* from the composition are not deleted so that they can be restored via an undo * from the composition are not deleted so that they can be restored via an undo
* command. * command.
@ -286,7 +286,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
* @see setFrameOutlineColor * @see setFrameOutlineColor
*/ */
virtual void setFrameEnabled( const bool drawFrame ); virtual void setFrameEnabled( const bool drawFrame );
/**Sets frame outline color /**Sets frame outline color
* @param color new color for outline frame * @param color new color for outline frame
* @note introduced in 2.6 * @note introduced in 2.6
@ -590,7 +590,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
* @note added in version 2.5 * @note added in version 2.5
*/ */
virtual void setVisibility( const bool visible ); virtual void setVisibility( const bool visible );
/**Returns whether the item should be excluded from composer exports and prints /**Returns whether the item should be excluded from composer exports and prints
* @param valueType controls whether the returned value is the user specified vaule, * @param valueType controls whether the returned value is the user specified vaule,
* or the current evaluated value (which may be affected by data driven settings). * or the current evaluated value (which may be affected by data driven settings).
@ -605,7 +605,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
* @note added in version 2.5 * @note added in version 2.5
* @see excludeFromExports * @see excludeFromExports
*/ */
virtual void setExcludeFromExports( const bool exclude ); virtual void setExcludeFromExports( const bool exclude );
/**Returns whether this item is part of a group /**Returns whether this item is part of a group
* @returns true if item is in a group * @returns true if item is in a group
@ -772,7 +772,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
* @note added in QGIS 2.5 * @note added in QGIS 2.5
*/ */
QRectF evalItemRect( const QRectF &newRect, const bool resizeOnly = false ); QRectF evalItemRect( const QRectF &newRect, const bool resizeOnly = false );
/**Returns whether the item should be drawn in the current context /**Returns whether the item should be drawn in the current context
* @returns true if item should be drawn * @returns true if item should be drawn
* @note added in QGIS 2.5 * @note added in QGIS 2.5

18
python/core/composer/qgscomposermap.sip
View File

@ -241,7 +241,7 @@ class QgsComposerMap : QgsComposerItem
* @deprecated use grid()->setEnabled() or grids() instead * @deprecated use grid()->setEnabled() or grids() instead
*/ */
void setGridEnabled( bool enabled ) /Deprecated/; void setGridEnabled( bool enabled ) /Deprecated/;
/** /**
* @deprecated use grid()->enabled() or grids() instead * @deprecated use grid()->enabled() or grids() instead
*/ */
@ -455,7 +455,7 @@ class QgsComposerMap : QgsComposerItem
* @deprecated use grid()->framePenColor() or grids() instead * @deprecated use grid()->framePenColor() or grids() instead
*/ */
QColor gridFramePenColor() const /Deprecated/; QColor gridFramePenColor() const /Deprecated/;
/**Sets first fill color for grid zebra frame /**Sets first fill color for grid zebra frame
* @note: this function was added in version 2.1 * @note: this function was added in version 2.1
* @deprecated use grid()->setFrameFillColor1() or grids() instead * @deprecated use grid()->setFrameFillColor1() or grids() instead
@ -479,7 +479,7 @@ class QgsComposerMap : QgsComposerItem
* @deprecated use grid()->frameFillColor2() or grids() instead * @deprecated use grid()->frameFillColor2() or grids() instead
*/ */
QColor gridFrameFillColor2() const /Deprecated/; QColor gridFrameFillColor2() const /Deprecated/;
/**Sets length of the cross segments (if grid style is cross) /**Sets length of the cross segments (if grid style is cross)
* @note this function was added in version 1.4 * @note this function was added in version 1.4
* @deprecated use grid()->setCrossLength() or grids() instead * @deprecated use grid()->setCrossLength() or grids() instead
@ -490,7 +490,7 @@ class QgsComposerMap : QgsComposerItem
* @deprecated use grid()->crossLength() or grids() instead * @deprecated use grid()->crossLength() or grids() instead
*/ */
double crossLength() /Deprecated/; double crossLength() /Deprecated/;
/** /**
* @deprecated use grid()->setLineSymbol() or grids() instead * @deprecated use grid()->setLineSymbol() or grids() instead
*/ */
@ -500,7 +500,7 @@ class QgsComposerMap : QgsComposerItem
* @deprecated use grid()->lineSymbol() or grids() instead * @deprecated use grid()->lineSymbol() or grids() instead
*/ */
QgsLineSymbolV2* gridLineSymbol() /Deprecated/; QgsLineSymbolV2* gridLineSymbol() /Deprecated/;
/** Returns the grid's blending mode /** Returns the grid's blending mode
* @deprecated use grid()->blendMode() or grids() instead * @deprecated use grid()->blendMode() or grids() instead
*/ */
@ -510,7 +510,7 @@ class QgsComposerMap : QgsComposerItem
* @deprecated use grid()->setBlendMode() or grids() instead * @deprecated use grid()->setBlendMode() or grids() instead
*/ */
void setGridBlendMode( QPainter::CompositionMode blendMode ) /Deprecated/; void setGridBlendMode( QPainter::CompositionMode blendMode ) /Deprecated/;
/**Returns the map item's grid stack, which is used to control how grids /**Returns the map item's grid stack, which is used to control how grids
* are drawn over the map's contents. * are drawn over the map's contents.
* @returns pointer to grid stack * @returns pointer to grid stack
@ -525,7 +525,7 @@ class QgsComposerMap : QgsComposerItem
* @note introduced in QGIS 2.5 * @note introduced in QGIS 2.5
*/ */
QgsComposerMapGrid* grid(); QgsComposerMapGrid* grid();
/**Returns the map item's overview stack, which is used to control how over /**Returns the map item's overview stack, which is used to control how over
* are drawn over the map's contents. * are drawn over the map's contents.
* @returns pointer to overview stack * @returns pointer to overview stack
@ -543,7 +543,7 @@ class QgsComposerMap : QgsComposerItem
/**In case of annotations, the bounding rectangle can be larger than the map item rectangle /**In case of annotations, the bounding rectangle can be larger than the map item rectangle
@note this function was added in version 1.4*/ @note this function was added in version 1.4*/
QRectF boundingRect() const; QRectF boundingRect() const;
/**Updates the bounding rect of this item. Call this function before doing any changes related to annotation out of the map rectangle /**Updates the bounding rect of this item. Call this function before doing any changes related to annotation out of the map rectangle
@note this function was added in version 1.4*/ @note this function was added in version 1.4*/
@ -745,7 +745,7 @@ class QgsComposerMap : QgsComposerItem
//overriden to show "Map 1" type names //overriden to show "Map 1" type names
virtual QString displayName() const; virtual QString displayName() const;
/**Returns extent that considers rotation and shift with mOffsetX / mOffsetY*/ /**Returns extent that considers rotation and shift with mOffsetX / mOffsetY*/
QPolygonF transformedMapPolygon() const; QPolygonF transformedMapPolygon() const;

8
python/core/composer/qgscomposermapgrid.sip
View File

@ -119,7 +119,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
%End %End
public: public:
/** Unit for grid values /** Unit for grid values
*/ */
enum GridUnit enum GridUnit
@ -138,7 +138,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
Markers, /*< draw markers at intersections of grid lines */ Markers, /*< draw markers at intersections of grid lines */
FrameAnnotationsOnly /*< no grid lines over the map, only draw frame and annotations */ FrameAnnotationsOnly /*< no grid lines over the map, only draw frame and annotations */
}; };
/** Display settings for grid annotations and frames /** Display settings for grid annotations and frames
*/ */
enum DisplayMode enum DisplayMode
@ -500,7 +500,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see setAnnotationPrecision * @see setAnnotationPrecision
*/ */
int annotationPrecision() const; int annotationPrecision() const;
/**Sets what types of grid annotations should be drawn for a specified side of the map frame, /**Sets what types of grid annotations should be drawn for a specified side of the map frame,
* or whether grid annotations should be disabled for the side. * or whether grid annotations should be disabled for the side.
* @param display display mode for annotations * @param display display mode for annotations
@ -728,5 +728,5 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see frameFillColor1 * @see frameFillColor1
*/ */
QColor frameFillColor2() const; QColor frameFillColor2() const;
}; };

6
python/core/composer/qgscomposermapitem.sip
View File

@ -15,7 +15,7 @@ class QgsComposerMapItem : QgsComposerObject
* @param map QgsComposerMap the item is attached to * @param map QgsComposerMap the item is attached to
*/ */
QgsComposerMapItem( const QString& name, QgsComposerMap* map ); QgsComposerMapItem( const QString& name, QgsComposerMap* map );
virtual ~QgsComposerMapItem(); virtual ~QgsComposerMapItem();
/**Draws the item on to a painter /**Draws the item on to a painter
@ -53,7 +53,7 @@ class QgsComposerMapItem : QgsComposerObject
* @returns unique id * @returns unique id
*/ */
QString id() const; QString id() const;
/**Sets the friendly display name for the item /**Sets the friendly display name for the item
* @param name display name * @param name display name
* @see name * @see name
@ -77,7 +77,7 @@ class QgsComposerMapItem : QgsComposerObject
* @see setEnabled * @see setEnabled
*/ */
virtual bool enabled() const; virtual bool enabled() const;
/**Returns true if the item is drawn using advanced effects, such as blend modes. /**Returns true if the item is drawn using advanced effects, such as blend modes.
* @returns true if item uses advanced effects * @returns true if item uses advanced effects
*/ */

2
python/core/composer/qgscomposermapoverview.sip
View File

@ -214,5 +214,5 @@ class QgsComposerMapOverview : QgsComposerMapItem
/**Handles recentering of the map and redrawing of the map's overview /**Handles recentering of the map and redrawing of the map's overview
*/ */
void overviewExtentChanged(); void overviewExtentChanged();
}; };

38
python/core/composer/qgscomposermultiframe.sip
View File

@ -4,8 +4,8 @@
* \class QgsComposerMultiFrame * \class QgsComposerMultiFrame
* Abstract base class for composer items with the ability to distribute the content to several frames * Abstract base class for composer items with the ability to distribute the content to several frames
* (QgsComposerFrame items). * (QgsComposerFrame items).
*/ */
class QgsComposerMultiFrame: QgsComposerObject class QgsComposerMultiFrame: QgsComposerObject
{ {
%TypeHeaderCode %TypeHeaderCode
@ -37,7 +37,7 @@ class QgsComposerMultiFrame: QgsComposerObject
* @returns total size required for content * @returns total size required for content
*/ */
virtual QSizeF totalSize() const = 0; virtual QSizeF totalSize() const = 0;
/**Returns the fixed size for a frame, if desired. If the fixed frame size changes, /**Returns the fixed size for a frame, if desired. If the fixed frame size changes,
* the sizes of all frames can be recalculated by calling recalculateFrameRects(). * the sizes of all frames can be recalculated by calling recalculateFrameRects().
* @param frameIndex frame number * @param frameIndex frame number
@ -49,7 +49,7 @@ class QgsComposerMultiFrame: QgsComposerObject
* @see recalculateFrameRects * @see recalculateFrameRects
*/ */
virtual QSizeF fixedFrameSize( const int frameIndex = -1 ) const; virtual QSizeF fixedFrameSize( const int frameIndex = -1 ) const;
/**Returns the minimum size for a frames, if desired. If the minimum /**Returns the minimum size for a frames, if desired. If the minimum
* size changes, the sizes of all frames can be recalculated by calling * size changes, the sizes of all frames can be recalculated by calling
* recalculateFrameRects(). * recalculateFrameRects().
@ -61,20 +61,20 @@ class QgsComposerMultiFrame: QgsComposerObject
* @see recalculateFrameRects * @see recalculateFrameRects
*/ */
virtual QSizeF minFrameSize( const int frameIndex = -1 ) const; virtual QSizeF minFrameSize( const int frameIndex = -1 ) const;
/**Renders a portion of the multiframe's content into a painter. /**Renders a portion of the multiframe's content into a painter.
* @param p destination painter * @param p destination painter
* @param renderExtent visible extent of content to render into the painter. * @param renderExtent visible extent of content to render into the painter.
* @deprecated use render( QPainter* painter, const QRectF& renderExtent, const int frameIndex ) instead * @deprecated use render( QPainter* painter, const QRectF& renderExtent, const int frameIndex ) instead
*/ */
virtual void render( QPainter* p, const QRectF& renderExtent ) /Deprecated/; virtual void render( QPainter* p, const QRectF& renderExtent ) /Deprecated/;
/**Renders a portion of the multiframe's content into a painter. /**Renders a portion of the multiframe's content into a painter.
* @param painter destination painter * @param painter destination painter
* @param renderExtent visible extent of content to render into the painter. * @param renderExtent visible extent of content to render into the painter.
* @param frameIndex frame number for content * @param frameIndex frame number for content
* @note added in version 2.5 * @note added in version 2.5
*/ */
virtual void render( QPainter* painter, const QRectF& renderExtent, const int frameIndex ); virtual void render( QPainter* painter, const QRectF& renderExtent, const int frameIndex );
/**Adds a frame to the multiframe. /**Adds a frame to the multiframe.
@ -100,7 +100,7 @@ class QgsComposerMultiFrame: QgsComposerObject
* @see deleteFrames * @see deleteFrames
*/ */
void removeFrame( int i, const bool removeEmptyPages = false ); void removeFrame( int i, const bool removeEmptyPages = false );
/**Removes and deletes all child frames. /**Removes and deletes all child frames.
* @see removeFrame * @see removeFrame
*/ */
@ -111,7 +111,7 @@ class QgsComposerMultiFrame: QgsComposerObject
* @see resizeMode * @see resizeMode
*/ */
void setResizeMode( ResizeMode mode ); void setResizeMode( ResizeMode mode );
/**Returns the resize mode for the multiframe. /**Returns the resize mode for the multiframe.
* @returns resize mode * @returns resize mode
* @see setResizeMode * @see setResizeMode
@ -126,7 +126,7 @@ class QgsComposerMultiFrame: QgsComposerObject
* @see _writeXML * @see _writeXML
*/ */
virtual bool writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames = false ) const = 0; virtual bool writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames = false ) const = 0;
/**Stores state information about base multiframe object in DOM element. Implementations of writeXML /**Stores state information about base multiframe object in DOM element. Implementations of writeXML
* should call this method. * should call this method.
* @param elem is DOM element * @param elem is DOM element
@ -144,7 +144,7 @@ class QgsComposerMultiFrame: QgsComposerObject
* @see _readXML * @see _readXML
*/ */
virtual bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false ) = 0; virtual bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false ) = 0;
/**Restores state information about base multiframe object from a DOM element. Implementations of readXML /**Restores state information about base multiframe object from a DOM element. Implementations of readXML
* should call this method. * should call this method.
* @param itemElem is DOM element * @param itemElem is DOM element
@ -164,7 +164,7 @@ class QgsComposerMultiFrame: QgsComposerObject
* @see setCreateUndoCommands * @see setCreateUndoCommands
*/ */
bool createUndoCommands() const; bool createUndoCommands() const;
/**Sets whether undo commands should be created for interactions with the multiframe. /**Sets whether undo commands should be created for interactions with the multiframe.
* @param enabled set to true if undo commands should be created * @param enabled set to true if undo commands should be created
* @see createUndoCommands * @see createUndoCommands
@ -176,21 +176,21 @@ class QgsComposerMultiFrame: QgsComposerObject
* @note added in QGIS 2.0, replaces nFrames * @note added in QGIS 2.0, replaces nFrames
**/ **/
int frameCount() const; int frameCount() const;
/**Returns a child frame from the multiframe. /**Returns a child frame from the multiframe.
* @param i index of frame * @param i index of frame
* @returns child frame if found * @returns child frame if found
* @see frameIndex * @see frameIndex
*/ */
QgsComposerFrame* frame( int i ); QgsComposerFrame* frame( int i );
/**Returns the index of a frame within the multiframe /**Returns the index of a frame within the multiframe
* @param frame frame to find index of * @param frame frame to find index of
* @returns index for frame if found, -1 if frame not found in multiframe * @returns index for frame if found, -1 if frame not found in multiframe
* @note added in version 2.5 * @note added in version 2.5
* @see frame * @see frame
*/ */
int frameIndex( QgsComposerFrame *frame ) const; int frameIndex( QgsComposerFrame *frame ) const;
/**Creates a new frame and adds it to the multi frame and composition. /**Creates a new frame and adds it to the multi frame and composition.
* @param currentFrame an existing QgsComposerFrame from which to copy the size * @param currentFrame an existing QgsComposerFrame from which to copy the size
@ -243,7 +243,7 @@ class QgsComposerMultiFrame: QgsComposerObject
* must be redrawn. * must be redrawn.
*/ */
void contentsChanged(); void contentsChanged();
protected slots: protected slots:
/**Called before a frame is going to be removed. Updates frame list and recalculates /**Called before a frame is going to be removed. Updates frame list and recalculates
@ -253,6 +253,6 @@ class QgsComposerMultiFrame: QgsComposerObject
/**Adapts to changed number of composition pages if resize type is RepeatOnEveryPage. /**Adapts to changed number of composition pages if resize type is RepeatOnEveryPage.
*/ */
void handlePageChange(); void handlePageChange();
}; };

2
python/core/composer/qgscomposerobject.sip
View File

@ -52,7 +52,7 @@ class QgsComposerObject : QObject
EvaluatedValue = 0, /*< return the current evaluated value for the property */ EvaluatedValue = 0, /*< return the current evaluated value for the property */
OriginalValue /*< return the original, user set value */ OriginalValue /*< return the original, user set value */
}; };
/**Constructor /**Constructor
* @param composition parent composition * @param composition parent composition
*/ */

2
python/core/composer/qgscomposertablecolumn.sip
View File

@ -25,7 +25,7 @@ class QgsComposerTableColumn: QObject
* @see writeXML * @see writeXML
*/ */
virtual bool readXML( const QDomElement& columnElem ); virtual bool readXML( const QDomElement& columnElem );
/**Returns the width for a column. /**Returns the width for a column.
* @returns column width in mm, or 0 if column width is automatically calculated. * @returns column width in mm, or 0 if column width is automatically calculated.
* @note added in 2.5 * @note added in 2.5

30
python/core/composer/qgscomposertablev2.sip
View File

@ -36,7 +36,7 @@ class QgsComposerTableV2: QgsComposerMultiFrame
HeaderCenter, /*!< align headers to center */ HeaderCenter, /*!< align headers to center */
HeaderRight /*!< align headers right */ HeaderRight /*!< align headers right */
}; };
/*! Controls where headers are shown in the table /*! Controls where headers are shown in the table
*/ */
enum HeaderMode enum HeaderMode
@ -44,8 +44,8 @@ class QgsComposerTableV2: QgsComposerMultiFrame
FirstFrame, /*!< header shown on first frame only */ FirstFrame, /*!< header shown on first frame only */
AllFrames, /*!< headers shown on all frames */ AllFrames, /*!< headers shown on all frames */
NoHeaders /*!< no headers shown for table */ NoHeaders /*!< no headers shown for table */
}; };
/*! Controls how empty tables are displayed /*! Controls how empty tables are displayed
*/ */
enum EmptyTableMode enum EmptyTableMode
@ -53,7 +53,7 @@ class QgsComposerTableV2: QgsComposerMultiFrame
HeadersOnly, /*!< show header rows only */ HeadersOnly, /*!< show header rows only */
HideTable, /*!< hides entire table if empty */ HideTable, /*!< hides entire table if empty */
ShowMessage /*!< shows preset message instead of table contents*/ ShowMessage /*!< shows preset message instead of table contents*/
}; };
QgsComposerTableV2( QgsComposition* composition /TransferThis/, bool createUndoCommands ); QgsComposerTableV2( QgsComposition* composition /TransferThis/, bool createUndoCommands );
QgsComposerTableV2(); QgsComposerTableV2();
@ -71,7 +71,7 @@ class QgsComposerTableV2: QgsComposerMultiFrame
* @see setCellMargin * @see setCellMargin
*/ */
double cellMargin() const; double cellMargin() const;
/**Sets the behaviour for empty tables with no content rows. /**Sets the behaviour for empty tables with no content rows.
* @param mode behaviour mode for empty tables * @param mode behaviour mode for empty tables
* @see emptyTableBehaviour * @see emptyTableBehaviour
@ -101,9 +101,9 @@ class QgsComposerTableV2: QgsComposerMultiFrame
* @see setEmptyTableMessage * @see setEmptyTableMessage
* @see emptyTableBehaviour * @see emptyTableBehaviour
*/ */
QString emptyTableMessage() const; QString emptyTableMessage() const;
/**Sets whether empty rows should be drawn. Tables default to hiding empty /**Sets whether empty rows should be drawn. Tables default to hiding empty
* @param showEmpty set to true to show empty rows in the table * @param showEmpty set to true to show empty rows in the table
* @see showEmptyRows * @see showEmptyRows
*/ */
@ -248,7 +248,7 @@ class QgsComposerTableV2: QgsComposerMultiFrame
* @see gridStrokeWidth * @see gridStrokeWidth
*/ */
QColor gridColor() const; QColor gridColor() const;
/**Sets color used for background of table. /**Sets color used for background of table.
* @param color table background color * @param color table background color
* @see backgroundColor * @see backgroundColor
@ -288,7 +288,7 @@ class QgsComposerTableV2: QgsComposerMultiFrame
* @note not available in python bindings * @note not available in python bindings
*/ */
virtual bool getTableContents( QgsComposerTableContents &contents ) = 0; virtual bool getTableContents( QgsComposerTableContents &contents ) = 0;
/**Returns the current contents of the table. Excludes header cells. /**Returns the current contents of the table. Excludes header cells.
* @returns table contents * @returns table contents
*/ */
@ -304,7 +304,7 @@ class QgsComposerTableV2: QgsComposerMultiFrame
virtual bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false ); virtual bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );
virtual QSizeF totalSize() const; virtual QSizeF totalSize() const;
virtual void render( QPainter* p, const QRectF& renderExtent, const int frameIndex ); virtual void render( QPainter* p, const QRectF& renderExtent, const int frameIndex );
public slots: public slots:
/**Refreshes the contents shown in the table by querying for new data. /**Refreshes the contents shown in the table by querying for new data.
@ -315,9 +315,9 @@ class QgsComposerTableV2: QgsComposerMultiFrame
virtual void refreshAttributes(); virtual void refreshAttributes();
void recalculateFrameSizes(); void recalculateFrameSizes();
protected: protected:
/**Calculates the maximum width of text shown in columns. /**Calculates the maximum width of text shown in columns.
*/ */
virtual bool calculateMaxColumnWidths(); virtual bool calculateMaxColumnWidths();
@ -382,12 +382,12 @@ class QgsComposerTableV2: QgsComposerMultiFrame
/**Recalculates and updates the size of the table and all table frames. /**Recalculates and updates the size of the table and all table frames.
*/ */
void recalculateTableSize(); void recalculateTableSize();
/**Checks whether a table contents contains a given row /**Checks whether a table contents contains a given row
* @param contents table contents to check * @param contents table contents to check
* @param row row to check for * @param row row to check for
* @returns true if contents contains rows * @returns true if contents contains rows
*/ */
bool contentsContainsRow( const QgsComposerTableContents &contents, const QgsComposerTableRow &row ) const; bool contentsContainsRow( const QgsComposerTableContents &contents, const QgsComposerTableRow &row ) const;
}; };

12
python/core/composer/qgscomposition.sip
View File

@ -95,7 +95,7 @@ class QgsComposition : QGraphicsScene
* @see setNumPages * @see setNumPages
*/ */
int numPages() const; int numPages() const;
/**Returns whether a page is empty, ie, it contains no items except for the background /**Returns whether a page is empty, ie, it contains no items except for the background
* paper item. * paper item.
* @param page page number, starting with 1 * @param page page number, starting with 1
@ -222,7 +222,7 @@ class QgsComposition : QGraphicsScene
* @note Added in QGIS 2.5 * @note Added in QGIS 2.5
*/ */
int snapTolerance() const; int snapTolerance() const;
/**Sets whether selection bounding boxes should be shown in the composition /**Sets whether selection bounding boxes should be shown in the composition
* @param boundsVisible set to true to show selection bounding box * @param boundsVisible set to true to show selection bounding box
* @see boundingBoxesVisible * @see boundingBoxesVisible
@ -235,7 +235,7 @@ class QgsComposition : QGraphicsScene
* @see setBoundingBoxesVisible * @see setBoundingBoxesVisible
* @note added in QGIS 2.7 * @note added in QGIS 2.7
*/ */
bool boundingBoxesVisible() const; bool boundingBoxesVisible() const;
/**Returns pointer to undo/redo command storage*/ /**Returns pointer to undo/redo command storage*/
QUndoStack* undoStack(); QUndoStack* undoStack();
@ -278,7 +278,7 @@ class QgsComposition : QGraphicsScene
@note not available in python bindings @note not available in python bindings
*/ */
// template<class T> void composerItems( QList<T*>& itemList ); // template<class T> void composerItems( QList<T*>& itemList );
/**Return composer items of a specific type on a specified page /**Return composer items of a specific type on a specified page
* @param itemList list of item type to store matching items in * @param itemList list of item type to store matching items in
* @param pageNumber page number (0 based) * @param pageNumber page number (0 based)
@ -421,7 +421,7 @@ class QgsComposition : QGraphicsScene
void lockSelectedItems(); void lockSelectedItems();
/**Unlock all items*/ /**Unlock all items*/
void unlockAllItems(); void unlockAllItems();
/**Creates a new group from a list of composer items and adds it to the composition. /**Creates a new group from a list of composer items and adds it to the composition.
* @param items items to include in group * @param items items to include in group
* @returns QgsComposerItemGroup of grouped items, if grouping was possible * @returns QgsComposerItemGroup of grouped items, if grouping was possible
@ -631,7 +631,7 @@ class QgsComposition : QGraphicsScene
* @param item item to set as selected * @param item item to set as selected
* @note added in version 2.3*/ * @note added in version 2.3*/
void setSelectedItem( QgsComposerItem* item ); void setSelectedItem( QgsComposerItem* item );
/**Clears any selected items in the composition. Call this method rather than /**Clears any selected items in the composition. Call this method rather than
* QGraphicsScene::clearSelection, as the latter does not correctly emit signals to allow * QGraphicsScene::clearSelection, as the latter does not correctly emit signals to allow
* the composition's model to update. * the composition's model to update.

2
python/core/layertree/qgslayertreemodellegendnode.sip
View File

@ -13,7 +13,7 @@ class QgsLayerTreeModelLegendNode : QObject
%TypeHeaderCode %TypeHeaderCode
#include <qgslayertreemodellegendnode.h> #include <qgslayertreemodellegendnode.h>
%End %End
public: public:
~QgsLayerTreeModelLegendNode(); ~QgsLayerTreeModelLegendNode();

4
python/core/qgscolorscheme.sip
View File

@ -74,7 +74,7 @@ class QgsColorScheme
* @returns copy of color scheme * @returns copy of color scheme
*/ */
virtual QgsColorScheme* clone() const = 0 /Factory/; virtual QgsColorScheme* clone() const = 0 /Factory/;
}; // class QgsColorScheme }; // class QgsColorScheme
QFlags<QgsColorScheme::SchemeFlag> operator|(QgsColorScheme::SchemeFlag f1, QFlags<QgsColorScheme::SchemeFlag> f2); QFlags<QgsColorScheme::SchemeFlag> operator|(QgsColorScheme::SchemeFlag f1, QFlags<QgsColorScheme::SchemeFlag> f2);
@ -137,7 +137,7 @@ class QgsUserColorScheme : QgsGplColorScheme
virtual QgsColorScheme* clone() const; virtual QgsColorScheme* clone() const;
virtual bool isEditable() const; virtual bool isEditable() const;
/**Sets the name for the scheme /**Sets the name for the scheme
* @param name new name * @param name new name
*/ */

2
python/core/qgscolorschemeregistry.sip
View File

@ -61,5 +61,5 @@ class QgsColorSchemeRegistry
* @returns list of color schemes with flag set * @returns list of color schemes with flag set
*/ */
QList<QgsColorScheme *> schemes( const QgsColorScheme::SchemeFlag flag ) const; QList<QgsColorScheme *> schemes( const QgsColorScheme::SchemeFlag flag ) const;
}; // class QgsColorSchemeRegistry }; // class QgsColorSchemeRegistry

2
python/core/qgsexpression.sip
View File

@ -90,7 +90,7 @@ class QgsExpression
//! Sets the geometry calculator used in evaluation of expressions, //! Sets the geometry calculator used in evaluation of expressions,
// instead of the default. // instead of the default.
void setGeomCalculator( const QgsDistanceArea &calc ); void setGeomCalculator( const QgsDistanceArea &calc );
/** This function currently replaces each expression between [% and %] /** This function currently replaces each expression between [% and %]
in the string with the result of its evaluation on the feature in the string with the result of its evaluation on the feature
passed as argument. passed as argument.

7
python/core/qgsmaptopixel.sip
View File

@ -34,7 +34,7 @@ class QgsMapToPixel
* @return QgsPoint in device coordinates * @return QgsPoint in device coordinates
*/ */
QgsPoint transform( double x, double y ) const; QgsPoint transform( double x, double y ) const;
/*! Tranform device coordinates to map (world) coordinates /*! Transform device coordinates to map (world) coordinates
* @param x x coordinate of point to be converted to map cooordinates * @param x x coordinate of point to be converted to map cooordinates
* @param y y coordinate of point to be converted to map cooordinates * @param y y coordinate of point to be converted to map cooordinates
* @return QgsPoint in map coordinates * @return QgsPoint in map coordinates
@ -54,11 +54,10 @@ class QgsMapToPixel
QgsPoint toMapCoordinates( int x, int y ) const; QgsPoint toMapCoordinates( int x, int y ) const;
/*! Transform device coordinates to map (world) coordinates /*! Transform device coordinates to map (world) coordinates */
@note: this method was added in version 1.6*/
QgsPoint toMapCoordinatesF( double x, double y ) const; QgsPoint toMapCoordinatesF( double x, double y ) const;
/*! Tranform device coordinates to map (world) coordinates /*! Transform device coordinates to map (world) coordinates
* @param p Point to be converted to map cooordinates * @param p Point to be converted to map cooordinates
* @return QgsPoint in map coorndiates * @return QgsPoint in map coorndiates
*/ */

2
python/core/qgsrelationmanager.sip
View File

@ -23,7 +23,7 @@ class QgsRelationManager : QObject
signals: signals:
/** this signal is emitted when the relations were loaded after reading a project */ /** this signal is emitted when the relations were loaded after reading a project */
void relationsLoaded(); void relationsLoaded();
/** /**
* Emitted when relations are added or removed to the manager. * Emitted when relations are added or removed to the manager.
* @note added in QGIS 2.5 * @note added in QGIS 2.5

2
python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip
View File

@ -155,7 +155,7 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
//! If supported by the renderer, return classification attribute for the use in legend //! If supported by the renderer, return classification attribute for the use in legend
//! @note added in 2.6 //! @note added in 2.6
virtual QString legendClassificationAttribute() const; virtual QString legendClassificationAttribute() const;
//! creates a QgsCategorizedSymbolRendererV2 from an existing renderer. //! creates a QgsCategorizedSymbolRendererV2 from an existing renderer.
//! @note added in 2.5 //! @note added in 2.5

4
python/core/symbology-ng/qgssymbollayerv2utils.sip
View File

@ -199,7 +199,7 @@ class QgsSymbolLayerV2Utils
* @note added in 2.5 * @note added in 2.5
*/ */
static QString colorToName( const QColor& color ); static QString colorToName( const QColor& color );
/** /**
* Attempts to parse a string as a list of colors using a variety of common formats, including hex * Attempts to parse a string as a list of colors using a variety of common formats, including hex
* codes, rgb and rgba strings. * codes, rgb and rgba strings.
@ -228,7 +228,7 @@ class QgsSymbolLayerV2Utils
* @note added in 2.5 * @note added in 2.5
*/ */
static QColor colorFromMimeData( const QMimeData * mimeData, bool& hasAlpha ); static QColor colorFromMimeData( const QMimeData * mimeData, bool& hasAlpha );
/** /**
* Attempts to parse mime data as a list of named colors * Attempts to parse mime data as a list of named colors
* @param data mime data to parse * @param data mime data to parse

2
python/core/symbology-ng/qgsvectorcolorrampv2.sip
View File

@ -140,7 +140,7 @@ class QgsRandomColorsV2 : QgsVectorColorRampV2
double value( int index ) const; double value( int index ) const;
QColor color( double value ) const; QColor color( double value ) const;
/*Sets the desired total number of unique colors for the resultant ramp. Calling /*Sets the desired total number of unique colors for the resultant ramp. Calling
* this method pregenerates a set of visually distinct colors which are returned * this method pregenerates a set of visually distinct colors which are returned
* by subsequent calls to color(). * by subsequent calls to color().

2
python/gui/editorwidgets/qgsdoublespinbox.sip
View File

@ -17,5 +17,5 @@ class QgsDoubleSpinBox : QDoubleSpinBox
protected: protected:
virtual void resizeEvent( QResizeEvent* event ); virtual void resizeEvent( QResizeEvent* event );
virtual void changeEvent( QEvent* event ); virtual void changeEvent( QEvent* event );
}; };

2
python/gui/editorwidgets/qgsspinbox.sip
View File

@ -17,5 +17,5 @@ class QgsSpinBox : QSpinBox
protected: protected:
virtual void resizeEvent( QResizeEvent* event ); virtual void resizeEvent( QResizeEvent* event );
virtual void changeEvent( QEvent* event ); virtual void changeEvent( QEvent* event );
}; };

4
python/gui/qgscodeeditor.sip
View File

@ -12,7 +12,7 @@ class QgsCodeEditor: QsciScintilla
* @param title widget title * @param title widget title
*/ */
void setTitle( const QString title ); void setTitle( const QString title );
/** Set margin visible state /** Set margin visible state
* @param margin Set margin in the editor * @param margin Set margin in the editor
*/ */
@ -24,7 +24,7 @@ class QgsCodeEditor: QsciScintilla
*/ */
void setFoldingVisible( bool folding); void setFoldingVisible( bool folding);
bool foldingVisible(); bool foldingVisible();
/** Insert text at cursor position, or replace any selected text if user has /** Insert text at cursor position, or replace any selected text if user has
* made a selection. * made a selection.
* @param theText The text to be inserted * @param theText The text to be inserted

2
python/gui/qgscolorbuttonv2.sip
View File

@ -38,7 +38,7 @@ class QgsColorButtonV2: QToolButton
* @see setColor * @see setColor
*/ */
QColor color() const; QColor color() const;
/**Sets whether alpha modification (transparency) is permitted /**Sets whether alpha modification (transparency) is permitted
* for the color. Defaults to false. * for the color. Defaults to false.
* @param allowAlpha set to true to allow alpha modification * @param allowAlpha set to true to allow alpha modification

2
python/gui/qgscolordialog.sip
View File

@ -109,7 +109,7 @@ class QgsColorDialogV2 : QDialog
* @param color desired color * @param color desired color
*/ */
void setColor( const QColor color ); void setColor( const QColor color );
protected: protected:
void closeEvent( QCloseEvent* e ); void closeEvent( QCloseEvent* e );

8
python/gui/qgscolorschemelist.sip
View File

@ -107,7 +107,7 @@ class QgsColorSchemeList: QTreeView
%End %End
public: public:
/**Construct a new color swatch grid. /**Construct a new color swatch grid.
* @param parent parent widget * @param parent parent widget
* @param scheme QgsColorScheme for colors to show in the list * @param scheme QgsColorScheme for colors to show in the list
@ -149,7 +149,7 @@ class QgsColorSchemeList: QTreeView
* @param baseColor base color for color scheme * @param baseColor base color for color scheme
*/ */
void setScheme( QgsColorScheme* scheme, const QString context = QString(), const QColor baseColor = QColor() ); void setScheme( QgsColorScheme* scheme, const QString context = QString(), const QColor baseColor = QColor() );
/**Removes any selected colors from the list /**Removes any selected colors from the list
*/ */
void removeSelection(); void removeSelection();
@ -169,7 +169,7 @@ class QgsColorSchemeList: QTreeView
* @see pasteColors * @see pasteColors
*/ */
void copyColors(); void copyColors();
signals: signals:
/**Emitted when a color is selected from the list /**Emitted when a color is selected from the list
@ -184,6 +184,6 @@ class QgsColorSchemeList: QTreeView
void mousePressEvent( QMouseEvent* event ); void mousePressEvent( QMouseEvent* event );
void mouseReleaseEvent( QMouseEvent* event ); void mouseReleaseEvent( QMouseEvent* event );
}; };

6
python/gui/qgscolorswatchgrid.sip
View File

@ -14,7 +14,7 @@ class QgsColorSwatchGrid: QWidget
%End %End
public: public:
/**Construct a new color swatch grid. /**Construct a new color swatch grid.
* @param scheme QgsColorScheme for colors to show in grid * @param scheme QgsColorScheme for colors to show in grid
* @param context context string provided to color scheme * @param context context string provided to color scheme
@ -71,10 +71,10 @@ class QgsColorSwatchGrid: QWidget
* @param color selected color * @param color selected color
*/ */
void colorChanged( const QColor color ); void colorChanged( const QColor color );
/**Emitted when mouse hovers over widget /**Emitted when mouse hovers over widget
*/ */
void hovered(); void hovered();
protected: protected:
void paintEvent( QPaintEvent * event ); void paintEvent( QPaintEvent * event );

29
python/gui/qgscolorwidgets.sip
View File

@ -56,7 +56,7 @@ class QgsColorWidget : QWidget
* @see component * @see component
*/ */
int componentValue() const; int componentValue() const;
/**Create an icon for dragging colors /**Create an icon for dragging colors
* @param color for icon * @param color for icon
*/ */
@ -138,7 +138,6 @@ class QgsColorWidget : QWidget
//Reimplemented to accept dropped colors //Reimplemented to accept dropped colors
void dropEvent( QDropEvent *e ); void dropEvent( QDropEvent *e );
}; };
@ -163,7 +162,7 @@ class QgsColorWheel : QgsColorWidget
QgsColorWheel( QWidget* parent /TransferThis/ = 0 ); QgsColorWheel( QWidget* parent /TransferThis/ = 0 );
virtual ~QgsColorWheel(); virtual ~QgsColorWheel();
void paintEvent( QPaintEvent* event ); void paintEvent( QPaintEvent* event );
public slots: public slots:
@ -176,7 +175,7 @@ class QgsColorWheel : QgsColorWidget
virtual void mouseMoveEvent( QMouseEvent *event ); virtual void mouseMoveEvent( QMouseEvent *event );
virtual void mousePressEvent( QMouseEvent *event ); virtual void mousePressEvent( QMouseEvent *event );
virtual void mouseReleaseEvent( QMouseEvent *event ); virtual void mouseReleaseEvent( QMouseEvent *event );
}; };
@ -205,12 +204,12 @@ class QgsColorBox : QgsColorWidget
QgsColorBox( QWidget* parent /TransferThis/ = 0, const ColorComponent component = Value ); QgsColorBox( QWidget* parent /TransferThis/ = 0, const ColorComponent component = Value );
virtual ~QgsColorBox(); virtual ~QgsColorBox();
virtual QSize sizeHint() const; virtual QSize sizeHint() const;
void paintEvent( QPaintEvent* event ); void paintEvent( QPaintEvent* event );
virtual void setComponent( const ColorComponent component ); virtual void setComponent( const ColorComponent component );
public slots: public slots:
virtual void setColor( const QColor color, const bool emitSignals = false ); virtual void setColor( const QColor color, const bool emitSignals = false );
@ -237,7 +236,7 @@ class QgsColorRampWidget : QgsColorWidget
%End %End
public: public:
/*! Specifies the orientation of a color ramp /*! Specifies the orientation of a color ramp
*/ */
enum Orientation enum Orientation
@ -259,7 +258,7 @@ class QgsColorRampWidget : QgsColorWidget
virtual QSize sizeHint() const; virtual QSize sizeHint() const;
void paintEvent( QPaintEvent* event ); void paintEvent( QPaintEvent* event );
/**Sets the orientation for the color ramp /**Sets the orientation for the color ramp
* @param orientation new orientation for the ramp * @param orientation new orientation for the ramp
* @see orientation * @see orientation
@ -307,9 +306,9 @@ class QgsColorRampWidget : QgsColorWidget
* @param value new value of color component * @param value new value of color component
*/ */
void valueChanged( const int value ); void valueChanged( const int value );
protected: protected:
virtual void mouseMoveEvent( QMouseEvent *event ); virtual void mouseMoveEvent( QMouseEvent *event );
virtual void mousePressEvent( QMouseEvent *event ); virtual void mousePressEvent( QMouseEvent *event );
virtual void keyPressEvent( QKeyEvent * event ); virtual void keyPressEvent( QKeyEvent * event );
@ -337,7 +336,7 @@ class QgsColorSliderWidget : QgsColorWidget
QgsColorSliderWidget( QWidget* parent /TransferThis/ = 0, const ColorComponent component = QgsColorWidget::Red ); QgsColorSliderWidget( QWidget* parent /TransferThis/ = 0, const ColorComponent component = QgsColorWidget::Red );
virtual ~QgsColorSliderWidget(); virtual ~QgsColorSliderWidget();
virtual void setComponent( const ColorComponent component ); virtual void setComponent( const ColorComponent component );
virtual void setComponentValue( const int value ); virtual void setComponentValue( const int value );
virtual void setColor( const QColor color, const bool emitSignals = false ); virtual void setColor( const QColor color, const bool emitSignals = false );
@ -366,12 +365,12 @@ class QgsColorTextWidget : QgsColorWidget
QgsColorTextWidget( QWidget* parent /TransferThis/ = 0 ); QgsColorTextWidget( QWidget* parent /TransferThis/ = 0 );
virtual ~QgsColorTextWidget(); virtual ~QgsColorTextWidget();
virtual void setColor( const QColor color, const bool emitSignals = false ); virtual void setColor( const QColor color, const bool emitSignals = false );
protected: protected:
void resizeEvent( QResizeEvent * event ); void resizeEvent( QResizeEvent * event );
}; };
@ -415,7 +414,7 @@ class QgsColorPreviewWidget : QgsColorWidget
* @see color2 * @see color2
*/ */
virtual void setColor2( const QColor& color ); virtual void setColor2( const QColor& color );
protected: protected:
//reimplemented to allow dragging colors //reimplemented to allow dragging colors
@ -426,5 +425,5 @@ class QgsColorPreviewWidget : QgsColorWidget
//reimplemented to allow dragging colors //reimplemented to allow dragging colors
void mouseMoveEvent( QMouseEvent *e ); void mouseMoveEvent( QMouseEvent *e );
}; };

2
python/gui/qgsmaptoolidentifyfeature.sip
View File

@ -11,7 +11,7 @@ class QgsMapToolIdentifyFeature : QgsMapToolIdentify
* @param vl the vector layer. The map tool can be initialized without any layer and can be set afterward. * @param vl the vector layer. The map tool can be initialized without any layer and can be set afterward.
*/ */
QgsMapToolIdentifyFeature( QgsMapCanvas* canvas, QgsVectorLayer* vl = 0 ); QgsMapToolIdentifyFeature( QgsMapCanvas* canvas, QgsVectorLayer* vl = 0 );
~QgsMapToolIdentifyFeature(); ~QgsMapToolIdentifyFeature();
//! change the layer used by the map tool to identify //! change the layer used by the map tool to identify

4
python/plugins/processing/algs/gdal/GridAverage.py
View File

@ -49,8 +49,8 @@ class GridAverage(GdalAlgorithm):
NODATA = 'NODATA' NODATA = 'NODATA'
OUTPUT = 'OUTPUT' OUTPUT = 'OUTPUT'
RTYPE = 'RTYPE' RTYPE = 'RTYPE'
TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64'] TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64']
def commandLineName(self): def commandLineName(self):
return "gdalogr:gridaverage" return "gdalogr:gridaverage"

4
python/plugins/processing/algs/gdal/GridDataMetrics.py
View File

@ -50,9 +50,9 @@ class GridDataMetrics(GdalAlgorithm):
NODATA = 'NODATA' NODATA = 'NODATA'
OUTPUT = 'OUTPUT' OUTPUT = 'OUTPUT'
RTYPE = 'RTYPE' RTYPE = 'RTYPE'
TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64'] TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64']
DATA_METRICS = ['Minimum', 'Maximum', 'Range', 'Count', 'Average distance', DATA_METRICS = ['Minimum', 'Maximum', 'Range', 'Count', 'Average distance',
'Average distance between points'] 'Average distance between points']

4
python/plugins/processing/algs/gdal/GridInvDist.py
View File

@ -52,9 +52,9 @@ class GridInvDist(GdalAlgorithm):
NODATA = 'NODATA' NODATA = 'NODATA'
OUTPUT = 'OUTPUT' OUTPUT = 'OUTPUT'
RTYPE = 'RTYPE' RTYPE = 'RTYPE'
TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64'] TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64']
def commandLineName(self): def commandLineName(self):
return "gdalogr:gridinvdist" return "gdalogr:gridinvdist"

4
python/plugins/processing/algs/gdal/GridNearest.py
View File

@ -48,9 +48,9 @@ class GridNearest(GdalAlgorithm):
NODATA = 'NODATA' NODATA = 'NODATA'
OUTPUT = 'OUTPUT' OUTPUT = 'OUTPUT'
RTYPE = 'RTYPE' RTYPE = 'RTYPE'
TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64'] TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64']
def commandLineName(self): def commandLineName(self):
return "gdalogr:gridnearestneighbor" return "gdalogr:gridnearestneighbor"

6
python/plugins/processing/algs/gdal/merge.py
View File

@ -42,9 +42,9 @@ class merge(GdalAlgorithm):
PCT = 'PCT' PCT = 'PCT'
SEPARATE = 'SEPARATE' SEPARATE = 'SEPARATE'
RTYPE = 'RTYPE' RTYPE = 'RTYPE'
TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64'] TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64']
def defineCharacteristics(self): def defineCharacteristics(self):
self.name = 'Merge' self.name = 'Merge'
self.group = '[GDAL] Miscellaneous' self.group = '[GDAL] Miscellaneous'
@ -55,7 +55,7 @@ class merge(GdalAlgorithm):
self.addParameter(ParameterBoolean(merge.SEPARATE, 'Layer stack', self.addParameter(ParameterBoolean(merge.SEPARATE, 'Layer stack',
False)) False))
self.addParameter(ParameterSelection(self.RTYPE, 'Output raster type', self.addParameter(ParameterSelection(self.RTYPE, 'Output raster type',
self.TYPE, 5)) self.TYPE, 5))
self.addOutput(OutputRaster(merge.OUTPUT, 'Output layer')) self.addOutput(OutputRaster(merge.OUTPUT, 'Output layer'))
def processAlgorithm(self, progress): def processAlgorithm(self, progress):

4
python/plugins/processing/algs/gdal/ogr2ogrclip.py
View File

@ -56,7 +56,7 @@ class Ogr2OgrClip(OgrAlgorithm):
self.addParameter(ParameterVector(self.INPUT_LAYER, 'Input layer', self.addParameter(ParameterVector(self.INPUT_LAYER, 'Input layer',
[ParameterVector.VECTOR_TYPE_ANY], False)) [ParameterVector.VECTOR_TYPE_ANY], False))
self.addParameter(ParameterVector(self.CLIP_LAYER, 'Clip layer', self.addParameter(ParameterVector(self.CLIP_LAYER, 'Clip layer',
[ParameterVector.VECTOR_TYPE_POLYGON], False)) [ParameterVector.VECTOR_TYPE_POLYGON], False))
self.addParameter(ParameterString(self.OPTIONS, 'Creation Options', self.addParameter(ParameterString(self.OPTIONS, 'Creation Options',
'', optional=True)) '', optional=True))
@ -76,7 +76,7 @@ class Ogr2OgrClip(OgrAlgorithm):
arguments = [] arguments = []
arguments.append('-clipsrc') arguments.append('-clipsrc')
arguments.append(ogrClipLayer) arguments.append(ogrClipLayer)
if len(options) > 0: if len(options) > 0:
arguments.append(options) arguments.append(options)

4
python/plugins/processing/algs/gdal/ogr2ogrclipextent.py
View File

@ -83,9 +83,9 @@ class Ogr2OgrClipExtent(OgrAlgorithm):
arguments.append(regionCoords[0]) arguments.append(regionCoords[0])
arguments.append(regionCoords[2]) arguments.append(regionCoords[2])
arguments.append(regionCoords[1]) arguments.append(regionCoords[1])
arguments.append(regionCoords[3]) arguments.append(regionCoords[3])
#arguments.append('-spat') #arguments.append('-spat')
#arguments.append(ogrclipExtent) #arguments.append(ogrclipExtent)
if len(options) > 0: if len(options) > 0:
arguments.append(options) arguments.append(options)

4
python/plugins/processing/algs/gdal/proximity.py
View File

@ -45,7 +45,7 @@ class proximity(GdalAlgorithm):
BUF_VAL = 'BUF_VAL' BUF_VAL = 'BUF_VAL'
OUTPUT = 'OUTPUT' OUTPUT = 'OUTPUT'
RTYPE = 'RTYPE' RTYPE = 'RTYPE'
TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64'] TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64']
DISTUNITS = ['GEO', 'PIXEL'] DISTUNITS = ['GEO', 'PIXEL']
@ -76,7 +76,7 @@ class proximity(GdalAlgorithm):
arguments = [] arguments = []
arguments.append('-ot') arguments.append('-ot')
arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)]) arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)])
arguments.append(self.getParameterValue(self.INPUT)) arguments.append(self.getParameterValue(self.INPUT))
arguments.append(output) arguments.append(output)

8
python/plugins/processing/algs/gdal/rasterize.py
View File

@ -43,10 +43,10 @@ class rasterize(GdalAlgorithm):
DIMENSIONS = 'DIMENSIONS' DIMENSIONS = 'DIMENSIONS'
WIDTH = 'WIDTH' WIDTH = 'WIDTH'
HEIGHT = 'HEIGHT' HEIGHT = 'HEIGHT'
WRITEOVER = 'WRITEOVER' WRITEOVER = 'WRITEOVER'
RTYPE = 'RTYPE' RTYPE = 'RTYPE'
OUTPUT = 'OUTPUT' OUTPUT = 'OUTPUT'
TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64'] TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64']
def commandLineName(self): def commandLineName(self):
@ -74,14 +74,14 @@ class rasterize(GdalAlgorithm):
def processAlgorithm(self, progress): def processAlgorithm(self, progress):
writeOver = self.getParameterValue(self.WRITEOVER) writeOver = self.getParameterValue(self.WRITEOVER)
arguments = [] arguments = []
arguments.append('-a') arguments.append('-a')
arguments.append(str(self.getParameterValue(self.FIELD))) arguments.append(str(self.getParameterValue(self.FIELD)))
if not writeOver: if not writeOver:
arguments.append('-ot') arguments.append('-ot')
arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)]) arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)])
dimType = self.getParameterValue(self.DIMENSIONS) dimType = self.getParameterValue(self.DIMENSIONS)
if dimType == 0: if dimType == 0:
# size in pixels # size in pixels

2
python/plugins/processing/algs/gdal/translate.py
View File

@ -52,7 +52,7 @@ class translate(GdalAlgorithm):
SDS = 'SDS' SDS = 'SDS'
EXTRA = 'EXTRA' EXTRA = 'EXTRA'
RTYPE = 'RTYPE' RTYPE = 'RTYPE'
TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64'] TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64']
def commandLineName(self): def commandLineName(self):

4
python/plugins/processing/algs/gdal/warp.py
View File

@ -47,9 +47,9 @@ class warp(GdalAlgorithm):
TR = 'TR' TR = 'TR'
EXTRA = 'EXTRA' EXTRA = 'EXTRA'
RTYPE = 'RTYPE' RTYPE = 'RTYPE'
TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64'] TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64']
def defineCharacteristics(self): def defineCharacteristics(self):
self.name = 'Warp (reproject)' self.name = 'Warp (reproject)'
self.group = '[GDAL] Projections' self.group = '[GDAL] Projections'

4
scripts/astyle.sh
View File

@ -69,11 +69,11 @@ for f in "$@"; do
cmd="$ASTYLE $ARTISTIC_STYLE_OPTIONS" cmd="$ASTYLE $ARTISTIC_STYLE_OPTIONS"
;; ;;
*.ui|*.qgm|*.txt|*.t2t|*.sip|resources/context_help/*) *.ui|*.qgm|*.txt|*.t2t|resources/context_help/*)
cmd=: cmd=:
;; ;;
*.py) *.py|*.sip)
cmd="perl -i.prepare -pe 's/[\r\t ]+$//;'" cmd="perl -i.prepare -pe 's/[\r\t ]+$//;'"
;; ;;

2
src/app/qgsmaptoolrotatefeature.cpp
View File

@ -62,7 +62,7 @@ void QgsMapToolRotateFeature::canvasMoveEvent( QMouseEvent * e )
double XDistance = e->pos().x() - mStPoint.x(); double XDistance = e->pos().x() - mStPoint.x();
double YDistance = e->pos().y() - mStPoint.y(); double YDistance = e->pos().y() - mStPoint.y();
mRotation = atan2( YDistance, XDistance ) * ( 180 / PI ); mRotation = atan2( YDistance, XDistance ) * ( 180 / PI );
mRotation = mRotation-mRotationOffset; mRotation = mRotation - mRotationOffset;
mStPoint = toCanvasCoordinates( mStartPointMapCoords ); mStPoint = toCanvasCoordinates( mStartPointMapCoords );
double offsetX = mStPoint.x() - mRubberBand->x(); double offsetX = mStPoint.x() - mRubberBand->x();

46
src/app/qgstipfactory.cpp
View File

@ -193,31 +193,31 @@ QgsTipFactory::QgsTipFactory() : QObject()
) ); ) );
addGenericTip( myTip ); addGenericTip( myTip );
// by yjacolin // by yjacolin
myTip.setTitle(tr("Add an action to layer")); myTip.setTitle( tr( "Add an action to layer" ) );
myTip.setContent(tr("Action in a layer allow user to trigger action when clicking on a geometry" myTip.setContent( tr( "Action in a layer allow user to trigger action when clicking on a geometry"
" with 'Run Feature Action' tools." " with 'Run Feature Action' tools."
"For example, you can open an html page using the field value of the geometry " "For example, you can open an html page using the field value of the geometry "
"as a parameter. Look at the <a href=\"http://docs.qgis.org/latest/en/docs/user_manual/working_with_vector/vector_properties.html?#actions-menu\">documentation</a>." "as a parameter. Look at the <a href=\"http://docs.qgis.org/latest/en/docs/user_manual/working_with_vector/vector_properties.html?#actions-menu\">documentation</a>."
)); ) );
addGuiTip(myTip); addGuiTip( myTip );
// by yjacolin // by yjacolin
myTip.setTitle(tr("Copy, paste and cut in QGIS")); myTip.setTitle( tr( "Copy, paste and cut in QGIS" ) );
myTip.setContent(tr("Copy, paste, and cut work as in another applications in QGIS. Select a " myTip.setContent( tr( "Copy, paste, and cut work as in another applications in QGIS. Select a "
"feature (a geometry or an attribut row in the attribute table) and use " "feature (a geometry or an attribut row in the attribute table) and use "
"one of this shortcuts: Ctrl+C to copy, Ctrl+X to cut, and Ctrl+V to paste." "one of this shortcuts: Ctrl+C to copy, Ctrl+X to cut, and Ctrl+V to paste."
)); ) );
addGuiTip(myTip); addGuiTip( myTip );
// by yjacolin // by yjacolin
myTip.setTitle(tr("Right click with identify tools")); myTip.setTitle( tr( "Right click with identify tools" ) );
myTip.setContent(tr("Right click with the identify tool to show a context menu from which you can " myTip.setContent( tr( "Right click with the identify tool to show a context menu from which you can "
"choose the layer in which to identify a feature. A sub menu will list features " "choose the layer in which to identify a feature. A sub menu will list features "
"identified and a third sub-menu will show the action link setup for the layer." "identified and a third sub-menu will show the action link setup for the layer."
"If one of this sub-menu doesn't contain any information, the next sub-menu" "If one of this sub-menu doesn't contain any information, the next sub-menu"
"will appear instead. For example, if you have just one layer, and click " "will appear instead. For example, if you have just one layer, and click "
"somewhere with several features, the first menu will list the feature list " "somewhere with several features, the first menu will list the feature list "
"instead of layer list." "instead of layer list."
)); ) );
addGuiTip(myTip); addGuiTip( myTip );
/* Template for adding more tips /* Template for adding more tips
myTip.setTitle(tr("")); myTip.setTitle(tr(""));

2
src/core/qgsbrowsermodel.h
View File

@ -124,7 +124,7 @@ class CORE_EXPORT QgsBrowserModel : public QAbstractItemModel
bool fetching( QgsDataItem *item ) const; bool fetching( QgsDataItem *item ) const;
signals: signals:
/** Emited when item children fetch was finished */ /** Emitted when item children fetch was finished */
void fetchFinished( const QModelIndex & index ); void fetchFinished( const QModelIndex & index );
public slots: public slots:

4
src/core/qgsmaphittest.cpp
View File

@ -53,12 +53,12 @@ void QgsMapHitTest::run()
void QgsMapHitTest::runHitTestLayer( QgsVectorLayer* vl, SymbolV2Set& usedSymbols, QgsRenderContext& context ) void QgsMapHitTest::runHitTestLayer( QgsVectorLayer* vl, SymbolV2Set& usedSymbols, QgsRenderContext& context )
{ {
QgsFeatureRendererV2* r = vl->rendererV2(); QgsFeatureRendererV2* r = vl->rendererV2();
// Point displacement case // Point displacement case
QgsPointDisplacementRenderer* pdr = dynamic_cast<QgsPointDisplacementRenderer*>( r ); QgsPointDisplacementRenderer* pdr = dynamic_cast<QgsPointDisplacementRenderer*>( r );
if ( pdr ) if ( pdr )
r = pdr->embeddedRenderer(); r = pdr->embeddedRenderer();
bool moreSymbolsPerFeature = r->capabilities() & QgsFeatureRendererV2::MoreSymbolsPerFeature; bool moreSymbolsPerFeature = r->capabilities() & QgsFeatureRendererV2::MoreSymbolsPerFeature;
r->startRender( context, vl->pendingFields() ); r->startRender( context, vl->pendingFields() );
QgsFeature f; QgsFeature f;

4
src/core/qgsmaptopixel.h
View File

@ -56,7 +56,7 @@ class CORE_EXPORT QgsMapToPixel
* @return QgsPoint in device coordinates * @return QgsPoint in device coordinates
*/ */
QgsPoint transform( double x, double y ) const; QgsPoint transform( double x, double y ) const;
/*! Tranform device coordinates to map (world) coordinates /*! Transform device coordinates to map (world) coordinates
* @param x x coordinate of point to be converted to map cooordinates * @param x x coordinate of point to be converted to map cooordinates
* @param y y coordinate of point to be converted to map cooordinates * @param y y coordinate of point to be converted to map cooordinates
* @return QgsPoint in map coordinates * @return QgsPoint in map coordinates
@ -87,7 +87,7 @@ class CORE_EXPORT QgsMapToPixel
/*! Transform device coordinates to map (world) coordinates */ /*! Transform device coordinates to map (world) coordinates */
QgsPoint toMapCoordinatesF( double x, double y ) const; QgsPoint toMapCoordinatesF( double x, double y ) const;
/*! Tranform device coordinates to map (world) coordinates /*! Transform device coordinates to map (world) coordinates
* @param p Point to be converted to map cooordinates * @param p Point to be converted to map cooordinates
* @return QgsPoint in map coorndiates * @return QgsPoint in map coorndiates
*/ */

4
src/core/qgsogcutils.cpp
View File

@ -1603,7 +1603,7 @@ QgsExpression::NodeBinaryOperator* QgsOgcUtils::nodeBinaryOperatorFromOgcFilter(
return NULL; return NULL;
} }
for( operandElem = operandElem.nextSiblingElement(); !operandElem.isNull(); operandElem = operandElem.nextSiblingElement() ) for ( operandElem = operandElem.nextSiblingElement(); !operandElem.isNull(); operandElem = operandElem.nextSiblingElement() )
{ {
QgsExpression::Node* opRight = nodeFromOgcFilter( operandElem, errorMessage ); QgsExpression::Node* opRight = nodeFromOgcFilter( operandElem, errorMessage );
if ( !opRight ) if ( !opRight )
@ -1617,7 +1617,7 @@ QgsExpression::NodeBinaryOperator* QgsOgcUtils::nodeBinaryOperatorFromOgcFilter(
expr = new QgsExpression::NodeBinaryOperator(( QgsExpression::BinaryOperator ) op, expr, opRight ); expr = new QgsExpression::NodeBinaryOperator(( QgsExpression::BinaryOperator ) op, expr, opRight );
} }
if( expr == leftOp ) if ( expr == leftOp )
{ {
if ( errorMessage.isEmpty() ) if ( errorMessage.isEmpty() )
errorMessage = QString( "only one operand for '%1' binary operator" ).arg( element.tagName() ); errorMessage = QString( "only one operand for '%1' binary operator" ).arg( element.tagName() );

4
src/core/qgsvectorfilewriter.cpp
View File

@ -1523,9 +1523,9 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()
) )
); );
return driverMetadata; return driverMetadata;
} }
bool QgsVectorFileWriter::driverMetadata( const QString& driverName, QgsVectorFileWriter::MetaData& driverMetadata ) bool QgsVectorFileWriter::driverMetadata( const QString& driverName, QgsVectorFileWriter::MetaData& driverMetadata )
{ {
static const QMap<QString, MetaData> sDriverMetadata = initMetaData(); static const QMap<QString, MetaData> sDriverMetadata = initMetaData();

2
src/core/qgsvectorlayerfeatureiterator.cpp
View File

@ -506,7 +506,7 @@ void QgsVectorLayerFeatureIterator::prepareExpressions()
if ( mRequest.flags() & QgsFeatureRequest::SubsetOfAttributes ) if ( mRequest.flags() & QgsFeatureRequest::SubsetOfAttributes )
{ {
QgsAttributeList attrs; QgsAttributeList attrs;
Q_FOREACH( const QString& col, exp->referencedColumns() ) Q_FOREACH ( const QString& col, exp->referencedColumns() )
{ {
attrs.append( mSource->mFields.fieldNameIndex( col ) ); attrs.append( mSource->mFields.fieldNameIndex( col ) );
} }

20
src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
View File

@ -378,7 +378,7 @@ void QgsGraduatedSymbolRendererV2::startRender( QgsRenderContext& context, const
QgsRangeList::iterator it = mRanges.begin(); QgsRangeList::iterator it = mRanges.begin();
for ( ; it != mRanges.end(); ++it ) for ( ; it != mRanges.end(); ++it )
{ {
if( !it->symbol() ) if ( !it->symbol() )
continue; continue;
it->symbol()->startRender( context, &fields ); it->symbol()->startRender( context, &fields );
@ -399,7 +399,7 @@ void QgsGraduatedSymbolRendererV2::stopRender( QgsRenderContext& context )
QgsRangeList::iterator it = mRanges.begin(); QgsRangeList::iterator it = mRanges.begin();
for ( ; it != mRanges.end(); ++it ) for ( ; it != mRanges.end(); ++it )
{ {
if( !it->symbol() ) if ( !it->symbol() )
continue; continue;
it->symbol()->stopRender( context ); it->symbol()->stopRender( context );
@ -977,10 +977,10 @@ QList<double> QgsGraduatedSymbolRendererV2::getDataValues( QgsVectorLayer *vlaye
lst = expression->referencedColumns(); lst = expression->referencedColumns();
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest() QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest()
.setFlags( ( expression && expression->needsGeometry() ) ? .setFlags(( expression && expression->needsGeometry() ) ?
QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoFlags :
QgsFeatureRequest::NoGeometry ) QgsFeatureRequest::NoGeometry )
.setSubsetOfAttributes( lst, vlayer->pendingFields() ) ); .setSubsetOfAttributes( lst, vlayer->pendingFields() ) );
// create list of non-null attribute values // create list of non-null attribute values
while ( fit.nextFeature( f ) ) while ( fit.nextFeature( f ) )
@ -1015,7 +1015,7 @@ void QgsGraduatedSymbolRendererV2::updateClasses( QgsVectorLayer *vlayer, Mode m
if ( attrNum == -1 ) if ( attrNum == -1 )
{ {
values = getDataValues( vlayer ); values = getDataValues( vlayer );
if( values.isEmpty() ) if ( values.isEmpty() )
return; return;
qSort( values ); qSort( values );
@ -1355,7 +1355,7 @@ void QgsGraduatedSymbolRendererV2::updateColorRamp( QgsVectorColorRampV2 *ramp,
foreach ( QgsRendererRangeV2 range, mRanges ) foreach ( QgsRendererRangeV2 range, mRanges )
{ {
QgsSymbolV2 *symbol = range.symbol() ? range.symbol()->clone() : 0; QgsSymbolV2 *symbol = range.symbol() ? range.symbol()->clone() : 0;
if( symbol ) if ( symbol )
{ {
double colorValue; double colorValue;
if ( inverted ) if ( inverted )
@ -1373,7 +1373,7 @@ void QgsGraduatedSymbolRendererV2::updateColorRamp( QgsVectorColorRampV2 *ramp,
void QgsGraduatedSymbolRendererV2::updateSymbols( QgsSymbolV2 *sym ) void QgsGraduatedSymbolRendererV2::updateSymbols( QgsSymbolV2 *sym )
{ {
if( !sym ) if ( !sym )
return; return;
int i = 0; int i = 0;
@ -1412,7 +1412,7 @@ void QgsGraduatedSymbolRendererV2::setScaleMethod( QgsSymbolV2::ScaleMethod scal
mScaleMethod = scaleMethod; mScaleMethod = scaleMethod;
for ( QgsRangeList::iterator it = mRanges.begin(); it != mRanges.end(); ++it ) for ( QgsRangeList::iterator it = mRanges.begin(); it != mRanges.end(); ++it )
{ {
if( it->symbol() ) if ( it->symbol() )
setScaleMethodToSymbol( it->symbol(), scaleMethod ); setScaleMethodToSymbol( it->symbol(), scaleMethod );
} }
} }

2
src/gui/qgsattributedialog.cpp
View File

@ -58,7 +58,7 @@ QgsAttributeDialog::~QgsAttributeDialog()
delete mHighlight; delete mHighlight;
} }
if( mOwnedFeature ) if ( mOwnedFeature )
delete mOwnedFeature; delete mOwnedFeature;
saveGeometry(); saveGeometry();

2
src/gui/qgscolorwidgets.h
View File

@ -27,7 +27,7 @@ class QToolButton;
* \class QgsColorWidget * \class QgsColorWidget
* A base class for interactive color widgets. Widgets can either allow setting a single component of * A base class for interactive color widgets. Widgets can either allow setting a single component of
* a color (eg the red or green components), or an entire color. The QgsColorWidget also keeps track of * a color (eg the red or green components), or an entire color. The QgsColorWidget also keeps track of
* any explicitly set hue for the color, so that this information is not lost when the widget is * any explicitely set hue for the color, so that this information is not lost when the widget is
* set to a color with an ambiguous hue (eg black or white shades). * set to a color with an ambiguous hue (eg black or white shades).
* \note Added in version 2.5 * \note Added in version 2.5
*/ */

68
src/mapserver/qgshttprequesthandler.cpp
View File

@ -32,9 +32,9 @@
#include <QUrl> #include <QUrl>
#include <fcgi_stdio.h> #include <fcgi_stdio.h>
QgsHttpRequestHandler::QgsHttpRequestHandler(): QgsHttpRequestHandler::QgsHttpRequestHandler()
QgsRequestHandler() : QgsRequestHandler()
{ {
mException = NULL; mException = NULL;
mHeadersSent = FALSE; mHeadersSent = FALSE;
} }
@ -74,7 +74,7 @@ bool QgsHttpRequestHandler::exceptionRaised() const
void QgsHttpRequestHandler::setHeader( const QString &name, const QString &value ) void QgsHttpRequestHandler::setHeader( const QString &name, const QString &value )
{ {
mHeaders.insert( name, value); mHeaders.insert( name, value );
} }
@ -88,7 +88,7 @@ int QgsHttpRequestHandler::removeHeader( const QString &name )
return mHeaders.remove( name ); return mHeaders.remove( name );
} }
void QgsHttpRequestHandler::appendBody( const QByteArray &body) void QgsHttpRequestHandler::appendBody( const QByteArray &body )
{ {
mBody.append( body ); mBody.append( body );
} }
@ -109,28 +109,28 @@ void QgsHttpRequestHandler::sendHeaders()
// Send default headers if they've not been set in a previous stage // Send default headers if they've not been set in a previous stage
if ( mHeaders.empty() ) if ( mHeaders.empty() )
{ {
QgsDebugMsg( QString( "Content size: %1" ).arg( mBody.size() ) ); QgsDebugMsg( QString( "Content size: %1" ).arg( mBody.size() ) );
QgsDebugMsg( QString( "Content format: %1" ).arg( mInfoFormat ) ); QgsDebugMsg( QString( "Content format: %1" ).arg( mInfoFormat ) );
printf( "Content-Type: " ); printf( "Content-Type: " );
printf( mInfoFormat.toLocal8Bit() ); printf( mInfoFormat.toLocal8Bit() );
printf( "\n" ); printf( "\n" );
// size is not known when streaming // size is not known when streaming
if ( mBody.size() > 0) if ( mBody.size() > 0 )
{ {
printf( "Content-Length: %d\n", mBody.size() ); printf( "Content-Length: %d\n", mBody.size() );
} }
} }
else else
{ {
QMap<QString, QString>::const_iterator it; QMap<QString, QString>::const_iterator it;
for ( it = mHeaders.constBegin(); it != mHeaders.constEnd(); ++it ) for ( it = mHeaders.constBegin(); it != mHeaders.constEnd(); ++it )
{ {
printf ( it.key().toLocal8Bit() ); printf( it.key().toLocal8Bit() );
printf ( ": " ); printf( ": " );
printf ( it.value().toLocal8Bit() ); printf( it.value().toLocal8Bit() );
printf ( "\n" );
}
printf( "\n" ); printf( "\n" );
}
printf( "\n" );
} }
printf( "\n" ); printf( "\n" );
mHeadersSent = TRUE; mHeadersSent = TRUE;
@ -138,19 +138,19 @@ void QgsHttpRequestHandler::sendHeaders()
void QgsHttpRequestHandler::sendBody() const void QgsHttpRequestHandler::sendBody() const
{ {
fwrite( (void*)mBody.data(), mBody.size(), 1, FCGI_stdout ); fwrite(( void* )mBody.data(), mBody.size(), 1, FCGI_stdout );
QgsDebugMsg( QString( "Sent %1 bytes" ).arg( mBody.size() ) ); QgsDebugMsg( QString( "Sent %1 bytes" ).arg( mBody.size() ) );
} }
void QgsHttpRequestHandler::sendResponse() void QgsHttpRequestHandler::sendResponse()
{ {
QgsDebugMsg( QString( "Sending HTTP response" ) ); QgsDebugMsg( QString( "Sending HTTP response" ) );
if ( ! responseReady() ) if ( ! responseReady() )
{ {
QgsDebugMsg( QString( "Trying to send out an empty reponse" ) ); QgsDebugMsg( QString( "Trying to send out an empty reponse" ) );
return; return;
} }
if (! mHeadersSent ) if ( ! mHeadersSent )
{ {
sendHeaders(); sendHeaders();
} }
@ -382,7 +382,7 @@ void QgsHttpRequestHandler::setGetFeatureInfoResponse( const QDomDocument& infoD
setHttpResponse( &ba, infoFormat ); setHttpResponse( &ba, infoFormat );
} }
void QgsHttpRequestHandler::setServiceException(QgsMapServiceException ex ) void QgsHttpRequestHandler::setServiceException( QgsMapServiceException ex )
{ {
mException = &ex; mException = &ex;
//create Exception DOM document //create Exception DOM document
@ -604,23 +604,23 @@ QString QgsHttpRequestHandler::readPostBody() const
return inputString; return inputString;
} }
void QgsHttpRequestHandler::setParameter(const QString &key, const QString &value) void QgsHttpRequestHandler::setParameter( const QString &key, const QString &value )
{ {
if(! ( key.isEmpty() || value.isEmpty() ) ) if ( !( key.isEmpty() || value.isEmpty() ) )
{ {
mParameterMap.insert(key, value); mParameterMap.insert( key, value );
} }
} }
QString QgsHttpRequestHandler::parameter(const QString &key) const QString QgsHttpRequestHandler::parameter( const QString &key ) const
{ {
return mParameterMap.value(key); return mParameterMap.value( key );
} }
int QgsHttpRequestHandler::removeParameter(const QString &key) int QgsHttpRequestHandler::removeParameter( const QString &key )
{ {
return mParameterMap.remove(key); return mParameterMap.remove( key );
} }

12
src/mapserver/qgshttprequesthandler.h
View File

@ -50,19 +50,19 @@ class QgsHttpRequestHandler: public QgsRequestHandler
virtual void setHeader( const QString &name, const QString &value ); virtual void setHeader( const QString &name, const QString &value );
virtual int removeHeader( const QString &name ); virtual int removeHeader( const QString &name );
virtual void clearHeaders( ); virtual void clearHeaders( );
virtual void appendBody( const QByteArray &body); virtual void appendBody( const QByteArray &body );
virtual void clearBody( ); virtual void clearBody( );
virtual void setInfoFormat( const QString &format ); virtual void setInfoFormat( const QString &format );
virtual bool responseReady() const; virtual bool responseReady() const;
virtual bool exceptionRaised() const; virtual bool exceptionRaised() const;
virtual void setParameter(const QString &key, const QString &value); virtual void setParameter( const QString &key, const QString &value );
virtual QString parameter(const QString &key) const; virtual QString parameter( const QString &key ) const;
virtual int removeParameter(const QString &key); virtual int removeParameter( const QString &key );
protected: protected:
virtual void sendHeaders( ); virtual void sendHeaders( );
virtual void sendBody( ) const; virtual void sendBody( ) const;
void setHttpResponse(QByteArray *ba, const QString &format ); void setHttpResponse( QByteArray *ba, const QString &format );
/**Converts format to official mimetype (e.g. 'jpg' to 'image/jpeg') /**Converts format to official mimetype (e.g. 'jpg' to 'image/jpeg')
@return mime string (or the entered string if not found)*/ @return mime string (or the entered string if not found)*/
QString formatToMimeType( const QString& format ) const; QString formatToMimeType( const QString& format ) const;
@ -83,7 +83,7 @@ class QgsHttpRequestHandler: public QgsRequestHandler
static bool blueCompare( const QPair<QRgb, int>& c1, const QPair<QRgb, int>& c2 ); static bool blueCompare( const QPair<QRgb, int>& c1, const QPair<QRgb, int>& c2 );
static bool alphaCompare( const QPair<QRgb, int>& c1, const QPair<QRgb, int>& c2 ); static bool alphaCompare( const QPair<QRgb, int>& c1, const QPair<QRgb, int>& c2 );
/**Calculates a representative color for a box (pixel weighted average)*/ /**Calculates a representative color for a box (pixel weighted average)*/
static QRgb boxColor( const QgsColorBox& box, int boxPixels ); static QRgb boxColor( const QgsColorBox& box, int boxPixels );
}; };
#endif #endif

4
src/mapserver/qgspostrequesthandler.cpp
View File

@ -37,7 +37,7 @@ void QgsPostRequestHandler::parseInput()
QString errorMsg; QString errorMsg;
if ( !doc.setContent( inputString, true, &errorMsg ) ) if ( !doc.setContent( inputString, true, &errorMsg ) )
{ {
requestStringToParameterMap( inputString, mParameterMap); requestStringToParameterMap( inputString, mParameterMap );
} }
else else
{ {
@ -54,7 +54,7 @@ void QgsPostRequestHandler::parseInput()
return; //no query string? something must be wrong... return; //no query string? something must be wrong...
} }
requestStringToParameterMap( queryString, mParameterMap); requestStringToParameterMap( queryString, mParameterMap );
QDomElement docElem = doc.documentElement(); QDomElement docElem = doc.documentElement();
if ( docElem.hasAttribute( "version" ) ) if ( docElem.hasAttribute( "version" ) )

12
src/mapserver/qgsrequesthandler.h
View File

@ -47,7 +47,7 @@ class QgsRequestHandler
virtual void setGetFeatureInfoResponse( const QDomDocument& infoDoc, const QString& infoFormat ) = 0; virtual void setGetFeatureInfoResponse( const QDomDocument& infoDoc, const QString& infoFormat ) = 0;
virtual void setServiceException( QgsMapServiceException ex ) = 0; virtual void setServiceException( QgsMapServiceException ex ) = 0;
virtual void setGetStyleResponse( const QDomDocument& doc ) = 0; virtual void setGetStyleResponse( const QDomDocument& doc ) = 0;
virtual void setGetPrintResponse( QByteArray* b ) = 0; virtual void setGetPrintResponse( QByteArray* b ) = 0;
virtual bool startGetFeatureResponse( QByteArray* ba, const QString& infoFormat ) = 0; virtual bool startGetFeatureResponse( QByteArray* ba, const QString& infoFormat ) = 0;
virtual void setGetFeatureResponse( QByteArray* ba ) = 0; virtual void setGetFeatureResponse( QByteArray* ba ) = 0;
virtual void endGetFeatureResponse( QByteArray* ba ) = 0; virtual void endGetFeatureResponse( QByteArray* ba ) = 0;
@ -59,7 +59,7 @@ class QgsRequestHandler
/**Delete all HTTP headers*/ /**Delete all HTTP headers*/
virtual void clearHeaders( ) = 0; virtual void clearHeaders( ) = 0;
/**Append the bytestream to response body*/ /**Append the bytestream to response body*/
virtual void appendBody( const QByteArray &body) = 0; virtual void appendBody( const QByteArray &body ) = 0;
/**Clears the response body*/ /**Clears the response body*/
virtual void clearBody( ) = 0; virtual void clearBody( ) = 0;
virtual void setInfoFormat( const QString &format ) = 0; virtual void setInfoFormat( const QString &format ) = 0;
@ -70,15 +70,15 @@ class QgsRequestHandler
virtual bool exceptionRaised() const = 0; virtual bool exceptionRaised() const = 0;
QMap<QString, QString> parameterMap( ) { return mParameterMap; } QMap<QString, QString> parameterMap( ) { return mParameterMap; }
/**Set a request parameter*/ /**Set a request parameter*/
virtual void setParameter(const QString &key, const QString &value) = 0; virtual void setParameter( const QString &key, const QString &value ) = 0;
/**Remove a request parameter*/ /**Remove a request parameter*/
virtual int removeParameter(const QString &key) = 0; virtual int removeParameter( const QString &key ) = 0;
/**Return a request parameter*/ /**Return a request parameter*/
virtual QString parameter(const QString &key) const = 0; virtual QString parameter( const QString &key ) const = 0;
QString format() const { return mFormat; } QString format() const { return mFormat; }
bool headersSent() { return mHeadersSent; } bool headersSent() { return mHeadersSent; }
protected: protected:
virtual void sendHeaders( ) = 0; virtual void sendHeaders( ) = 0;
virtual void sendBody( ) const = 0; virtual void sendBody( ) const = 0;

2
src/mapserver/qgsserverprojectparser.cpp
View File

@ -227,7 +227,7 @@ QgsMapLayer* QgsServerProjectParser::createLayerFromElement( const QDomElement&
{ {
QString project = convertToAbsolutePath( elem.attribute( "project" ) ); QString project = convertToAbsolutePath( elem.attribute( "project" ) );
QgsDebugMsg( QString( "Project path: %1" ).arg( project ) ); QgsDebugMsg( QString( "Project path: %1" ).arg( project ) );
QgsServerProjectParser* otherConfig = QgsConfigCache::instance()->serverConfiguration( project ); QgsServerProjectParser* otherConfig = QgsConfigCache::instance()->serverConfiguration( project );
if ( !otherConfig ) if ( !otherConfig )
{ {

2
src/mapserver/qgswcsserver.cpp
View File

@ -37,7 +37,7 @@ static const QString WCS_NAMESPACE = "http://www.opengis.net/wcs";
static const QString GML_NAMESPACE = "http://www.opengis.net/gml"; static const QString GML_NAMESPACE = "http://www.opengis.net/gml";
static const QString OGC_NAMESPACE = "http://www.opengis.net/ogc"; static const QString OGC_NAMESPACE = "http://www.opengis.net/ogc";
QgsWCSServer::QgsWCSServer(const QString& configFilePath, QMap<QString, QString> &parameters, QgsWCSProjectParser* pp, QgsWCSServer::QgsWCSServer( const QString& configFilePath, QMap<QString, QString> &parameters, QgsWCSProjectParser* pp,
QgsRequestHandler* rh ): QgsOWSServer( configFilePath, parameters, rh ), mConfigParser( pp ) QgsRequestHandler* rh ): QgsOWSServer( configFilePath, parameters, rh ), mConfigParser( pp )
{ {
} }

2
src/mapserver/qgswfsserver.cpp
View File

@ -64,7 +64,7 @@ static const QString GML_NAMESPACE = "http://www.opengis.net/gml";
static const QString OGC_NAMESPACE = "http://www.opengis.net/ogc"; static const QString OGC_NAMESPACE = "http://www.opengis.net/ogc";
static const QString QGS_NAMESPACE = "http://www.qgis.org/gml"; static const QString QGS_NAMESPACE = "http://www.qgis.org/gml";
QgsWFSServer::QgsWFSServer(const QString& configFilePath, QMap<QString, QString> &parameters, QgsWFSProjectParser* cp, QgsWFSServer::QgsWFSServer( const QString& configFilePath, QMap<QString, QString> &parameters, QgsWFSProjectParser* cp,
QgsRequestHandler* rh ): QgsOWSServer( configFilePath, parameters, rh ), mConfigParser( cp ) QgsRequestHandler* rh ): QgsOWSServer( configFilePath, parameters, rh ), mConfigParser( cp )
{ {
} }

2
src/mapserver/qgswmsserver.h
View File

@ -61,7 +61,7 @@ class QgsWMSServer: public QgsOWSServer
public: public:
/**Constructor. Does _NOT_ take ownership of /**Constructor. Does _NOT_ take ownership of
QgsConfigParser, QgsCapabilitiesCache and QgsMapRenderer*/ QgsConfigParser, QgsCapabilitiesCache and QgsMapRenderer*/
QgsWMSServer(const QString& configFilePath, QMap<QString, QString> &parameters, QgsWMSConfigParser* cp, QgsRequestHandler* rh, QgsWMSServer( const QString& configFilePath, QMap<QString, QString> &parameters, QgsWMSConfigParser* cp, QgsRequestHandler* rh,
QgsMapRenderer* renderer, QgsCapabilitiesCache* capCache ); QgsMapRenderer* renderer, QgsCapabilitiesCache* capCache );
~QgsWMSServer(); ~QgsWMSServer();

12
src/providers/mssql/qgsmssqlprovider.cpp
View File

@ -756,7 +756,7 @@ bool QgsMssqlProvider::addFeatures( QgsFeatureList & flist )
bool first = true; bool first = true;
if ( !mDatabase.isOpen() ) if ( !mDatabase.isOpen() )
{ {
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword ); mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
} }
QSqlQuery query = QSqlQuery( mDatabase ); QSqlQuery query = QSqlQuery( mDatabase );
query.setForwardOnly( true ); query.setForwardOnly( true );
@ -989,7 +989,7 @@ bool QgsMssqlProvider::deleteAttributes( const QgsAttributeIds &attributes )
if ( !mDatabase.isOpen() ) if ( !mDatabase.isOpen() )
{ {
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword ); mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
} }
QSqlQuery query = QSqlQuery( mDatabase ); QSqlQuery query = QSqlQuery( mDatabase );
@ -1140,7 +1140,7 @@ bool QgsMssqlProvider::changeGeometryValues( QgsGeometryMap & geometry_map )
if ( !mDatabase.isOpen() ) if ( !mDatabase.isOpen() )
{ {
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword ); mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
} }
QSqlQuery query = QSqlQuery( mDatabase ); QSqlQuery query = QSqlQuery( mDatabase );
query.setForwardOnly( true ); query.setForwardOnly( true );
@ -1213,7 +1213,7 @@ bool QgsMssqlProvider::deleteFeatures( const QgsFeatureIds & id )
if ( !mDatabase.isOpen() ) if ( !mDatabase.isOpen() )
{ {
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword ); mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
} }
QSqlQuery query = QSqlQuery( mDatabase ); QSqlQuery query = QSqlQuery( mDatabase );
query.setForwardOnly( true ); query.setForwardOnly( true );
@ -1248,7 +1248,7 @@ bool QgsMssqlProvider::createSpatialIndex()
if ( !mDatabase.isOpen() ) if ( !mDatabase.isOpen() )
{ {
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword ); mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
} }
QSqlQuery query = QSqlQuery( mDatabase ); QSqlQuery query = QSqlQuery( mDatabase );
query.setForwardOnly( true ); query.setForwardOnly( true );
@ -1281,7 +1281,7 @@ bool QgsMssqlProvider::createAttributeIndex( int field )
{ {
if ( !mDatabase.isOpen() ) if ( !mDatabase.isOpen() )
{ {
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword ); mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
} }
QSqlQuery query = QSqlQuery( mDatabase ); QSqlQuery query = QSqlQuery( mDatabase );
query.setForwardOnly( true ); query.setForwardOnly( true );

2
src/providers/postgres/qgspostgresdataitems.cpp
View File

@ -330,7 +330,7 @@ QVector<QgsDataItem*> QgsPGSchemaItem::createChildren()
for ( int i = 0; i < layerProperty.size(); i++ ) for ( int i = 0; i < layerProperty.size(); i++ )
{ {
QgsPGLayerItem *layerItem = createLayer( layerProperty.at(i) ); QgsPGLayerItem *layerItem = createLayer( layerProperty.at( i ) );
if ( layerItem ) if ( layerItem )
items.append( layerItem ); items.append( layerItem );
} }

2
tests/src/core/testqgscomposerlabel.cpp
View File

@ -179,7 +179,7 @@ void TestQgsComposerLabel::page_evaluation()
void TestQgsComposerLabel::marginMethods() void TestQgsComposerLabel::marginMethods()
{ {
QgsComposerLabel label( mComposition ); QgsComposerLabel label( mComposition );
//test setting margins seperately //test setting margins separately
label.setMarginX( 3.0 ); label.setMarginX( 3.0 );
label.setMarginY( 4.0 ); label.setMarginY( 4.0 );
QCOMPARE( label.marginX(), 3.0 ); QCOMPARE( label.marginX(), 3.0 );