Rename files

* remove redundant ask-user- prefix
* remove askuser-notification directory
* rename ipc-lib to ipc

Change-Id: Iccfb2c4664b0aa8e05b12220b78db73fb82c8ead

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b81172..16aa8c0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,7 @@ SET(TARGET_PRIVACY_PRIVILEGE_MANAGER_TEST "capi-privacy-privilege-manager-test")
 ADD_SUBDIRECTORY(src/plugin)
 ADD_SUBDIRECTORY(src/notification-daemon)
 ADD_SUBDIRECTORY(src/common)
-ADD_SUBDIRECTORY(src/ipc-lib)
+ADD_SUBDIRECTORY(src/ipc)
 ADD_SUBDIRECTORY(src/client)
 ADD_SUBDIRECTORY(src/capi)
 

diff --git a/src/capi/CMakeLists.txt b/src/capi/CMakeLists.txt
index 70cf037..ea4c84f 100644 (file)
--- a/src/capi/CMakeLists.txt
+++ b/src/capi/CMakeLists.txt
@@ -27,7 +27,7 @@ PKG_CHECK_MODULES(PRIVACY_PRIVILEGE_MANAGER_DEP
 INCLUDE_DIRECTORIES(SYSTEM ${PRIVACY_PRIVILEGE_MANAGER_DEP_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(
     ${ASKUSER_PATH}/common
-    ${ASKUSER_PATH}/ipc-lib
+    ${ASKUSER_PATH}/ipc
     ${PRIVACY_PRIVILEGE_MANAGER_PATH}/include
     ${ASKUSER_PATH}/client/include
   )

diff --git a/src/capi/test/privacy_privilege_manager_test.cpp b/src/capi/test/privacy_privilege_manager_test.cpp
index f20629d..689b99b 100644 (file)
--- a/src/capi/test/privacy_privilege_manager_test.cpp
+++ b/src/capi/test/privacy_privilege_manager_test.cpp
@@ -31,10 +31,10 @@
 #include <unistd.h>
 
 #include <attributes/attributes.h>
-#include <askuser-notification/ask-user-client-channel.h>
-#include <askuser-notification/ask-user-server-channel.h>
-#include <askuser-notification/ask-user-types.h>
-#include <askuser-notification/connection-exception.h>
+#include <client-channel.h>
+#include <server-channel.h>
+#include <common-types.h>
+#include <connection-exception.h>
 #include <privacy_privilege_manager.h>
 
 using namespace AskUser::Protocol;

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 271273c..917d363 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -26,7 +26,7 @@ PKG_CHECK_MODULES(ASKUSER_NOTIFICATION_CLIENT_DEP
 INCLUDE_DIRECTORIES(SYSTEM ${ASKUSER_NOTIFICATION_CLIENT_DEP_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(
     ${ASKUSER_PATH}/common
-    ${ASKUSER_PATH}/ipc-lib
+    ${ASKUSER_PATH}/ipc
     ${ASKUSER_NOTIFICATION_CLIENT_PATH}/api
     ${ASKUSER_NOTIFICATION_CLIENT_PATH}/impl
     ${ASKUSER_NOTIFICATION_CLIENT_PATH}/include

diff --git a/src/client/impl/ApiInterfaceImpl.cpp b/src/client/impl/ApiInterfaceImpl.cpp
index ec96944..c05cf36 100644 (file)
--- a/src/client/impl/ApiInterfaceImpl.cpp
+++ b/src/client/impl/ApiInterfaceImpl.cpp
@@ -26,8 +26,8 @@
 
 #include <log/alog.h>
 #include <policy/Policy.h>
-#include <askuser-notification/ask-user-client-channel.h>
-#include <askuser-notification/ask-user-types.h>
+#include <client-channel.h>
+#include <common-types.h>
 
 #include "ClientCallbacks.h"
 #include "ApiInterfaceImpl.h"

diff --git a/src/client/impl/ApiInterfaceImpl.h b/src/client/impl/ApiInterfaceImpl.h
index 2726a76..ab089e3 100644 (file)
--- a/src/client/impl/ApiInterfaceImpl.h
+++ b/src/client/impl/ApiInterfaceImpl.h
@@ -29,7 +29,7 @@
 #include <PopupCallbackClosure.h>
 #include <StatusCallbackClosure.h>
 
-#include <askuser-notification/ask-user-client-channel.h>
+#include <client-channel.h>
 
 #include <askuser-notification-client.h>
 

diff --git a/src/client/impl/ClientCallbacks.h b/src/client/impl/ClientCallbacks.h
index 440bde1..d7a79d2 100644 (file)
--- a/src/client/impl/ClientCallbacks.h
+++ b/src/client/impl/ClientCallbacks.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <askuser-notification/ask-user-client-channel.h>
+#include <client-channel.h>
 
 #include "ApiInterfaceImpl.h"
 

diff --git a/src/client/impl/TryCatch.h b/src/client/impl/TryCatch.h
index 52d84cc..243b805 100644 (file)
--- a/src/client/impl/TryCatch.h
+++ b/src/client/impl/TryCatch.h
@@ -27,7 +27,7 @@
 #include <functional>
 
 #include <log/alog.h>
-#include <askuser-notification/connection-exception.h>
+#include <connection-exception.h>
 
 #include <askuser-notification-client.h>
 

diff --git a/src/ipc-lib/CMakeLists.txt b/src/ipc/CMakeLists.txt
similarity index 85%
rename from src/ipc-lib/CMakeLists.txt
rename to src/ipc/CMakeLists.txt
index c7b4d57..8e1c2c4 100644 (file)
--- a/src/ipc-lib/CMakeLists.txt
+++ b/src/ipc/CMakeLists.txt
@@ -16,7 +16,7 @@
 # @author      Dariusz Michaluk <d.michaluk@samsung.com>
 #
 
-SET(ASKUSER_NOTIFICATION_LIB_PATH ${ASKUSER_PATH}/ipc-lib)
+SET(ASKUSER_NOTIFICATION_LIB_PATH ${ASKUSER_PATH}/ipc)
 
 PKG_CHECK_MODULES(ASKUSER_NOTIFICATION_LIB_DEP
     REQUIRED
@@ -32,13 +32,13 @@ INCLUDE_DIRECTORIES(
   )
 
 SET(ASKUSER_NOTIFICATION_LIB_SOURCES
-    ${ASKUSER_NOTIFICATION_LIB_PATH}/ask-user-channel.cpp
-    ${ASKUSER_NOTIFICATION_LIB_PATH}/ask-user-client-channel.cpp
-    ${ASKUSER_NOTIFICATION_LIB_PATH}/ask-user-server-channel.cpp
+    ${ASKUSER_NOTIFICATION_LIB_PATH}/channel.cpp
+    ${ASKUSER_NOTIFICATION_LIB_PATH}/client-channel.cpp
+    ${ASKUSER_NOTIFICATION_LIB_PATH}/server-channel.cpp
     ${ASKUSER_NOTIFICATION_LIB_PATH}/credentials.cpp
     ${ASKUSER_NOTIFICATION_LIB_PATH}/message-utils.cpp
     ${ASKUSER_NOTIFICATION_LIB_PATH}/sock.cpp
-    ${ASKUSER_NOTIFICATION_LIB_PATH}/ask-user-config.cpp
+    ${ASKUSER_NOTIFICATION_LIB_PATH}/config.cpp
    )
 
 SET(ASKUSER_NOTIFICATION_LIB_TEST_SOURCES
@@ -70,7 +70,7 @@ TARGET_LINK_LIBRARIES(${TARGET_ASKUSER_NOTIFICATION_LIB_TEST} ${TARGET_ASKUSER_N
 INSTALL(TARGETS     ${TARGET_ASKUSER_NOTIFICATION_LIB}
         DESTINATION ${LIB_INSTALL_DIR})
 
-FILE(GLOB HEADERS   ${ASKUSER_NOTIFICATION_LIB_PATH}/askuser-notification/*.h)
+FILE(GLOB HEADERS   ${ASKUSER_NOTIFICATION_LIB_PATH}/*.h)
 INSTALL(FILES       ${HEADERS}
         DESTINATION ${INCLUDE_INSTALL_DIR}/askuser-notification)
 

diff --git a/src/ipc-lib/ask-user-channel.cpp b/src/ipc/channel.cpp
similarity index 97%
rename from src/ipc-lib/ask-user-channel.cpp
rename to src/ipc/channel.cpp
index fe88252..1c17e44 100644 (file)
--- a/src/ipc-lib/ask-user-channel.cpp
+++ b/src/ipc/channel.cpp
@@ -25,12 +25,12 @@
 #include <cstddef>
 
 #include <log/alog.h>
-#include <askuser-notification/sock-desc.h>
-#include <askuser-notification/ask-user-channel.h>
-
-#include <ask-user-config.h>
 #include <message-utils.h>
 
+#include "sock-desc.h"
+#include "channel.h"
+#include "config.h"
+
 namespace AskUser {
 namespace Protocol {
 

diff --git a/src/ipc-lib/askuser-notification/ask-user-channel.h b/src/ipc/channel.h
similarity index 95%
rename from src/ipc-lib/askuser-notification/ask-user-channel.h
rename to src/ipc/channel.h
index e546733..5fd6df3 100644 (file)
--- a/src/ipc-lib/askuser-notification/ask-user-channel.h
+++ b/src/ipc/channel.h
@@ -26,8 +26,8 @@
 #include <string>
 #include <vector>
 
-#include <askuser-notification/sock-desc.h>
-#include <askuser-notification/ask-user-types.h>
+#include "sock-desc.h"
+#include "common-types.h"
 
 namespace AskUser {
 namespace Protocol {

diff --git a/src/ipc-lib/ask-user-client-channel.cpp b/src/ipc/client-channel.cpp
similarity index 95%
rename from src/ipc-lib/ask-user-client-channel.cpp
rename to src/ipc/client-channel.cpp
index d79b81c..f245c01 100644 (file)
--- a/src/ipc-lib/ask-user-client-channel.cpp
+++ b/src/ipc/client-channel.cpp
@@ -23,13 +23,13 @@
 #include <sstream>
 
 #include <attributes/attributes.h>
-#include <askuser-notification/ask-user-client-channel.h>
-#include <askuser-notification/connection-exception.h>
 #include <log/alog.h>
-
-#include <ask-user-config.h>
 #include <message-utils.h>
 
+#include "client-channel.h"
+#include "connection-exception.h"
+#include "config.h"
+
 namespace AskUser {
 namespace Protocol {
 

diff --git a/src/ipc-lib/askuser-notification/ask-user-client-channel.h b/src/ipc/client-channel.h
similarity index 96%
rename from src/ipc-lib/askuser-notification/ask-user-client-channel.h
rename to src/ipc/client-channel.h
index 7978c9f..e8bc858 100644 (file)
--- a/src/ipc-lib/askuser-notification/ask-user-client-channel.h
+++ b/src/ipc/client-channel.h
@@ -25,8 +25,8 @@
 #include <string>
 #include <vector>
 
-#include <askuser-notification/ask-user-channel.h>
-#include <askuser-notification/ask-user-types.h>
+#include "channel.h"
+#include "common-types.h"
 
 namespace AskUser {
 namespace Protocol {

diff --git a/src/ipc-lib/askuser-notification/ask-user-types.h b/src/ipc/common-types.h
similarity index 100%
rename from src/ipc-lib/askuser-notification/ask-user-types.h
rename to src/ipc/common-types.h

diff --git a/src/ipc-lib/ask-user-config.cpp b/src/ipc/config.cpp
similarity index 97%
rename from src/ipc-lib/ask-user-config.cpp
rename to src/ipc/config.cpp
index 597abe6..11ecbd7 100644 (file)
--- a/src/ipc-lib/ask-user-config.cpp
+++ b/src/ipc/config.cpp
@@ -18,7 +18,7 @@
  * @author      Bartlomiej Grzelewski <b.grzelewski@samsung.com>
  * @brief       The implementation of utility functions for getting sockets paths.
  */
-#include <ask-user-config.h>
+#include "config.h"
 
 namespace {
 const std::string USER_EXT_PATH("/run/user_ext/");

diff --git a/src/ipc-lib/ask-user-config.h b/src/ipc/config.h
similarity index 100%
rename from src/ipc-lib/ask-user-config.h
rename to src/ipc/config.h

diff --git a/src/ipc-lib/askuser-notification/connection-exception.h b/src/ipc/connection-exception.h
similarity index 100%
rename from src/ipc-lib/askuser-notification/connection-exception.h
rename to src/ipc/connection-exception.h

diff --git a/src/ipc-lib/askuser-notification/credentials-exception.h b/src/ipc/credentials-exception.h
similarity index 100%
rename from src/ipc-lib/askuser-notification/credentials-exception.h
rename to src/ipc/credentials-exception.h

diff --git a/src/ipc-lib/credentials.cpp b/src/ipc/credentials.cpp
similarity index 94%
rename from src/ipc-lib/credentials.cpp
rename to src/ipc/credentials.cpp
index 401bf30..8e1b98b 100644 (file)
--- a/src/ipc-lib/credentials.cpp
+++ b/src/ipc/credentials.cpp
@@ -24,9 +24,8 @@
 #include <sys/smack.h>
 #include <sys/socket.h>
 
-#include <askuser-notification/credentials-exception.h>
-
-#include <askuser-notification/credentials.h>
+#include "credentials-exception.h"
+#include "credentials.h"
 
 namespace {
 

diff --git a/src/ipc-lib/askuser-notification/credentials.h b/src/ipc/credentials.h
similarity index 100%
rename from src/ipc-lib/askuser-notification/credentials.h
rename to src/ipc/credentials.h

diff --git a/src/ipc-lib/message-utils.cpp b/src/ipc/message-utils.cpp
similarity index 100%
rename from src/ipc-lib/message-utils.cpp
rename to src/ipc/message-utils.cpp

diff --git a/src/ipc-lib/message-utils.h b/src/ipc/message-utils.h
similarity index 98%
rename from src/ipc-lib/message-utils.h
rename to src/ipc/message-utils.h
index 6ad9025..4106657 100644 (file)
--- a/src/ipc-lib/message-utils.h
+++ b/src/ipc/message-utils.h
@@ -27,7 +27,7 @@
 #include <string>
 #include <type_traits>
 
-#include <askuser-notification/ask-user-types.h>
+#include "common-types.h"
 
 namespace AskUser {
 namespace Protocol {

diff --git a/src/ipc-lib/askuser-notification/raw-buffer.h b/src/ipc/raw-buffer.h
similarity index 100%
rename from src/ipc-lib/askuser-notification/raw-buffer.h
rename to src/ipc/raw-buffer.h

diff --git a/src/ipc-lib/ask-user-server-channel.cpp b/src/ipc/server-channel.cpp
similarity index 95%
rename from src/ipc-lib/ask-user-server-channel.cpp
rename to src/ipc/server-channel.cpp
index 4a08a48..f854a82 100644 (file)
--- a/src/ipc-lib/ask-user-server-channel.cpp
+++ b/src/ipc/server-channel.cpp
@@ -22,12 +22,12 @@
 
 #include <sstream>
 
-#include <askuser-notification/ask-user-server-channel.h>
-#include <askuser-notification/connection-exception.h>
 #include <log/alog.h>
 
-#include <ask-user-config.h>
-#include <message-utils.h>
+#include "connection-exception.h"
+#include "config.h"
+#include "message-utils.h"
+#include "server-channel.h"
 
 namespace AskUser {
 namespace Protocol {

diff --git a/src/ipc-lib/askuser-notification/ask-user-server-channel.h b/src/ipc/server-channel.h
similarity index 95%
rename from src/ipc-lib/askuser-notification/ask-user-server-channel.h
rename to src/ipc/server-channel.h
index fcb353b..8e18670 100644 (file)
--- a/src/ipc-lib/askuser-notification/ask-user-server-channel.h
+++ b/src/ipc/server-channel.h
@@ -25,9 +25,9 @@
 #include <string>
 #include <vector>
 
-#include <askuser-notification/ask-user-types.h>
-#include <askuser-notification/ask-user-channel.h>
-#include <askuser-notification/credentials.h>
+#include "common-types.h"
+#include "channel.h"
+#include "credentials.h"
 
 namespace AskUser {
 namespace Protocol {

diff --git a/src/ipc-lib/askuser-notification/sock-desc.h b/src/ipc/sock-desc.h
similarity index 93%
rename from src/ipc-lib/askuser-notification/sock-desc.h
rename to src/ipc/sock-desc.h
index 819a986..046336a 100644 (file)
--- a/src/ipc-lib/askuser-notification/sock-desc.h
+++ b/src/ipc/sock-desc.h
@@ -24,8 +24,8 @@
 
 #include <map>
 
-#include <askuser-notification/sock.h>
-#include <askuser-notification/raw-buffer.h>
+#include "sock.h"
+#include "raw-buffer.h"
 
 namespace AskUser {
 namespace Protocol {

diff --git a/src/ipc-lib/sock.cpp b/src/ipc/sock.cpp
similarity index 98%
rename from src/ipc-lib/sock.cpp
rename to src/ipc/sock.cpp
index e0f2df1..64b05ba 100644 (file)
--- a/src/ipc-lib/sock.cpp
+++ b/src/ipc/sock.cpp
@@ -24,19 +24,19 @@
 #include <stdexcept>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <string>
+#include <vector>
 #include <unistd.h>
 
 #ifdef BUILD_WITH_SYSTEMD_DAEMON
 #include <systemd/sd-daemon.h>
 #endif // BUILD_WITH_SYSTEMD_DAEMON
 
-#include <string>
-#include <vector>
-
-#include <askuser-notification/ask-user-types.h>
-#include <askuser-notification/sock.h>
 #include <log/alog.h>
 
+#include "common-types.h"
+#include "sock.h"
+
 namespace AskUser {
 namespace Protocol {
 

diff --git a/src/ipc-lib/askuser-notification/sock.h b/src/ipc/sock.h
similarity index 97%
rename from src/ipc-lib/askuser-notification/sock.h
rename to src/ipc/sock.h
index 5377d37..f9a0656 100644 (file)
--- a/src/ipc-lib/askuser-notification/sock.h
+++ b/src/ipc/sock.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <unistd.h>
 
-#include <askuser-notification/raw-buffer.h>
+#include "raw-buffer.h"
 
 namespace AskUser {
 namespace Protocol {

diff --git a/src/ipc-lib/test/main.cpp b/src/ipc/test/main.cpp
similarity index 96%
rename from src/ipc-lib/test/main.cpp
rename to src/ipc/test/main.cpp
index 644d6f6..9e84842 100644 (file)
--- a/src/ipc-lib/test/main.cpp
+++ b/src/ipc/test/main.cpp
@@ -25,9 +25,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <askuser-notification/ask-user-client-channel.h>
-#include <askuser-notification/ask-user-server-channel.h>
-#include <askuser-notification/ask-user-types.h>
+#include <client-channel.h>
+#include <server-channel.h>
+#include <common-types.h>
 
 std::map<int, int> m_sockets;
 

diff --git a/src/notification-daemon/CMakeLists.txt b/src/notification-daemon/CMakeLists.txt
index c62e9fa..89b330d 100644 (file)
--- a/src/notification-daemon/CMakeLists.txt
+++ b/src/notification-daemon/CMakeLists.txt
@@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(SYSTEM
 INCLUDE_DIRECTORIES(
     ${ASKUSER_PATH}
     ${ASKUSER_PATH}/common
-    ${ASKUSER_PATH}/ipc-lib
+    ${ASKUSER_PATH}/ipc
     ${NOTIF_PATH}
 )
 

diff --git a/src/notification-daemon/Logic.h b/src/notification-daemon/Logic.h
index be066cb..2c6ea82 100644 (file)
--- a/src/notification-daemon/Logic.h
+++ b/src/notification-daemon/Logic.h
@@ -23,7 +23,7 @@
 
 #include <map>
 #include <deque>
-#include <askuser-notification/ask-user-server-channel.h>
+#include <server-channel.h>
 #include <event/Event.h>
 
 namespace AskUser {

diff --git a/src/notification-daemon/ServerCallbacks.h b/src/notification-daemon/ServerCallbacks.h
index 159adc3..e615e1a 100644 (file)
--- a/src/notification-daemon/ServerCallbacks.h
+++ b/src/notification-daemon/ServerCallbacks.h
@@ -22,7 +22,7 @@
 
 #include <memory>
 
-#include <askuser-notification/ask-user-server-channel.h>
+#include <channel.h>
 
 #include "Logic.h"
 #include "ui/Popupper.h"