include headers in proper location

.h has headers required for prototyping .cc has headers required for definition
apertium · Jul 11, 2019 · d014437 · d014437
1 parent e8e2342
commit d014437
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 34 deletions.
diff --git a/apertium/pretransfer.cc b/apertium/pretransfer.cc
@@ -1,5 +1,13 @@
 #include <apertium/pretransfer.h>
 
+#include <lttoolbox/lt_locale.h>
+#include <apertium/apertium_config.h>
+#include <apertium/unlocked_cstdio.h>
+#include <apertium/string_utils.h>
+
+#include <iostream>
+#include <string>
+
 void readAndWriteUntil(FILE *input, FILE *output, int const charcode)
 {
   int mychar;

diff --git a/apertium/pretransfer.h b/apertium/pretransfer.h
@@ -2,12 +2,7 @@
 #define PRETRANSFER_H
 
 #include <iostream>
-#include <string>
-
 #include <lttoolbox/lt_locale.h>
-#include <apertium/apertium_config.h>
-#include <apertium/unlocked_cstdio.h>
-#include <apertium/string_utils.h>
 
 void readAndWriteUntil(FILE *input, FILE *output, int const charcode);
 void procWord(FILE *input, FILE *output, bool surface_forms, bool compound_sep);

diff --git a/apertium/tagger.cc b/apertium/tagger.cc
@@ -1,5 +1,43 @@
 #include<apertium/tagger.h>
 
+#include "apertium_config.h"
+
+#include "align.h"
+#include "basic_exception_type.h"
+#include "basic_stream_tagger.h"
+#include "basic_stream_tagger_trainer.h"
+#include "basic_tagger.h"
+#include "err_exception.h"
+#include "exception.h"
+#include "file_tagger.h"
+#include "linebreak.h"
+#include "stream_5_3_1_tagger.h"
+#include "stream_5_3_1_tagger_trainer.h"
+#include "stream_5_3_2_tagger.h"
+#include "stream_5_3_2_tagger_trainer.h"
+#include "stream_5_3_3_tagger.h"
+#include "stream_5_3_3_tagger_trainer.h"
+#include <apertium/perceptron_tagger.h>
+#include <apertium/hmm.h>
+#include <apertium/lswpost.h>
+#include <apertium/tagger_word.h>
+#include <apertium/shell_utils.h>
+
+#include <lttoolbox/lt_locale.h>
+
+#include "getopt_long.h"
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <fstream>
+#include <iomanip>
+#include <ios>
+#include <iostream>
+#include <locale>
+#include <sstream>
+#include <string>
+#include <unistd.h>
 
 namespace Apertium {
 using namespace ShellUtils;

diff --git a/apertium/tagger.h b/apertium/tagger.h
@@ -18,45 +18,16 @@
 
 #include "apertium_config.h"
 
-#include "align.h"
-#include "basic_exception_type.h"
 #include "basic_stream_tagger.h"
 #include "basic_stream_tagger_trainer.h"
 #include "basic_tagger.h"
 #include "constructor_eq_delete.h"
 #include "err_exception.h"
-#include "exception.h"
 #include "file_tagger.h"
-#include "linebreak.h"
 #include "optional.h"
-#include "stream_5_3_1_tagger.h"
-#include "stream_5_3_1_tagger_trainer.h"
-#include "stream_5_3_2_tagger.h"
-#include "stream_5_3_2_tagger_trainer.h"
-#include "stream_5_3_3_tagger.h"
-#include "stream_5_3_3_tagger_trainer.h"
-#include <apertium/perceptron_tagger.h>
 #include <apertium/file_morpho_stream.h>
-#include <apertium/hmm.h>
-#include <apertium/lswpost.h>
-#include <apertium/tagger_word.h>
-#include <apertium/shell_utils.h>
-
-#include <lttoolbox/lt_locale.h>
 
 #include "getopt_long.h"
-#include <cerrno>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <iomanip>
-#include <ios>
-#include <iostream>
-#include <locale>
-#include <sstream>
-#include <string>
-#include <unistd.h>
 #include <string>
 
 namespace Apertium {