svnno****@sourc*****
svnno****@sourc*****
2009年 8月 8日 (土) 00:00:44 JST
Revision: 2529 http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2529 Author: nogu Date: 2009-08-08 00:00:43 +0900 (Sat, 08 Aug 2009) Log Message: ----------- URL -> Url Modified Paths: -------------- kita/branches/KITA-KDE4/kita/src/boardview.cpp kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp kita/branches/KITA-KDE4/kita/src/htmlpart.cpp kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h kita/branches/KITA-KDE4/kita/src/libkita/parsemisc.h kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp kita/branches/KITA-KDE4/kita/src/mainwindow.cpp kita/branches/KITA-KDE4/kita/src/mainwindow.h kita/branches/KITA-KDE4/kita/src/threadview.cpp kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp kita/branches/KITA-KDE4/kita/src/writeview.cpp Modified: kita/branches/KITA-KDE4/kita/src/boardview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-08-07 15:00:43 UTC (rev 2529) @@ -213,7 +213,7 @@ { QDateTime current = QDateTime::currentDateTime(); - KUrl datURL = getDatURL(url); + KUrl datURL = getDatUrl(url); for (int i = 0, j = subjectList->rowCount(); i < j; i++) { if (subjectList->item(i, ColumnDatUrl)->text() == datURL.prettyUrl()) { Modified: kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp 2009-08-07 15:00:43 UTC (rev 2529) @@ -68,7 +68,7 @@ subjectList->setSortingEnabled(true); // insert item. for (int i = 0; i < count; i++) { - QString datURL = FavoriteThreads::getDatURL(i); + QString datURL = FavoriteThreads::getDatUrl(i); QDateTime since; since.setTime_t(datToSince(datURL)); @@ -113,7 +113,7 @@ QString itemURL = subjectList->item(item->row(), ColumnDatUrl)->text(); for (int i = 0; FavoriteThreads::count() > i; i++) { - QString datURL = FavoriteThreads::getDatURL(i); + QString datURL = FavoriteThreads::getDatUrl(i); if (datURL == itemURL) { ViewMediator::getInstance()->openThread(datURL); @@ -129,7 +129,7 @@ QList<QString> boardList; for (int i = 0; FavoriteThreads::count() > i; i++) { - QString datURL = FavoriteThreads::getDatURL(i); + QString datURL = FavoriteThreads::getDatUrl(i); QString boardURL = BoardManager::boardURL(datURL); if (boardList.contains(boardURL) == 0) { boardList.append(boardURL); Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-08-07 15:00:43 UTC (rev 2529) @@ -115,7 +115,7 @@ clearPart(); - m_datURL = getDatURL(url); + m_datURL = getDatUrl(url); m_mode = mode; if (m_mode == HTMLPART_MODE_MAINPART) { /* This part is on the main thread view. */ @@ -924,7 +924,7 @@ void HTMLPart::clickAnchor(const KUrl& urlin) { QString refstr; - KUrl datURL = getDatURL(urlin , refstr); + KUrl datURL = getDatUrl(urlin , refstr); /*--------------------*/ /* Ctrl + right click */ @@ -1452,7 +1452,7 @@ if (url.at(0) == '#') { refstr = url.mid(1); } else { - datURL = getDatURL(KUrl(m_datURL, url) , refstr); + datURL = getDatUrl(KUrl(m_datURL, url) , refstr); } /*------------------------*/ Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-08-07 15:00:43 UTC (rev 2529) @@ -38,7 +38,7 @@ m_access (0), m_access2(0) { QString refstr; - m_datURL = getDatURL(url, refstr); + m_datURL = getDatUrl(url, refstr); m_threadIndex = ThreadIndex(m_datURL); /* get the pointer of Thread class */ m_thread = Thread::getByURLNew(m_datURL); Modified: kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp 2009-08-07 15:00:43 UTC (rev 2529) @@ -86,7 +86,7 @@ without creating instance. */ /* private */ DatInfo* DatManager::searchDatInfo(const KUrl& url) { - KUrl datURL = getDatURL(url); + KUrl datURL = getDatUrl(url); if (datURL.isEmpty()) return 0; /* This url is not enrolled in BoardManager. */ if (m_datInfoList.isEmpty()) return 0; @@ -118,7 +118,7 @@ Note that DatInfo::DatInfo() opens cached data and reads it. */ /* private */ DatInfo* DatManager::enrollDatInfo(const KUrl& url, bool checkCached) { - KUrl datURL = getDatURL(url); + KUrl datURL = getDatUrl(url); if (datURL.isEmpty()) return 0; /* This url is not enrolled in BoardManager. */ /* create DatInfo & read cached data */ @@ -194,7 +194,7 @@ /* public */ bool DatManager::deleteCache(const KUrl& url) { - KUrl datURL = getDatURL(url); + KUrl datURL = getDatUrl(url); Thread* thread = Thread::getByURLNew(datURL); if (thread == 0) return false; if (thread->readNum() == 0) return false; @@ -299,7 +299,7 @@ /* get name (i.e. subject) of thread from URL of dat file. */ /* public */ const QString DatManager::threadName(const KUrl& url) { - KUrl datURL = getDatURL(url); + KUrl datURL = getDatUrl(url); Thread* thread = Thread::getByURLNew(datURL); if (thread != 0) return thread->threadName(); @@ -310,7 +310,7 @@ /* public */ const QString DatManager::threadID(const KUrl& url) { - KUrl datURL = getDatURL(url); + KUrl datURL = getDatUrl(url); return datURL.fileName().section('.', 0, 0); } @@ -361,7 +361,7 @@ /* public */ int DatManager::getResNum(const KUrl& url) { - KUrl datURL = getDatURL(url); + KUrl datURL = getDatUrl(url); Thread* thread = Thread::getByURLNew(datURL); if (thread != 0) return thread->resNum(); @@ -372,7 +372,7 @@ /* public */ int DatManager::getReadNum(const KUrl& url) { - KUrl datURL = getDatURL(url); + KUrl datURL = getDatUrl(url); Thread* thread = Thread::getByURLNew(datURL); if (thread != 0) return thread->readNum(); @@ -383,7 +383,7 @@ /* public */ int DatManager::getViewPos(const KUrl& url) { - KUrl datURL = getDatURL(url); + KUrl datURL = getDatUrl(url); Thread* thread = Thread::getByURLNew(datURL); if (thread != 0) return thread->viewPos(); @@ -394,7 +394,7 @@ /* public */ void DatManager::setViewPos(const KUrl& url , int num) { - KUrl datURL = getDatURL(url); + KUrl datURL = getDatUrl(url); Thread* thread = Thread::getByURLNew(datURL); if (thread != 0) thread->setViewPos(num); @@ -429,7 +429,7 @@ /* public */ bool DatManager::isThreadEnrolled(const KUrl& url) { - if (getDatURL(url).isEmpty()) return false; + if (getDatUrl(url).isEmpty()) return false; return true; } @@ -439,7 +439,7 @@ bool DatManager::is2chThread(const KUrl& url) { if (BoardManager::type(url) != Board_2ch) return false; - if (getDatURL(url).isEmpty()) return false; + if (getDatUrl(url).isEmpty()) return false; QRegExp url_2ch(".*\\.2ch\\.net"); QRegExp url_bbspink(".*\\.bbspink\\.com"); @@ -507,7 +507,7 @@ /* public */ bool DatManager::isMarked(const KUrl& url, int num) { - KUrl datURL = getDatURL(url); + KUrl datURL = getDatUrl(url); Thread* thread = Thread::getByURLNew(datURL); if (thread == 0) return false; @@ -518,7 +518,7 @@ /* public */ void DatManager::setMark(const KUrl& url, int num, bool mark) { - KUrl datURL = getDatURL(url); + KUrl datURL = getDatUrl(url); Thread* thread = Thread::getByURLNew(datURL); if (thread == 0) return ; Modified: kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp 2009-08-07 15:00:43 UTC (rev 2529) @@ -110,7 +110,7 @@ QString url = datURLNode.toElement().text(); QString name = nameNode.toElement().text(); - KUrl datURL = Kita::getDatURL(url); + KUrl datURL = Kita::getDatUrl(url); Thread* thread = Thread::getByURL(datURL); thread->setThreadName(name); ThreadIndex threadIndex(datURL); @@ -182,7 +182,7 @@ } } -QString FavoriteThreads::getDatURL(int i) +QString FavoriteThreads::getDatUrl(int i) { if (getInstance() ->m_threadList.count() > i) { return getInstance() ->m_threadList[ i ].m_datURL; Modified: kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h 2009-08-07 15:00:43 UTC (rev 2529) @@ -51,7 +51,7 @@ const QString toXML() const; static bool readFromXML(const QString& xml); static void replace(const QString& fromURL, const QString& toURL); - static QString getDatURL(int i); + static QString getDatUrl(int i); static int count() { return getInstance() ->m_threadList.count(); } }; Modified: kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp 2009-08-07 15:00:43 UTC (rev 2529) @@ -179,12 +179,12 @@ /* conversion of URL */ -KUrl Kita::getDatURL(const KUrl& url , QString& refstr) +KUrl Kita::getDatUrl(const KUrl& url , QString& refstr) { return convertURL(URLMODE_DAT, url, refstr); } -KUrl Kita::getDatURL(const KUrl& url) +KUrl Kita::getDatUrl(const KUrl& url) { QString refstr; return convertURL(URLMODE_DAT, url, refstr); @@ -528,6 +528,7 @@ /* init parser. Don't forget to call this before parsing. */ void Kita::InitParseMachiBBS() { + qDebug("initparse"); m_machiSubject.clear(); m_machiLine.clear(); } Modified: kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h 2009-08-07 15:00:43 UTC (rev 2529) @@ -43,8 +43,8 @@ /*------------------------------*/ /* conversion of URL */ - KDE_EXPORT KUrl getDatURL(const KUrl& url , QString& refstr); - KDE_EXPORT KUrl getDatURL(const KUrl& url); + KDE_EXPORT KUrl getDatUrl(const KUrl& url , QString& refstr); + KDE_EXPORT KUrl getDatUrl(const KUrl& url); QString getThreadURL(const KUrl& url, QString& refstr); KDE_EXPORT QString getThreadURL(const KUrl& url); Modified: kita/branches/KITA-KDE4/kita/src/libkita/parsemisc.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/parsemisc.h 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/libkita/parsemisc.h 2009-08-07 15:00:43 UTC (rev 2529) @@ -25,10 +25,10 @@ public: static KUrl parseURL(const KUrl& url , QString& refstr) { - return getDatURL(url , refstr); + return getDatUrl(url , refstr); } - static KUrl parseURLonly(const KUrl& url) { return getDatURL(url); } + static KUrl parseURLonly(const KUrl& url) { return getDatUrl(url); } static QString utf8ToUnicode(const QByteArray& str) { return utf8ToUnicode(str); } Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp 2009-08-07 15:00:43 UTC (rev 2529) @@ -145,7 +145,7 @@ setMarkListPrivate(config, thread->markList()); /* save "cache" */ - KUrl datURL = getDatURL(m_url); + KUrl datURL = getDatUrl(m_url); int num = (thread->viewPos() ? thread->viewPos() : thread->readNum()); ThreadInfo::setReadNum(datURL.prettyUrl(), num); } @@ -174,7 +174,7 @@ /* use obsoleted "cache" file */ if (!resNum) { - KUrl datURL = getDatURL(m_url); + KUrl datURL = getDatUrl(m_url); resNum = ThreadInfo::readNum(datURL.prettyUrl()); if (resNum) config.group("").writeEntry("ResNum", resNum); @@ -212,7 +212,7 @@ /* use obsoleted "cache" file */ if (!readNum) { - KUrl datURL = getDatURL(m_url); + KUrl datURL = getDatUrl(m_url); readNum = ThreadInfo::readNum(datURL.prettyUrl()); } Modified: kita/branches/KITA-KDE4/kita/src/mainwindow.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/mainwindow.cpp 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/mainwindow.cpp 2009-08-07 15:00:43 UTC (rev 2529) @@ -109,7 +109,7 @@ // allow the view to change the statusbar and caption connect(m_urlLine, SIGNAL(returnPressed()), - SLOT(slotURLLine())); + SLOT(slotUrlLine())); QMenu* settingsPopup = static_cast<QMenu *>(factory() ->container("settings", this)); connect(settingsPopup, SIGNAL(aboutToShow()), @@ -167,11 +167,11 @@ setCaption(url.url()); } -void MainWindow::bookmark(const QString& datURL, bool on) +void MainWindow::bookmark(const QString& datUrl, bool on) { FavoriteThreads * favorite = FavoriteThreads::getInstance(); - on ? favorite->insert(datURL) : favorite->remove(datURL); + on ? favorite->insert(datUrl) : favorite->remove(datUrl); saveFavorites(); ViewMediator::getInstance()->updateFavoriteListView(); } @@ -275,11 +275,11 @@ statusBar() ->showMessage(statusStr); } -void MainWindow::slotURLLine() +void MainWindow::slotUrlLine() { KUrl url = m_urlLine->text(); - KUrl datURL = getDatURL(url); - m_threadTab->slotShowMainThread(datURL); + KUrl datUrl = getDatUrl(url); + m_threadTab->slotShowMainThread(datUrl); } // @@ -307,7 +307,7 @@ urlLineAction->setDefaultWidget(m_urlLine); urlLineAction->setText(i18n("URL Line")); actionCollection()->addAction("url_line_action", urlLineAction); - connect(urlLineAction, SIGNAL(triggered()), this, SLOT(slotURLLine())); + connect(urlLineAction, SIGNAL(triggered()), this, SLOT(slotUrlLine())); KStandardAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); Modified: kita/branches/KITA-KDE4/kita/src/mainwindow.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/mainwindow.h 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/mainwindow.h 2009-08-07 15:00:43 UTC (rev 2529) @@ -42,7 +42,7 @@ void load(const KUrl& url); void setMainStatus(const QString& statusStr); void setUrl(const KUrl& url); - void bookmark(const QString& datURL, bool on); + void bookmark(const QString& datUrl, bool on); private slots: void login(); @@ -56,7 +56,7 @@ void setFont(const QFont& font); void slotEditCopy(); - void slotURLLine(); + void slotUrlLine(); private: KLineEdit* m_urlLine; Modified: kita/branches/KITA-KDE4/kita/src/threadview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-08-07 15:00:43 UTC (rev 2529) @@ -284,7 +284,7 @@ /*---------------------------------------*/ /* setup */ - m_datURL = getDatURL(datURL); + m_datURL = getDatUrl(datURL); /* setup HTMLPart */ int partMode = HTMLPART_MODE_MAINPART; Modified: kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp 2009-08-07 15:00:43 UTC (rev 2529) @@ -85,7 +85,7 @@ /* private */ WriteView* WriteTabWidget::findWriteView(const KUrl& url) { - KUrl datURL = getDatURL(url); + KUrl datURL = getDatUrl(url); if (datURL.isEmpty()) return 0; int max = count(); Modified: kita/branches/KITA-KDE4/kita/src/writeview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-08-07 10:06:55 UTC (rev 2528) +++ kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-08-07 15:00:43 UTC (rev 2529) @@ -48,7 +48,7 @@ : QWidget(parent) { setupUi(this); - m_datURL = getDatURL(url); + m_datURL = getDatUrl(url); m_bbstype = BoardManager::type(m_datURL); m_bbscgi = getWriteURL(m_datURL); m_parent = parent;