Refactor|PathTree: Dumped PathTree's now redundant C wrapper API

skyjake · Nov 7, 2012 · fbd9e66 · fbd9e66
1 parent 5770f11
commit fbd9e66
Show file tree

Hide file tree

Showing 11 changed files with 328 additions and 690 deletions.
diff --git a/doomsday/engine/portable/include/cbuffer.h b/doomsday/engine/portable/include/cbuffer.h
@@ -25,6 +25,10 @@
 #ifndef LIBDENG_CONSOLE_BUFFER_H
 #define LIBDENG_CONSOLE_BUFFER_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup consoleBufferLineFlags Console Buffer Line Flags.
  *
@@ -140,4 +144,9 @@ const cbline_t* CBuffer_GetLine(CBuffer* cb, uint idx);
  */
 uint CBuffer_GetLines2(CBuffer* cb, uint reqCount, int firstIdx, cbline_t const** list, int blflags);
 uint CBuffer_GetLines(CBuffer* cb, uint reqCount, int firstIdx, cbline_t const** list); /* blflags = 0 */
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* LIBDENG_CONSOLE_BUFFER_H */
diff --git a/doomsday/engine/portable/include/con_main.h b/doomsday/engine/portable/include/con_main.h
@@ -34,7 +34,6 @@
 #include "dd_types.h"
 #include "de_system.h"
 #include "dd_input.h"
-#include "pathtree.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -92,7 +91,7 @@ typedef struct cvar_s {
     cvartype_t type;
 
     /// Pointer to this variable's node in the directory.
-    PathTreeNode* directoryNode;
+    void* directoryNode;
 
     /// Pointer to the user data.
     void* ptr;

diff --git a/doomsday/engine/portable/include/de_platform.h b/doomsday/engine/portable/include/de_platform.h
@@ -68,8 +68,16 @@
 #define strdup _strdup
 #define spawnlp _spawnlp
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 const char* strcasestr(const char* text, const char* sub);
 
+#ifdef __cplusplus
+} extern "C"
+#endif
+
 #endif                          // WIN32
 
 /*

diff --git a/doomsday/engine/portable/include/fs_main.h b/doomsday/engine/portable/include/fs_main.h
@@ -34,12 +34,12 @@
 
 #include "file.h"
 #include "filehandle.h"
-#include "pathtree.h"
 
 #ifdef __cplusplus
 
 #include <QList>
 #include <de/String>
+#include "pathtree.h"
 #include "fileinfo.h"
 
 /**