Skip to content
Permalink
Browse files

Remove some unnecessary trailing ;

(Gets rid of annoying squiggle warnings from Qt Creator!)
  • Loading branch information
nyalldawson committed Nov 2, 2015
1 parent c968031 commit 4f7509530a943ba19db953f1a75b4b69da34c76f
Showing with 57 additions and 58 deletions.
  1. +1 −1 src/app/qgsattributeactiondialog.h
  2. +2 −2 src/app/qgstip.h
  3. +1 −1 src/core/composer/qgscomposerpicture.h
  4. +1 −1 src/core/composer/qgscomposershape.h
  5. +1 −1 src/core/composer/qgscomposition.h
  6. +1 −1 src/core/geometry/qgsgeometry.h
  7. +1 −1 src/core/qgscsexception.h
  8. +2 −2 src/core/qgsexpression.h
  9. +2 −2 src/core/qgsfeaturestore.h
  10. +2 −2 src/core/qgsfield.h
  11. +1 −1 src/core/qgsprojectfiletransform.h
  12. +2 −2 src/core/raster/qgsrasterinterface.h
  13. +1 −1 src/gui/qgsmapcanvas.h
  14. +0 −1 src/plugins/dxf2shp_converter/dxflib/src/dl_writer.h
  15. +1 −1 src/plugins/georeferencer/qgsgeorefdatapoint.h
  16. +1 −1 src/plugins/georeferencer/qgsimagewarper.h
  17. +1 −1 src/plugins/roadgraph/settings.h
  18. +1 −1 src/plugins/spatialquery/qgsmngprogressbar.h
  19. +1 −1 src/providers/gpx/gpsdata.h
  20. +2 −2 src/providers/mssql/qgsmssqlgeometryparser.h
  21. +1 −1 src/providers/postgres/qgspostgresconnpool.h
  22. +1 −1 tests/src/analysis/testqgsrastercalculator.cpp
  23. +2 −2 tests/src/core/regression1141.cpp
  24. +2 −2 tests/src/core/testcontrastenhancements.cpp
  25. +2 −2 tests/src/core/testqgsapplication.cpp
  26. +1 −1 tests/src/core/testqgsclipper.cpp
  27. +2 −2 tests/src/core/testqgsdistancearea.cpp
  28. +2 −2 tests/src/core/testqgsgradients.cpp
  29. +2 −2 tests/src/core/testqgsmaplayer.cpp
  30. +2 −2 tests/src/core/testqgsrectangle.cpp
  31. +2 −2 tests/src/core/testqgsshapeburst.cpp
  32. +1 −1 tests/src/core/testqgsvectordataprovider.cpp
  33. +2 −2 tests/src/core/testziplayer.cpp
  34. +5 −5 tests/src/gui/testprojectionissues.cpp
  35. +5 −5 tests/src/gui/testqgsscalecombobox.cpp
@@ -39,7 +39,7 @@ class APP_EXPORT QgsAttributeActionDialog: public QWidget, private Ui::QgsAttrib
const QgsFields& fields,
QWidget* parent = 0 );

~QgsAttributeActionDialog() {};
~QgsAttributeActionDialog() {}

void init();

@@ -31,9 +31,9 @@ class APP_EXPORT QgsTip
{
public:
/** Constructor */
QgsTip() {};
QgsTip() {}
/** Destructor */
~QgsTip() {};
~QgsTip() {}
//
// Accessors
//
@@ -279,7 +279,7 @@ class CORE_EXPORT QgsComposerPicture: public QgsComposerItem
* @note added in 2.3
* @deprecated no longer required
*/
Q_DECL_DEPRECATED void updatePictureExpression() {};
Q_DECL_DEPRECATED void updatePictureExpression() {}

/** Forces a recalculation of the picture's frame size
* @note added in 2.3
@@ -66,7 +66,7 @@ class CORE_EXPORT QgsComposerShape: public QgsComposerItem
/** Sets radius for rounded rectangle corners. Added in v2.1 */
void setCornerRadius( double radius );
/** Returns the radius for rounded rectangle corners*/
double cornerRadius() const { return mCornerRadius; };
double cornerRadius() const { return mCornerRadius; }

/** Sets the QgsFillSymbolV2 used to draw the shape. Must also call setUseSymbolV2( true ) to
* enable drawing with a symbol.
@@ -560,7 +560,7 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene
* after reading all the items from xml file
* @deprecated use refreshZList instead
*/
Q_DECL_DEPRECATED void sortZList() {};
Q_DECL_DEPRECATED void sortZList() {}

/** Rebuilds the z order list by adding any item which are present in the composition
* but missing from the z order list.
@@ -777,7 +777,7 @@ class CORE_EXPORT QgsGeometry
QgsGeometry* convertToPolygon( bool destMultipart ) const;
}; // class QgsGeometry

Q_DECLARE_METATYPE( QgsGeometry );
Q_DECLARE_METATYPE( QgsGeometry )

/** Writes the geometry to stream out. QGIS version compatibility is not guaranteed. */
CORE_EXPORT QDataStream& operator<<( QDataStream& out, const QgsGeometry& geometry );
@@ -24,7 +24,7 @@
class CORE_EXPORT QgsCsException : public QgsException
{
public:
QgsCsException( QString const &what ) : QgsException( what ) {};
QgsCsException( QString const &what ) : QgsException( what ) {}

};
#endif //QGCSEXCEPTION_H
@@ -1022,7 +1022,7 @@ class CORE_EXPORT QgsExpression
};
Q_NOWARN_DEPRECATED_POP

