version 0.3.29

[fms.git] / src / freenet / boardlistrequester.cpp

diff --git a/src/freenet/boardlistrequester.cpp b/src/freenet/boardlistrequester.cpp
index 21e82b7..41df7d6 100644 (file)
--- a/src/freenet/boardlistrequester.cpp
+++ b/src/freenet/boardlistrequester.cpp
@@ -8,12 +8,12 @@
        #include <xmem.h>\r
 #endif\r
 \r
-BoardListRequester::BoardListRequester()\r
+BoardListRequester::BoardListRequester(SQLite3DB::DB *db):IIndexRequester<long>(db)\r
 {\r
        Initialize();\r
 }\r
 \r
-BoardListRequester::BoardListRequester(FCPv2::Connection *fcp):IIndexRequester<long>(fcp)\r
+BoardListRequester::BoardListRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester<long>(db,fcp)\r
 {\r
        Initialize();\r
 }\r
@@ -192,8 +192,9 @@ void BoardListRequester::Initialize()
 \r
        m_fcpuniquename="BoardListRequester";\r
        m_maxrequests=0;\r
+       Option option(m_db);\r
 \r
-       Option::Instance()->GetInt("MaxBoardListRequests",m_maxrequests);\r
+       option.GetInt("MaxBoardListRequests",m_maxrequests);\r
        if(m_maxrequests<0)\r
        {\r
                m_maxrequests=0;\r
@@ -204,7 +205,7 @@ void BoardListRequester::Initialize()
                m_log->warning("Option MaxBoardListRequests is currently set at "+tempval+".  This value might be incorrectly configured.");\r
        }\r
 \r
-       Option::Instance()->Get("SaveMessagesFromNewBoards",tempval);\r
+       option.Get("SaveMessagesFromNewBoards",tempval);\r
        if(tempval=="true")\r
        {\r
                m_savemessagesfromnewboards=true;\r
@@ -214,7 +215,7 @@ void BoardListRequester::Initialize()
                m_savemessagesfromnewboards=false;\r
        }\r
 \r
-       Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);\r
+       option.Get("LocalTrustOverridesPeerTrust",tempval);\r
        if(tempval=="true")\r
        {\r
                m_localtrustoverrides=true;\r