ファイル読込の中止処理を修正

[gefu/Gefu.git] / preferences.cpp

diff --git a/preferences.cpp b/preferences.cpp
index 32fb146..116b181 100644 (file)
--- a/preferences.cpp
+++ b/preferences.cpp
@@ -150,7 +150,7 @@ QString Preferences::getBookmarkPath(int n) const
     return value(Key_BookmarkPath(n)).toString();
 }
 
-QColor Preferences::folderViewFgColor(bool active)
+QColor Preferences::folderViewFgColor(bool active) const
 {
     int darkFactor = 100;
     if (!active) {
@@ -159,7 +159,7 @@ QColor Preferences::folderViewFgColor(bool active)
     return getFolderViewFgColor().darker(darkFactor);
 }
 
-QColor Preferences::folderViewBgColor(bool active)
+QColor Preferences::folderViewBgColor(bool active) const
 {
     int darkFactor = 100;
     if (!active) {
@@ -168,7 +168,7 @@ QColor Preferences::folderViewBgColor(bool active)
     return getFolderViewBgColor().darker(darkFactor);
 }
 
-QColor Preferences::folderViewMarkedFgColor(bool active)
+QColor Preferences::folderViewMarkedFgColor(bool active) const
 {
     int darkFactor = 100;
     if (!active) {
@@ -177,7 +177,7 @@ QColor Preferences::folderViewMarkedFgColor(bool active)
     return getFolderViewMarkedFgColor().darker(darkFactor);
 }
 
-QColor Preferences::folderViewMarkedBgColor(bool active)
+QColor Preferences::folderViewMarkedBgColor(bool active) const
 {
     int darkFactor = 100;
     if (!active) {
@@ -186,7 +186,7 @@ QColor Preferences::folderViewMarkedBgColor(bool active)
     return getFolderViewMarkedBgColor().darker(darkFactor);
 }
 
-QColor Preferences::folderViewSystemColor(bool active)
+QColor Preferences::folderViewSystemColor(bool active) const
 {
     int darkFactor = 100;
     if (!active) {
@@ -195,7 +195,7 @@ QColor Preferences::folderViewSystemColor(bool active)
     return getFolderViewSystemColor().darker(darkFactor);
 }
 
-QColor Preferences::folderViewHiddenColor(bool active)
+QColor Preferences::folderViewHiddenColor(bool active) const
 {
     int darkFactor = 100;
     if (!active) {
@@ -204,7 +204,7 @@ QColor Preferences::folderViewHiddenColor(bool active)
     return getFolderViewHiddenColor().darker(darkFactor);
 }
 
-QColor Preferences::folderViewReadOnlyColor(bool active)
+QColor Preferences::folderViewReadOnlyColor(bool active) const
 {
     int darkFactor = 100;
     if (!active) {
@@ -213,7 +213,7 @@ QColor Preferences::folderViewReadOnlyColor(bool active)
     return getFolderViewReadOnlyColor().darker(darkFactor);
 }
 
-QColor Preferences::locationBoxFgColor(bool active)
+QColor Preferences::locationBoxFgColor(bool active) const
 {
     int darkFactor = 100;
     if (!active) {
@@ -222,7 +222,7 @@ QColor Preferences::locationBoxFgColor(bool active)
     return getLocationBoxFgColor().darker(darkFactor);
 }
 
-QColor Preferences::locationBoxBgColor(bool active)
+QColor Preferences::locationBoxBgColor(bool active) const
 {
     int darkFactor = 100;
     if (!active) {
@@ -242,6 +242,7 @@ QColor Preferences::locationBoxBgColor(bool active)
         setValue(#key, value);                      \
     }
 
+IMPLEMENT_BOOL(Reset, false)
 IMPLEMENT_BOOL(CheckUpdate, true)
 IMPLEMENT_BOOL(ConfirmQuit, true)
 IMPLEMENT_BOOL(ConfirmCopy, true)