Fixes from mateusz for the following issues:

1453164 getCurrentLongAttribute incomplete return path 1449301 QgsSingleSymbolRenderer::operator= must return a value 1449277 QgsLegendGroup::insert must return a value 1449268 QgsGeometryVertexIndex::operator= must return a value 1449257 QgsGraduatedSymbolRenderer::operator= must return a value 1449252 QgsContinuousColorRenderer::operator= must return a value 1448031 QgsUniqueValueRenderer::operator= must return a value 1448028 QgsMapLayer::draw must return a value 1448014 'and' is undefined keyword git-svn-id: http://svn.osgeo.org/qgis/trunk@5060 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 18, 2006 · d2b74ca · d2b74ca
1 parent 3ece7be
commit d2b74ca
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 27 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,6 @@
 /* ChangeLog,v 1.214 2004/11/12 00:42:21 gsherman Exp */
 ------------------------------------------------------------------------------
+
 Version 0.8 'Joesephine' .... development version
 2006-01-23 [timlinux] 0.7.9.10
 ** Dropped use of qpicture and resampling for point markers in favour of

diff --git a/src/core/qgsgeometryvertexindex.cpp b/src/core/qgsgeometryvertexindex.cpp
@@ -31,6 +31,7 @@ QgsGeometryVertexIndex::QgsGeometryVertexIndex( QgsGeometryVertexIndex const & r
 QgsGeometryVertexIndex & QgsGeometryVertexIndex::operator=( QgsGeometryVertexIndex const & rhs )
 {
   mIndex = rhs.mIndex;
+  return *this;
 }
 
 QgsGeometryVertexIndex::~QgsGeometryVertexIndex()

diff --git a/src/gui/qgscontinuouscolorrenderer.cpp b/src/gui/qgscontinuouscolorrenderer.cpp
@@ -54,6 +54,7 @@ QgsContinuousColorRenderer& QgsContinuousColorRenderer::operator=(const QgsConti
 	mMinimumSymbol = new QgsSymbol(*other.mMinimumSymbol);
 	mMaximumSymbol = new QgsSymbol(*other.mMaximumSymbol);
     }
+    return *this;
 }
 
 QgsContinuousColorRenderer::~QgsContinuousColorRenderer()

