重複するコードをまとめて関数化。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@372 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/src/lychee/cls_config.cpp b/src/lychee/cls_config.cpp
index 6a8d062..d06e3a1 100644 (file)
--- a/src/lychee/cls_config.cpp
+++ b/src/lychee/cls_config.cpp
@@ -73,19 +73,9 @@ myConfig::~myConfig()
 {\r
        if (this->bWriteHistory)\r
        {\r
-               size_t nMax = this->ReadId(CONF_HISTORY_COUNT, 7l);\r
-               for (size_t i = 0; i < nMax && i < this->GetHistoryCount(CONF_HISTORY_PATH); i++)\r
-               {\r
-                       this->myWriteHistory(CONF_HISTORY_PATH, i);\r
-               }\r
-               for (size_t i = 0; i < nMax && i < this->GetHistoryCount(CONF_HISTORY_NAME); i++)\r
-               {\r
-                       this->myWriteHistory(CONF_HISTORY_NAME, i);\r
-               }\r
-               for (size_t i = 0; i < nMax && i < this->GetHistoryCount(CONF_HISTORY_FULL); i++)\r
-               {\r
-                       this->myWriteHistory(CONF_HISTORY_FULL, i);\r
-               }\r
+               this->myWriteHistoryLoop(CONF_HISTORY_PATH);\r
+               this->myWriteHistoryLoop(CONF_HISTORY_NAME);\r
+               this->myWriteHistoryLoop(CONF_HISTORY_FULL);\r
        }\r
 }\r
 \r
@@ -144,6 +134,14 @@ void myConfig::myWriteHistory(myConfigId confId, size_t i)
        this->Write(wxString::Format(this->label[confId], i), this->asHistory[confId - CONF_HISTORY_PATH][i]);\r
 }\r
 \r
+void myConfig::myWriteHistoryLoop(myConfigId confId)\r
+{\r
+       for (size_t i = 0; i < (size_t) this->ReadId(CONF_HISTORY_COUNT, 7l) && i < this->GetHistoryCount(confId); i++)\r
+       {\r
+               this->myWriteHistory(confId, i);\r
+       }\r
+}\r
+\r
 size_t myConfig::GetHistoryCount(myConfigId confId)\r
 {\r
        return this->asHistory[confId - CONF_HISTORY_PATH].GetCount();\r

diff --git a/src/lychee/cls_config.h b/src/lychee/cls_config.h
index fe384c7..b1cdc53 100644 (file)
--- a/src/lychee/cls_config.h
+++ b/src/lychee/cls_config.h
@@ -87,6 +87,7 @@ private:
 \r
        void myReadHistory(myConfigId confId, size_t i);\r
        void myWriteHistory(myConfigId confId, size_t i);\r
+       void myConfig::myWriteHistoryLoop(myConfigId confId);\r
 };\r
 \r
 #endif\r