Skip to content
Permalink
Browse files

remove duplicate semicolons

  • Loading branch information
jef-n committed Sep 15, 2015
1 parent 2a260ed commit 481d2c071ea052cdead7b9d2bda27494ff6dac25
@@ -319,7 +319,7 @@ bool QgsAlignRaster::checkInputParameters()
// output raster grid configuration (with no rotation/shear)
// ... and raster width/height

double originX = ceil_with_tolerance(( finalExtent[0] - mGridOffsetX ) / mCellSizeX ) * mCellSizeX + mGridOffsetX;;
double originX = ceil_with_tolerance(( finalExtent[0] - mGridOffsetX ) / mCellSizeX ) * mCellSizeX + mGridOffsetX;
double originY = ceil_with_tolerance(( finalExtent[1] - mGridOffsetY ) / mCellSizeY ) * mCellSizeY + mGridOffsetY;
int xSize = floor_with_tolerance(( finalExtent[2] - originX ) / mCellSizeX );
int ySize = floor_with_tolerance(( finalExtent[3] - originY ) / mCellSizeY );
@@ -253,7 +253,7 @@ GDALDatasetH QgsNineCellFilter::openOutputFile( GDALDatasetH inputDataset, GDALD
}

int xSize = GDALGetRasterXSize( inputDataset );
int ySize = GDALGetRasterYSize( inputDataset );;
int ySize = GDALGetRasterYSize( inputDataset );

//open output file
char **papszOptions = NULL;
@@ -442,7 +442,7 @@ GDALDatasetH QgsRelief::openOutputFile( GDALDatasetH inputDataset, GDALDriverH o
}

int xSize = GDALGetRasterXSize( inputDataset );
int ySize = GDALGetRasterYSize( inputDataset );;
int ySize = GDALGetRasterYSize( inputDataset );

//open output file
char **papszOptions = NULL;
@@ -196,7 +196,7 @@ void QwtPolarSpectrogram::draw( QPainter *painter,
QwtDoubleRect r( 0, 0, 2 * radius, 2 * radius );
r.moveCenter( pole );

clipRegion &= QRegion( r.toRect(), QRegion::Ellipse );;
clipRegion &= QRegion( r.toRect(), QRegion::Ellipse );

imageRect &= r.toRect();
}
@@ -297,7 +297,7 @@ void QwtPolarSpectrogram::draw( QPainter *painter,
QRectF r( 0, 0, 2 * radius, 2 * radius );
r.moveCenter( pole );

clipRegion &= QRegion( r.toRect(), QRegion::Ellipse );;
clipRegion &= QRegion( r.toRect(), QRegion::Ellipse );

imageRect &= r.toRect();
}
@@ -122,7 +122,7 @@ void QgsDecorationCopyright::render( QPainter * theQPainter )
break;
case 1: // Top left
//Define top left hand corner start point
myYOffset = 0;;
myYOffset = 0;
myXOffset = 5;
break;
case 2: // Top Right
@@ -122,7 +122,7 @@ static int registerNativeMethods( JNIEnv* env, const char* className,
if ( !constr )
{
__android_log_print( ANDROID_LOG_FATAL, "Qt", "Native registration unable to find constructor for class '%s'", className );
return JNI_FALSE;;
return JNI_FALSE;
}
jobject obj = env->NewObject( clazz, constr );
objptr = env->NewGlobalRef( obj );
@@ -149,7 +149,7 @@ void QgsComposerHtml::loadHtml( const bool useCache, const QgsExpressionContext
QVariant exprVal;
if ( dataDefinedEvaluate( QgsComposerObject::SourceUrl, exprVal, *evalContext ) )
{
currentUrl = exprVal.toString().trimmed();;
currentUrl = exprVal.toString().trimmed();
QgsDebugMsg( QString( "exprVal Source Url:%1" ).arg( currentUrl ) );
}
if ( currentUrl.isEmpty() )
@@ -127,7 +127,7 @@ void QgsComposerMapOverview::draw( QPainter *painter )
if ( !mInverted )
{
//Render the intersecting map extent
mFrameSymbol->renderPolygon( intersectPolygon, &rings, 0, context );;
mFrameSymbol->renderPolygon( intersectPolygon, &rings, 0, context );
}
else
{
@@ -915,7 +915,7 @@ Qt::ItemFlags QgsComposerModel::flags( const QModelIndex & index ) const

if ( ! index.isValid() )
{
return flags | Qt::ItemIsDropEnabled;;
return flags | Qt::ItemIsDropEnabled;
}

switch ( index.column() )
@@ -279,7 +279,7 @@ namespace pal
return;
}

p[i] = new_p;;
p[i] = new_p;

upheap( key );
downheap( pos[key] );
@@ -2009,7 +2009,7 @@ namespace pal

maxit = probSize * pal->tabuMaxIt;

itwimp = probSize * pal->tabuMinIt;;
itwimp = probSize * pal->tabuMinIt;

stop_it = itwimp;

@@ -1075,18 +1075,18 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry* geometry, QDomDocumen
case QGis::WKBPoint:
case QGis::WKBMultiPoint25D:
case QGis::WKBMultiPoint:
baseCoordElem = doc.createElement( "gml:pos" );;
baseCoordElem = doc.createElement( "gml:pos" );
break;
default:
baseCoordElem = doc.createElement( "gml:posList" );;
baseCoordElem = doc.createElement( "gml:posList" );
break;
}
baseCoordElem.setAttribute( "srsDimension", "2" );
cs = " ";
}
else
{
baseCoordElem = doc.createElement( "gml:coordinates" );;
baseCoordElem = doc.createElement( "gml:coordinates" );
baseCoordElem.setAttribute( "cs", cs );
baseCoordElem.setAttribute( "ts", ts );
}
@@ -46,7 +46,7 @@ QgsRelation QgsRelation::createFromXML( const QDomNode &node )
const QMap<QString, QgsMapLayer*>& mapLayers = QgsMapLayerRegistry::instance()->mapLayers();

