Backed out changeset: 159f9e7014f8

This commit is contained in:
Oliver Duis
2012-05-06 23:04:47 +02:00
parent 1483ecb47c
commit 05226a2875
125 changed files with 747 additions and 750 deletions

View File

@@ -291,7 +291,7 @@ Options* Options::copyFrom (Options* other) {
void Options::filterOutParsedExtensions () {
parsedExtensions.clear();
for (size_t i=0; i<parseExtensions.size(); i++)
for (unsigned int i=0; i<parseExtensions.size(); i++)
if (parseExtensionsEnabled[i]) parsedExtensions.push_back(parseExtensions[i].lowercase());
}
@@ -835,7 +835,7 @@ void Options::load () {
void Options::save () {
if (!options.multiUser) {
if (options.multiUser==false) {
options.saveToFile (argv0+"/options");
}
else {
@@ -850,11 +850,11 @@ bool Options::has_retained_extention (Glib::ustring fname) {
Glib::ustring ext = getExtension(fname).lowercase();
if (!ext.empty()) {
if (ext.length()) {
// there is an extension to the filename
// look out if it has one of the retained extensions
for (size_t i=0; i<parsedExtensions.size(); i++) {
for (unsigned int i=0; i<parsedExtensions.size(); i++) {
if (ext == parsedExtensions[i]) {
return true;
}
@@ -867,8 +867,8 @@ bool Options::has_retained_extention (Glib::ustring fname) {
* return true if ext is an enabled extension
*/
bool Options::is_extention_enabled (Glib::ustring ext) {
for (size_t j=0; j<parseExtensions.size(); j++)
for (int j=0; j<(int)parseExtensions.size(); j++)
if (parseExtensions[j].casefold() == ext.casefold())
return j>=parseExtensionsEnabled.size() || parseExtensionsEnabled[j];
return j>=(int)parseExtensionsEnabled.size() || parseExtensionsEnabled[j];
return false;
}