svnno****@sourc*****
svnno****@sourc*****
2009年 8月 9日 (日) 08:45:45 JST
Revision: 2534 http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2534 Author: nogu Date: 2009-08-09 08:45:45 +0900 (Sun, 09 Aug 2009) Log Message: ----------- ID -> Id Modified Paths: -------------- kita/branches/KITA-KDE4/kita/src/htmlpart.cpp kita/branches/KITA-KDE4/kita/src/htmlpart.h kita/branches/KITA-KDE4/kita/src/libkita/access.cpp kita/branches/KITA-KDE4/kita/src/libkita/account.h kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp kita/branches/KITA-KDE4/kita/src/libkita/postdata.cpp kita/branches/KITA-KDE4/kita/src/writeview.cpp kita/branches/KITA-KDE4/kita/src/writeview.h Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-08-08 23:45:45 UTC (rev 2534) @@ -503,12 +503,12 @@ /* private */ void HTMLPart::pushCurrentPosition() { - m_anchorStack += getCurrentIDofNode(); + m_anchorStack += getCurrentIdOfNode(); } /* find the id of current node */ /* private */ -QString HTMLPart::getCurrentIDofNode() +QString HTMLPart::getCurrentIdOfNode() { DOM::Node node; node = nodeUnderMouse(); @@ -975,7 +975,7 @@ /* extract responses by ID */ if (refstr.left(5) == "idpop") { - showIDPopup(refstr); + showIdPopup(refstr); return ; } @@ -1186,7 +1186,7 @@ /*--------------------------------------------------*/ /* popup that is opened when user clicked ID */ /* This funtcion is called in only clickAnchor(). */ /* private */ -void HTMLPart::showIDPopup(const QString& refstr) +void HTMLPart::showIdPopup(const QString& refstr) { QString strid = refstr.mid(5) .replace("%2B", "+") @@ -1468,7 +1468,7 @@ /* id popup */ if (url.left(6) == "#idpop") { - int num = datManager.getNumByID(url.mid(6)); + int num = datManager.getNumById(url.mid(6)); QString tmpstr; if (num >= 2) { tmpstr = QString("<DIV>ID:%1:[%2]</DIV>").arg(url.mid(6)).arg(num); Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/htmlpart.h 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/htmlpart.h 2009-08-08 23:45:45 UTC (rev 2534) @@ -129,7 +129,7 @@ /* goto anchor */ void pushCurrentPosition(); - QString getCurrentIDofNode(); + QString getCurrentIdOfNode(); /* popup menu */ void showPopupMenu(const KUrl& kurl); @@ -137,7 +137,7 @@ /* click */ void clickAnchor(const KUrl& urlin); void showWritePopupMenu(const QString& refstr); - void showIDPopup(const QString& refstr); + void showIdPopup(const QString& refstr); void showBePopupMenu(const QString& refstr); /* search */ Modified: kita/branches/KITA-KDE4/kita/src/libkita/access.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/access.cpp 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/libkita/access.cpp 2009-08-08 23:45:45 UTC (rev 2534) @@ -388,7 +388,7 @@ { QString getURL = datToOfflaw(m_datURL.url()); KUrl kgetURL(getURL); - kgetURL.addQueryItem("sid", Account::getSessionID()); + kgetURL.addQueryItem("sid", Account::getSessionId()); m_threadData.clear(); m_invalidDataReceived = false; Modified: kita/branches/KITA-KDE4/kita/src/libkita/account.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/account.h 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/libkita/account.h 2009-08-08 23:45:45 UTC (rev 2534) @@ -50,7 +50,7 @@ Account(const Account&); Account& operator=(const Account&); public: - static const QString& getSessionID() { return getInstance() ->m_sessionID; } + static const QString& getSessionId() { return getInstance() ->m_sessionID; } static bool isLogged() { return getInstance() ->m_isLogged; } static bool login(const QString& userID, const QString& password); }; Modified: kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp 2009-08-08 23:45:45 UTC (rev 2534) @@ -364,7 +364,7 @@ } /* ID of board for writing */ /* public */ /* static */ -const QString BoardManager::boardID(const KUrl& url) +const QString BoardManager::boardId(const KUrl& url) { BoardData * bdata = getBoardData(url); if (bdata == 0) return QString(); Modified: kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h 2009-08-08 23:45:45 UTC (rev 2534) @@ -137,7 +137,7 @@ static const QString boardRoot(const KUrl& url); static const QString boardPath(const KUrl& url); static const QString ext(const KUrl& url); - static const QString boardID(const KUrl& url); + static const QString boardId(const KUrl& url); static const QString subjectURL(const KUrl& url); static const QString boardName(const KUrl& url); static int type(const KUrl& url); Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-08-08 23:45:45 UTC (rev 2534) @@ -477,7 +477,7 @@ /* return HTML strings that have ID = strid. */ /* public */ -QString DatInfo::getHtmlByID(const QString& strid, int &count) +QString DatInfo::getHtmlById(const QString& strid, int &count) { QString retHTML; count = 0; @@ -675,7 +675,7 @@ /* return number of responses that have ID = strid. */ /* Note that this function checks Abone internally. */ /* public */ -int DatInfo::getNumByID(const QString& strid) +int DatInfo::getNumById(const QString& strid) { int count = 0; @@ -739,7 +739,7 @@ } /* ID = strid ? */ /* public */ -bool DatInfo::checkID(const QString& strid, int num) +bool DatInfo::checkId(const QString& strid, int num) { if (!parseDat(num)) return false; Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h 2009-08-08 23:45:45 UTC (rev 2534) @@ -161,7 +161,7 @@ /* HTML data */ int getHTML(int num, bool checkAbone, QString& titleHTML, QString& bodyHTML); QString getHTMLString(int startnum, int endnum, bool checkAbone = true); - QString getHtmlByID(const QString& strid, int &count); + QString getHtmlById(const QString& strid, int &count); QString getTreeByRes(const int rootnum, int& count); QString getTreeByResReverse(const int rootnum, int& count); @@ -169,7 +169,7 @@ int getResNum(); int getReadNum(); int getViewPos(); - int getNumByID(const QString& strid); + int getNumById(const QString& strid); int getDatSize(); /* several information */ @@ -177,7 +177,7 @@ bool isResValid(int num); bool isBroken(); bool isResBroken(int num); - bool checkID(const QString& strid, int num); + bool checkId(const QString& strid, int num); bool checkWord(const QStringList& stlist, int num, bool checkOR); bool isOpened(); void setIsOpened(bool isOpened); Modified: kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp 2009-08-08 23:45:45 UTC (rev 2534) @@ -282,7 +282,7 @@ /* public */ -QString DatManager::threadID() +QString DatManager::threadId() { return m_datUrl.fileName().section('.', 0, 0); } @@ -302,7 +302,7 @@ /* public */ QString DatManager::getHtmlById(const QString& strid, int &count) { - return (m_datInfo == 0) ? QString() : m_datInfo->getHtmlByID(strid, count); + return (m_datInfo == 0) ? QString() : m_datInfo->getHtmlById(strid, count); } @@ -369,9 +369,9 @@ } /* get number of responses which have same ID. */ /* public */ -int DatManager::getNumByID(const QString& strid) +int DatManager::getNumById(const QString& strid) { - return (m_datInfo == 0) ? 0 : m_datInfo->getNumByID(strid); + return (m_datInfo == 0) ? 0 : m_datInfo->getNumById(strid); } @@ -425,7 +425,7 @@ /* check if ID == strid */ /* public */ bool DatManager::checkId(const QString& strid, int num) { - return (m_datInfo == 0) ? false : m_datInfo->checkID(strid, num); + return (m_datInfo == 0) ? false : m_datInfo->checkId(strid, num); } Modified: kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h 2009-08-08 23:45:45 UTC (rev 2534) @@ -50,7 +50,7 @@ QString getPlainTitle(int num); QString threadName(); /* = subject of thread */ - QString threadID(); + QString threadId(); /* HTML data */ QString getHtml(int startnum, int endnum, bool checkAbone = true); @@ -64,7 +64,7 @@ int getViewPos(); void setViewPos(int num); int getDatSize(); - int getNumByID(const QString& strid); + int getNumById(const QString& strid); /* another information */ Modified: kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp 2009-08-08 23:45:45 UTC (rev 2534) @@ -211,7 +211,7 @@ case Board_JBBS: { QString cgipath = BoardManager::boardRoot(m_datURL) - + "/bbs/write.cgi/" + BoardManager::boardID(m_datURL) + '/'; + + "/bbs/write.cgi/" + BoardManager::boardId(m_datURL) + '/'; cgipath += "new/"; @@ -246,9 +246,9 @@ case Board_JBBS: { QString cgipath = BoardManager::boardRoot(m_datURL) - + "/bbs/write.cgi/" + BoardManager::boardID(m_datURL) + '/'; + + "/bbs/write.cgi/" + BoardManager::boardId(m_datURL) + '/'; - cgipath += DatManager(m_datURL).threadID() + '/'; + cgipath += DatManager(m_datURL).threadId() + '/'; m_bbscgi = cgipath; } Modified: kita/branches/KITA-KDE4/kita/src/libkita/postdata.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/postdata.cpp 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/libkita/postdata.cpp 2009-08-08 23:45:45 UTC (rev 2534) @@ -23,11 +23,11 @@ m_body = body; m_boardId = boardId; DatManager datManager(m_datUrl); - m_threadId = datManager.threadID(); + m_threadId = datManager.threadId(); m_serverTime = datManager.getServerTime(); /* login */ if (datManager.is2chThread() && Account::isLogged()) { - m_sessionId = KUrl::toPercentEncoding(Account::getSessionID()); + m_sessionId = KUrl::toPercentEncoding(Account::getSessionId()); } } Modified: kita/branches/KITA-KDE4/kita/src/writeview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-08-08 23:45:45 UTC (rev 2534) @@ -152,9 +152,9 @@ return threadNameLine->text(); } -const QString WriteView::boardID() const +const QString WriteView::boardId() const { - return BoardManager::boardID(m_datURL); + return BoardManager::boardId(m_datURL); } const QString WriteView::boardName() const @@ -178,7 +178,7 @@ QString WriteView::buildPostMessage() { - PostData postData(m_datURL, name(), mail(), body(), boardID()); + PostData postData(m_datURL, name(), mail(), body(), boardId()); QString postStr; switch (m_bbstype) { case Board_JBBS: Modified: kita/branches/KITA-KDE4/kita/src/writeview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/writeview.h 2009-08-08 23:32:43 UTC (rev 2533) +++ kita/branches/KITA-KDE4/kita/src/writeview.h 2009-08-08 23:45:45 UTC (rev 2534) @@ -71,7 +71,7 @@ const KUrl datURL() const; const QString threadName() const; const QString boardName() const; - const QString boardID() const; + const QString boardId() const; const QString name() const { return nameLine->text();