From ee35696368999d8c8fd14979c72315ef2cd49ea6 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Thu, 21 Jun 2018 15:47:49 +0200 Subject: [PATCH] Rename src/extension/param/* in order not to conflict with C stdlib headers. --- src/extension/CMakeLists.txt | 36 +++++++++---------- .../param/{bool.cpp => param_bool.cpp} | 2 +- src/extension/param/{bool.h => param_bool.h} | 0 .../param/{color.cpp => param_color.cpp} | 2 +- .../param/{color.h => param_color.h} | 0 ...{description.cpp => param_description.cpp} | 2 +- .../{description.h => param_description.h} | 0 .../param/{enum.cpp => param_enum.cpp} | 2 +- src/extension/param/{enum.h => param_enum.h} | 0 .../param/{float.cpp => param_float.cpp} | 2 +- .../param/{float.h => param_float.h} | 0 .../param/{int.cpp => param_int.cpp} | 2 +- src/extension/param/{int.h => param_int.h} | 0 .../{notebook.cpp => param_notebook.cpp} | 3 +- .../param/{notebook.h => param_notebook.h} | 0 ...radiobutton.cpp => param_radio_button.cpp} | 2 +- .../{radiobutton.h => param_radio_button.h} | 0 .../param/{string.cpp => param_string.cpp} | 2 +- .../param/{string.h => param_string.h} | 0 src/extension/param/parameter.cpp | 18 +++++----- 20 files changed, 36 insertions(+), 37 deletions(-) rename src/extension/param/{bool.cpp => param_bool.cpp} (99%) rename src/extension/param/{bool.h => param_bool.h} (100%) rename src/extension/param/{color.cpp => param_color.cpp} (99%) rename src/extension/param/{color.h => param_color.h} (100%) rename src/extension/param/{description.cpp => param_description.cpp} (99%) rename src/extension/param/{description.h => param_description.h} (100%) rename src/extension/param/{enum.cpp => param_enum.cpp} (99%) rename src/extension/param/{enum.h => param_enum.h} (100%) rename src/extension/param/{float.cpp => param_float.cpp} (99%) rename src/extension/param/{float.h => param_float.h} (100%) rename src/extension/param/{int.cpp => param_int.cpp} (99%) rename src/extension/param/{int.h => param_int.h} (100%) rename src/extension/param/{notebook.cpp => param_notebook.cpp} (99%) rename src/extension/param/{notebook.h => param_notebook.h} (100%) rename src/extension/param/{radiobutton.cpp => param_radio_button.cpp} (99%) rename src/extension/param/{radiobutton.h => param_radio_button.h} (100%) rename src/extension/param/{string.cpp => param_string.cpp} (99%) rename src/extension/param/{string.h => param_string.h} (100%) diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt index a5352d0bab..510be6ab21 100644 --- a/src/extension/CMakeLists.txt +++ b/src/extension/CMakeLists.txt @@ -20,16 +20,16 @@ set(extension_SRC implementation/xslt.cpp implementation/script.cpp - param/bool.cpp - param/color.cpp - param/description.cpp - param/enum.cpp - param/float.cpp - param/int.cpp - param/notebook.cpp + param/param_bool.cpp + param/param_color.cpp + param/param_description.cpp + param/param_enum.cpp + param/param_float.cpp + param/param_int.cpp + param/param_notebook.cpp param/parameter.cpp - param/radiobutton.cpp - param/string.cpp + param/param_radio_button.cpp + param/param_string.cpp internal/bluredge.cpp internal/cairo-png-out.cpp @@ -76,16 +76,16 @@ set(extension_SRC init.h input.h output.h - param/bool.h - param/color.h - param/description.h - param/enum.h - param/float.h - param/int.h - param/notebook.h + param/param_bool.h + param/param_color.h + param/param_description.h + param/param_enum.h + param/param_float.h + param/param_int.h + param/param_notebook.h param/parameter.h - param/radiobutton.h - param/string.h + param/param_radio_button.h + param/param_string.h patheffect.h prefdialog.h print.h diff --git a/src/extension/param/bool.cpp b/src/extension/param/param_bool.cpp similarity index 99% rename from src/extension/param/bool.cpp rename to src/extension/param/param_bool.cpp index ac86e77b19..835c917349 100644 --- a/src/extension/param/bool.cpp +++ b/src/extension/param/param_bool.cpp @@ -17,7 +17,7 @@ #include "xml/node.h" #include "../extension.h" -#include "bool.h" +#include "param_bool.h" #include "preferences.h" namespace Inkscape { diff --git a/src/extension/param/bool.h b/src/extension/param/param_bool.h similarity index 100% rename from src/extension/param/bool.h rename to src/extension/param/param_bool.h diff --git a/src/extension/param/color.cpp b/src/extension/param/param_color.cpp similarity index 99% rename from src/extension/param/color.cpp rename to src/extension/param/param_color.cpp index 886f6ab492..1667cca10d 100644 --- a/src/extension/param/color.cpp +++ b/src/extension/param/param_color.cpp @@ -21,7 +21,7 @@ #include #include "../extension.h" -#include "color.h" +#include "param_color.h" #include #include "ui/widget/color-notebook.h" diff --git a/src/extension/param/color.h b/src/extension/param/param_color.h similarity index 100% rename from src/extension/param/color.h rename to src/extension/param/param_color.h diff --git a/src/extension/param/description.cpp b/src/extension/param/param_description.cpp similarity index 99% rename from src/extension/param/description.cpp rename to src/extension/param/param_description.cpp index d795514c39..ca7124f33f 100644 --- a/src/extension/param/description.cpp +++ b/src/extension/param/param_description.cpp @@ -21,7 +21,7 @@ #include "xml/node.h" #include "extension/extension.h" -#include "description.h" +#include "param_description.h" namespace Inkscape { namespace Extension { diff --git a/src/extension/param/description.h b/src/extension/param/param_description.h similarity index 100% rename from src/extension/param/description.h rename to src/extension/param/param_description.h diff --git a/src/extension/param/enum.cpp b/src/extension/param/param_enum.cpp similarity index 99% rename from src/extension/param/enum.cpp rename to src/extension/param/param_enum.cpp index df4b22d0cb..5dbaf5f339 100644 --- a/src/extension/param/enum.cpp +++ b/src/extension/param/param_enum.cpp @@ -25,7 +25,7 @@ #include "xml/node.h" #include "extension/extension.h" #include "document-private.h" -#include "enum.h" +#include "param_enum.h" #include "preferences.h" namespace Inkscape { diff --git a/src/extension/param/enum.h b/src/extension/param/param_enum.h similarity index 100% rename from src/extension/param/enum.h rename to src/extension/param/param_enum.h diff --git a/src/extension/param/float.cpp b/src/extension/param/param_float.cpp similarity index 99% rename from src/extension/param/float.cpp rename to src/extension/param/param_float.cpp index bde96339a4..4ddb2d19e7 100644 --- a/src/extension/param/float.cpp +++ b/src/extension/param/param_float.cpp @@ -19,7 +19,7 @@ #include "xml/node.h" #include "extension/extension.h" #include "preferences.h" -#include "float.h" +#include "param_float.h" namespace Inkscape { namespace Extension { diff --git a/src/extension/param/float.h b/src/extension/param/param_float.h similarity index 100% rename from src/extension/param/float.h rename to src/extension/param/param_float.h diff --git a/src/extension/param/int.cpp b/src/extension/param/param_int.cpp similarity index 99% rename from src/extension/param/int.cpp rename to src/extension/param/param_int.cpp index 2e07920810..3b3a808e5b 100644 --- a/src/extension/param/int.cpp +++ b/src/extension/param/param_int.cpp @@ -19,7 +19,7 @@ #include "xml/node.h" #include "extension/extension.h" #include "preferences.h" -#include "int.h" +#include "param_int.h" namespace Inkscape { namespace Extension { diff --git a/src/extension/param/int.h b/src/extension/param/param_int.h similarity index 100% rename from src/extension/param/int.h rename to src/extension/param/param_int.h diff --git a/src/extension/param/notebook.cpp b/src/extension/param/param_notebook.cpp similarity index 99% rename from src/extension/param/notebook.cpp rename to src/extension/param/param_notebook.cpp index f948cc937f..faf804eb19 100644 --- a/src/extension/param/notebook.cpp +++ b/src/extension/param/param_notebook.cpp @@ -28,8 +28,7 @@ #include #include "preferences.h" #include "document-private.h" - -#include "notebook.h" +#include "param_notebook.h" /** * The root directory in the preferences database for extension diff --git a/src/extension/param/notebook.h b/src/extension/param/param_notebook.h similarity index 100% rename from src/extension/param/notebook.h rename to src/extension/param/param_notebook.h diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/param_radio_button.cpp similarity index 99% rename from src/extension/param/radiobutton.cpp rename to src/extension/param/param_radio_button.cpp index 428767cb0e..272ea00913 100644 --- a/src/extension/param/radiobutton.cpp +++ b/src/extension/param/param_radio_button.cpp @@ -28,7 +28,7 @@ #include "preferences.h" #include "document-private.h" -#include "radiobutton.h" +#include "param_radio_button.h" /** * The root directory in the preferences database for extension diff --git a/src/extension/param/radiobutton.h b/src/extension/param/param_radio_button.h similarity index 100% rename from src/extension/param/radiobutton.h rename to src/extension/param/param_radio_button.h diff --git a/src/extension/param/string.cpp b/src/extension/param/param_string.cpp similarity index 99% rename from src/extension/param/string.cpp rename to src/extension/param/param_string.cpp index 59e21d77d7..e97eb5d650 100644 --- a/src/extension/param/string.cpp +++ b/src/extension/param/param_string.cpp @@ -18,7 +18,7 @@ #include "xml/node.h" #include "extension/extension.h" -#include "string.h" +#include "param_string.h" #include "preferences.h" #include diff --git a/src/extension/param/string.h b/src/extension/param/param_string.h similarity index 100% rename from src/extension/param/string.h rename to src/extension/param/param_string.h diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp index 36c6838cd0..0b1dbbeb55 100644 --- a/src/extension/param/parameter.cpp +++ b/src/extension/param/parameter.cpp @@ -30,15 +30,15 @@ #include #include "parameter.h" -#include "bool.h" -#include "color.h" -#include "description.h" -#include "enum.h" -#include "float.h" -#include "int.h" -#include "notebook.h" -#include "radiobutton.h" -#include "string.h" +#include "param_bool.h" +#include "param_color.h" +#include "param_description.h" +#include "param_enum.h" +#include "param_float.h" +#include "param_int.h" +#include "param_notebook.h" +#include "param_radio_button.h" +#include "param_string.h" #include -- GitLab