diff options
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/CMakeLists.txt | 47 | ||||
| -rw-r--r-- | src/extension/effect.cpp | 13 | ||||
| -rw-r--r-- | src/extension/execution-env.cpp | 2 | ||||
| -rw-r--r-- | src/extension/extension.cpp | 2 | ||||
| -rw-r--r-- | src/extension/input.cpp | 2 | ||||
| -rw-r--r-- | src/extension/output.cpp | 2 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/bool.cpp (renamed from src/extension/param/bool.cpp) | 2 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/bool.h (renamed from src/extension/param/bool.h) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/color.cpp (renamed from src/extension/param/color.cpp) | 2 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/color.h (renamed from src/extension/param/color.h) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/description.cpp (renamed from src/extension/param/description.cpp) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/description.h (renamed from src/extension/param/description.h) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/enum.cpp (renamed from src/extension/param/enum.cpp) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/enum.h (renamed from src/extension/param/enum.h) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/float.cpp (renamed from src/extension/param/float.cpp) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/float.h (renamed from src/extension/param/float.h) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/int.cpp (renamed from src/extension/param/int.cpp) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/int.h (renamed from src/extension/param/int.h) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/notebook.cpp (renamed from src/extension/param/notebook.cpp) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/notebook.h (renamed from src/extension/param/notebook.h) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/parameter.cpp (renamed from src/extension/param/parameter.cpp) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/parameter.h (renamed from src/extension/param/parameter.h) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/radiobutton.cpp (renamed from src/extension/param/radiobutton.cpp) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/radiobutton.h (renamed from src/extension/param/radiobutton.h) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/string.cpp (renamed from src/extension/param/string.cpp) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/param/string.h (renamed from src/extension/param/string.h) | 0 | ||||
| -rw-r--r-- | src/extension/prefdialog/prefdialog.cpp (renamed from src/extension/prefdialog.cpp) | 9 | ||||
| -rw-r--r-- | src/extension/prefdialog/prefdialog.h (renamed from src/extension/prefdialog.h) | 0 |
28 files changed, 42 insertions, 39 deletions
diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt index eaa9b4956..c00111209 100644 --- a/src/extension/CMakeLists.txt +++ b/src/extension/CMakeLists.txt @@ -11,7 +11,6 @@ set(extension_SRC input.cpp output.cpp patheffect.cpp - prefdialog.cpp print.cpp system.cpp timer.cpp @@ -21,17 +20,6 @@ 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/parameter.cpp - param/radiobutton.cpp - param/string.cpp - internal/bluredge.cpp internal/cairo-ps-out.cpp internal/cairo-render-context.cpp @@ -64,6 +52,18 @@ set(extension_SRC internal/pdfinput/pdf-parser.cpp 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 + # ------ # Header db.h @@ -75,18 +75,7 @@ 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/parameter.h - param/radiobutton.h - param/string.h patheffect.h - prefdialog.h print.h system.h timer.h @@ -137,6 +126,18 @@ set(extension_SRC internal/text_reassemble.h internal/wmf-inout.h 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 ) if(WIN32) diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp index 3c9940240..c10ad10bd 100644 --- a/src/extension/effect.cpp +++ b/src/extension/effect.cpp @@ -9,16 +9,17 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "prefdialog.h" -#include "inkscape.h" -#include "helper/action.h" -#include "ui/view/view.h" - -#include "implementation/implementation.h" #include "effect.h" + #include "execution-env.h" +#include "inkscape.h" #include "timer.h" +#include "helper/action.h" +#include "implementation/implementation.h" +#include "prefdialog/prefdialog.h" +#include "ui/view/view.h" + /* Inkscape::Extension::Effect */ diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp index ca770e1f6..a2bae3832 100644 --- a/src/extension/execution-env.cpp +++ b/src/extension/execution-env.cpp @@ -13,7 +13,7 @@ #include <gtkmm/messagedialog.h> #include "execution-env.h" -#include "prefdialog.h" +#include "prefdialog/prefdialog.h" #include "implementation/implementation.h" #include "selection.h" diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp index 77a171487..f85be2a70 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 "param/parameter.h" +#include "prefdialog/param/parameter.h" #include "io/resource.h" namespace Inkscape { diff --git a/src/extension/input.cpp b/src/extension/input.cpp index 708324de2..792b794c8 100644 --- a/src/extension/input.cpp +++ b/src/extension/input.cpp @@ -11,7 +11,7 @@ #ifdef HAVE_CONFIG_H #endif -#include "prefdialog.h" +#include "prefdialog/prefdialog.h" #include "implementation/implementation.h" #include "timer.h" #include "input.h" diff --git a/src/extension/output.cpp b/src/extension/output.cpp index c6cf399b8..51d58bc89 100644 --- a/src/extension/output.cpp +++ b/src/extension/output.cpp @@ -9,7 +9,7 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ -#include "prefdialog.h" +#include "prefdialog/prefdialog.h" #include "document.h" #include "implementation/implementation.h" #include "output.h" diff --git a/src/extension/param/bool.cpp b/src/extension/prefdialog/param/bool.cpp index 10121f7ab..f304f9aef 100644 --- a/src/extension/param/bool.cpp +++ b/src/extension/prefdialog/param/bool.cpp @@ -13,7 +13,7 @@ #include <gtkmm/checkbutton.h> #include "xml/node.h" -#include "../extension.h" +#include "extension/extension.h" #include "bool.h" #include "preferences.h" diff --git a/src/extension/param/bool.h b/src/extension/prefdialog/param/bool.h index 9864cac38..9864cac38 100644 --- a/src/extension/param/bool.h +++ b/src/extension/prefdialog/param/bool.h diff --git a/src/extension/param/color.cpp b/src/extension/prefdialog/param/color.cpp index f71670cb2..ed9940154 100644 --- a/src/extension/param/color.cpp +++ b/src/extension/prefdialog/param/color.cpp @@ -17,7 +17,7 @@ #include <xml/node.h> -#include "../extension.h" +#include "extension/extension.h" #include "color.h" #include <color.h> diff --git a/src/extension/param/color.h b/src/extension/prefdialog/param/color.h index c2d3c2ccb..c2d3c2ccb 100644 --- a/src/extension/param/color.h +++ b/src/extension/prefdialog/param/color.h diff --git a/src/extension/param/description.cpp b/src/extension/prefdialog/param/description.cpp index 60e2d02c8..60e2d02c8 100644 --- a/src/extension/param/description.cpp +++ b/src/extension/prefdialog/param/description.cpp diff --git a/src/extension/param/description.h b/src/extension/prefdialog/param/description.h index 822370b82..822370b82 100644 --- a/src/extension/param/description.h +++ b/src/extension/prefdialog/param/description.h diff --git a/src/extension/param/enum.cpp b/src/extension/prefdialog/param/enum.cpp index 5ba3e5772..5ba3e5772 100644 --- a/src/extension/param/enum.cpp +++ b/src/extension/prefdialog/param/enum.cpp diff --git a/src/extension/param/enum.h b/src/extension/prefdialog/param/enum.h index 329bb26f9..329bb26f9 100644 --- a/src/extension/param/enum.h +++ b/src/extension/prefdialog/param/enum.h diff --git a/src/extension/param/float.cpp b/src/extension/prefdialog/param/float.cpp index 661c533ca..661c533ca 100644 --- a/src/extension/param/float.cpp +++ b/src/extension/prefdialog/param/float.cpp diff --git a/src/extension/param/float.h b/src/extension/prefdialog/param/float.h index c1d0f0f79..c1d0f0f79 100644 --- a/src/extension/param/float.h +++ b/src/extension/prefdialog/param/float.h diff --git a/src/extension/param/int.cpp b/src/extension/prefdialog/param/int.cpp index 1c41c0834..1c41c0834 100644 --- a/src/extension/param/int.cpp +++ b/src/extension/prefdialog/param/int.cpp diff --git a/src/extension/param/int.h b/src/extension/prefdialog/param/int.h index fac481267..fac481267 100644 --- a/src/extension/param/int.h +++ b/src/extension/prefdialog/param/int.h diff --git a/src/extension/param/notebook.cpp b/src/extension/prefdialog/param/notebook.cpp index 838c09d5b..838c09d5b 100644 --- a/src/extension/param/notebook.cpp +++ b/src/extension/prefdialog/param/notebook.cpp diff --git a/src/extension/param/notebook.h b/src/extension/prefdialog/param/notebook.h index dd7154f06..dd7154f06 100644 --- a/src/extension/param/notebook.h +++ b/src/extension/prefdialog/param/notebook.h diff --git a/src/extension/param/parameter.cpp b/src/extension/prefdialog/param/parameter.cpp index 1a60ef32e..1a60ef32e 100644 --- a/src/extension/param/parameter.cpp +++ b/src/extension/prefdialog/param/parameter.cpp diff --git a/src/extension/param/parameter.h b/src/extension/prefdialog/param/parameter.h index c37d1539a..c37d1539a 100644 --- a/src/extension/param/parameter.h +++ b/src/extension/prefdialog/param/parameter.h diff --git a/src/extension/param/radiobutton.cpp b/src/extension/prefdialog/param/radiobutton.cpp index 8c1d6a5f7..8c1d6a5f7 100644 --- a/src/extension/param/radiobutton.cpp +++ b/src/extension/prefdialog/param/radiobutton.cpp diff --git a/src/extension/param/radiobutton.h b/src/extension/prefdialog/param/radiobutton.h index 48d470a01..48d470a01 100644 --- a/src/extension/param/radiobutton.h +++ b/src/extension/prefdialog/param/radiobutton.h diff --git a/src/extension/param/string.cpp b/src/extension/prefdialog/param/string.cpp index c1986cf92..c1986cf92 100644 --- a/src/extension/param/string.cpp +++ b/src/extension/prefdialog/param/string.cpp diff --git a/src/extension/param/string.h b/src/extension/prefdialog/param/string.h index 7c094d394..7c094d394 100644 --- a/src/extension/param/string.h +++ b/src/extension/prefdialog/param/string.h diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog/prefdialog.cpp index de58545fb..6fbffb262 100644 --- a/src/extension/prefdialog.cpp +++ b/src/extension/prefdialog/prefdialog.cpp @@ -9,6 +9,7 @@ */ #include "prefdialog.h" + #include <gtkmm/checkbutton.h> #include <gtkmm/separator.h> #include <glibmm/i18n.h> @@ -22,10 +23,10 @@ #include "document.h" #include "document-undo.h" -#include "effect.h" -#include "implementation/implementation.h" +#include "extension/effect.h" +#include "extension/execution-env.h" +#include "extension/implementation/implementation.h" -#include "execution-env.h" #include "param/parameter.h" @@ -258,7 +259,7 @@ PrefDialog::on_response (int signal) { return; } -#include "internal/clear-n_.h" +#include "extension/internal/clear-n_.h" const char * PrefDialog::live_param_xml = "<param name=\"__live_effect__\" type=\"boolean\" _gui-text=\"" N_("Live preview") "\" gui-description=\"" N_("Is the effect previewed live on canvas?") "\">false</param>"; diff --git a/src/extension/prefdialog.h b/src/extension/prefdialog/prefdialog.h index 087900fbe..087900fbe 100644 --- a/src/extension/prefdialog.h +++ b/src/extension/prefdialog/prefdialog.h |
