Cppcheck: some fixes

This commit is contained in:
heckflosse
2016-10-17 18:49:15 +02:00
parent ed42b1239c
commit 8df2df664f
9 changed files with 40 additions and 49 deletions

View File

@@ -394,8 +394,8 @@ void Options::setDefaults ()
gimpDir = "";
psDir = "";
customEditorProg = "";
CPBKeys = CPBKT_TID;
editorToSendTo = 1;
liveThumbnails = true;
favoriteDirs.clear();
tpOpen.clear ();
//crvOpen.clear ();
@@ -1093,10 +1093,6 @@ int Options::readFromFile (Glib::ustring fname)
thumbInterp = keyFile.get_integer ("File Browser", "ThumbnailInterpolation");
}
if (keyFile.has_key ("File Browser", "LiveThumbnails")) {
liveThumbnails = keyFile.get_boolean ("File Browser", "LiveThumbnails");
}
if (keyFile.has_key ("File Browser", "FavoriteDirs")) {
favoriteDirs = keyFile.get_string_list ("File Browser", "FavoriteDirs");
}
@@ -1894,7 +1890,6 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_integer_list ("File Browser", "ParseExtensionsEnabled", pextena);
keyFile.set_integer ("File Browser", "ThumbnailArrangement", fbArrangement);
keyFile.set_integer ("File Browser", "ThumbnailInterpolation", thumbInterp);
keyFile.set_boolean ("File Browser", "LiveThumbnails", liveThumbnails);
Glib::ArrayHandle<Glib::ustring> pfav = favoriteDirs;
keyFile.set_string_list ("File Browser", "FavoriteDirs", pfav);
Glib::ArrayHandle<Glib::ustring> pren = renameTemplates;

View File

@@ -180,9 +180,7 @@ public:
int editorToSendTo;
int maxThumbnailHeight;
std::size_t maxCacheEntries;
ThFileType thumbnailFormat;
int thumbInterp; // 0: nearest, 1: bilinear
bool liveThumbnails;
std::vector<Glib::ustring> parseExtensions; // List containing all extensions type
std::vector<int> parseExtensionsEnabled; // List of bool to retain extension or not
std::vector<Glib::ustring> parsedExtensions; // List containing all retained extensions (lowercase)
@@ -203,7 +201,6 @@ public:
bool showFileNames;
bool filmStripShowFileNames;
bool tabbedUI;
int previewSizeTab, previewSizeBrowser;
bool rememberZoomAndPan;
int multiDisplayMode; // 0=none, 1=Edit panels on other display
std::vector<double> cutOverlayBrush; // Red;Green;Blue;Alpha , all ranging 0..1
@@ -219,7 +216,6 @@ public:
//int histogramWorking; // 0=disabled, 1=left pane, 2=right pane
bool histogramBar;
bool histogramFullMode;
bool showProfileSelector;
bool FileBrowserToolbarSingleRow;
bool hideTPVScrollbar;
bool UseIconNoText;