Fix for ticket #634 (compile warnings in RHEL64)

g_j_m · g_j_m · commit d98dcffa27bd · 2007-03-03T17:30:16.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@6752 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsprojectionselector.cpp b/src/gui/qgsprojectionselector.cpp
@@ -286,7 +286,7 @@ QString QgsProjectionSelector::getCurrentProj4String()
         if ( !myFileInfo.exists( ) ) //its unlikely that this condition will ever be reached
         {
           QgsDebugMsg("users qgis.db not found");
-          return NULL;
+          return QString("");
         }
         else
         {
@@ -342,13 +342,13 @@ QString QgsProjectionSelector::getCurrentProj4String()
     else
     {
       // No node is selected, return null
-      return NULL;
+      return QString("");
     }
   }
   else
   {
     // No node is selected, return null
-    return NULL;
+    return QString("");
   }
 
 }
@@ -380,7 +380,7 @@ long QgsProjectionSelector::getCurrentLongAttribute(QString attributeName)
         if ( !myFileInfo.exists( ) )
         {
           std::cout << " QgsSpatialRefSys::createFromSrid failed :  users qgis.db not found" << std::endl;
-          return (long)NULL;
+          return 0;
         }
       }
       else //must be  a system projection then
@@ -435,7 +435,7 @@ long QgsProjectionSelector::getCurrentLongAttribute(QString attributeName)
   }
 
   // No node is selected, return null
-  return (long)NULL;
+  return 0;
 }
 
 
@@ -461,7 +461,7 @@ long QgsProjectionSelector::getCurrentSRSID()
   }
   else
   {
-    return (long)NULL;
+    return 0;
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ QString QgsProjectionSelector::getCurrentProj4String()`
`286`	`286`	`if ( !myFileInfo.exists( ) ) //its unlikely that this condition will ever be reached`
`287`	`287`	`{`
`288`	`288`	`QgsDebugMsg("users qgis.db not found");`
`289`		`- return NULL;`
	`289`	`+ return QString("");`
`290`	`290`	`}`
`291`	`291`	`else`
`292`	`292`	`{`
`@@ -342,13 +342,13 @@ QString QgsProjectionSelector::getCurrentProj4String()`
`342`	`342`	`else`
`343`	`343`	`{`
`344`	`344`	`// No node is selected, return null`
`345`		`- return NULL;`
	`345`	`+ return QString("");`
`346`	`346`	`}`
`347`	`347`	`}`
`348`	`348`	`else`
`349`	`349`	`{`
`350`	`350`	`// No node is selected, return null`
`351`		`- return NULL;`
	`351`	`+ return QString("");`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`}`
`@@ -380,7 +380,7 @@ long QgsProjectionSelector::getCurrentLongAttribute(QString attributeName)`
`380`	`380`	`if ( !myFileInfo.exists( ) )`
`381`	`381`	`{`
`382`	`382`	`std::cout << " QgsSpatialRefSys::createFromSrid failed : users qgis.db not found" << std::endl;`
`383`		`- return (long)NULL;`
	`383`	`+ return 0;`
`384`	`384`	`}`
`385`	`385`	`}`
`386`	`386`	`else //must be a system projection then`
`@@ -435,7 +435,7 @@ long QgsProjectionSelector::getCurrentLongAttribute(QString attributeName)`
`435`	`435`	`}`
`436`	`436`
`437`	`437`	`// No node is selected, return null`
`438`		`- return (long)NULL;`
	`438`	`+ return 0;`
`439`	`439`	`}`
`440`	`440`
`441`	`441`
`@@ -461,7 +461,7 @@ long QgsProjectionSelector::getCurrentSRSID()`
`461`	`461`	`}`
`462`	`462`	`else`
`463`	`463`	`{`
`464`		`- return (long)NULL;`
	`464`	`+ return 0;`
`465`	`465`	`}`
`466`	`466`	`}`
`467`	`467`