QgsMapLayer* referencingLayer = mapLayers[referencingLayerId];
QgsMapLayer* referencedLayer = mapLayers[referencedLayerId];;
QgsMapLayer* referencedLayer = mapLayers[referencedLayerId];

if ( NULL == referencingLayer )
{
@@ -583,7 +583,7 @@ void QgsVectorLayerFeatureIterator::addVirtualAttributes( QgsFeature& f )
QgsExpression* exp = it.value();
mExpressionContext->setFeature( f );
QVariant val = exp->evaluate( mExpressionContext.data() );
mSource->mFields.at( it.key() ).convertCompatible( val );;
mSource->mFields.at( it.key() ).convertCompatible( val );
f.setAttribute( it.key(), val );
}
}
@@ -2657,7 +2657,7 @@ void QgsLinePatternFillSymbolLayer::applyPattern( const QgsSymbolV2RenderContext
tempPt = QgsSymbolLayerV2Utils::pointOnLineWithDistance( p1, p3, outputPixelOffset );
p1 = QPointF( tempPt.x(), tempPt.y() );
tempPt = QgsSymbolLayerV2Utils::pointOnLineWithDistance( p2, p4, outputPixelOffset );
p2 = QPointF( tempPt.x(), tempPt.y() );;
p2 = QPointF( tempPt.x(), tempPt.y() );
}

QPainter p( &patternImage );
@@ -707,7 +707,7 @@ static QList<double> _calcJenksBreaks( QList<double> values, int classes,
QgsDebugMsg( QString( "values:%1" ).arg( values.size() ) );

sample[ 0 ] = minimum;
sample[ 1 ] = maximum;;
sample[ 1 ] = maximum;
for ( int i = 2; i < sample.size(); i++ )
{
// pick a random integer from 0 to n
@@ -524,7 +524,7 @@ QList<QAction*> UrlFilter::HotSpot::actions()
const UrlType kind = urlType();

QAction* openAction = new QAction(_urlObject);
QAction* copyAction = new QAction(_urlObject);;
QAction* copyAction = new QAction(_urlObject);

Q_ASSERT( kind == StandardUrl || kind == Email );

@@ -904,25 +904,25 @@ QRegion TerminalDisplay::hotSpotRegion() const
r.setTop(hotSpot->startLine());
r.setRight(hotSpot->endColumn());
r.setBottom(hotSpot->endLine());
region |= imageToWidget(r);;
region |= imageToWidget(r);
} else {
r.setLeft(hotSpot->startColumn());
r.setTop(hotSpot->startLine());
r.setRight(_columns);
r.setBottom(hotSpot->startLine());
region |= imageToWidget(r);;
region |= imageToWidget(r);
for ( int line = hotSpot->startLine()+1 ; line < hotSpot->endLine() ; line++ ) {
r.setLeft(0);
r.setTop(line);
r.setRight(_columns);
r.setBottom(line);
region |= imageToWidget(r);;
region |= imageToWidget(r);
}
r.setLeft(0);
r.setTop(hotSpot->endLine());
r.setRight(hotSpot->endColumn());
r.setBottom(hotSpot->endLine());
region |= imageToWidget(r);;
region |= imageToWidget(r);
}
}
return region;
@@ -160,7 +160,7 @@ bool QgsDelimitedTextFile::setFromUrl( const QUrl &url )
//
if ( url.hasQueryItem( "useWatcher" ) )
{
mUseWatcher = ! url.queryItemValue( "useWatcher" ).toUpper().startsWith( 'N' );;
mUseWatcher = ! url.queryItemValue( "useWatcher" ).toUpper().startsWith( 'N' );
}

