[QGIS Commit] r9212 - trunk/qgis/src/app

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sat Aug 30 04:32:34 EDT 2008


Author: jef
Date: 2008-08-30 04:32:34 -0400 (Sat, 30 Aug 2008)
New Revision: 9212

Modified:
   trunk/qgis/src/app/qgisapp.cpp
Log:
remove 'using namespace std' from qgisapp

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2008-08-29 21:00:45 UTC (rev 9211)
+++ trunk/qgis/src/app/qgisapp.cpp	2008-08-30 08:32:34 UTC (rev 9212)
@@ -185,7 +185,6 @@
 #include <windows.h>
 #endif
 
-using namespace std;
 class QTreeWidgetItem;
 
 /* typedefs for plugins */
@@ -2664,10 +2663,10 @@
 */
 static
 void
-findLayers_( QString const & fileFilters, list<QDomNode> const & layerNodes )
+findLayers_( QString const & fileFilters, std::list<QDomNode> const & layerNodes )
 {
 
-  for ( list<QDomNode>::const_iterator i = layerNodes.begin();
+  for ( std::list<QDomNode>::const_iterator i = layerNodes.begin();
         i != layerNodes.end();
         ++i )
   {
@@ -3163,9 +3162,9 @@
   QSettings settings;
   QString lastUsedDir = settings.value( "/UI/lastProjectDir", "." ).toString();
 
-  auto_ptr<QFileDialog> saveFileDialog( new QFileDialog( this,
-                                        tr( "Choose a file name to save the QGIS project file as" ),
-                                        lastUsedDir, QObject::tr( "QGis files (*.qgs)" ) ) );
+  std::auto_ptr<QFileDialog> saveFileDialog( new QFileDialog( this,
+      tr( "Choose a file name to save the QGIS project file as" ),
+      lastUsedDir, QObject::tr( "QGis files (*.qgs)" ) ) );
 
   saveFileDialog->setFileMode( QFileDialog::AnyFile );
 



More information about the QGIS-commit mailing list