Make compilation unit rtengine/icons.cc -Wextra clean, #4155
This commit is contained in:
@@ -21,6 +21,7 @@
|
||||
#include "icons.h"
|
||||
|
||||
#include <iostream>
|
||||
#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...
|
||||
|
||||
|
@@ -26,7 +26,7 @@ namespace rtengine
|
||||
{
|
||||
|
||||
Glib::ustring findIconAbsolutePath (const Glib::ustring& iconName);
|
||||
void setPaths (const Options& options);
|
||||
void setPaths ();
|
||||
|
||||
}
|
||||
|
||||
|
@@ -163,7 +163,7 @@ int main (int argc, char **argv)
|
||||
return -2;
|
||||
}
|
||||
|
||||
rtengine::setPaths (options);
|
||||
rtengine::setPaths();
|
||||
|
||||
TIFFSetWarningHandler (nullptr); // avoid annoying message boxes
|
||||
|
||||
|
@@ -257,7 +257,7 @@ RTWindow *create_rt_window()
|
||||
Glib::RefPtr<Gtk::IconTheme> 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
|
||||
|
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user