// The default type is csv, to be consistent with the
@@ -222,7 +222,7 @@ bool QgsDelimitedTextFile::setFromUrl( const QUrl &url )
}
if ( url.hasQueryItem( "trimFields" ) )
{
mTrimFields = ! url.queryItemValue( "trimFields" ).toUpper().startsWith( 'N' );;
mTrimFields = ! url.queryItemValue( "trimFields" ).toUpper().startsWith( 'N' );
}
if ( url.hasQueryItem( "maxFields" ) )
{
@@ -434,7 +434,7 @@ QgsGeometry* QgsGPXFeatureIterator::readTrackGeometry( const QgsTrack& trk )
return 0;

// A track consists of several segments. Add all those segments into one.
int totalPoints = 0;;
int totalPoints = 0;
for ( int i = 0; i < trk.segments.size(); i ++ )
{
totalPoints += trk.segments[i].points.size();
@@ -391,7 +391,7 @@ void QgsMssqlGeometryParser::ReadPolygon( int iShape )
void QgsMssqlGeometryParser::ReadMultiPolygon( int iShape )
{
int i;
int iCount = nNumShapes - iShape - 1;;
int iCount = nNumShapes - iShape - 1;
if ( iCount <= 0 )
return;
// copy byte order
@@ -423,13 +423,13 @@ void QgsMssqlGeometryParser::ReadMultiPolygon( int iShape )
void QgsMssqlGeometryParser::ReadGeometryCollection( int iShape )
{
int i;
int iCount = nNumShapes - iShape - 1;;
int iCount = nNumShapes - iShape - 1;
if ( iCount <= 0 )
return;
// copy byte order
CopyBytes( &chByteOrder, 1 );
// copy type
int wkbType = QGis::WKBUnknown;;
int wkbType = QGis::WKBUnknown;
CopyBytes( &wkbType, 4 );
// copy geom count
CopyBytes( &iCount, 4 );
@@ -3602,7 +3602,7 @@ QStringList QOCISpatialDriver::tables( QSql::TableType type ) const
user = user.toUpper();

if ( sysUsers.contains( user ) )
sysUsers.removeAll( user );;
sysUsers.removeAll( user );

if ( !isOpen() )
return tl;
@@ -296,7 +296,7 @@ void TestQgsField::dataStream()
original.setComment( "comment1" );

QByteArray ba;
QDataStream ds( &ba, QIODevice::ReadWrite );;
QDataStream ds( &ba, QIODevice::ReadWrite );
ds << original;

QgsField result;
@@ -425,7 +425,7 @@ void TestQgsFields::dataStream()
originalFields.append( original2 );

QByteArray ba;
QDataStream ds( &ba, QIODevice::ReadWrite );;
QDataStream ds( &ba, QIODevice::ReadWrite );
ds << originalFields;

QgsFields resultFields;
@@ -174,7 +174,7 @@ void TestQgsRasterFill::alpha()
void TestQgsRasterFill::offset()
{
mReport += "<h2>Raster fill offset</h2>\n";
mRasterFill->setOffset( QPointF( 5, 10 ) );;
mRasterFill->setOffset( QPointF( 5, 10 ) );
bool result = imageCheck( "rasterfill_offset" );
QVERIFY( result );
}
@@ -671,7 +671,7 @@ void TestQgsWcsPublicServers::report()
int offender = NoOffender;
if ( provider == "wcs" )
{
myValues << issuesString;;
myValues << issuesString;

offender = issueOffender( myServerLog.value( "server" ), myLog.value( "identifier" ), myLog.value( "version" ) );
myVersionErrCount++;

0 comments on commit 481d2c0

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