Skip to content

Commit 07b1bbe

Browse files
author
timlinux
committed
Fixed compiler warnings:
- for potentially unintialised vars I set them all to 0, NULL or some similar default - grass has some warnings for multiple definitions of NDEBUG - Ive disabled warnings on all files relying on grass headers - and submitted a bug to grass. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7059 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 684f671 commit 07b1bbe

22 files changed

+108
-72
lines changed

src/app/composer/qgscomposer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ void QgsComposer::on_mActionPrint_activated(void)
362362
try {
363363
std::cout << "Print to file" << std::endl;
364364

365-
QPrinter::PageSize psize;
365+
QPrinter::PageSize psize (QPrinter::A4); //default to A4
366366

367367
// WARNING mPrinter->outputFormat() returns always 0 in Qt 4.2.2
368368
// => we have to check extension

src/app/composer/qgscomposermap.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ void QgsComposerMap::on_mCalculateComboBox_activated( int )
383383

384384
double QgsComposerMap::scaleFromUserScale ( double us )
385385
{
386-
double s;
386+
double s=0;
387387

388388
switch ( mComposition->mapCanvas()->mapUnits() ) {
389389
case QGis::METERS :
@@ -402,7 +402,7 @@ double QgsComposerMap::scaleFromUserScale ( double us )
402402

403403
double QgsComposerMap::userScaleFromScale ( double s )
404404
{
405-
double us;
405+
double us=0;
406406

407407
switch ( mComposition->mapCanvas()->mapUnits() ) {
408408
case QGis::METERS :

src/app/composer/qgscomposerscalebar.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ QRect QgsComposerScalebar::render ( QPainter *p )
156156
std::cout << "QgsComposerScalebar::render p = " << p << std::endl;
157157

158158
// Painter can be 0, create dummy to avoid many if below
159-
QPainter *painter;
160-
QPixmap *pixmap;
159+
QPainter *painter = NULL;
160+
QPixmap *pixmap = NULL;
161161
if ( p ) {
162162
painter = p;
163163
} else {
@@ -191,8 +191,8 @@ QRect QgsComposerScalebar::render ( QPainter *p )
191191
// Not sure about Style Strategy, QFont::PreferMatch?
192192
font.setStyleStrategy ( (QFont::StyleStrategy) (QFont::PreferOutline | QFont::PreferAntialias) );
193193

194-
int xmin; // min x
195-
int xmax; // max x
194+
int xmin = 0; // min x
195+
int xmax = 0; // max x
196196
int ymin; // min y
197197
int ymax; // max y
198198

src/app/composer/qgscomposervectorlegend.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ QRect QgsComposerVectorLegend::render ( QPainter *p )
148148
std::cout << "QgsComposerVectorLegend::render p = " << p << std::endl;
149149

150150
// Painter can be 0, create dummy to avoid many if below
151-
QPainter *painter;
152-
QPixmap *pixmap;
151+
QPainter *painter = NULL;
152+
QPixmap *pixmap = NULL;
153153
if ( p ) {
154154
painter = p;
155155
} else {
@@ -753,7 +753,7 @@ void QgsComposerVectorLegend::groupLayers ( void )
753753

754754
Q3ListViewItemIterator it( mLayersListView );
755755
int count = 0;
756-
Q3ListViewItem *lastItem;
756+
Q3ListViewItem *lastItem = NULL;
757757
QString id;
758758
while ( it.current() ) {
759759
if ( it.current()->isSelected() ) {

src/app/qgsgraduatedsymboldialog.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,8 @@ void QgsGraduatedSymbolDialog::adjustClassification()
232232
mClassListWidget->clear();
233233
QGis::VectorType m_type = mVectorLayer->vectorType();
234234
QgsVectorDataProvider *provider = dynamic_cast<QgsVectorDataProvider *>(mVectorLayer->getDataProvider());
235-
double minimum, maximum;
235+
double minimum = 0;
236+
double maximum = 0;
236237

237238
//delete all previous entries
238239
for(std::map<QString, QgsSymbol*>::iterator it=mEntries.begin();it!=mEntries.end();++it)

src/app/qgsmaptooladdfeature.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ void QgsMapToolAddFeature::canvasReleaseEvent(QMouseEvent * e)
119119
// snap point to points within the vector layer snapping tolerance
120120
vlayer->snapPoint(savePoint, tolerance);
121121

122-
int size;
122+
int size = 0;
123123
char end=QgsApplication::endian();
124-
unsigned char *wkb;
125-
int wkbtype;
124+
unsigned char *wkb = NULL;
125+
int wkbtype = 0;
126126
double x = savePoint.x();
127127
double y = savePoint.y();
128128

src/core/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ SET_SOURCE_FILES_PROPERTIES(
7373
SET(QGIS_CORE_MOC_HDRS
7474
qgscontexthelp.h
7575
qgscoordinatetransform.h
76-
qgscsexception.h
7776
qgsdataprovider.h
78-
qgsexception.h
7977
qgshttptransaction.h
8078
qgsmaplayer.h
8179
qgsmaplayerregistry.h
@@ -87,9 +85,6 @@ qgsrunprocess.h
8785
qgsvectorlayer.h
8886

8987
raster/qgsrasterlayer.h
90-
raster/qgscolortable.h
91-
raster/qgsrasterpyramid.h
92-
raster/qgsrasterbandstats.h
9388
raster/qgsrasterviewport.h
9489
)
9590

src/core/qgsdistancearea.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,17 @@ double QgsDistanceArea::computeDistanceBearing(
440440
double lambda = L;
441441
double lambdaP = 2*M_PI;
442442

443-
double sinLambda, cosLambda, sinSigma, cosSigma;
444-
double sigma, alpha, cosSqAlpha, cos2SigmaM, C;
445-
double tu1, tu2;
443+
double sinLambda=0;
444+
double cosLambda=0;
445+
double sinSigma=0;
446+
double cosSigma=0;
447+
double sigma=0;
448+
double alpha=0;
449+
double cosSqAlpha=0;
450+
double cos2SigmaM=0;
451+
double C=0;
452+
double tu1=0;
453+
double tu2=0;
446454

447455
int iterLimit = 20;
448456
while (fabs(lambda-lambdaP) > 1e-12 && --iterLimit>0)

src/core/qgsgeometry.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,8 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point, QgsGeometryVertexInde
379379
int vertexcounter = 0;
380380
QGis::WKBTYPE wkbType;
381381
double actdist = std::numeric_limits<double>::max();
382-
double x,y;
382+
double x=0;
383+
double y=0;
383384
double *tempx,*tempy;
384385
memcpy(&wkbType, (mGeometry+1), sizeof(int));
385386
beforeVertex = -1;
@@ -2057,8 +2058,10 @@ double QgsGeometry::closestSegmentWithContext(const QgsPoint& point,
20572058

20582059
QGis::WKBTYPE wkbType;
20592060
bool hasZValue = false;
2060-
double *thisx,*thisy;
2061-
double *prevx,*prevy;
2061+
double *thisx = NULL;
2062+
double *thisy = NULL;
2063+
double *prevx = NULL;
2064+
double *prevy = NULL;
20622065
double testdist;
20632066
int closestSegmentIndex = 0;
20642067

src/core/qgslabel.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ void QgsLabel::renderLabel( QPainter * painter, QgsRect &viewExtent,
204204
QFontMetrics fm ( font );
205205
int width = fm.width ( text );
206206
int height = fm.height();
207-
int dx, dy;
207+
int dx = 0;
208+
int dy = 0;
208209

209210
value = fieldValue ( Alignment, feature );
210211
if ( value.isEmpty() )

0 commit comments

Comments
 (0)