diff options
| author | hellozee <hellozee@disroot.org> | 2018-03-06 12:22:22 +0000 |
|---|---|---|
| committer | hellozee <hellozee@disroot.org> | 2018-03-06 12:22:22 +0000 |
| commit | a65c02c515528168aec0c5a092078117de02b0a9 (patch) | |
| tree | c80b1ead2a302de453ab901af79b4740947122f1 /src/ui | |
| parent | Fix for Bug #1643260, Step size changed to 0.1% for Blur and Opacity Spin But... (diff) | |
| parent | Remove unused includes, etc. (diff) | |
| download | inkscape-a65c02c515528168aec0c5a092078117de02b0a9.tar.gz inkscape-a65c02c515528168aec0c5a092078117de02b0a9.zip | |
Merge remote-tracking branch 'remote/master'
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/monitor.cpp | 2 | ||||
| -rw-r--r-- | src/ui/tools/spray-tool.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/ui/monitor.cpp b/src/ui/monitor.cpp index 3e0c983fe..19a304bb0 100644 --- a/src/ui/monitor.cpp +++ b/src/ui/monitor.cpp @@ -45,7 +45,7 @@ Gdk::Rectangle get_monitor_geometry_primary() { Gdk::Rectangle monitor_geometry; #if GTKMM_CHECK_VERSION(3,22,0) auto const display = Gdk::Display::get_default(); - auto const monitor = display->get_primary_monitor(); + auto monitor = display->get_primary_monitor(); // Fallback to monitor number 0 if the user hasn't configured a primary monitor if (!monitor) { diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp index beb556dff..603d5e80a 100644 --- a/src/ui/tools/spray-tool.cpp +++ b/src/ui/tools/spray-tool.cpp @@ -52,8 +52,6 @@ #include "helper/action.h" -#include "livarot/Shape.h" - #include "object/box3d.h" #include "object/sp-item-transform.h" |