Imported Upstream version 17.23.5

[platform/upstream/libzypp.git] / zypp / target / TargetImpl.cc

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index a387060..97b69ca 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -19,47 +19,47 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-#include "zypp/base/LogTools.h"
-#include "zypp/base/Exception.h"
-#include "zypp/base/Iterator.h"
-#include "zypp/base/Gettext.h"
-#include "zypp/base/IOStream.h"
-#include "zypp/base/Functional.h"
-#include "zypp/base/UserRequestException.h"
-#include "zypp/base/Json.h"
-
-#include "zypp/ZConfig.h"
-#include "zypp/ZYppFactory.h"
-#include "zypp/PathInfo.h"
-
-#include "zypp/PoolItem.h"
-#include "zypp/ResObjects.h"
-#include "zypp/Url.h"
-#include "zypp/TmpPath.h"
-#include "zypp/RepoStatus.h"
-#include "zypp/ExternalProgram.h"
-#include "zypp/Repository.h"
-#include "zypp/ShutdownLock_p.h"
-
-#include "zypp/ResFilters.h"
-#include "zypp/HistoryLog.h"
-#include "zypp/target/TargetImpl.h"
-#include "zypp/target/TargetCallbackReceiver.h"
-#include "zypp/target/rpm/librpmDb.h"
-#include "zypp/target/CommitPackageCache.h"
-#include "zypp/target/RpmPostTransCollector.h"
-
-#include "zypp/parser/ProductFileReader.h"
-#include "zypp/repo/SrcPackageProvider.h"
-
-#include "zypp/sat/Pool.h"
-#include "zypp/sat/detail/PoolImpl.h"
-#include "zypp/sat/SolvableSpec.h"
-#include "zypp/sat/Transaction.h"
-
-#include "zypp/PluginExecutor.h"
-
-using namespace std;
+#include <zypp/base/LogTools.h>
+#include <zypp/base/Exception.h>
+#include <zypp/base/Iterator.h>
+#include <zypp/base/Gettext.h>
+#include <zypp/base/IOStream.h>
+#include <zypp/base/Functional.h>
+#include <zypp/base/UserRequestException.h>
+#include <zypp/base/Json.h>
+
+#include <zypp/ZConfig.h>
+#include <zypp/ZYppFactory.h>
+#include <zypp/PathInfo.h>
+
+#include <zypp/PoolItem.h>
+#include <zypp/ResObjects.h>
+#include <zypp/Url.h>
+#include <zypp/TmpPath.h>
+#include <zypp/RepoStatus.h>
+#include <zypp/ExternalProgram.h>
+#include <zypp/Repository.h>
+#include <zypp/ShutdownLock_p.h>
+
+#include <zypp/ResFilters.h>
+#include <zypp/HistoryLog.h>
+#include <zypp/target/TargetImpl.h>
+#include <zypp/target/TargetCallbackReceiver.h>
+#include <zypp/target/rpm/librpmDb.h>
+#include <zypp/target/CommitPackageCache.h>
+#include <zypp/target/RpmPostTransCollector.h>
+
+#include <zypp/parser/ProductFileReader.h>
+#include <zypp/repo/SrcPackageProvider.h>
+
+#include <zypp/sat/Pool.h>
+#include <zypp/sat/detail/PoolImpl.h>
+#include <zypp/sat/SolvableSpec.h>
+#include <zypp/sat/Transaction.h>
+
+#include <zypp/PluginExecutor.h>
+
+using std::endl;
 
 ///////////////////////////////////////////////////////////////////
 extern "C"
@@ -605,7 +605,7 @@ namespace zypp
         else if ( format == DIGEST || format == BULK )
         {
           filesystem::TmpFile tmpfile;
-          ofstream out( tmpfile.path().c_str() );
+         std::ofstream out( tmpfile.path().c_str() );
           for_( it, notifications_r.begin(), notifications_r.end() )
           {
             if ( format == DIGEST )
@@ -773,9 +773,9 @@ namespace zypp
      */
     void updateFileContent( const Pathname &filename,
                             boost::function<bool ()> condition,
-                            boost::function<string ()> value )
+                           boost::function<std::string ()> value )
     {
-        string val = value();
+        std::string val = value();
         // if the value is empty, then just dont
         // do anything, regardless of the condition
         if ( val.empty() )
@@ -847,7 +847,7 @@ namespace zypp
           return;
       }
 
-      string flavor = p->flavor();
+      std::string flavor = p->flavor();
 
       try
       {
@@ -855,7 +855,7 @@ namespace zypp
         updateFileContent( flavorpath,
                            // only if flavor is not empty
                            functor::Constant<bool>( ! flavor.empty() ),
-                           functor::Constant<string>(flavor) );
+                          functor::Constant<std::string>(flavor) );
       }
       catch ( const Exception &e )
       {