Q_DECLARE_METATYPE( QgsExpression::Interval );
Q_DECLARE_METATYPE( QgsExpression::Node* );
Q_DECLARE_METATYPE( QgsExpression::Interval )
Q_DECLARE_METATYPE( QgsExpression::Node* )

#endif // QGSEXPRESSION_H
@@ -82,8 +82,8 @@ class CORE_EXPORT QgsFeatureStore

typedef QList<QgsFeatureStore> QgsFeatureStoreList;

Q_DECLARE_METATYPE( QgsFeatureStore );
Q_DECLARE_METATYPE( QgsFeatureStore )

Q_DECLARE_METATYPE( QgsFeatureStoreList );
Q_DECLARE_METATYPE( QgsFeatureStoreList )

#endif
@@ -158,7 +158,7 @@ class CORE_EXPORT QgsField

}; // class QgsField

Q_DECLARE_METATYPE( QgsField );
Q_DECLARE_METATYPE( QgsField )

/** Writes the field to stream out. QGIS version compatibility is not guaranteed. */
CORE_EXPORT QDataStream& operator<<( QDataStream& out, const QgsField& field );
@@ -280,7 +280,7 @@ class CORE_EXPORT QgsFields

};

Q_DECLARE_METATYPE( QgsFields );
Q_DECLARE_METATYPE( QgsFields )

