diff options
| author | Thomas Holder <thomas@thomas-holder.de> | 2018-11-10 13:04:01 +0000 |
|---|---|---|
| committer | Thomas Holder <thomas@thomas-holder.de> | 2018-11-10 13:04:01 +0000 |
| commit | f7e658587354a38f89258dac40b6740e10be4a5f (patch) | |
| tree | 989eb77f227f97550c98c85426dc884b76d975ea /src | |
| parent | license check: use exceptions (diff) | |
| download | inkscape-f7e658587354a38f89258dac40b6740e10be4a5f.tar.gz inkscape-f7e658587354a38f89258dac40b6740e10be4a5f.zip | |
fix compiling on macOS
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/dbus/application-interface.xml | 2 | ||||
| -rw-r--r-- | src/extension/dbus/document-interface.xml | 2 | ||||
| -rw-r--r-- | src/extension/dbus/proposed-interface.xml | 2 | ||||
| -rw-r--r-- | src/ui/icon-loader.cpp | 4 | ||||
| -rw-r--r-- | src/xml/node.h | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/extension/dbus/application-interface.xml b/src/extension/dbus/application-interface.xml index 38d763074..05513cb99 100644 --- a/src/extension/dbus/application-interface.xml +++ b/src/extension/dbus/application-interface.xml @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0-or-later <?xml version="1.0" encoding="UTF-8" ?> +<!-- SPDX-License-Identifier: GPL-2.0-or-later --> <!-- * This is the master description of the DBus application interface. * The interface is mostly just for creating new document instances. diff --git a/src/extension/dbus/document-interface.xml b/src/extension/dbus/document-interface.xml index 64ff4223c..4524cbad5 100644 --- a/src/extension/dbus/document-interface.xml +++ b/src/extension/dbus/document-interface.xml @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0-or-later <?xml version="1.0" encoding="UTF-8" ?> +<!-- SPDX-License-Identifier: GPL-2.0-or-later --> <!-- * This is the master description of the DBus document interface. * diff --git a/src/extension/dbus/proposed-interface.xml b/src/extension/dbus/proposed-interface.xml index 0fe995cac..829ee7eba 100644 --- a/src/extension/dbus/proposed-interface.xml +++ b/src/extension/dbus/proposed-interface.xml @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0-or-later <?xml version="1.0" encoding="UTF-8" ?> +<!-- SPDX-License-Identifier: GPL-2.0-or-later --> <!-- * These are some of the proposed functions for the document interface. * diff --git a/src/ui/icon-loader.cpp b/src/ui/icon-loader.cpp index fae3fba70..fa04873a6 100644 --- a/src/ui/icon-loader.cpp +++ b/src/ui/icon-loader.cpp @@ -57,14 +57,14 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size) else { _icon_pixbuf = icon_theme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); } - g_warning("Icon Loader using a future dead function in this icon: %s", icon_name); + g_warning("Icon Loader using a future dead function in this icon: %s", icon_name.c_str()); } else { _icon_pixbuf = icon_theme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); } } catch (const Gtk::IconThemeError &e) { - g_warning("Icon Loader error loading icon file: %s", e.what()); + g_warning("Icon Loader error loading icon file: %s", e.what().c_str()); } return _icon_pixbuf; } diff --git a/src/xml/node.h b/src/xml/node.h index 4d739f338..11a23c6ac 100644 --- a/src/xml/node.h +++ b/src/xml/node.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later /** @file * @brief Interface for XML nodes - *//* -/* Authors: + * + * Authors: * MenTaLguY <mental@rydia.net> * Krzysztof Kosiński <tweenk.pl@gmail.com> (documentation) * |