diff --git a/src/gui/qgsgraduatedsymbolrenderer.cpp b/src/gui/qgsgraduatedsymbolrenderer.cpp
@@ -49,15 +49,17 @@ QgsGraduatedSymbolRenderer& QgsGraduatedSymbolRenderer::operator=(const QgsGradu
 {
     if(this != &other)
     {
-	mVectorType = other.mVectorType; 
-	mClassificationField = other.mClassificationField;
-	removeSymbols();
-	const std::list<QgsSymbol*> s = other.symbols();
-	for(std::list<QgsSymbol*>::const_iterator it=s.begin(); it!=s.end(); ++it)
-	{
-	    addSymbol(new QgsSymbol(**it));
-	}
+        mVectorType = other.mVectorType; 
+        mClassificationField = other.mClassificationField;
+        removeSymbols();
+        const std::list<QgsSymbol*> s = other.symbols();
+        for(std::list<QgsSymbol*>::const_iterator it=s.begin(); it!=s.end(); ++it)
+        {
+            addSymbol(new QgsSymbol(**it));
+        }
     }
+
+    return *this;
 }
 
 QgsGraduatedSymbolRenderer::~QgsGraduatedSymbolRenderer()

diff --git a/src/gui/qgslabel.cpp b/src/gui/qgslabel.cpp
@@ -38,6 +38,7 @@
 
 // use M_PI define PI 3.141592654
 #ifdef WIN32
+#undef M_PI
 #define M_PI 4*atan(1.0)
 #endif
 

diff --git a/src/gui/qgsmaplayer.cpp b/src/gui/qgsmaplayer.cpp
@@ -157,6 +157,7 @@ void QgsMapLayer::draw(QPainter *, QgsRect * viewExtent, int yTransform)
 bool QgsMapLayer::draw(QPainter *, QgsRect *, QgsMapToPixel *)
 {
     //  std::cout << "In QgsMapLayer::draw" << std::endl;
+    return false;
 }
 
 void QgsMapLayer::drawLabels(QPainter *, QgsRect *, QgsMapToPixel *)

diff --git a/src/gui/qgsserversourceselect.cpp b/src/gui/qgsserversourceselect.cpp
@@ -283,7 +283,10 @@ void QgsServerSourceSelect::populateImageEncodingGroup(QgsWmsProvider* wmsProvid
 
 std::set<QString> QgsServerSourceSelect::crsForSelection()
 {
-  std::set<QString> crsCandidates;;
+  std::set<QString> crsCandidates;
+
+  // XXX - mloskot - temporary solution, function must return a value
+  return crsCandidates;
 
   QStringList::const_iterator i;
   for (i = m_selectedLayers.constBegin(); i != m_selectedLayers.constEnd(); ++i)

diff --git a/src/gui/qgssinglesymbolrenderer.cpp b/src/gui/qgssinglesymbolrenderer.cpp
@@ -67,10 +67,11 @@ QgsSingleSymbolRenderer& QgsSingleSymbolRenderer::operator=(const QgsSingleSymbo
 {
     if(this!=&other)
     {
-	mVectorType = other.mVectorType;
-	delete mSymbol;
-	mSymbol = new QgsSymbol(*other.mSymbol);
+        mVectorType = other.mVectorType;
+        delete mSymbol;
+        mSymbol = new QgsSymbol(*other.mSymbol);
     }
+    return *this;
 }
 
 QgsSingleSymbolRenderer::~QgsSingleSymbolRenderer()

diff --git a/src/gui/qgsuniquevaluerenderer.cpp b/src/gui/qgsuniquevaluerenderer.cpp
@@ -51,15 +51,16 @@ QgsUniqueValueRenderer& QgsUniqueValueRenderer::operator=(const QgsUniqueValueRe
 {
     if(this != &other)
     {
-	mVectorType = other.mVectorType;
-	mClassificationField = other.mClassificationField;
-	clearValues();
-	for(std::map<QString, QgsSymbol*>::iterator it=mSymbols.begin(); it!=mSymbols.end(); ++it)
-	{
-	    QgsSymbol* s = new QgsSymbol(*(it->second));
-	    insertValue(it->first, s);
-	}
+        mVectorType = other.mVectorType;
+        mClassificationField = other.mClassificationField;
+        clearValues();
+        for(std::map<QString, QgsSymbol*>::iterator it=mSymbols.begin(); it!=mSymbols.end(); ++it)
+        {
+            QgsSymbol* s = new QgsSymbol(*(it->second));
+            insertValue(it->first, s);
+        }
     }
+    return *this;
 }
 
 QgsUniqueValueRenderer::~QgsUniqueValueRenderer()

diff --git a/src/legend/qgslegendgroup.cpp b/src/legend/qgslegendgroup.cpp
@@ -99,8 +99,11 @@ bool QgsLegendGroup::insert(QgsLegendItem* theItem)
 {
     if(theItem->type() == LEGEND_LAYER)
     {
-	addChild(theItem);
+        addChild(theItem);
     }
+    // XXX - mloskot - I don't know what to return
+    // but this function must return a value
+    return true;
 }
 
 std::list<QgsLegendLayerFile*> QgsLegendGroup::legendLayerFiles()

diff --git a/src/ui/qgisappbase.ui b/src/ui/qgisappbase.ui
@@ -89,8 +89,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>341</width>
-           <height>237</height>
+           <width>363</width>
+           <height>243</height>
           </rect>
          </property>
          <attribute name="label" >

diff --git a/src/widgets/projectionselector/qgsprojectionselector.cpp b/src/widgets/projectionselector/qgsprojectionselector.cpp
@@ -161,8 +161,8 @@ void QgsProjectionSelector::setSelectedSRSID(long theSRSID)
 void QgsProjectionSelector::applySRSNameSelection()
 {
   if (
-      (mSRSNameSelectionPending) and
-      (mProjListDone) and
+      (mSRSNameSelectionPending) &&
+      (mProjListDone) &&
       (mUserProjListDone)
      )
   {
@@ -190,8 +190,8 @@ void QgsProjectionSelector::applySRSNameSelection()
 void QgsProjectionSelector::applySRSIDSelection()
 {
   if (
-      (mSRSIDSelectionPending) and
-      (mProjListDone) and
+      (mSRSIDSelectionPending) &&
+      (mProjListDone) &&
       (mUserProjListDone)
      )
   {