Removed nonsensical ifdefs.

CMakeLists.txt

@@ -48,10 +48,6 @@ configure_file (
   "${PROJECT_BINARY_DIR}/version.hpp"
 )
 
-# Announce that we are compiling mastodon-cpp (used to figure out where the
-# headers are)
-add_definitions(-DMASTODON_CPP=1)
-
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_definitions(-DDEBUG=1)
 endif()

examples/example01_get_public_timeline.cpp

@@ -8,13 +8,8 @@
 #include <string>
 #include <cstdint>
 #include <regex>
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/all.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/all.hpp>
-#endif
+#include "mastodon-cpp.hpp"
+#include "easy/all.hpp"
 
 using std::cout;
 using std::cerr;

examples/example02_stream.cpp

@@ -10,13 +10,8 @@
 #include <mutex>
 #include <chrono>
 #include <vector>
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/all.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/all.hpp>
-#endif
+#include "mastodon-cpp.hpp"
+#include "easy/all.hpp"
 
 using std::cout;
 using std::cerr;

src/easy/all.hpp

@@ -17,47 +17,24 @@
 #ifndef MASTODON_CPP_EASY_ALL_HPP
 #define MASTODON_CPP_EASY_ALL_HPP
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "easy/easy.hpp"
-    #include "easy/entities/account.hpp"
-    #include "easy/entities/application.hpp"
-    #include "easy/entities/attachment.hpp"
-    #include "easy/entities/card.hpp"
-    #include "easy/entities/context.hpp"
-    #include "easy/entities/emoji.hpp"
-    #include "easy/entities/instance.hpp"
-    #include "easy/entities/list.hpp"
-    #include "easy/entities/mention.hpp"
-    #include "easy/entities/notification.hpp"
-    #include "easy/entities/relationship.hpp"
-    #include "easy/entities/report.hpp"
-    #include "easy/entities/results.hpp"
-    #include "easy/entities/status.hpp"
-    #include "easy/entities/tag.hpp"
-    #include "easy/entities/token.hpp"
-    #include "easy/entities/pushsubscription.hpp"
-    #include "easy/entities/filter.hpp"
-#else
-    #include <mastodon-cpp/easy/easy.hpp>
-    #include <mastodon-cpp/easy/entities/account.hpp>
-    #include <mastodon-cpp/easy/entities/application.hpp>
-    #include <mastodon-cpp/easy/entities/attachment.hpp>
-    #include <mastodon-cpp/easy/entities/card.hpp>
-    #include <mastodon-cpp/easy/entities/context.hpp>
-    #include <mastodon-cpp/easy/entities/emoji.hpp>
-    #include <mastodon-cpp/easy/entities/instance.hpp>
-    #include <mastodon-cpp/easy/entities/list.hpp>
-    #include <mastodon-cpp/easy/entities/mention.hpp>
-    #include <mastodon-cpp/easy/entities/notification.hpp>
-    #include <mastodon-cpp/easy/entities/relationship.hpp>
-    #include <mastodon-cpp/easy/entities/report.hpp>
-    #include <mastodon-cpp/easy/entities/results.hpp>
-    #include <mastodon-cpp/easy/entities/status.hpp>
-    #include <mastodon-cpp/easy/entities/tag.hpp>
-    #include <mastodon-cpp/easy/entities/token.hpp>
-    #include <mastodon-cpp/easy/entities/pushsubscription.hpp>
-    #include <mastodon-cpp/easy/entities/filter.hpp>
-#endif
+#include "easy.hpp"
+#include "entities/account.hpp"
+#include "entities/application.hpp"
+#include "entities/attachment.hpp"
+#include "entities/card.hpp"
+#include "entities/context.hpp"
+#include "entities/emoji.hpp"
+#include "entities/instance.hpp"
+#include "entities/list.hpp"
+#include "entities/mention.hpp"
+#include "entities/notification.hpp"
+#include "entities/relationship.hpp"
+#include "entities/report.hpp"
+#include "entities/results.hpp"
+#include "entities/status.hpp"
+#include "entities/tag.hpp"
+#include "entities/token.hpp"
+#include "entities/pushsubscription.hpp"
+#include "entities/filter.hpp"
 
 #endif  // MASTODON_CPP_EASY_ALL_HPP

src/easy/easy.hpp

@@ -24,20 +24,11 @@
 #include <ostream>
 #include <jsoncpp/json/json.h>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/return_types_easy.hpp"
-    #include "easy/types_easy.hpp"
-    #include "easy/entities/notification.hpp"
-    #include "easy/entities/status.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/return_types_easy.hpp>
-    #include <mastodon-cpp/easy/types_easy.hpp>
-    #include <mastodon-cpp/easy/entities/notification.hpp>
-    #include <mastodon-cpp/easy/entities/status.hpp>
-#endif
+#include "../mastodon-cpp.hpp"
+#include "return_types_easy.hpp"
+#include "types_easy.hpp"
+#include "entities/notification.hpp"
+#include "entities/status.hpp"
 
 using std::string;
 using std::vector;

src/easy/entities/account.hpp

@@ -22,16 +22,9 @@
 #include <vector>
 #include <utility>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-    #include "easy/entities/emoji.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-    #include <mastodon-cpp/easy/entities/emoji.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
+#include "emoji.hpp"
 
 using std::string;
 using std::uint64_t;

src/easy/entities/application.hpp

@@ -19,14 +19,8 @@
 
 #include <string>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
 
 using std::string;
 

src/easy/entities/attachment.hpp

@@ -22,14 +22,8 @@
 #include <chrono>
 #include <array>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
 
 using std::string;
 using std::uint64_t;

