Skip to content

Commit

Permalink
Fix some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Feb 2, 2015
1 parent 8c1675a commit cd86710
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 14 deletions.
12 changes: 0 additions & 12 deletions cmake_templates/Doxyfile.in
Expand Up @@ -1256,18 +1256,6 @@ GENERATE_XML = NO

XML_OUTPUT = xml

# The XML_SCHEMA tag can be used to specify an XML schema,
# which can be used by a validating XML parser to check the
# syntax of the XML files.

XML_SCHEMA =

# The XML_DTD tag can be used to specify an XML DTD,
# which can be used by a validating XML parser to check the
# syntax of the XML files.

XML_DTD =

# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
# dump the program listings (including syntax highlighting
# and cross-referencing information) to the XML output. Note that
Expand Down
7 changes: 7 additions & 0 deletions python/core/qgsofflineediting.sip
Expand Up @@ -59,4 +59,11 @@ class QgsOfflineEditing : QObject

/** emit a signal that processing of all layers has finished */
void progressStopped();

/**
* Emitted when a warning needs to be displayed.
* @param title title string for message
* @param message A descriptive message for the warning
*/
void warning( const QString& title, const QString& message );
};
4 changes: 4 additions & 0 deletions python/gui/qgsmessagebar.sip
Expand Up @@ -70,27 +70,31 @@ class QgsMessageBar: QFrame

/**
* Pushes a warning with default timeout to the message bar
* @param title title string for message
* @param message The message to be displayed
* @note added in 2.8
*/
void pushSuccess( const QString& title, const QString& message );

/**
* Pushes a warning with default timeout to the message bar
* @param title title string for message
* @param message The message to be displayed
* @note added in 2.8
*/
void pushInfo( const QString& title, const QString& message );

/**
* Pushes a warning with default timeout to the message bar
* @param title title string for message
* @param message The message to be displayed
* @note added in 2.8
*/
void pushWarning( const QString& title, const QString& message );

/**
* Pushes a warning with default timeout to the message bar
* @param title title string for message
* @param message The message to be displayed
* @note added in 2.8
*/
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsofflineediting.h
Expand Up @@ -87,7 +87,7 @@ class CORE_EXPORT QgsOfflineEditing : public QObject

/**
* Emitted when a warning needs to be displayed.
*
* @param title title string for message
* @param message A descriptive message for the warning
*/
void warning( const QString& title, const QString& message );
Expand Down
1 change: 1 addition & 0 deletions src/core/symbology-ng/qgslinesymbollayerv2.cpp
Expand Up @@ -613,6 +613,7 @@ QColor QgsSimpleLineSymbolLayerV2::dxfColor( const QgsSymbolV2RenderContext& con

double QgsSimpleLineSymbolLayerV2::dxfOffset( const QgsDxfExport& e, const QgsSymbolV2RenderContext& context ) const
{
Q_UNUSED( e );
double offset = mOffset;
QgsExpression* offsetExpression = expression( "offset" );
if ( offsetExpression )
Expand Down
2 changes: 1 addition & 1 deletion src/gui/attributetable/qgsdualview.h
Expand Up @@ -210,7 +210,7 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas

/**
* Will be called, once all the features are loaded.
* Use e.g. to close a dialog created from {@link progress(int i,bool& cancel )}
* Use e.g. to close a dialog created from {@link progress( int i, bool& cancel )}
*/
virtual void finished();

Expand Down
4 changes: 4 additions & 0 deletions src/gui/qgsmessagebar.h
Expand Up @@ -109,27 +109,31 @@ class GUI_EXPORT QgsMessageBar: public QFrame

/**
* Pushes a warning with default timeout to the message bar
* @param title title string for message
* @param message The message to be displayed
* @note added in 2.8
*/
void pushSuccess( const QString& title, const QString& message );

/**
* Pushes a warning with default timeout to the message bar
* @param title title string for message
* @param message The message to be displayed
* @note added in 2.8
*/
void pushInfo( const QString& title, const QString& message );

/**
* Pushes a warning with default timeout to the message bar
* @param title title string for message
* @param message The message to be displayed
* @note added in 2.8
*/
void pushWarning( const QString& title, const QString& message );

/**
* Pushes a warning with default timeout to the message bar
* @param title title string for message
* @param message The message to be displayed
* @note added in 2.8
*/
Expand Down

0 comments on commit cd86710

Please sign in to comment.