Skip to content

Commit

Permalink
fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed May 21, 2014
1 parent c169842 commit 91f371b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/core/qgsproject.h
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ class CORE_EXPORT QgsProject : public QObject
QgsRelationManager* relationManager() const;

/** Return pointer to the root (invisible) node of the project's layer tree
* @node added in 2.4 */
* @note added in 2.4 */
QgsLayerTreeGroup* layerTreeRoot() const;

/** Return pointer to the helper class that synchronizes map layer registry with layer tree */
Expand Down
4 changes: 1 addition & 3 deletions src/core/qgsvectorlayercache.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,14 @@ class CORE_EXPORT QgsVectorLayerCache : public QObject

public:
QgsVectorLayerCache( QgsVectorLayer* layer, int cacheSize, QObject* parent = NULL );
~QgsVectorLayerCache();

/**
* Sets the maximum number of features to keep in the cache. Some features will be removed from
* the cache if the number is smaller than the previous size of the cache.
*
* @param cacheSize indicates the maximum number of features to keep in the cache
*/

~QgsVectorLayerCache();

void setCacheSize( int cacheSize );

/**
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgscolorbutton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ void QgsColorButton::mouseMoveEvent( QMouseEvent *e )
//set as drag pixmap
drag->setPixmap( QPixmap::fromImage( colorImage ) );

Qt::DropAction dropAction = drag->exec( Qt::CopyAction | Qt::MoveAction );
drag->exec( Qt::CopyAction | Qt::MoveAction );
setDown( false );
}

Expand Down
2 changes: 2 additions & 0 deletions src/mapserver/qgswfsprojectparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,8 @@ QStringList QgsWFSProjectParser::wfsLayers() const

QList<QgsMapLayer*> QgsWFSProjectParser::mapLayerFromTypeName( const QString& aTypeName, bool useCache ) const
{
Q_UNUSED( useCache );

QList<QgsMapLayer*> layerList;
const QList<QDomElement>& projectLayerElements = mProjectParser.projectLayerElements();

Expand Down

0 comments on commit 91f371b

Please sign in to comment.