コミットメタ情報

リビジョンc601e64270e3463a53b446ec0837d0bd956e6fff (tree)
日時2010-02-13 07:32:49
作者nogu <nogu@user...>
コミッターnogu

ログメッセージ

Use record' instead of enroll'

変更サマリ

差分

--- a/src/bbsview.cpp
+++ b/src/bbsview.cpp
@@ -149,13 +149,13 @@ bool BBSView::downloadBoardList()
149149 QString boardName = category.boardNameList[ count ];
150150 QString oldUrl;
151151 BoardDatabase db(boardUrl);
152- int ret = db.enrollBoard(
152+ int ret = db.recordBoard(
153153 boardName, oldUrl, Board_Unknown, true /* test only */);
154- if (ret == Board_enrollNew) {
154+ if (ret == Board_recordNew) {
155155 newBoards += boardName + " ( " + category.category_name
156156 + " ) " + boardUrl + '\n';
157157 }
158- if (ret == Board_enrollMoved) {
158+ if (ret == Board_recordMoved) {
159159 oldBoards += boardName + " ( " + category.category_name
160160 + " ) " + oldUrl + " -> " + boardUrl + '\n';
161161 }
@@ -313,7 +313,7 @@ void BBSView::showBoardList()
313313 }
314314 QString oldUrl;
315315 BoardDatabase db(boardUrl);
316- db.enrollBoard(boardName, oldUrl);
316+ db.recordBoard(boardName, oldUrl);
317317 db.loadBBSHistory();
318318 previousBoard = new ListViewItem(categoryItem, previousBoard,
319319 QStringList() << boardName << boardUrl);
@@ -326,7 +326,7 @@ void BBSView::showBoardList()
326326 QString oldUrl;
327327 new ListViewItem(m_boardList, 0, QStringList() << boardName << boardUrl);
328328 BoardDatabase db(boardUrl);
329- db.enrollBoard(boardName, oldUrl);
329+ db.recordBoard(boardName, oldUrl);
330330
331331 loadExtBoard();
332332 refreshFavoriteBoards();
@@ -363,7 +363,7 @@ void BBSView::loadExtBoard()
363363 int type = Board_Unknown;
364364 if (list.size() == 3) type = list[ 2 ].toInt();
365365 BoardDatabase db(board_url);
366- db.enrollBoard(board_title, oldUrl, type);
366+ db.recordBoard(board_title, oldUrl, type);
367367 }
368368 }
369369 }
--- a/src/libkita/boarddata.h
+++ b/src/libkita/boarddata.h
@@ -27,12 +27,12 @@ namespace Kita
2727 };
2828
2929
30- /* return value of BoardManager::enrollBoard */
30+ /* return value of BoardManager::recordBoard */
3131 enum {
32- Board_enrollNew,
33- Board_enrollEnrolled,
34- Board_enrollMoved,
35- Board_enrollFailed
32+ Board_recordNew,
33+ Board_recordRecorded,
34+ Board_recordMoved,
35+ Board_recordFailed
3636 };
3737
3838 /*---------------------------------*/
--- a/src/libkita/boarddatabase.cpp
+++ b/src/libkita/boarddatabase.cpp
@@ -345,20 +345,20 @@ void BoardDatabase::clearBoardData()
345345 *
346346 * @param[out] oldURL
347347 *
348- * @retval Board_enrollEnrolled if board is already enrolled. oldURL is QString().
349- * @retval Board_enrollNew if board is new board. oldURL is QString().
350- * @retval Board_enrollMoved if board is moved. oldURL is old URL.
348+ * @retval Board_recordRecorded if board is already recorded. oldURL is QString().
349+ * @retval Board_recordNew if board is new board. oldURL is QString().
350+ * @retval Board_recordMoved if board is moved. oldURL is old URL.
351351 *
352- * @note board is NOT enrolled when board is moved.
353- * To enroll new URL, call BoardDatabase::moveBoard().
352+ * @note board is NOT recorded when board is moved.
353+ * To record new URL, call BoardDatabase::moveBoard().
354354 *
355355 * "int type" is type of board. It could be "Board_Unknown". See also parseBoardURL().
356356 *
357- * If "bool test" is true, this function just checks if the board is enrolled (never enroll board).
357+ * If "bool test" is true, this function just checks if the board is recorded (never record board).
358358 *
359359 */
360360 /* public */
361-int BoardDatabase::enrollBoard(const QString& boardName, QString& oldUrl, int type, bool test)
361+int BoardDatabase::recordBoard(const QString& boardName, QString& oldUrl, int type, bool test)
362362 {
363363 QString hostname;
364364 QString rootPath;
@@ -368,9 +368,9 @@ int BoardDatabase::enrollBoard(const QString& boardName, QString& oldUrl, int ty
368368 type = parseBoardUrl(type, hostname, rootPath, delimiter, bbsPath, ext);
369369 oldUrl.clear();
370370
371- if (type == Board_Unknown) return Board_enrollFailed;
371+ if (type == Board_Unknown) return Board_recordFailed;
372372
373- /* check if the board is enrolled or moved. */
373+ /* check if the board is recorded or moved. */
374374 BoardData *data;
375375 foreach (data, m_boardDataList) {
376376
@@ -379,24 +379,24 @@ int BoardDatabase::enrollBoard(const QString& boardName, QString& oldUrl, int ty
379379 && data->bbsPath() == bbsPath) {
380380
381381 if (data->hostName() == hostname
382- && data->rootPath() == rootPath) { /* enrolled */
383- return Board_enrollEnrolled;
382+ && data->rootPath() == rootPath) { /* recorded */
383+ return Board_recordRecorded;
384384 } else { /* moved */
385385 oldUrl = data->basePath();
386- return Board_enrollMoved;
386+ return Board_recordMoved;
387387 }
388388 }
389389 }
390390
391391 /* test only */
392392 if (test)
393- return Board_enrollNew;
393+ return Board_recordNew;
394394
395- /* enroll new board */
395+ /* record new board */
396396 BoardData* bdata = new BoardData(boardName, hostname, rootPath, delimiter, bbsPath, ext, type);
397397 m_boardDataList.append(bdata);
398398
399- return Board_enrollNew;
399+ return Board_recordNew;
400400 }
401401
402402 /* parse board URL */
@@ -483,7 +483,7 @@ int BoardDatabase::parseBoardUrl(
483483 }
484484
485485 /* public */
486-bool BoardDatabase::isEnrolled()
486+bool BoardDatabase::isRecorded()
487487 {
488488 return getBoardData() != 0;
489489 }
@@ -529,7 +529,7 @@ BoardData* BoardDatabase::getBoardData()
529529
530530
531531 /* load the bbs history file (BBSHISTORY), and create keys of Data Base. */
532-/* Before calling this, enroll the board by enrollBoard(). */
532+/* Before calling this, record the board by recordBoard(). */
533533 /*
534534 ex) If the host of board moved like :
535535
@@ -588,11 +588,11 @@ bool BoardDatabase::moveBoard(const KUrl& fromUrl, const KUrl& toUrl)
588588
589589 if (oldUrl == newUrl) return false;
590590
591- /* Is oldURL enrolled? */
591+ /* Is oldURL recorded? */
592592 BoardData* bdata = getBoardData(oldUrl);
593593 if (bdata == 0) {
594594
595- /* Is newURL enrolled? */
595+ /* Is newURL recorded? */
596596 bdata = getBoardData(newUrl);
597597 if (bdata == 0) return false;
598598 }
--- a/src/libkita/boarddatabase.h
+++ b/src/libkita/boarddatabase.h
@@ -44,9 +44,9 @@ namespace Kita {
4444
4545 /* BoardData */
4646 void clearBoardData();
47- int enrollBoard(const QString& boardName, QString& oldUrl,
47+ int recordBoard(const QString& boardName, QString& oldUrl,
4848 int type = Board_Unknown, bool test = false);
49- bool isEnrolled();
49+ bool isRecorded();
5050 BoardData* getBoardData();
5151
5252 /* BBSHISTORY */
--- a/src/libkita/cache.cpp
+++ b/src/libkita/cache.cpp
@@ -32,7 +32,7 @@ QString Cache::baseDir()
3232
3333 QString Cache::serverDir() const
3434 {
35- /* Is board enrolled ? */
35+ /* Is board recorded ? */
3636 BoardDatabase db(m_url);
3737 BoardData * bdata = db.getBoardData();
3838 if (bdata == 0) return QString();
@@ -45,7 +45,7 @@ QString Cache::serverDir() const
4545
4646 QString Cache::boardDir() const
4747 {
48- /* Is board enrolled ? */
48+ /* Is board recorded ? */
4949 BoardDatabase db(m_url);
5050 BoardData * bdata = db.getBoardData();
5151 if (bdata == 0) return QString();
--- a/src/libkita/datmanager.cpp
+++ b/src/libkita/datmanager.cpp
@@ -77,9 +77,9 @@ DatInfo * DatManager::getDatInfoPointer() const
7777 DatInfo* DatManager::getDatInfo(bool checkCached) const
7878 {
7979 /* search */
80- /* create and enroll instance */
80+ /* create and record instance */
8181 return (m_searchDatInfo != 0)
82- ? m_searchDatInfo : enrollDatInfo(checkCached);
82+ ? m_searchDatInfo : recordDatInfo(checkCached);
8383 }
8484
8585
@@ -88,7 +88,7 @@ DatInfo* DatManager::getDatInfo(bool checkCached) const
8888 DatInfo* DatManager::searchDatInfo() const
8989 {
9090 if (m_datUrl.isEmpty())
91- return 0; /* This url is not enrolled in BoardManager. */
91+ return 0; /* This url is not recorded in BoardManager. */
9292 if (m_datInfoList.isEmpty())
9393 return 0;
9494
@@ -116,13 +116,13 @@ DatInfo* DatManager::searchDatInfo() const
116116 }
117117
118118
119-/* create and enroll the instance of DatInfo and delete old instances.
119+/* create and record the instance of DatInfo and delete old instances.
120120 Note that DatInfo::DatInfo() opens cached data and reads it. */
121121 /* private */
122-DatInfo* DatManager::enrollDatInfo(bool checkCached) const
122+DatInfo* DatManager::recordDatInfo(bool checkCached) const
123123 {
124124 if (m_datUrl.isEmpty())
125- return 0; /* This url is not enrolled in BoardManager. */
125+ return 0; /* This url is not recorded in BoardManager. */
126126
127127 /* create DatInfo & read cached data */
128128 DatInfo* datInfo = new DatInfo(m_datUrl);
@@ -374,7 +374,7 @@ int DatManager::getNumById(const QString& strid) const
374374
375375
376376 /* public */
377-bool DatManager::isThreadEnrolled() const
377+bool DatManager::isThreadRecorded() const
378378 {
379379 return !m_datUrl.isEmpty();
380380 }
--- a/src/libkita/datmanager.h
+++ b/src/libkita/datmanager.h
@@ -69,7 +69,7 @@ namespace Kita
6969
7070
7171 /* another information */
72- bool isThreadEnrolled() const;
72+ bool isThreadRecorded() const;
7373 bool is2chThread() const;
7474 bool isResValid(int num) const;
7575 bool isBroken() const;
@@ -95,7 +95,7 @@ namespace Kita
9595 private:
9696 DatInfo* getDatInfo(bool checkCached = true) const;
9797 DatInfo* searchDatInfo() const;
98- DatInfo* enrollDatInfo(bool checkCached) const;
98+ DatInfo* recordDatInfo(bool checkCached) const;
9999
100100 KUrl m_url;
101101 KUrl m_datUrl;
--- a/src/libkita/kita_misc.cpp
+++ b/src/libkita/kita_misc.cpp
@@ -98,7 +98,7 @@ QString Kita::getWriteUrl(const KUrl& m_datUrl)
9898 If mode = URLMODE_DAT, output is URL of dat file.
9999 If mode = URLMODE_THREAD, output is URL of read.cgi .
100100
101- If url is NOT enrolled, return QString().
101+ If url is NOT recorded, return QString().
102102
103103 (ex.1)
104104
@@ -145,7 +145,7 @@ QString Kita::convertUrl(
145145 return m_prevConvNewUrl;
146146 }
147147
148- /* Is board enrolled ? */
148+ /* Is board recorded ? */
149149 BoardDatabase db(url);
150150 BoardData* bdata = db.getBoardData();
151151 if (bdata == 0) return QString();
--- a/src/viewmediator.cpp
+++ b/src/viewmediator.cpp
@@ -137,7 +137,7 @@ void ViewMediator::updateFavoriteListView()
137137 void ViewMediator::openUrl(const KUrl& url)
138138 {
139139 // open thread.
140- if (DatManager(url).isThreadEnrolled()) {
140+ if (DatManager(url).isThreadRecorded()) {
141141 m_threadTabWidget->slotShowMainThread(url);
142142 return;
143143 }
旧リポジトリブラウザで表示