V1.0

coralkashri · Aug 17, 2018 · 2e4f8c8 · 2e4f8c8
1 parent 8fdade4
commit 2e4f8c8
Show file tree

Hide file tree

Showing 17 changed files with 612 additions and 617 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/CodeTests/ComplexDataStructureTest.cpp b/CodeTests/ComplexDataStructureTest.cpp
@@ -4,6 +4,7 @@
 #include "../File.h"
 
 using namespace std;
+using namespace FilesApi;
 
 int mainComplexDataStructureTest() {
     File f("../Test/test_file.bin");

diff --git a/CodeTests/ExceptionsTester.cpp b/CodeTests/ExceptionsTester.cpp
@@ -8,6 +8,7 @@
 #include "../File.h"
 
 using namespace std;
+using namespace FilesApi;
 
 int mainExceptionsTest() {
     File f("../Test/not_exist_file.bin", true);

diff --git a/CodeTests/FileTestNotVector.cpp b/CodeTests/FileTestNotVector.cpp
@@ -4,6 +4,7 @@
 #include "../File.h"
 
 using namespace std;
+using namespace FilesApi;
 
 int mainFileTestNotVector() {
     File f("../Test/test_file.bin");

diff --git a/CodeTests/FileTestOpertorsNotVectors.cpp b/CodeTests/FileTestOpertorsNotVectors.cpp
@@ -4,6 +4,7 @@
 #include "../File.h"
 
 using namespace std;
+using namespace FilesApi;
 
 int mainFileTestOpertorsNotVectors() {
     File f("../Test/test_file.bin");

diff --git a/CodeTests/FileTestOpertorsVectors.cpp b/CodeTests/FileTestOpertorsVectors.cpp
@@ -4,6 +4,7 @@
 #include "../File.h"
 
 using namespace std;
+using namespace FilesApi;
 
 int mainFileTestOpertorsVectors() {
     File f("../Test/test_file.bin");

diff --git a/CodeTests/FileTestVector.cpp b/CodeTests/FileTestVector.cpp
@@ -4,6 +4,7 @@
 #include "../File.h"
 
 using namespace std;
+using namespace FilesApi;
 
 int mainFileTestVector() {
     File f("../Test/test_file.bin");

diff --git a/CodeTests/FilesManagerOperatorsTest.cpp b/CodeTests/FilesManagerOperatorsTest.cpp
@@ -4,7 +4,7 @@
 #include "../FilesManager.h"
 
 using namespace std;
-
+using namespace FilesApi;
 
 int mainFilesManagerOperatorsTest() {
     FilesManager fm(false, 0, "../Test/");

diff --git a/CodeTests/FilesManagerTest.cpp b/CodeTests/FilesManagerTest.cpp
@@ -4,7 +4,7 @@
 #include "../FilesManager.h"
 
 using namespace std;
-
+using namespace FilesApi;
 
 int mainFilesManagerTest() {
     FilesManager fm;

diff --git a/DesignText.cpp b/DesignText.cpp
@@ -1,41 +1,41 @@
 #include "DesignText.h"
+namespace FilesApi {
+    namespace DesignText {
+        inline std::string BoolToString(bool b) {
+            return b ? "1" : "0";
+        }
 
-namespace DesignText {
-    inline std::string BoolToString(bool b)
-    {
-        return b ? "1" : "0";
-    }
-
-    std::string make_colored(const std::string &text, Color color, bool bold) {
-        std::string new_text;
-        new_text = "\033[";
-        switch (color) {
-            case Color::BLACK:
-                new_text += BoolToString(bold) + ";30m" + text;
-                break;
-            case Color::RED:
-                new_text += BoolToString(bold) + ";31m" + text;
-                break;
-            case Color::GREEN:
-                new_text += BoolToString(bold) + ";32m" + text;
-                break;
-            case Color::YELLOW:
-                new_text += BoolToString(bold) + ";33m" + text;
-                break;
-            case Color::BLUE:
-                new_text += BoolToString(bold) + ";34m" + text;
-                break;
-            case Color::MAGENTA:
-                new_text += BoolToString(bold) + ";35m" + text;
-                break;
-            case Color::CYAN:
-                new_text += BoolToString(bold) + ";36m" + text;
-                break;
-            case Color::WHITE:
-                new_text += BoolToString(bold) + ";37m" + text;
-                break;
+        std::string make_colored(const std::string &text, Color color, bool bold) {
+            std::string new_text;
+            new_text = "\033[";
+            switch (color) {
+                case Color::BLACK:
+                    new_text += BoolToString(bold) + ";30m" + text;
+                    break;
+                case Color::RED:
+                    new_text += BoolToString(bold) + ";31m" + text;
+                    break;
+                case Color::GREEN:
+                    new_text += BoolToString(bold) + ";32m" + text;
+                    break;
+                case Color::YELLOW:
+                    new_text += BoolToString(bold) + ";33m" + text;
+                    break;
+                case Color::BLUE:
+                    new_text += BoolToString(bold) + ";34m" + text;
+                    break;
+                case Color::MAGENTA:
+                    new_text += BoolToString(bold) + ";35m" + text;
+                    break;
+                case Color::CYAN:
+                    new_text += BoolToString(bold) + ";36m" + text;
+                    break;
+                case Color::WHITE:
+                    new_text += BoolToString(bold) + ";37m" + text;
+                    break;
+            }
+            new_text += "\033[0m";
+            return new_text;
         }
-        new_text += "\033[0m";
-        return new_text;
     }
 }
diff --git a/DesignText.h b/DesignText.h
@@ -2,20 +2,20 @@
 #define FILESAPI_DESIGNTEXT_H
 
 #include <iostream>
+namespace FilesApi {
+    namespace DesignText {
+        enum class Color {
+            BLACK,
+            RED,
+            GREEN,
+            YELLOW,
+            BLUE,
+            MAGENTA,
+            CYAN,
+            WHITE
+        };
 
-namespace DesignText {
-    enum class Color {
-        BLACK,
-        RED,
-        GREEN,
-        YELLOW,
-        BLUE,
-        MAGENTA,
-        CYAN,
-        WHITE
-    };
-
-    std::string make_colored(const std::string &text, Color color, bool bold);
+        std::string make_colored(const std::string &text, Color color, bool bold);
+    }
 }
-
 #endif //FILESAPI_DESIGNTEXT_H
diff --git a/Exceptions.h b/Exceptions.h
@@ -4,22 +4,21 @@
 #include <iostream>
 #include <exception>
 
+namespace FilesApi {
+    class FileOpenException : public std::runtime_error {
+        std::string _file_name;
+        std::string what_message;
 
-class FileOpenException: public std::runtime_error
-{
-    std::string _file_name;
-    std::string what_message;
+    public:
+        explicit FileOpenException(const std::string &file_name) : runtime_error("") {
+            _file_name = file_name;
+            what_message = "Can't open file '" + _file_name + "' exception.";
+        }
 
-public:
-    explicit FileOpenException(const std::string &file_name) : runtime_error("") {
-        _file_name = file_name;
-        what_message = "Can't open file '" + _file_name + "' exception.";
-    }
-
-    virtual const char* what() const throw()
-    {
-        return what_message.c_str();
-    }
-};
+        virtual const char *what() const throw() {
+            return what_message.c_str();
+        }
+    };
+}
 
 #endif //FILESAPI_EXCEPTIONS_H