liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make compilation unit rtengine/icons.cc -Wextra clean, #4155

Browse Source
This commit is contained in:
heckflosse
2017-10-25 13:26:14 +02:00
parent beb6347a48
commit 7542cfc456
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rtengine/icons.cc
View File

@@ -21,6 +21,7 @@
#include "icons.h" #include "icons.h"
#include <iostream> #include <iostream>
#pragma GCC diagnostic warning "-Wextra"
namespace rtengine namespace rtengine
{ {
@@ -86,7 +87,7 @@ Glib::ustring findIconAbsolutePath (const Glib::ustring& iconName)
return Glib::ustring(); 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... // TODO: Forcing the Dark theme, so reading the icon set files is useless for now...

2
rtengine/icons.h
View File

@@ -26,7 +26,7 @@ namespace rtengine
{ {
Glib::ustring findIconAbsolutePath (const Glib::ustring& iconName); Glib::ustring findIconAbsolutePath (const Glib::ustring& iconName);
void setPaths (const Options& options); void setPaths ();
} }

2
rtgui/main-cli.cc
View File

@@ -163,7 +163,7 @@ int main (int argc, char **argv)
return -2; return -2;
} }
rtengine::setPaths (options); rtengine::setPaths();
TIFFSetWarningHandler (nullptr); // avoid annoying message boxes TIFFSetWarningHandler (nullptr); // avoid annoying message boxes

2
rtgui/main.cc
View File

@@ -257,7 +257,7 @@ RTWindow *create_rt_window()
Glib::RefPtr<Gtk::IconTheme> defaultIconTheme = Gtk::IconTheme::get_default(); Glib::RefPtr<Gtk::IconTheme> defaultIconTheme = Gtk::IconTheme::get_default();
defaultIconTheme->append_search_path (icon_path); defaultIconTheme->append_search_path (icon_path);
rtengine::setPaths (options); rtengine::setPaths();
MyExpander::init(); // has to stay AFTER rtengine::setPaths MyExpander::init(); // has to stay AFTER rtengine::setPaths
// ------- loading theme files // ------- loading theme files

4
rtgui/preferences.cc
View File

@@ -2147,7 +2147,7 @@ void Preferences::cancelPressed ()
{ {
// set the initial theme back // set the initial theme back
if (themeFNames.at (theme->get_active_row_number ()).longFName != options.theme) { if (themeFNames.at (theme->get_active_row_number ()).longFName != options.theme) {
rtengine::setPaths (options); rtengine::setPaths();
RTImage::updateImages(); RTImage::updateImages();
switchThemeTo (options.theme); switchThemeTo (options.theme);
} }
@@ -2205,7 +2205,7 @@ void Preferences::themeChanged ()
{ {
moptions.theme = themeFNames.at (theme->get_active_row_number ()).longFName; moptions.theme = themeFNames.at (theme->get_active_row_number ()).longFName;
rtengine::setPaths (moptions); rtengine::setPaths();
RTImage::updateImages(); RTImage::updateImages();
switchThemeTo (moptions.theme); switchThemeTo (moptions.theme);
} }