Moved include files, changed include directives

CMakeLists.txt

@@ -1,24 +1,23 @@
 set (HEADERS
-  Audio.h
-  Document.h
-  json_encode.h
-  PhotoSize.h
-  User.h
-  Chat.h
-  exec.h
-  Location.h
-  std.h
-  Venue.h
-  Contact.h
-  explode.h
-  MessageEntity.h
-  Sticker.h
-  Video.h
-  defines.h
-  http_build_query.h
-  Message.h
-  TelegramBot.h
-  Voice.h
+  include/Audio.h
+  include/Document.h
+  include/json_encode.h
+  include/PhotoSize.h
+  include/User.h
+  include/Chat.h
+  include/exec.h
+  include/Location.h
+  include/std.h
+  include/Venue.h
+  include/Contact.h
+  include/explode.h
+  include/MessageEntity.h
+  include/Sticker.h
+  include/Video.h
+  include/http_build_query.h
+  include/Message.h
+  include/TelegramBot.h
+  include/Voice.h
 )
 
 set (SOURCES

include/Telegram/Document.h

@@ -4,7 +4,7 @@
 #include <json/json.h>
 #include <string>
 
-#include "PhotoSize.h"
+#include <Telegram/PhotoSize.h>
 
 namespace Telegram {
 

include/Telegram/Message.h

@@ -6,18 +6,18 @@
 #include <string>
 #include <vector>
 
-#include "Audio.h"
-#include "Chat.h"
-#include "Contact.h"
-#include "Document.h"
-#include "Location.h"
-#include "MessageEntity.h"
-#include "PhotoSize.h"
-#include "Sticker.h"
-#include "User.h"
-#include "Venue.h"
-#include "Video.h"
-#include "Voice.h"
+#include <Telegram/Audio.h>
+#include <Telegram/Chat.h>
+#include <Telegram/Contact.h>
+#include <Telegram/Document.h>
+#include <Telegram/Location.h>
+#include <Telegram/MessageEntity.h>
+#include <Telegram/PhotoSize.h>
+#include <Telegram/Sticker.h>
+#include <Telegram/User.h>
+#include <Telegram/Venue.h>
+#include <Telegram/Video.h>
+#include <Telegram/Voice.h>
 
 namespace Telegram {
 

include/Telegram/Sticker.h

@@ -4,7 +4,7 @@
 #include <json/json.h>
 #include <string>
 
-#include "PhotoSize.h"
+#include <Telegram/PhotoSize.h>
 
 namespace Telegram {
 

include/Telegram/TelegramBot.h

@@ -7,7 +7,7 @@
 #include <curl/curl.h>
 #include <json/json.h>
 
-#include "Message.h"
+#include <Telegram/Message.h>
 
 namespace Telegram {
 

include/Telegram/Venue.h

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "Location.h"
+#include <Telegram/Location.h>
 
 namespace Telegram {
 

include/Telegram/Video.h

@@ -4,7 +4,7 @@
 #include <json/json.h>
 #include <string>
 
-#include "PhotoSize.h"
+#include <Telegram/PhotoSize.h>
 
 namespace Telegram {
 

src/Audio.cc

@@ -1,4 +1,4 @@
-#include "Audio.h"
+#include "Telegram/Audio.h"
 
 Telegram::Audio::Audio(Json::Value json) {
 

src/Chat.cc

@@ -1,4 +1,4 @@
-#include "Chat.h"
+#include "Telegram/Chat.h"
 
 Telegram::Chat::Chat(Json::Value json) {
 

src/Contact.cc

@@ -1,4 +1,4 @@
-#include "Contact.h"
+#include "Telegram/Contact.h"
 
 Telegram::Contact::Contact(Json::Value json) {
 

src/Document.cc

@@ -1,4 +1,4 @@
-#include "Document.h"
+#include "Telegram/Document.h"
 
 Telegram::Document::Document(Json::Value json) {
 

src/Location.cc

@@ -1,4 +1,4 @@
-#include "Location.h"
+#include "Telegram/Location.h"
 
 Telegram::Location::Location(Json::Value json) {
 

src/Message.cc

@@ -1,4 +1,4 @@
-#include "Message.h"
+#include "Telegram/Message.h"
 
 // Generic constructor
 // @TODO: Make this an "init"-Method and call it from the constructor

src/MessageEntity.cc

@@ -1,4 +1,4 @@
-#include "MessageEntity.h"
+#include "Telegram/MessageEntity.h"
 
 Telegram::MessageEntity::MessageEntity(Json::Value json) {
 

src/PhotoSize.cc

@@ -1,4 +1,4 @@
-#include "PhotoSize.h"
+#include "Telegram/PhotoSize.h"
 
 Telegram::PhotoSize::PhotoSize(Json::Value json) {
 

src/Sticker.cc

@@ -1,4 +1,4 @@
-#include "Sticker.h"
+#include "Telegram/Sticker.h"
 
 Telegram::Sticker::Sticker(Json::Value json) {
 

src/TelegramBot.cc

@@ -1,4 +1,4 @@
-#include "TelegramBot.h"
+#include "Telegram/TelegramBot.h"
 
 #include <iostream>
 
@@ -7,12 +7,12 @@
 #include <curlpp/Infos.hpp>
 #include <curlpp/Options.hpp>
 
-#include "http_build_query.h"
-#include "json_encode.h"
-#include "std.h"
+#include "Telegram/http_build_query.h"
+#include "Telegram/json_encode.h"
+#include "Telegram/std.h"
 
-#include "Message.h"
-#include "MessageEntity.h"
+#include "Telegram/Message.h"
+#include "Telegram/MessageEntity.h"
 
 #define API_URL "https://api.telegram.org/bot"
 

src/User.cc

@@ -1,4 +1,4 @@
-#include "User.h"
+#include "Telegram/User.h"
 
 Telegram::User::User(Json::Value json) {
 

src/Venue.cc

@@ -1,4 +1,4 @@
-#include "Venue.h"
+#include "Telegram/Venue.h"
 
 Telegram::Venue::Venue(Json::Value json) {
 

src/Video.cc

@@ -1,4 +1,4 @@
-#include "Video.h"
+#include "Telegram/Video.h"
 
 Telegram::Video::Video(Json::Value json) {
 

src/Voice.cc

@@ -1,4 +1,4 @@
-#include "Voice.h"
+#include "Telegram/Voice.h"
 
 Telegram::Voice::Voice(Json::Value json) {
 

src/exec.cc

@@ -1,4 +1,4 @@
-#include "exec.h"
+#include "Telegram/exec.h"
 
 #include <iostream>
 #include <stdio.h>

src/explode.cc

@@ -1,4 +1,4 @@
-#include "explode.h"
+#include "Telegram/explode.h"
 
 std::vector<std::string> explode( const std::string &delimiter, const std::string &str) {
 

src/http_build_query.cc

@@ -1,4 +1,4 @@
-#include "http_build_query.h"
+#include "Telegram/http_build_query.h"
 
 std::string http_build_query(std::map<std::string, std::string> data) {
 

src/json_encode.cc

@@ -1,4 +1,4 @@
-#include "json_encode.h"
+#include "Telegram/json_encode.h"
 
 std::string json_encode(std::map<std::string, std::string> parameters) {
 

src/std.cc

@@ -1,4 +1,4 @@
-#include "std.h"
+#include "Telegram/std.h"
 
 #include <pwd.h>
 #include <time.h>