[Refactoring] boost namespaces unification

Change-Id: I3abfc7452bba40d9936d5958f03db563a809fa2d

diff --git a/src/common/context_installer.cc b/src/common/context_installer.cc
index f3450e4..293223d 100644 (file)
--- a/src/common/context_installer.cc
+++ b/src/common/context_installer.cc
@@ -8,8 +8,6 @@
 #include <unistd.h>
 #include <cstdlib>
 
-namespace fs = boost::filesystem;
-
 namespace common_installer {
 
 bool SatifiesPrivilegeLevel(PrivilegeLevel required_level,

diff --git a/src/common/step/step_parse.cc b/src/common/step/step_parse.cc
index 97034f2..493f852 100644 (file)
--- a/src/common/step/step_parse.cc
+++ b/src/common/step/step_parse.cc
@@ -19,11 +19,11 @@
 namespace common_installer {
 namespace parse {
 
-namespace fs = boost::filesystem;
+namespace bf = boost::filesystem;
 
 Step::Status StepParse::process() {
-  fs::path xml_path = fs::path(getUserManifestPath(context_->uid.get()))
-      / fs::path(context_->pkgid.get());
+  bf::path xml_path = bf::path(getUserManifestPath(context_->uid.get()))
+      / bf::path(context_->pkgid.get());
   xml_path += ".xml";
 
   context_->xml_path.set(xml_path.string());

diff --git a/src/common/step/step_register_app.cc b/src/common/step/step_register_app.cc
index 1dea8ad..483b7ea 100644 (file)
--- a/src/common/step/step_register_app.cc
+++ b/src/common/step/step_register_app.cc
@@ -14,8 +14,6 @@
 namespace common_installer {
 namespace pkgmgr {
 
-namespace fs = boost::filesystem;
-
 Step::Status StepRegisterApplication::precheck() {
   if (context_->xml_path.get().empty()) {
     LOG(ERROR) << "xml_path attribute is empty";

diff --git a/src/common/step/step_remove_files.cc b/src/common/step/step_remove_files.cc
index b52fbed..cb82d1b 100755 (executable)
--- a/src/common/step/step_remove_files.cc
+++ b/src/common/step/step_remove_files.cc
@@ -13,7 +13,7 @@ namespace common_installer {
 namespace filesystem {
 
 namespace bs = boost::system;
-namespace fs = boost::filesystem;
+namespace bf = boost::filesystem;
 
 Step::Status StepRemoveFiles::precheck() {
   if (!context_->manifest_data.get()) {
@@ -25,7 +25,7 @@ Step::Status StepRemoveFiles::precheck() {
   // to remove the files
   if (context_->pkg_path.get().empty())
     LOG(ERROR) << "pkg_path attribute is empty";
-  else if (!fs::exists(context_->pkg_path.get()))
+  else if (!bf::exists(context_->pkg_path.get()))
     LOG(ERROR) << "pkg_path ("
                << context_->pkg_path.get()
                << ") path does not exist";
@@ -35,7 +35,7 @@ Step::Status StepRemoveFiles::precheck() {
 }
 
 Step::Status StepRemoveFiles::process() {
-  fs::path backup_path = GetBackupPathForPackagePath(context_->pkg_path.get());
+  bf::path backup_path = GetBackupPathForPackagePath(context_->pkg_path.get());
   if (!MoveDir(context_->pkg_path.get(), backup_path)) {
     LOG(ERROR) << "Cannot remove widget files from its location";
     return Status::ERROR;
@@ -46,14 +46,14 @@ Step::Status StepRemoveFiles::process() {
 
 Step::Status StepRemoveFiles::clean() {
   bs::error_code error;
-  fs::path backup_path = GetBackupPathForPackagePath(context_->pkg_path.get());
-  fs::remove_all(backup_path, error);
+  bf::path backup_path = GetBackupPathForPackagePath(context_->pkg_path.get());
+  bf::remove_all(backup_path, error);
   return Status::OK;
 }
 
 Step::Status StepRemoveFiles::undo() {
-  fs::path backup_path = GetBackupPathForPackagePath(context_->pkg_path.get());
-  if (fs::exists(backup_path)) {
+  bf::path backup_path = GetBackupPathForPackagePath(context_->pkg_path.get());
+  if (bf::exists(backup_path)) {
     LOG(DEBUG) << "Restoring directory: " << context_->pkg_path.get();
     if (!MoveDir(backup_path, context_->pkg_path.get())) {
       LOG(ERROR) << "Cannot restore widget files";

diff --git a/src/common/step/step_remove_icons.cc b/src/common/step/step_remove_icons.cc
index 8f011ca..399655e 100644 (file)
--- a/src/common/step/step_remove_icons.cc
+++ b/src/common/step/step_remove_icons.cc
@@ -17,7 +17,7 @@ namespace common_installer {
 namespace filesystem {
 
 namespace bs = boost::system;
-namespace fs = boost::filesystem;
+namespace bf = boost::filesystem;
 
 Step::Status StepRemoveIcons::precheck() {
   if (!context_->manifest_data.get()) {
@@ -33,14 +33,14 @@ Step::Status StepRemoveIcons::process() {
   PKGMGR_LIST_MOVE_NODE_TO_HEAD(context_->manifest_data.get()->uiapplication,
                                 ui);
   for (; ui != nullptr; ui = ui->next) {
-    fs::path app_icon = fs::path(getIconPath(context_->uid.get()))
-      / fs::path(ui->appid);
+    bf::path app_icon = bf::path(getIconPath(context_->uid.get()))
+      / bf::path(ui->appid);
     if (ui->icon && ui->icon->text)
-      app_icon += fs::path(ui->icon->text).extension();
+      app_icon += bf::path(ui->icon->text).extension();
     else
       app_icon += ".png";
-    if (fs::exists(app_icon)) {
-      fs::path backup_icon_file = GetBackupPathForIconFile(app_icon);
+    if (bf::exists(app_icon)) {
+      bf::path backup_icon_file = GetBackupPathForIconFile(app_icon);
       if (!MoveFile(app_icon, backup_icon_file)) {
         LOG(ERROR) << "Failed to create backup for icon: " << app_icon;
         return Status::ERROR;
@@ -56,7 +56,7 @@ Step::Status StepRemoveIcons::clean() {
   if (!backups_.empty()) {
     LOG(DEBUG) << "Clean up icons files...";
     for (auto& pair : backups_) {
-      fs::remove(pair.first, error);
+      bf::remove(pair.first, error);
       if (error) {
         LOG(WARNING) << "Failed to remove: " << pair.first;
       }

diff --git a/src/common/step/step_unregister_app.cc b/src/common/step/step_unregister_app.cc
index 2180a3e..d906e83 100755 (executable)
--- a/src/common/step/step_unregister_app.cc
+++ b/src/common/step/step_unregister_app.cc
@@ -20,7 +20,7 @@ namespace common_installer {
 namespace pkgmgr {
 
 namespace bs = boost::system;
-namespace fs = boost::filesystem;
+namespace bf = boost::filesystem;
 
 Step::Status StepUnregisterApplication::precheck() {
   if (context_->pkgid.get().empty()) {
@@ -86,7 +86,7 @@ Step::Status StepUnregisterApplication::process() {
 
   // remove manifest file
   bs::error_code error;
-  fs::remove(context_->xml_path.get(), error);
+  bf::remove(context_->xml_path.get(), error);
 
   LOG(DEBUG) << "Successfully unregister the application";
 

diff --git a/src/tpk/step/step_create_symbolic_link.cc b/src/tpk/step/step_create_symbolic_link.cc
index e9c31be..1a5a6ab 100644 (file)
--- a/src/tpk/step/step_create_symbolic_link.cc
+++ b/src/tpk/step/step_create_symbolic_link.cc
@@ -16,7 +16,7 @@
 namespace tpk {
 namespace filesystem {
 
-namespace fs = boost::filesystem;
+namespace bf = boost::filesystem;
 using common_installer::ContextInstaller;
 typedef common_installer::Step::Status Status;
 
@@ -27,8 +27,8 @@ bool CreateSymLink(T *app, ContextInstaller* context) {
   boost::system::error_code boost_error;
 
   for (; app != nullptr; app=app->next) {
-    fs::path bindir = context->pkg_path.get() /
-        fs::path("bin");
+    bf::path bindir = context->pkg_path.get() /
+        bf::path("bin");
     LOG(INFO) << "Creating dir: " << bindir;
     if (!common_installer::CreateDir(bindir)) {
       LOG(ERROR) << "Directory creation failure: " << bindir;
@@ -37,21 +37,21 @@ bool CreateSymLink(T *app, ContextInstaller* context) {
 
     // Exec path
     // Make a symlink with the name of appid, pointing exec file
-    fs::path symlink_path = bindir / fs::path(app->appid);
+    bf::path symlink_path = bindir / bf::path(app->appid);
     LOG(INFO) << "Creating symlink " << symlink_path << " pointing " <<
         app->exec;
-    fs::create_symlink(fs::path(app->exec), symlink_path, boost_error);
+    bf::create_symlink(bf::path(app->exec), symlink_path, boost_error);
     if (boost_error) {
       LOG(ERROR) << "Symlink creation failure: " << symlink_path;
       return false;
     }
 
     // Give an execution permission to the original executable
-    fs::path exec_path = bindir / fs::path(app->exec);
+    bf::path exec_path = bindir / bf::path(app->exec);
     LOG(INFO) << "Giving exec permission to " << exec_path;
-    fs::permissions(exec_path, fs::owner_all |
-        fs::group_read | fs::group_exe |
-        fs::others_read | fs::others_exe, boost_error);
+    bf::permissions(exec_path, bf::owner_all |
+        bf::group_read | bf::group_exe |
+        bf::others_read | bf::others_exe, boost_error);
     if (boost_error) {
       LOG(ERROR) << "Permission change failure";
       return false;
@@ -67,8 +67,8 @@ bool RemoveSymLink(T *app, ContextInstaller* context) {
    * So we don't remove the bin/ directory.
    */
   for (; app != nullptr; app=app->next) {
-    fs::path exec_path = fs::path(context->pkg_path.get()) / fs::path("bin");
-    fs::remove_all(exec_path / fs::path(app->appid));
+    bf::path exec_path = bf::path(context->pkg_path.get()) / bf::path("bin");
+    bf::remove_all(exec_path / bf::path(app->appid));
   }
   return true;
 }

diff --git a/src/wgt/step/step_create_symbolic_link.cc b/src/wgt/step/step_create_symbolic_link.cc
index 3ba2146..6e13ba2 100644 (file)
--- a/src/wgt/step/step_create_symbolic_link.cc
+++ b/src/wgt/step/step_create_symbolic_link.cc
@@ -19,7 +19,7 @@
 namespace wgt {
 namespace filesystem {
 
-namespace fs = boost::filesystem;
+namespace bf = boost::filesystem;
 
 common_installer::Step::Status StepCreateSymbolicLink::process() {
   assert(context_->manifest_data.get());
@@ -35,14 +35,14 @@ common_installer::Step::Status StepCreateSymbolicLink::process() {
   // add ui-application element per ui application
   for (; ui != nullptr; ui = ui->next) {
     // binary is a symbolic link named <appid> and is located in <pkgid>/<appid>
-    fs::path exec_path =
+    bf::path exec_path =
         context_->pkg_path.get()
-            / fs::path("bin");
+            / bf::path("bin");
     common_installer::CreateDir(exec_path);
 
-    exec_path /= fs::path(ui->appid);
+    exec_path /= bf::path(ui->appid);
 
-    fs::create_symlink(fs::path(WRT_LAUNCHER), exec_path, error);
+    bf::create_symlink(bf::path(WRT_LAUNCHER), exec_path, error);
     if (error) {
       LOG(ERROR) << "Failed to set symbolic link "
         << boost::system::system_error(error).what();
@@ -51,12 +51,12 @@ common_installer::Step::Status StepCreateSymbolicLink::process() {
   }
   for (; svc != nullptr; svc = svc->next) {
     // binary is a symbolic link named <appid> and is located in <pkgid>/<appid>
-    fs::path exec_path = context_->pkg_path.get() / fs::path("bin");
+    bf::path exec_path = context_->pkg_path.get() / bf::path("bin");
     common_installer::CreateDir(exec_path);
 
-    exec_path /= fs::path(svc->appid);
+    exec_path /= bf::path(svc->appid);
 
-    fs::create_symlink(fs::path(WRT_LAUNCHER), exec_path, error);
+    bf::create_symlink(bf::path(WRT_LAUNCHER), exec_path, error);
     if (error) {
       LOG(ERROR) << "Failed to set symbolic link "
         << boost::system::system_error(error).what();
@@ -73,14 +73,14 @@ common_installer::Step::Status StepCreateSymbolicLink::undo() {
   serviceapplication_x* svc = context_->manifest_data.get()->serviceapplication;
 
   for (; ui != nullptr; ui = ui->next) {
-    fs::path exec_path = context_->pkg_path.get() / fs::path("bin");
-    if (fs::exists(exec_path))
-      fs::remove_all(exec_path);
+    bf::path exec_path = context_->pkg_path.get() / bf::path("bin");
+    if (bf::exists(exec_path))
+      bf::remove_all(exec_path);
   }
   for (; svc != nullptr; svc = svc->next) {
-    fs::path exec_path = context_->pkg_path.get() / fs::path("bin");
-    if (fs::exists(exec_path))
-      fs::remove_all(exec_path);
+    bf::path exec_path = context_->pkg_path.get() / bf::path("bin");
+    if (bf::exists(exec_path))
+      bf::remove_all(exec_path);
   }
   return Status::OK;
 }

diff --git a/src/wgt/step/step_generate_xml.cc b/src/wgt/step/step_generate_xml.cc
index bdf7d07..9de82d4 100755 (executable)
--- a/src/wgt/step/step_generate_xml.cc
+++ b/src/wgt/step/step_generate_xml.cc
@@ -22,7 +22,7 @@
 #include "common/utils/file_util.h"
 
 namespace bs = boost::system;
-namespace fs = boost::filesystem;
+namespace bf = boost::filesystem;
 
 namespace wgt {
 namespace pkgmgr {
@@ -50,8 +50,8 @@ common_installer::Step::Status StepGenerateXml::GenerateApplicationCommonXml(
   xmlTextWriterWriteAttribute(writer, BAD_CAST "appid", BAD_CAST app->appid);
 
   // binary is a symbolic link named <appid> and is located in <pkgid>/<appid>
-  fs::path exec_path = context_->pkg_path.get()
-      / fs::path("bin") / fs::path(app->appid);
+  bf::path exec_path = context_->pkg_path.get()
+      / bf::path("bin") / bf::path(app->appid);
   xmlTextWriterWriteAttribute(writer, BAD_CAST "exec",
                               BAD_CAST exec_path.string().c_str());
   if (app->type)
@@ -82,15 +82,15 @@ common_installer::Step::Status StepGenerateXml::GenerateApplicationCommonXml(
 
   // icon is renamed to <appid.png>
   if (app->icon->text) {
-    fs::path app_icon = context_->pkg_path.get() / "res/wgt" /
+    bf::path app_icon = context_->pkg_path.get() / "res/wgt" /
         app->icon->text;
-    fs::path icon = app->appid;
+    bf::path icon = app->appid;
     if (app_icon.has_extension())
       icon += app_icon.extension();
     else
-      icon += fs::path(".png");
+      icon += bf::path(".png");
 
-    if (fs::exists(app_icon)) {
+    if (bf::exists(app_icon)) {
       xmlTextWriterWriteFormatElement(writer, BAD_CAST "icon",
                                           "%s", BAD_CAST icon.c_str());
     }
@@ -164,13 +164,13 @@ common_installer::Step::Status StepGenerateXml::precheck() {
 }
 
 common_installer::Step::Status StepGenerateXml::process() {
-  fs::path xml_path = fs::path(getUserManifestPath(context_->uid.get()))
-      / fs::path(context_->pkgid.get());
+  bf::path xml_path = bf::path(getUserManifestPath(context_->uid.get()))
+      / bf::path(context_->pkgid.get());
   xml_path += ".xml";
   context_->xml_path.set(xml_path.string());
 
   bs::error_code error;
-  if (!fs::exists(xml_path.parent_path(), error)) {
+  if (!bf::exists(xml_path.parent_path(), error)) {
     if (!common_installer::CreateDir(xml_path.parent_path())) {
       LOG(ERROR) <<
           "Directory for manifest xml is missing and cannot be created";
@@ -356,8 +356,8 @@ common_installer::Step::Status StepGenerateXml::process() {
 
 common_installer::Step::Status StepGenerateXml::undo() {
   bs::error_code error;
-  if (fs::exists(context_->xml_path.get()))
-    fs::remove_all(context_->xml_path.get(), error);
+  if (bf::exists(context_->xml_path.get()))
+    bf::remove_all(context_->xml_path.get(), error);
   return Status::OK;
 }