summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormanzerbredes <loic.guegan_secondary@yahoo.fr>2015-03-21 07:08:34 +0100
committermanzerbredes <loic.guegan_secondary@yahoo.fr>2015-03-21 07:08:34 +0100
commit3a10207bf5ddf14c478623b6e32ff72af6379a48 (patch)
tree8506da971d0661fc074b0b79a56fe705273d1c32
parent77affb6d5564f691ea337a3971fdc85f2460ed92 (diff)
parent697d44fd357779309bb0c1931f589a92bb88a642 (diff)
Merge branch 'PARSER'
-rw-r--r--.gitignore13
-rw-r--r--main.cpp68
-rw-r--r--src/CryptClass/AESCrypt.cpp (renamed from CryptClass/AESCrypt.cpp)0
-rw-r--r--src/CryptClass/AESCrypt.hpp (renamed from CryptClass/AESCrypt.hpp)0
-rw-r--r--src/CryptClass/AbstractSKA.hpp (renamed from CryptClass/AbstractSKA.hpp)0
-rw-r--r--src/CryptClass/HASHCrypt.cpp (renamed from CryptClass/HASHCrypt.cpp)0
-rw-r--r--src/CryptClass/HASHCrypt.hpp (renamed from CryptClass/HASHCrypt.hpp)0
-rw-r--r--src/IOFileClass/FileManIOFile.cpp (renamed from IOFileClass/FileManIOFile.cpp)0
-rw-r--r--src/IOFileClass/FileManIOFile.hpp (renamed from IOFileClass/FileManIOFile.hpp)0
-rw-r--r--src/ParserClass/AbstractIDManager.cpp (renamed from ParserClass/AbstractIDManager.cpp)0
-rw-r--r--src/ParserClass/AbstractIDManager.hpp (renamed from ParserClass/AbstractIDManager.hpp)0
-rw-r--r--src/ParserClass/FileManContainer/Website.cpp (renamed from ParserClass/FileManContainer/Website.cpp)0
-rw-r--r--src/ParserClass/FileManContainer/Website.hpp (renamed from ParserClass/FileManContainer/Website.hpp)0
-rw-r--r--src/ParserClass/FileManParser.cpp (renamed from ParserClass/FileManParser.cpp)0
-rw-r--r--src/ParserClass/FileManParser.hpp (renamed from ParserClass/FileManParser.hpp)0
-rw-r--r--src/Readme.md21
-rw-r--r--src/main.cpp80
17 files changed, 103 insertions, 79 deletions
diff --git a/.gitignore b/.gitignore
index 6e16385..f010513 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,2 @@
-#For codeblocks project:
-/*.depend
-/*.layout
-/*.cbp
-/*.cbTemp
-/bin
-/obj
-/Doxyfile
-/Doxygen
-*.untracked
-
+#I have an Untraked folder
+Untracked
diff --git a/main.cpp b/main.cpp
deleted file mode 100644
index c392103..0000000
--- a/main.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * @file main.cpp
- * @brief Entry point
- * @author manzerbredes
- * @version Prototype
- * @date 8 Mars 2015
- *
- * Entry point of the application.
- *
- */
-
-
-
-
-//----- std -----
-
-#include <iostream>
-#include <string>
-#include <vector>
-
-
-//----- class -----
-#include "FileManIOFile.hpp"
-#include "FileManParser.hpp"
-#include "Website.hpp"
-
-
-
-
-
-/**
- * @fn int main(int argc, char *argv[])
- * @author manzerbredes
- * @brief main function
- * @param argc contain *argv[] length
- * @param *argv[] contain the arguments list
- * @return Return code, an int.
- */
-int main(int argc, char *argv[]){
-
-
- //TEST PARSER FAKE ARGUMENT
- FileManParser xmlParser("");
-
- std::vector<Website> *siteWeb=xmlParser.getWebsites();
-
- siteWeb->erase(siteWeb->begin()+1);
-
- xmlParser.updateParser();
-
-
- //Save modification in file
-
- FileManIOFile save("Doxygen/bob.bin");
-
- save.write("loic", xmlParser.getDocument());
-
- //Print
- std::cout << xmlParser.getDocument();
-
-
-
-
- return 0;
-}
-
-
-
diff --git a/CryptClass/AESCrypt.cpp b/src/CryptClass/AESCrypt.cpp
index d3ea949..d3ea949 100644
--- a/CryptClass/AESCrypt.cpp
+++ b/src/CryptClass/AESCrypt.cpp
diff --git a/CryptClass/AESCrypt.hpp b/src/CryptClass/AESCrypt.hpp
index c4d75aa..c4d75aa 100644
--- a/CryptClass/AESCrypt.hpp
+++ b/src/CryptClass/AESCrypt.hpp
diff --git a/CryptClass/AbstractSKA.hpp b/src/CryptClass/AbstractSKA.hpp
index 7622ab4..7622ab4 100644
--- a/CryptClass/AbstractSKA.hpp
+++ b/src/CryptClass/AbstractSKA.hpp
diff --git a/CryptClass/HASHCrypt.cpp b/src/CryptClass/HASHCrypt.cpp
index eed9cb5..eed9cb5 100644
--- a/CryptClass/HASHCrypt.cpp
+++ b/src/CryptClass/HASHCrypt.cpp
diff --git a/CryptClass/HASHCrypt.hpp b/src/CryptClass/HASHCrypt.hpp
index 3eafb2f..3eafb2f 100644
--- a/CryptClass/HASHCrypt.hpp
+++ b/src/CryptClass/HASHCrypt.hpp
diff --git a/IOFileClass/FileManIOFile.cpp b/src/IOFileClass/FileManIOFile.cpp
index ea49201..ea49201 100644
--- a/IOFileClass/FileManIOFile.cpp
+++ b/src/IOFileClass/FileManIOFile.cpp
diff --git a/IOFileClass/FileManIOFile.hpp b/src/IOFileClass/FileManIOFile.hpp
index 221cf13..221cf13 100644
--- a/IOFileClass/FileManIOFile.hpp
+++ b/src/IOFileClass/FileManIOFile.hpp
diff --git a/ParserClass/AbstractIDManager.cpp b/src/ParserClass/AbstractIDManager.cpp
index e1c5e13..e1c5e13 100644
--- a/ParserClass/AbstractIDManager.cpp
+++ b/src/ParserClass/AbstractIDManager.cpp
diff --git a/ParserClass/AbstractIDManager.hpp b/src/ParserClass/AbstractIDManager.hpp
index 67d5f6f..67d5f6f 100644
--- a/ParserClass/AbstractIDManager.hpp
+++ b/src/ParserClass/AbstractIDManager.hpp
diff --git a/ParserClass/FileManContainer/Website.cpp b/src/ParserClass/FileManContainer/Website.cpp
index f65a66d..f65a66d 100644
--- a/ParserClass/FileManContainer/Website.cpp
+++ b/src/ParserClass/FileManContainer/Website.cpp
diff --git a/ParserClass/FileManContainer/Website.hpp b/src/ParserClass/FileManContainer/Website.hpp
index cb293d4..cb293d4 100644
--- a/ParserClass/FileManContainer/Website.hpp
+++ b/src/ParserClass/FileManContainer/Website.hpp
diff --git a/ParserClass/FileManParser.cpp b/src/ParserClass/FileManParser.cpp
index 57a485a..57a485a 100644
--- a/ParserClass/FileManParser.cpp
+++ b/src/ParserClass/FileManParser.cpp
diff --git a/ParserClass/FileManParser.hpp b/src/ParserClass/FileManParser.hpp
index f0d01e5..f0d01e5 100644
--- a/ParserClass/FileManParser.hpp
+++ b/src/ParserClass/FileManParser.hpp
diff --git a/src/Readme.md b/src/Readme.md
new file mode 100644
index 0000000..6600ef4
--- /dev/null
+++ b/src/Readme.md
@@ -0,0 +1,21 @@
+Class organisation
+=====
+
+##CryptClass
+> Contain all crypting algorithm, and use
+**crypto++** library.
+
+##IOFileClass
+> Contain all class that manage IO in file.
+*FileManIOFile* class load and save encrypted files, and use
+class from *CryptClass*.
+
+##ParserClass
+> Contain class for parsing data (exemple: parsing a decrypted file from *FileManIOFile*.
+
+##Coming soon:
+>GTK+Class to manager GUI.
+<br /><br />
+
+PLEASE USE DOXYGEN COMMENTS
+===== \ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
new file mode 100644
index 0000000..b2f344f
--- /dev/null
+++ b/src/main.cpp
@@ -0,0 +1,80 @@
+/**
+ * @file main.cpp
+ * @brief Entry point
+ * @author manzerbredes
+ * @version Prototype
+ * @date 8 Mars 2015
+ *
+ * Entry point of the application.
+ *
+ */
+
+
+
+
+//----- std -----
+
+#include <iostream>
+#include <string>
+#include <vector>
+
+
+//----- class -----
+#include "FileManIOFile.hpp"
+#include "FileManParser.hpp"
+#include "Website.hpp"
+
+
+#include <gtk/gtk.h>
+
+
+/**
+ * @fn int main(int argc, char *argv[])
+ * @author manzerbredes
+ * @brief main function
+ * @param argc contain *argv[] length
+ * @param *argv[] contain the arguments list
+ * @return Return code, an int.
+ */
+int main(int argc, char *argv[]){
+
+
+
+ /* Initialisation de GTK+ */
+ gtk_init(&argc, &argv);
+
+
+ GtkWidget* MainWindow=NULL;
+
+ MainWindow=gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+ g_signal_connect(G_OBJECT(MainWindow), "delete-event", G_CALLBACK(gtk_main_quit), NULL);
+
+
+ GtkWidget* bouton;
+
+ bouton=gtk_button_new_with_label("Hello Bro :");
+ gtk_container_add(GTK_CONTAINER(MainWindow), bouton);
+
+ g_signal_connect(G_OBJECT(bouton), "leave", G_CALLBACK(gtk_main_quit), NULL);
+
+ gtk_window_set_title(GTK_WINDOW(MainWindow), "forgetIt");
+ gtk_window_set_default_size(GTK_WINDOW(MainWindow), 500,500);
+
+ gtk_window_set_position(GTK_WINDOW(MainWindow), GTK_WIN_POS_CENTER);
+
+
+
+ gtk_widget_show_all(MainWindow);
+
+
+ gtk_main();
+
+
+
+ return EXIT_SUCCESS;
+
+}
+
+
+