rearrange files

CMakeLists.txt

@@ -165,12 +165,6 @@ add_executable(pdf2htmlEX
     src/BackgroundRenderer/SplashBackgroundRenderer.cc 
     src/BackgroundRenderer/CairoBackgroundRenderer.h 
     src/BackgroundRenderer/CairoBackgroundRenderer.cc 
-    src/util/ArgParser.h
-    src/util/ArgParser.cc
-    src/util/base64stream.h
-    src/util/base64stream.cc
-    src/util/color.h
-    src/util/color.cc
     src/util/const.h
     src/util/const.cc
     src/util/css_const.h
@@ -178,7 +172,6 @@ add_executable(pdf2htmlEX
     src/util/encoding.cc
     src/util/ffw.h
     src/util/ffw.c
-    src/util/HTMLState.h
     src/util/math.h
     src/util/math.cc
     src/util/misc.h
@@ -186,16 +179,23 @@ add_executable(pdf2htmlEX
     src/util/namespace.h
     src/util/path.h
     src/util/path.cc
-    src/util/Preprocessor.h
-    src/util/Preprocessor.cc
-    src/util/StringFormatter.h
-    src/util/StringFormatter.cc
-    src/util/TextLineBuffer.h
-    src/util/TextLineBuffer.cc
-    src/util/TmpFiles.h
-    src/util/TmpFiles.cc
     src/util/unicode.h
     src/util/unicode.cc
+    src/HTMLState.h
+    src/ArgParser.h
+    src/ArgParser.cc
+    src/base64stream.h
+    src/base64stream.cc
+    src/Color.h
+    src/Color.cc
+    src/Preprocessor.h
+    src/Preprocessor.cc
+    src/StringFormatter.h
+    src/StringFormatter.cc
+    src/TextLineBuffer.h
+    src/TextLineBuffer.cc
+    src/TmpFiles.h
+    src/TmpFiles.cc
     )
 target_link_libraries(pdf2htmlEX ${PDF2HTMLEX_LIBS})
 

src/Color.cc

@@ -1,4 +1,5 @@
-#include "util/color.h"
+#include "Color.h"
+
 #include "util/misc.h"
 
 namespace pdf2htmlEX {

src/HTMLRenderer/HTMLRenderer.h

@@ -22,14 +22,15 @@
 #include <Annot.h>
 
 #include "Param.h"
-#include "util/Preprocessor.h"
+#include "Preprocessor.h"
+#include "StringFormatter.h"
+#include "TmpFiles.h"
+#include "Color.h"
+#include "StateManager.h"
+#include "TextLineBuffer.h"
+
 #include "util/const.h"
-#include "util/StringFormatter.h"
-#include "util/TmpFiles.h"
 #include "util/misc.h"
-#include "util/color.h"
-#include "util/StateManager.h"
-#include "util/TextLineBuffer.h"
 
 namespace pdf2htmlEX {
 

src/HTMLRenderer/font.cc

@@ -19,10 +19,11 @@
 
 #include "Param.h"
 #include "HTMLRenderer.h"
+#include "base64stream.h"
+
 #include "util/namespace.h"
 #include "util/math.h"
 #include "util/misc.h"
-#include "util/base64stream.h"
 #include "util/ffw.h"
 #include "util/path.h"
 #include "util/unicode.h"

src/HTMLRenderer/general.cc

@@ -14,13 +14,14 @@
 
 #include <GlobalParams.h>
 
-#include "HTMLRenderer.h"
-#include "util/TextLineBuffer.h"
 #include "pdf2htmlEX-config.h"
+#include "HTMLRenderer.h"
+#include "TextLineBuffer.h"
 #include "BackgroundRenderer/BackgroundRenderer.h"
+#include "base64stream.h"
+
 #include "util/namespace.h"
 #include "util/ffw.h"
-#include "util/base64stream.h"
 #include "util/math.h"
 #include "util/path.h"
 #include "util/css_const.h"

src/HTMLRenderer/state.cc

@@ -10,7 +10,7 @@
 #include <algorithm>
 
 #include "HTMLRenderer.h"
-#include "util/TextLineBuffer.h"
+
 #include "util/namespace.h"
 #include "util/math.h"
 

src/HTMLRenderer/text.cc

@@ -10,7 +10,7 @@
 #include <algorithm>
 
 #include "HTMLRenderer.h"
-#include "util/TextLineBuffer.h"
+
 #include "util/namespace.h"
 #include "util/unicode.h"
 

src/HTMLState.h

@@ -5,7 +5,7 @@
 #ifndef HTMLSTATE_H__
 #define HTMLSTATE_H__
 
-#include "util/color.h"
+#include "Color.h"
 
 namespace pdf2htmlEX {
 

src/StateManager.h

@@ -13,9 +13,10 @@
 #include <map>
 #include <unordered_map>
 
+#include "Color.h"
+
 #include "util/math.h"
 #include "util/css_const.h"
-#include "util/color.h"
 
 namespace pdf2htmlEX {
 

src/TextLineBuffer.cc

@@ -10,8 +10,8 @@
 #include <cmath>
 #include <algorithm>
 
-#include "HTMLRenderer/HTMLRenderer.h"
+#include "TextLineBuffer.h"
-#include "util/TextLineBuffer.h"
+
 #include "util/namespace.h"
 #include "util/unicode.h"
 #include "util/math.h"

src/TextLineBuffer.h

@@ -4,9 +4,11 @@
 #include <iostream>
 #include <vector>
 
+#include <CharTypes.h>
+
 #include "Param.h"
-#include "util/StateManager.h"
+#include "StateManager.h"
-#include "util/HTMLState.h"
+#include "HTMLState.h"
 
 namespace pdf2htmlEX {
 

src/pdf2htmlEX.cc

@@ -21,10 +21,11 @@
 #include <PDFDocFactory.h>
 #include <GlobalParams.h>
 
-#include "Param.h"
 #include "pdf2htmlEX-config.h"
+#include "ArgParser.h"
+#include "Param.h"
 #include "HTMLRenderer/HTMLRenderer.h"
-#include "util/ArgParser.h"
+
 #include "util/path.h"
 #include "util/ffw.h"