Rename parameter source files to avoid name conflicts

23 files changed, 55 insertions, 42 deletions

diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt
index c00111209..3f5772cd2 100644
--- a/src/extension/CMakeLists.txt
+++ b/src/extension/CMakeLists.txt
@@ -53,16 +53,16 @@ set(extension_SRC
 	internal/pdfinput/svg-builder.cpp
 
 	prefdialog/prefdialog.cpp
-	prefdialog/param/bool.cpp
-	prefdialog/param/color.cpp
-	prefdialog/param/description.cpp
-	prefdialog/param/enum.cpp
-	prefdialog/param/float.cpp
-	prefdialog/param/int.cpp
-	prefdialog/param/notebook.cpp
-	prefdialog/param/parameter.cpp
-	prefdialog/param/radiobutton.cpp
-	prefdialog/param/string.cpp
+	prefdialog/parameter.cpp
+	prefdialog/parameter-bool.cpp
+	prefdialog/parameter-color.cpp
+	prefdialog/parameter-description.cpp
+	prefdialog/parameter-enum.cpp
+	prefdialog/parameter-float.cpp
+	prefdialog/parameter-int.cpp
+	prefdialog/parameter-notebook.cpp
+	prefdialog/parameter-radiobutton.cpp
+	prefdialog/parameter-string.cpp
 
 	# ------
 	# Header
@@ -128,16 +128,16 @@ set(extension_SRC
 	internal/wmf-print.h
 
 	prefdialog/prefdialog.h
-	prefdialog/param/bool.h
-	prefdialog/param/color.h
-	prefdialog/param/description.h
-	prefdialog/param/enum.h
-	prefdialog/param/float.h
-	prefdialog/param/int.h
-	prefdialog/param/notebook.h
-	prefdialog/param/parameter.h
-	prefdialog/param/radiobutton.h
-	prefdialog/param/string.h
+	prefdialog/parameter.h
+	prefdialog/parameter-bool.h
+	prefdialog/parameter-color.h
+	prefdialog/parameter-description.h
+	prefdialog/parameter-enum.h
+	prefdialog/parameter-float.h
+	prefdialog/parameter-int.h
+	prefdialog/parameter-notebook.h
+	prefdialog/parameter-radiobutton.h
+	prefdialog/parameter-string.h
 )
 
 if(WIN32)
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index f85be2a70..bd593ea15 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -29,7 +29,7 @@
 #include "db.h"
 #include "dependency.h"
 #include "timer.h"
-#include "prefdialog/param/parameter.h"
+#include "prefdialog/parameter.h"
 #include "io/resource.h"
 
 namespace Inkscape {
diff --git a/src/extension/prefdialog/param/bool.cpp b/src/extension/prefdialog/parameter-bool.cpp
index f304f9aef..8277d3120 100644
--- a/src/extension/prefdialog/param/bool.cpp
+++ b/src/extension/prefdialog/parameter-bool.cpp
@@ -7,6 +7,8 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include "parameter-bool.h"
+
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
@@ -14,7 +16,6 @@
 
 #include "xml/node.h"
 #include "extension/extension.h"
-#include "bool.h"
 #include "preferences.h"
 
 namespace Inkscape {
diff --git a/src/extension/prefdialog/param/bool.h b/src/extension/prefdialog/parameter-bool.h
index 9864cac38..9864cac38 100644
--- a/src/extension/prefdialog/param/bool.h
+++ b/src/extension/prefdialog/parameter-bool.h
diff --git a/src/extension/prefdialog/param/color.cpp b/src/extension/prefdialog/parameter-color.cpp
index ed9940154..385c7b90f 100644
--- a/src/extension/prefdialog/param/color.cpp
+++ b/src/extension/prefdialog/parameter-color.cpp
@@ -8,6 +8,8 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include "parameter-color.h"
+
 #include <iostream>
 #include <sstream>
 
@@ -18,9 +20,8 @@
 #include <xml/node.h>
 
 #include "extension/extension.h"
-#include "color.h"
 
-#include <color.h>
+#include "color.h"
 #include "ui/widget/color-notebook.h"
 #include "preferences.h"
 
diff --git a/src/extension/prefdialog/param/color.h b/src/extension/prefdialog/parameter-color.h
index c2d3c2ccb..c2d3c2ccb 100644
--- a/src/extension/prefdialog/param/color.h
+++ b/src/extension/prefdialog/parameter-color.h
diff --git a/src/extension/prefdialog/param/description.cpp b/src/extension/prefdialog/parameter-description.cpp
index 60e2d02c8..6dfb649b1 100644
--- a/src/extension/prefdialog/param/description.cpp
+++ b/src/extension/prefdialog/parameter-description.cpp
@@ -10,6 +10,8 @@
 # define ESCAPE_DOLLAR_COMMANDLINE
 #endif
 
+#include "parameter-description.h"
+
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 #include <glibmm/i18n.h>
@@ -18,7 +20,6 @@
 
 #include "xml/node.h"
 #include "extension/extension.h"
-#include "description.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/prefdialog/param/description.h b/src/extension/prefdialog/parameter-description.h
index 822370b82..822370b82 100644
--- a/src/extension/prefdialog/param/description.h
+++ b/src/extension/prefdialog/parameter-description.h
diff --git a/src/extension/prefdialog/param/enum.cpp b/src/extension/prefdialog/parameter-enum.cpp
index 5ba3e5772..9c71c3df8 100644
--- a/src/extension/prefdialog/param/enum.cpp
+++ b/src/extension/prefdialog/parameter-enum.cpp
@@ -15,13 +15,14 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include "parameter-enum.h"
+
 #include <gtkmm/box.h>
 #include <gtkmm/comboboxtext.h>
 #include <glibmm/i18n.h>
 
 #include "xml/node.h"
 #include "extension/extension.h"
-#include "enum.h"
 #include "preferences.h"
 
 namespace Inkscape {
diff --git a/src/extension/prefdialog/param/enum.h b/src/extension/prefdialog/parameter-enum.h
index 329bb26f9..329bb26f9 100644
--- a/src/extension/prefdialog/param/enum.h
+++ b/src/extension/prefdialog/parameter-enum.h
diff --git a/src/extension/prefdialog/param/float.cpp b/src/extension/prefdialog/parameter-float.cpp
index 661c533ca..79908d841 100644
--- a/src/extension/prefdialog/param/float.cpp
+++ b/src/extension/prefdialog/parameter-float.cpp
@@ -7,6 +7,8 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include "parameter-float.h"
+
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/scale.h>
@@ -16,7 +18,6 @@
 #include "xml/node.h"
 #include "extension/extension.h"
 #include "preferences.h"
-#include "./float.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/prefdialog/param/float.h b/src/extension/prefdialog/parameter-float.h
index c1d0f0f79..c1d0f0f79 100644
--- a/src/extension/prefdialog/param/float.h
+++ b/src/extension/prefdialog/parameter-float.h
diff --git a/src/extension/prefdialog/param/int.cpp b/src/extension/prefdialog/parameter-int.cpp
index 1c41c0834..2b9e2c5f6 100644
--- a/src/extension/prefdialog/param/int.cpp
+++ b/src/extension/prefdialog/parameter-int.cpp
@@ -7,6 +7,8 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include "parameter-int.h"
+
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/scale.h>
@@ -16,7 +18,6 @@
 #include "xml/node.h"
 #include "extension/extension.h"
 #include "preferences.h"
-#include "int.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/prefdialog/param/int.h b/src/extension/prefdialog/parameter-int.h
index fac481267..fac481267 100644
--- a/src/extension/prefdialog/param/int.h
+++ b/src/extension/prefdialog/parameter-int.h
diff --git a/src/extension/prefdialog/param/notebook.cpp b/src/extension/prefdialog/parameter-notebook.cpp
index 838c09d5b..77d94aa5a 100644
--- a/src/extension/prefdialog/param/notebook.cpp
+++ b/src/extension/prefdialog/parameter-notebook.cpp
@@ -13,6 +13,8 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include "parameter-notebook.h"
+
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
@@ -25,7 +27,6 @@
 #include <extension/extension.h>
 #include "preferences.h"
 
-#include "notebook.h"
 
 /**
  * The root directory in the preferences database for extension
diff --git a/src/extension/prefdialog/param/notebook.h b/src/extension/prefdialog/parameter-notebook.h
index dd7154f06..f1e16308b 100644
--- a/src/extension/prefdialog/param/notebook.h
+++ b/src/extension/prefdialog/parameter-notebook.h
@@ -16,6 +16,8 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include <vector>
+
 #include "parameter.h"
 
 namespace Gtk {
diff --git a/src/extension/prefdialog/param/radiobutton.cpp b/src/extension/prefdialog/parameter-radiobutton.cpp
index 8c1d6a5f7..f2c3187af 100644
--- a/src/extension/prefdialog/param/radiobutton.cpp
+++ b/src/extension/prefdialog/parameter-radiobutton.cpp
@@ -15,6 +15,8 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include "parameter-radiobutton.h"
+
 #include <gtkmm/box.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/radiobutton.h>
@@ -24,8 +26,6 @@
 #include "extension/extension.h"
 #include "preferences.h"
 
-#include "radiobutton.h"
-
 /**
  * The root directory in the preferences database for extension
  * related parameters.
diff --git a/src/extension/prefdialog/param/radiobutton.h b/src/extension/prefdialog/parameter-radiobutton.h
index 48d470a01..f35126d13 100644
--- a/src/extension/prefdialog/param/radiobutton.h
+++ b/src/extension/prefdialog/parameter-radiobutton.h
@@ -16,6 +16,8 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include <vector>
+
 #include "parameter.h"
 
 namespace Gtk {
diff --git a/src/extension/prefdialog/param/string.cpp b/src/extension/prefdialog/parameter-string.cpp
index c1986cf92..829b603d8 100644
--- a/src/extension/prefdialog/param/string.cpp
+++ b/src/extension/prefdialog/parameter-string.cpp
@@ -7,6 +7,8 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include "parameter-string.h"
+
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
@@ -15,7 +17,6 @@
 
 #include "xml/node.h"
 #include "extension/extension.h"
-#include "./string.h"
 #include "preferences.h"
 #include <glibmm/i18n.h>
 
diff --git a/src/extension/prefdialog/param/string.h b/src/extension/prefdialog/parameter-string.h
index 7c094d394..7c094d394 100644
--- a/src/extension/prefdialog/param/string.h
+++ b/src/extension/prefdialog/parameter-string.h
diff --git a/src/extension/prefdialog/param/parameter.cpp b/src/extension/prefdialog/parameter.cpp
index a07821441..159f54b9c 100644
--- a/src/extension/prefdialog/param/parameter.cpp
+++ b/src/extension/prefdialog/parameter.cpp
@@ -22,16 +22,16 @@
 #include <glibmm/i18n.h>
 #include <sigc++/sigc++.h>
 
-#include "bool.h"
-#include "color.h"
-#include "description.h"
-#include "enum.h"
-#include "./float.h"
-#include "int.h"
-#include "notebook.h"
 #include "parameter.h"
-#include "radiobutton.h"
-#include "./string.h"
+#include "parameter-bool.h"
+#include "parameter-color.h"
+#include "parameter-description.h"
+#include "parameter-enum.h"
+#include "parameter-float.h"
+#include "parameter-int.h"
+#include "parameter-notebook.h"
+#include "parameter-radiobutton.h"
+#include "parameter-string.h"
 
 #include "extension/extension.h"
 
diff --git a/src/extension/prefdialog/param/parameter.h b/src/extension/prefdialog/parameter.h
index cc10787e6..39433b902 100644
--- a/src/extension/prefdialog/param/parameter.h
+++ b/src/extension/prefdialog/parameter.h
@@ -16,6 +16,7 @@
 
 #include <string>
 
+#include <sigc++/sigc++.h>
 #include <glibmm/ustring.h>
 
 class SPDocument;
diff --git a/src/extension/prefdialog/prefdialog.cpp b/src/extension/prefdialog/prefdialog.cpp
index 6fbffb262..90a156abe 100644
--- a/src/extension/prefdialog/prefdialog.cpp
+++ b/src/extension/prefdialog/prefdialog.cpp
@@ -27,7 +27,7 @@
 #include "extension/execution-env.h"
 #include "extension/implementation/implementation.h"
 
-#include "param/parameter.h"
+#include "parameter.h"
 
 
 namespace Inkscape {