diff options
Diffstat (limited to '')
| -rw-r--r-- | src/dialogs/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/dialogs/Makefile_insert | 5 | ||||
| -rw-r--r-- | src/dialogs/makefile.in | 17 | ||||
| -rw-r--r-- | src/ui/dialog-events.cpp (renamed from src/dialogs/dialog-events.cpp) | 4 | ||||
| -rw-r--r-- | src/ui/dialog-events.h (renamed from src/dialogs/dialog-events.h) | 6 |
5 files changed, 4 insertions, 39 deletions
diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt deleted file mode 100644 index ca19c0b72..000000000 --- a/src/dialogs/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ - -set(dialogs_SRC - dialog-events.cpp - - # ------- - # Headers - dialog-events.h -) - -# add_inkscape_lib(dialogs_LIB "${dialogs_SRC}") -add_inkscape_source("${dialogs_SRC}") diff --git a/src/dialogs/Makefile_insert b/src/dialogs/Makefile_insert deleted file mode 100644 index f1ed89314..000000000 --- a/src/dialogs/Makefile_insert +++ /dev/null @@ -1,5 +0,0 @@ -## Makefile.am fragment sourced by src/Makefile.am. - -ink_common_sources += \ - dialogs/dialog-events.cpp \ - dialogs/dialog-events.h diff --git a/src/dialogs/makefile.in b/src/dialogs/makefile.in deleted file mode 100644 index 9acaf79a0..000000000 --- a/src/dialogs/makefile.in +++ /dev/null @@ -1,17 +0,0 @@ -# Convenience stub makefile to call the real Makefile. - -@SET_MAKE@ - -OBJEXT = @OBJEXT@ - -# Explicit so that it's the default rule. -all: - cd .. && $(MAKE) dialogs/all - -clean %.a %.$(OBJEXT): - cd .. && $(MAKE) dialogs/$@ - -.PHONY: all clean - -.SUFFIXES: -.SUFFIXES: .a .$(OBJEXT) diff --git a/src/dialogs/dialog-events.cpp b/src/ui/dialog-events.cpp index a12e3eafc..6bd93bbc3 100644 --- a/src/dialogs/dialog-events.cpp +++ b/src/ui/dialog-events.cpp @@ -29,7 +29,7 @@ #include "preferences.h" #include "ui/tools/tool-base.h" -#include "dialog-events.h" +#include "ui/dialog-events.h" /** @@ -187,7 +187,7 @@ void on_transientize (SPDesktop *desktop, win_data *wd ) } void -sp_transientize_callback ( Inkscape::Application * /*inkscape*/, +sp_transientize_callback ( InkscapeApplication * /*inkscape*/, SPDesktop *desktop, win_data *wd ) { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); diff --git a/src/dialogs/dialog-events.h b/src/ui/dialog-events.h index 623058282..b33eb3f38 100644 --- a/src/dialogs/dialog-events.h +++ b/src/ui/dialog-events.h @@ -29,9 +29,7 @@ class Entry; class SPDesktop; -namespace Inkscape { -struct Application; -} // namespace Inkscape +struct InkscapeApplication; typedef struct { GtkWidget *win; @@ -55,7 +53,7 @@ void sp_transientize ( GtkWidget *win ); void on_transientize ( SPDesktop *desktop, win_data *wd ); -void sp_transientize_callback ( Inkscape::Application *inkscape, +void sp_transientize_callback ( InkscapeApplication *inkscape, SPDesktop *desktop, win_data *wd ); |
