utils: remove dependency between modules

BinaryFile reader and writer should not depend on TizenAppUtils

Change-Id: Iccb1c070c967f18ee589c06ee85438cbfe17fa58

diff --git a/clock/inc/Utils/BinaryFileReader.h b/clock/inc/Utils/BinaryFileReader.h
index 2ba3dd3..5c5e5d4 100644 (file)
--- a/clock/inc/Utils/BinaryFileReader.h
+++ b/clock/inc/Utils/BinaryFileReader.h
@@ -18,7 +18,6 @@
 #define _CLOCK_COMMON_BINARY_FILE_READER_H_
 
 #include "Utils/Reader.h"
-#include "Utils/TizenAppUtils.h"
 #include <vector>
 
 namespace utils {
@@ -29,10 +28,9 @@ namespace utils {
                public:
                        /**
                         * @brief Constructs object instance
-                        * @param dir the application accessible directory
                         * @param filename file name.
                         */
-                       BinaryFileReader(TizenAppUtils::AppSubdirectory dir, const char *filename);
+                       BinaryFileReader(const char *filename);
                        ~BinaryFileReader() {}
                        void Read(void *buffer, size_t size);
                private:

diff --git a/clock/inc/Utils/BinaryFileWriter.h b/clock/inc/Utils/BinaryFileWriter.h
index c422be4..7f10753 100644 (file)
--- a/clock/inc/Utils/BinaryFileWriter.h
+++ b/clock/inc/Utils/BinaryFileWriter.h
@@ -18,7 +18,6 @@
 #define _CLOCK_COMMON_BINARY_FILE_WRITER_H_
 
 #include "Utils/Writer.h"
-#include "Utils/TizenAppUtils.h"
 
 #include <fstream>
 
@@ -33,7 +32,7 @@ namespace utils {
                         * @param dir the application accessible directory
                         * @param filename file name.
                         */
-                       BinaryFileWriter(TizenAppUtils::AppSubdirectory dir, const char *filename);
+                       BinaryFileWriter(const char *filename);
                        ~BinaryFileWriter();
                        void Write(const void *buffer, size_t size);
                        /**

diff --git a/clock/src/Model/AlarmProvider.cpp b/clock/src/Model/AlarmProvider.cpp
index fd098ab..29d1093 100644 (file)
--- a/clock/src/Model/AlarmProvider.cpp
+++ b/clock/src/Model/AlarmProvider.cpp
@@ -29,7 +29,7 @@ using namespace internal;
 
 AlarmProvider::AlarmProvider()
 {
-       BinaryFileReader reader(TizenAppUtils::APP_DIR_DATA, DATABASE_FILE);
+       BinaryFileReader reader(TizenAppUtils::GetResourcePath(TizenAppUtils::APP_DIR_DATA, DATABASE_FILE));
        impl_ = new AlarmBinaryStorage(reader);
        if (HasActiveAlarms())
                Notifier::GetInstance().AlarmNotiPost();
@@ -43,7 +43,7 @@ AlarmProvider::~AlarmProvider()
 
 void AlarmProvider::Sync()
 {
-       BinaryFileWriter writer(TizenAppUtils::APP_DIR_DATA, DATABASE_FILE);
+       BinaryFileWriter writer(TizenAppUtils::GetResourcePath(TizenAppUtils::APP_DIR_DATA, DATABASE_FILE));
        impl_->Serialize(writer);
        writer.Flush();
 

diff --git a/clock/src/Utils/BinaryFileReader.cpp b/clock/src/Utils/BinaryFileReader.cpp
index 2b489f1..9361862 100644 (file)
--- a/clock/src/Utils/BinaryFileReader.cpp
+++ b/clock/src/Utils/BinaryFileReader.cpp
@@ -23,9 +23,9 @@
 using namespace utils;
 using namespace std;
 
-BinaryFileReader::BinaryFileReader(TizenAppUtils::AppSubdirectory dir, const char *filename)
+BinaryFileReader::BinaryFileReader(const char *filename)
 {
-       ifstream file(TizenAppUtils::GetResourcePath(dir, filename));
+       ifstream file(filename);
        offset = 0;
 
        if (!file.good()) {

diff --git a/clock/src/Utils/BinaryFileWriter.cpp b/clock/src/Utils/BinaryFileWriter.cpp
index 836722f..2035ad2 100644 (file)
--- a/clock/src/Utils/BinaryFileWriter.cpp
+++ b/clock/src/Utils/BinaryFileWriter.cpp
@@ -22,8 +22,8 @@
 using namespace utils;
 using namespace std;
 
-BinaryFileWriter::BinaryFileWriter(TizenAppUtils::AppSubdirectory dir, const char *filename) :
-       file(TizenAppUtils::GetResourcePath(dir, filename), ios::binary)
+BinaryFileWriter::BinaryFileWriter(const char *filename) :
+       file(filename, ios::binary)
 {
        if (!file.good())
                abort();