[QGIS Commit] r15695 - trunk/qgis/src/mapserver

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2011-04-12 05:26:05 -0700 (Tue, 12 Apr 2011)
New Revision: 15695

Modified:
   trunk/qgis/src/mapserver/qgsprojectparser.cpp
Log:
Use filename for title of WMS top layer if project title empty (ticket #3719)

Modified: trunk/qgis/src/mapserver/qgsprojectparser.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgsprojectparser.cpp	2011-04-12 12:20:35 UTC (rev 15694)
+++ trunk/qgis/src/mapserver/qgsprojectparser.cpp	2011-04-12 12:26:05 UTC (rev 15695)
@@ -33,7 +33,9 @@
 #include "qgscomposerscalebar.h"
 #include "qgscomposershape.h"
 
+#include "QFileInfo"
 
+
 QgsProjectParser::QgsProjectParser( QDomDocument* xmlDoc, const QString& filePath ): QgsConfigParser(), mXMLDoc( xmlDoc ), mProjectPath( filePath )
 {
   mOutputUnits = QgsMapRenderer::Millimeters;
@@ -621,12 +623,18 @@
   }
 
   QDomElement titleElem = qgisElem.firstChildElement( "title" );
-  if ( titleElem.isNull() )
+  if ( !titleElem.isNull() )
   {
-    return QString();
+    QString title = titleElem.text();
+    if ( !title.isEmpty() )
+    {
+      return title;
+    }
   }
 
-  return titleElem.text();
+  //no title element or not project title set. Use project filename without extension
+  QFileInfo projectFileInfo( mProjectPath );
+  return projectFileInfo.baseName();
 }
 
 QList<QDomElement> QgsProjectParser::projectLayerElements() const