diff --git a/rtengine/icons.cc b/rtengine/icons.cc index 2c5075007..b4477f09c 100644 --- a/rtengine/icons.cc +++ b/rtengine/icons.cc @@ -21,6 +21,7 @@ #include "icons.h" #include +#pragma GCC diagnostic warning "-Wextra" namespace rtengine { @@ -86,7 +87,7 @@ Glib::ustring findIconAbsolutePath (const Glib::ustring& iconName) return Glib::ustring(); } -void setPaths (const Options& options) +void setPaths () { // TODO: Forcing the Dark theme, so reading the icon set files is useless for now... diff --git a/rtengine/icons.h b/rtengine/icons.h index 9f6654a9c..a890555b2 100644 --- a/rtengine/icons.h +++ b/rtengine/icons.h @@ -26,7 +26,7 @@ namespace rtengine { Glib::ustring findIconAbsolutePath (const Glib::ustring& iconName); -void setPaths (const Options& options); +void setPaths (); } diff --git a/rtgui/main-cli.cc b/rtgui/main-cli.cc index 1cb63ef6d..76ed84489 100644 --- a/rtgui/main-cli.cc +++ b/rtgui/main-cli.cc @@ -163,7 +163,7 @@ int main (int argc, char **argv) return -2; } - rtengine::setPaths (options); + rtengine::setPaths(); TIFFSetWarningHandler (nullptr); // avoid annoying message boxes diff --git a/rtgui/main.cc b/rtgui/main.cc index 6dd9ccf7f..bd8f381c4 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -257,7 +257,7 @@ RTWindow *create_rt_window() Glib::RefPtr defaultIconTheme = Gtk::IconTheme::get_default(); defaultIconTheme->append_search_path (icon_path); - rtengine::setPaths (options); + rtengine::setPaths(); MyExpander::init(); // has to stay AFTER rtengine::setPaths // ------- loading theme files diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 974ba5450..8fd33673f 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -2147,7 +2147,7 @@ void Preferences::cancelPressed () { // set the initial theme back if (themeFNames.at (theme->get_active_row_number ()).longFName != options.theme) { - rtengine::setPaths (options); + rtengine::setPaths(); RTImage::updateImages(); switchThemeTo (options.theme); } @@ -2205,7 +2205,7 @@ void Preferences::themeChanged () { moptions.theme = themeFNames.at (theme->get_active_row_number ()).longFName; - rtengine::setPaths (moptions); + rtengine::setPaths(); RTImage::updateImages(); switchThemeTo (moptions.theme); }