Software engineering to avoid #include "XXX.cpp": + file headers + co…

…rrect includes Signed-off-by: Tias Guns <tias@ulyssis.org>
kipr · Jun 7, 2012 · 150cf5e · 150cf5e
1 parent 6661579
commit 150cf5e
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -52,4 +52,4 @@ endif
 EXTRA_DIST = \
 	calibrator.cpp \
 	calibrator.hh \
-	main_common.hpp
+	main_common.cpp
diff --git a/src/calibrator/calibratorEvdev.cpp → src/calibrator/Evdev.cpp b/src/calibrator/calibratorEvdev.cpp → src/calibrator/Evdev.cpp
diff --git a/src/calibrator/Makefile.am b/src/calibrator/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = \
-	calibratorEvdev.cpp \
-	calibratorUsbtouchscreen.cpp \
-	calibratorXorgPrint.cpp
+	Evdev.cpp \
+	Usbtouchscreen.cpp \
+	XorgPrint.cpp
diff --git a/src/calibrator/calibratorUsbtouchscreen.cpp → src/calibrator/Usbtouchscreen.cpp b/src/calibrator/calibratorUsbtouchscreen.cpp → src/calibrator/Usbtouchscreen.cpp
diff --git a/src/calibrator/calibratorXorgPrint.cpp → src/calibrator/XorgPrint.cpp b/src/calibrator/calibratorXorgPrint.cpp → src/calibrator/XorgPrint.cpp
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
@@ -1,3 +1,3 @@
 EXTRA_DIST = \
-	gui_gtkmm.cpp \
-	gui_x11.cpp
+	gtkmm.cpp \
+	x11.cpp
diff --git a/src/gui/gui_gtkmm.cpp → src/gui/gtkmm.cpp b/src/gui/gui_gtkmm.cpp → src/gui/gtkmm.cpp
diff --git a/src/gui/gui_x11.cpp → src/gui/x11.cpp b/src/gui/gui_x11.cpp → src/gui/x11.cpp
diff --git a/src/main_common.hpp → src/main_common.cpp b/src/main_common.hpp → src/main_common.cpp
@@ -104,9 +104,9 @@ char* my_strdup(const char* s) {
 
 // all need struct XYinfo, and some the consts too
 #include "calibrator.cpp"
-#include "calibrator/calibratorXorgPrint.cpp"
-#include "calibrator/calibratorEvdev.cpp"
-#include "calibrator/calibratorUsbtouchscreen.cpp"
+#include "calibrator/XorgPrint.cpp"
+#include "calibrator/Evdev.cpp"
+#include "calibrator/Usbtouchscreen.cpp"
 
 
 /**

diff --git a/src/main_gtkmm.cpp b/src/main_gtkmm.cpp
@@ -27,8 +27,8 @@
 #include <gtkmm/drawingarea.h>
 #include <cairomm/context.h>
 
-#include "main_common.hpp"
-#include "gui/gui_gtkmm.cpp"
+#include "main_common.cpp"
+#include "gui/gtkmm.cpp"
 
 int main(int argc, char** argv)
 {

diff --git a/src/main_x11.cpp b/src/main_x11.cpp
@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-#include "main_common.hpp"
-#include "gui/gui_x11.cpp"
+#include "main_common.cpp"
+#include "gui/x11.cpp"
 
 int main(int argc, char** argv)
 {