X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=zypp%2Frepo%2FRepoMirrorList.cc;h=6ffda10bd2327cc576dcb0e1b8edbc0ff9f7e776;hb=c1de7ecea70e9ba879e90375c3f369ece884951e;hp=54778386c5c25c3b5ed1d9d82710f3de25182076;hpb=27b2f2ff8f910fb4010f7e29e07ca6249c9918ca;p=platform%2Fupstream%2Flibzypp.git

diff --git a/zypp/repo/RepoMirrorList.cc b/zypp/repo/RepoMirrorList.cc
index 5477838..6ffda10 100644
--- a/zypp/repo/RepoMirrorList.cc
+++ b/zypp/repo/RepoMirrorList.cc
@@ -13,14 +13,13 @@
 #include <iostream>
 #include <vector>
 #include <time.h>
-#include "zypp/repo/RepoMirrorList.h"
-#include "zypp/media/MetaLinkParser.h"
-#include "zypp/MediaSetAccess.h"
-#include "zypp/base/LogTools.h"
-#include "zypp/ZConfig.h"
-#include "zypp/PathInfo.h"
+#include <zypp/repo/RepoMirrorList.h>
+#include <zypp/media/MetaLinkParser.h>
+#include <zypp/MediaSetAccess.h>
+#include <zypp/base/LogTools.h>
+#include <zypp/ZConfig.h>
+#include <zypp/PathInfo.h>
 
-using namespace std;
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
@@ -76,7 +75,7 @@ namespace zypp
       {
 	InputStream tmpfstream (tmpfile);
 	std::vector<Url> my_urls;
-	string tmpurl;
+	std::string tmpurl;
 	while (getline(tmpfstream.stream(), tmpurl))
 	{
 	  if ( tmpurl[0] == '#' )
@@ -96,7 +95,7 @@ namespace zypp
 	USR << url_r << " " << listfile_r << endl;
 
 	std::vector<Url> mirrorurls;
-	if ( mirrorListForceMetalink_r || url_r.asString().find( "/metalink" ) != string::npos )
+	if ( mirrorListForceMetalink_r || url_r.asString().find( "/metalink" ) != std::string::npos )
 	  mirrorurls = RepoMirrorListParseXML( listfile_r );
 	else
 	  mirrorurls = RepoMirrorListParseTXT( listfile_r );
@@ -108,7 +107,7 @@ namespace zypp
 	  if ( murl.getScheme() != "rsync" )
 	  {
 	    size_t delpos = murl.getPathName().find("repodata/repomd.xml");
-	    if( delpos != string::npos )
+	    if( delpos != std::string::npos )
 	    {
 	      murl.setPathName( murl.getPathName().erase(delpos)  );
 	    }
@@ -141,7 +140,7 @@ namespace zypp
       {
 	// have cachedir
 	Pathname cachefile( metadatapath_r );
-	if ( mirrorListForceMetalink_r || url_r.asString().find( "/metalink" ) != string::npos )
+	if ( mirrorListForceMetalink_r || url_r.asString().find( "/metalink" ) != std::string::npos )
 	  cachefile /= "mirrorlist.xml";
 	else
 	  cachefile /= "mirrorlist.txt";