/** Writes the fields to stream out. QGIS version compatibility is not guaranteed. */
CORE_EXPORT QDataStream& operator<<( QDataStream& out, const QgsFields& fields );
@@ -77,7 +77,7 @@ class CORE_EXPORT QgsProjectFileTransform
// Transformer functions below. Declare functions here,
// define them in qgsprojectfiletransform.cpp and add them
// to the transformArray with proper version number
void transformNull() {}; // Do absolutely nothing
void transformNull() {} // Do absolutely nothing
void transform081to090();
void transform091to0100();
void transform0100to0110();
@@ -34,7 +34,7 @@
*/
class CORE_EXPORT QgsRasterInterface
{
Q_DECLARE_TR_FUNCTIONS( QgsRasterInterface );
Q_DECLARE_TR_FUNCTIONS( QgsRasterInterface )

public:
//! If you add to this, please also add to capabilitiesString()
@@ -75,7 +75,7 @@ class CORE_EXPORT QgsRasterInterface

/** Returns source data type for the band specified by number,
* source data type may be shorter than dataType */
virtual QGis::DataType srcDataType( int bandNo ) const { if ( mInput ) return mInput->srcDataType( bandNo ); else return QGis::UnknownDataType; };
virtual QGis::DataType srcDataType( int bandNo ) const { if ( mInput ) return mInput->srcDataType( bandNo ); else return QGis::UnknownDataType; }

/**
* Get the extent of the interface.
@@ -454,7 +454,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
//! Whether to suppress rendering or not
void setRenderFlag( bool theFlag );
//! State of render suppression flag
bool renderFlag() {return mRenderFlag;};
bool renderFlag() {return mRenderFlag;}

/** A simple helper method to find out if on the fly projections are enabled or not */
bool hasCrsTransformEnabled();
@@ -67,7 +67,6 @@ class DXFLIB_EXPORT DL_Writer {
}

virtual ~DL_Writer() {}
;

/** Generic section for section 'name'.
*
@@ -39,7 +39,7 @@ class QgsGeorefDataPoint : public QObject
QgsPoint mapCoords() const { return mMapCoords; }
void setMapCoords( const QgsPoint &p );

bool isEnabled() const { return mEnabled; };
bool isEnabled() const { return mEnabled; }
void setEnabled( bool enabled );

int id() const { return mId; }
@@ -29,7 +29,7 @@ class QWidget;

class QgsImageWarper
{
Q_DECLARE_TR_FUNCTIONS( QgsImageWarper );
Q_DECLARE_TR_FUNCTIONS( QgsImageWarper )

public:
explicit QgsImageWarper( QWidget *theParent );
@@ -32,7 +32,7 @@ class RgSettings
{
public:
//! Destructor
virtual ~RgSettings() { };
virtual ~RgSettings() { }

/**
* write settings to the poject file
@@ -35,7 +35,7 @@ class MngProgressBar
/**
* \brief Destructor
*/
~MngProgressBar() { mPb->reset(); };
~MngProgressBar() { mPb->reset(); }

/**
* \brief Sets the progress bar's minimum and maximum values to minimum and maximum respectively
@@ -42,7 +42,7 @@
class QgsGPSObject
{
public:
virtual ~QgsGPSObject() {};
virtual ~QgsGPSObject() {}
QString xmlify( const QString& str );
virtual void writeXML( QTextStream& stream );
QString name, cmt, desc, src, url, urlname;
@@ -64,8 +64,8 @@ class QgsMssqlGeometryParser
public:
QgsMssqlGeometryParser();
unsigned char* ParseSqlGeometry( unsigned char* pszInput, int nLen );
int GetSRSId() { return nSRSId; };
int GetWkbLen() { return nWkbLen; };
int GetSRSId() { return nSRSId; }
int GetWkbLen() { return nWkbLen; }
void DumpMemoryToLog( const char* pszMsg, unsigned char* pszInput, int nLen );
/* sql geo type */
bool IsGeography;
@@ -71,7 +71,7 @@ class QgsPostgresConnPool : public QgsConnectionPool<QgsPostgresConn*, QgsPostgr
static QgsPostgresConnPool* instance();

protected:
Q_DISABLE_COPY( QgsPostgresConnPool );
Q_DISABLE_COPY( QgsPostgresConnPool )

private:
QgsPostgresConnPool();
@@ -21,7 +21,7 @@ Email : nyall dot dawson at gmail dot com
#include "qgsapplication.h"
#include "qgsmaplayerregistry.h"

Q_DECLARE_METATYPE( QgsRasterCalcNode::Operator );
Q_DECLARE_METATYPE( QgsRasterCalcNode::Operator )


class TestQgsRasterCalculator : public QObject
@@ -56,8 +56,8 @@ class Regression1141: public QObject
private slots:
void initTestCase();// will be called before the first testfunction is executed.
void cleanupTestCase();// will be called after the last testfunction was executed.
void init() {};// will be called before each testfunction is executed.
void cleanup() {};// will be called after every testfunction.
void init() {} // will be called before each testfunction is executed.
void cleanup() {} // will be called after every testfunction.

/** This method tests that we can create a shpfile with diacriticals in its name
* and with fields that have diacriticals in their names*/
@@ -34,8 +34,8 @@ class TestContrastEnhancements: public QObject
private slots:
void initTestCase();// will be called before the first testfunction is executed.
void cleanupTestCase();// will be called after the last testfunction was executed.
void init() {};// will be called before each testfunction is executed.
void cleanup() {};// will be called after every testfunction.
void init() {} // will be called before each testfunction is executed.
void cleanup() {} // will be called after every testfunction.

void clipMinMaxEnhancementTest();
void linearMinMaxEnhancementWithClipTest();
@@ -43,7 +43,7 @@ void TestQgsApplication::initTestCase()
QgsApplication::init();
QgsApplication::initQgis();
qDebug( "%s", QgsApplication::showSettings().toUtf8().constData() );
};
}

void TestQgsApplication::cleanupTestCase()
{
@@ -56,7 +56,7 @@ void TestQgsApplication::checkPaths()
qDebug( "Checking authors file exists:" );
qDebug( "%s", myPath.toLocal8Bit().constData() );
QVERIFY( !myPath.isEmpty() );
};
}

void TestQgsApplication::checkGdalSkip()
{
@@ -76,7 +76,7 @@ void TestQgsClipper::basic()
clipRectInner = clipRect;
clipRectInner.scale( 0.999 );
QVERIFY( ! checkBoundingBox( polygon, clipRectInner ) );
};
}

