Imported Upstream version 17.23.5

[platform/upstream/libzypp.git] / zypp / media / MediaHandler.cc

diff --git a/zypp/media/MediaHandler.cc b/zypp/media/MediaHandler.cc
index 5a52ada..3aef0de 100644 (file)
--- a/zypp/media/MediaHandler.cc
+++ b/zypp/media/MediaHandler.cc
@@ -14,21 +14,20 @@
 #include <fstream>
 #include <sstream>
 
-#include "zypp/ZConfig.h"
-#include "zypp/TmpPath.h"
-#include "zypp/Date.h"
-#include "zypp/base/LogTools.h"
-#include "zypp/base/Gettext.h"
-#include "zypp/base/String.h"
-#include "zypp/media/MediaHandler.h"
-#include "zypp/media/MediaManager.h"
-#include "zypp/media/Mount.h"
+#include <zypp/ZConfig.h>
+#include <zypp/TmpPath.h>
+#include <zypp/Date.h>
+#include <zypp/base/LogTools.h>
+#include <zypp/base/Gettext.h>
+#include <zypp/base/String.h>
+#include <zypp/media/MediaHandler.h>
+#include <zypp/media/MediaManager.h>
+#include <zypp/media/Mount.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <errno.h>
 
-
-using namespace std;
+using std::endl;
 
 // use directory.yast on every media (not just via ftp/http)
 #define NONREMOTE_DIRECTORY_YAST 1
@@ -1180,14 +1179,14 @@ void MediaHandler::getDirectoryYast( filesystem::DirContent & retlist,
   DBG << "provideFile(" << dirFile << "): " << "OK" << endl;
 
   // using directory.yast
-  ifstream dir( localPath( dirFile ).asString().c_str() );
+  std::ifstream dir( localPath( dirFile ).asString().c_str() );
   if ( dir.fail() ) {
     ERR << "Unable to load '" << localPath( dirFile ) << "'" << endl;
     ZYPP_THROW(MediaSystemException(url(),
       "Unable to load '" + localPath( dirFile ).asString() + "'"));
   }
 
-  string line;
+  std::string line;
   while( getline( dir, line ) ) {
     if ( line.empty() ) continue;
     if ( line == "directory.yast" ) continue;
@@ -1216,7 +1215,7 @@ void MediaHandler::getDirectoryYast( filesystem::DirContent & retlist,
 **     FUNCTION NAME : operator<<
 **     FUNCTION TYPE : ostream &
 */
-ostream & operator<<( ostream & str, const MediaHandler & obj )
+std::ostream & operator<<( std::ostream & str, const MediaHandler & obj )
 {
   str << obj.url() << ( obj.isAttached() ? "" : " not" )
     << " attached; localRoot \"" << obj.localRoot() << "\"";