src/easy/entities/card.hpp

@@ -20,14 +20,8 @@
 #include <string>
 #include <cstdint>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
 
 using std::string;
 using std::uint64_t;

src/easy/entities/context.hpp

@@ -20,16 +20,9 @@
 #include <string>
 #include <vector>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-    #include "easy/entities/status.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-    #include <mastodon-cpp/easy/entities/status.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
+#include "status.hpp"
 
 using std::string;
 

src/easy/entities/emoji.hpp

@@ -19,14 +19,8 @@
 
 #include <string>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
 
 using std::string;
 

src/easy/entities/filter.hpp

@@ -19,14 +19,8 @@
 
 #include <string>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
 
 using std::string;
 

src/easy/entities/instance.hpp

@@ -22,16 +22,9 @@
 
 using std::uint64_t;
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entities/account.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entities/account.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
+#include "account.hpp"
 
 using std::string;
 

src/easy/entities/list.hpp

@@ -21,14 +21,8 @@
 #include <vector>
 #include <cstdint>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
 
 using std::string;
 using std::uint64_t;

src/easy/entities/mention.hpp

@@ -20,14 +20,8 @@
 #include <string>
 #include <cstdint>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
 
 using std::string;
 using std::uint64_t;

src/easy/entities/notification.hpp

@@ -20,18 +20,10 @@
 #include <string>
 #include <cstdint>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entities/account.hpp"
-    #include "easy/entities/status.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entities/account.hpp>
-    #include <mastodon-cpp/easy/entities/status.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
+#include "account.hpp"
+#include "status.hpp"
 
 using std::string;
 using std::uint64_t;

src/easy/entities/pushsubscription.hpp

@@ -22,14 +22,8 @@
 #include <cstdint>
 #include <map>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
 
 using std::string;
 using std::vector;

src/easy/entities/relationship.hpp

@@ -20,14 +20,8 @@
 #include <string>
 #include <cstdint>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
 
 using std::string;
 using std::uint64_t;

src/easy/entities/report.hpp

@@ -20,14 +20,8 @@
 #include <string>
 #include <cstdint>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
 
 using std::string;
 

src/easy/entities/results.hpp

@@ -20,20 +20,11 @@
 #include <string>
 #include <vector>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-    #include "easy/entities/account.hpp"
-    #include "easy/entities/status.hpp"
-    #include "easy/entities/tag.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-    #include <mastodon-cpp/easy/entities/account.hpp>
-    #include <mastodon-cpp/easy/entities/status.hpp>
-    #include <mastodon-cpp/easy/entities/tag.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
+#include "account.hpp"
+#include "status.hpp"
+#include "tag.hpp"
 
 using std::string;
 

src/easy/entities/status.hpp

@@ -21,28 +21,15 @@
 #include <cstdint>
 #include <vector>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-    #include "easy/entities/account.hpp"
-    #include "easy/entities/emoji.hpp"
-    #include "easy/entities/attachment.hpp"
-    #include "easy/entities/mention.hpp"
-    #include "easy/entities/tag.hpp"
-    #include "easy/entities/application.hpp"
-    #include "easy/entities/card.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-    #include <mastodon-cpp/easy/entities/account.hpp>
-    #include <mastodon-cpp/easy/entities/emoji.hpp>
-    #include <mastodon-cpp/easy/entities/attachment.hpp>
-    #include <mastodon-cpp/easy/entities/mention.hpp>
-    #include <mastodon-cpp/easy/entities/tag.hpp>
-    #include <mastodon-cpp/easy/entities/application.hpp>
-    #include <mastodon-cpp/easy/entities/card.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
+#include "account.hpp"
+#include "emoji.hpp"
+#include "attachment.hpp"
+#include "mention.hpp"
+#include "tag.hpp"
+#include "application.hpp"
+#include "card.hpp"
 
 using std::string;
 using std::uint64_t;

src/easy/entities/tag.hpp

@@ -20,14 +20,8 @@
 #include <string>
 #include <cstdint>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
 
 using std::string;
 using std::uint64_t;

src/easy/entities/token.hpp

@@ -19,14 +19,8 @@
 
 #include <string>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-    #include "easy/entity.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-    #include <mastodon-cpp/easy/entity.hpp>
-#endif
+#include "../../mastodon-cpp.hpp"
+#include "../entity.hpp"
 
 using std::string;
 

src/easy/entity.hpp

@@ -20,12 +20,7 @@
 #include <string>
 #include <jsoncpp/json/json.h>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "easy/types_easy.hpp"
-#else
-    #include <mastodon-cpp/easy/types_easy.hpp>
-#endif
+#include "types_easy.hpp"
 
 using std::string;
 

src/easy/return_types_easy.hpp

@@ -21,12 +21,7 @@
 #include <vector>
 #include <ostream>
 #include <cstdint>
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "mastodon-cpp.hpp"
-#else
-    #include <mastodon-cpp/mastodon-cpp.hpp>
-#endif
+#include "../mastodon-cpp.hpp"
 
 using std::string;
 using std::vector;

src/mastodon-cpp.hpp

@@ -28,14 +28,8 @@
 #include <curlpp/cURLpp.hpp>
 #include <curlpp/Easy.hpp>
 
-// If we are compiling mastodon-cpp, use another include path
-#ifdef MASTODON_CPP
-    #include "return_types.hpp"
-    #include "types.hpp"
-#else
-    #include <mastodon-cpp/return_types.hpp>
-    #include <mastodon-cpp/types.hpp>
-#endif
+#include "return_types.hpp"
+#include "types.hpp"
 
 using std::string;
 using std::uint8_t;