Skip to content

Commit a6470de

Browse files
author
jef
committed
remove 'using namespace std' from qgisapp
git-svn-id: http://svn.osgeo.org/qgis/trunk@9212 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent dec5ffc commit a6470de

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/app/qgisapp.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@
185185
#include <windows.h>
186186
#endif
187187

188-
using namespace std;
189188
class QTreeWidgetItem;
190189

191190
/* typedefs for plugins */
@@ -2664,10 +2663,10 @@ findLayer_( QString const & fileFilters, QDomNode const & constLayerNode )
26642663
*/
26652664
static
26662665
void
2667-
findLayers_( QString const & fileFilters, list<QDomNode> const & layerNodes )
2666+
findLayers_( QString const & fileFilters, std::list<QDomNode> const & layerNodes )
26682667
{
26692668

2670-
for ( list<QDomNode>::const_iterator i = layerNodes.begin();
2669+
for ( std::list<QDomNode>::const_iterator i = layerNodes.begin();
26712670
i != layerNodes.end();
26722671
++i )
26732672
{
@@ -3163,9 +3162,9 @@ void QgisApp::fileSaveAs()
31633162
QSettings settings;
31643163
QString lastUsedDir = settings.value( "/UI/lastProjectDir", "." ).toString();
31653164

3166-
auto_ptr<QFileDialog> saveFileDialog( new QFileDialog( this,
3167-
tr( "Choose a file name to save the QGIS project file as" ),
3168-
lastUsedDir, QObject::tr( "QGis files (*.qgs)" ) ) );
3165+
std::auto_ptr<QFileDialog> saveFileDialog( new QFileDialog( this,
3166+
tr( "Choose a file name to save the QGIS project file as" ),
3167+
lastUsedDir, QObject::tr( "QGis files (*.qgs)" ) ) );
31693168

31703169
saveFileDialog->setFileMode( QFileDialog::AnyFile );
31713170

0 commit comments

Comments
 (0)