bool TestQgsClipper::checkBoundingBox( const QPolygonF& polygon, const QgsRectangle& clipRect )
{
@@ -96,7 +96,7 @@ void TestQgsDistanceArea::basic()
daA.setEllipsoid( 6378135.0, 6378135.0 - ( 6378135.0 / 298.26 ) );
resultA = daA.measureLine( p1, p2 );
QCOMPARE( resultA, resultB );
};
}

void TestQgsDistanceArea::test_distances()
{
@@ -144,7 +144,7 @@ void TestQgsDistanceArea::test_distances()
}
}

};
}

void TestQgsDistanceArea::unit_conversions()
{
@@ -54,8 +54,8 @@ class TestQgsGradients : public QObject
private slots:
void initTestCase();// will be called before the first testfunction is executed.
void cleanupTestCase();// will be called after the last testfunction was executed.
void init() {};// will be called before each testfunction is executed.
void cleanup() {};// will be called after every testfunction.
void init() {} // will be called before each testfunction is executed.
void cleanup() {} // will be called after every testfunction.

void gradientSymbol();
void gradientSymbolColors();
@@ -55,8 +55,8 @@ class TestQgsMapLayer : public QObject
private slots:
void initTestCase();// will be called before the first testfunction is executed.
void cleanupTestCase();// will be called after the last testfunction was executed.
void init() {};// will be called before each testfunction is executed.
void cleanup() {};// will be called after every testfunction.
void init() {} // will be called before each testfunction is executed.
void cleanup() {} // will be called after every testfunction.

void isValid();

@@ -51,7 +51,7 @@ void TestQgsRectangle::manipulate()
rect3.unionRect( rect2 );
// Check union
QVERIFY( rect3 == QgsRectangle( 1.0, 1.0, 7.0, 5.0 ) );
};
}

void TestQgsRectangle::regression6194()
{
@@ -83,7 +83,7 @@ void TestQgsRectangle::regression6194()
QVERIFY( rect2.xMaximum() == rect1.xMaximum() );
QVERIFY( rect2.yMaximum() == rect1.yMaximum() );
QVERIFY( rect1 == rect2 );
};
}

QTEST_MAIN( TestQgsRectangle )
#include "testqgsrectangle.moc"
@@ -53,8 +53,8 @@ class TestQgsShapeburst : public QObject
private slots:
void initTestCase();// will be called before the first testfunction is executed.
void cleanupTestCase();// will be called after the last testfunction was executed.
void init() {};// will be called before each testfunction is executed.
void cleanup() {};// will be called after every testfunction.
void init() {} // will be called before each testfunction is executed.
void cleanup() {} // will be called after every testfunction.

void shapeburstSymbol();
void shapeburstSymbolColors();
@@ -22,7 +22,7 @@
#include <qgsvectordataprovider.h>
#include <qgsvectorlayer.h>

Q_DECLARE_METATYPE( QgsFeatureRequest );
Q_DECLARE_METATYPE( QgsFeatureRequest )

class TestQgsVectorDataProvider : public QObject
{
@@ -58,8 +58,8 @@ class TestZipLayer: public QObject
// init / cleanup
void initTestCase();// will be called before the first testfunction is executed.
void cleanupTestCase();// will be called after the last testfunction was executed.
void init() {};// will be called before each testfunction is executed.
void cleanup() {};// will be called after every testfunction.
void init() {} // will be called before each testfunction is executed.
void cleanup() {} // will be called after every testfunction.

// tests
// test for .zip and .gz files using all options
@@ -83,31 +83,31 @@ void TestProjectionIssues::initTestCase()
mMapCanvas->setDestinationCrs( destCRS );
mMapCanvas->setCrsTransformEnabled( true );

};
}

void TestProjectionIssues::cleanupTestCase()
{
delete mMapCanvas;

QgsApplication::exitQgis();
};
}

void TestProjectionIssues::init()
{

};
}

void TestProjectionIssues::cleanup()
{

};
}

void TestProjectionIssues::issue5895()
{
QgsRectangle largeExtent( -610861, 5101721, 2523921, 6795055 );
mMapCanvas->setExtent( largeExtent );
mMapCanvas->zoomByFactor( 2.0 ); // Zoom out. This should exceed the transform limits.
};
}

QTEST_MAIN( TestProjectionIssues )
#include "testprojectionissues.moc"

0 comments on commit 4f75095

Please sign in to comment.
You can’t perform that action at this time.