[Kita-svn] [2542] URL -> Url

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2009年 8月 9日 (日) 21:35:19 JST


Revision: 2542
          http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2542
Author:   nogu
Date:     2009-08-09 21:35:19 +0900 (Sun, 09 Aug 2009)

Log Message:
-----------
URL -> Url

Modified Paths:
--------------
    kita/branches/KITA-KDE4/kita/src/bbsview.cpp
    kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp
    kita/branches/KITA-KDE4/kita/src/boardtabwidget.h
    kita/branches/KITA-KDE4/kita/src/boardview.cpp
    kita/branches/KITA-KDE4/kita/src/boardview.h
    kita/branches/KITA-KDE4/kita/src/domtree.cpp
    kita/branches/KITA-KDE4/kita/src/domtree.h
    kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp
    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/access.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/favoriteboards.cpp
    kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.h
    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/thread.cpp
    kita/branches/KITA-KDE4/kita/src/libkita/thread.h
    kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp
    kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.cpp
    kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.h
    kita/branches/KITA-KDE4/kita/src/respopup.h
    kita/branches/KITA-KDE4/kita/src/threadlistview.cpp
    kita/branches/KITA-KDE4/kita/src/threadlistview.h
    kita/branches/KITA-KDE4/kita/src/threadproperty.ui
    kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp
    kita/branches/KITA-KDE4/kita/src/threadtabwidget.h
    kita/branches/KITA-KDE4/kita/src/threadview.cpp
    kita/branches/KITA-KDE4/kita/src/threadview.h
    kita/branches/KITA-KDE4/kita/src/viewmediator.cpp
    kita/branches/KITA-KDE4/kita/src/viewmediator.h
    kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp
    kita/branches/KITA-KDE4/kita/src/writeview.cpp
    kita/branches/KITA-KDE4/kita/src/writeview.h

Modified: kita/branches/KITA-KDE4/kita/src/bbsview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/bbsview.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/bbsview.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -46,7 +46,7 @@
 {
     QString category_name;
     QStringList boardNameList;
-    QStringList boardURLList;
+    QStringList boardUrlList;
 };
 
 
@@ -109,8 +109,8 @@
 bool BBSView::downloadBoardList()
 {
     // moved urls.
-    QList<QString> oldURLs;
-    QList<QString> newURLs;
+    QList<QString> oldUrls;
+    QList<QString> newUrls;
 
     QString tmpFile;
     QString url = GlobalConfig::boardListUrl();
@@ -138,30 +138,30 @@
     QString oldBoards;
     for (it = categoryList.begin(); it != categoryList.end(); ++it) {
         Category category = (*it);
-        QList<QString> board_url_list = category.boardURLList;
+        QList<QString> board_url_list = category.boardUrlList;
         if (board_url_list.isEmpty()) continue;
 
         int count = 0;
         for (QList<QString>::iterator it2 = board_url_list.begin();
                 it2 != board_url_list.end(); ++it2) {
 
-            QString boardURL = *it2;
+            QString boardUrl = *it2;
             QString boardName = category.boardNameList[ count ];
-            QString oldURL;
+            QString oldUrl;
             int ret = BoardManager::enrollBoard(
-                    boardURL, boardName, oldURL, Board_Unknown,
+                    boardUrl, boardName, oldUrl, Board_Unknown,
                       true /* test only */);
             if (ret == Board_enrollNew) {
                 newBoards += boardName + "  ( " + category.category_name
-                    + " )  " + boardURL + '\n';
+                    + " )  " + boardUrl + '\n';
             }
             if (ret == Board_enrollMoved) {
                 oldBoards += boardName + "  ( " + category.category_name
-                    + " )  " + oldURL + "  ->  " + boardURL + '\n';
+                    + " )  " + oldUrl + "  ->  " + boardUrl + '\n';
             }
             count++;
-            oldURLs += oldURL;
-            newURLs += boardURL;
+            oldUrls += oldUrl;
+            newUrls += boardUrl;
         }
     }
 
@@ -209,12 +209,12 @@
     }
 
     // if moved URL exists. move files.
-    for(int i=0; i<oldURLs.count(); i++) {
-        QString oldURL = oldURLs[ i ];
-        QString newURL = newURLs[ i ];
+    for(int i=0; i<oldUrls.count(); i++) {
+        QString oldUrl = oldUrls[ i ];
+        QString newUrl = newUrls[ i ];
 
 //        qDebug("move %s -> %s", oldURL.latin1(), newURL.latin1());
-        BoardManager::moveBoard(oldURL, newURL);
+        BoardManager::moveBoard(oldUrl, newUrl);
     }
 
     /* save config */
@@ -222,7 +222,7 @@
     KConfig config(configPath);
     for (it = categoryList.begin(); it != categoryList.end(); ++it) {
         Category category = (*it);
-        QList<QString> board_url_list = category.boardURLList;
+        QList<QString> board_url_list = category.boardUrlList;
 
         if (board_url_list.isEmpty()) {
             continue;
@@ -235,10 +235,10 @@
         int count = 0;
         for (it2 = board_url_list.begin(); it2 != board_url_list.end(); ++it2) {
             QString key = QString("item%1").arg(count);
-            QString boardURL = *it2;
+            QString boardUrl = *it2;
             QString boardName = category.boardNameList[ count ];
             QStringList tmpList;
-            tmpList << boardURL;
+            tmpList << boardUrl;
             tmpList << boardName;
             group.writeEntry(key, tmpList);
             count++;
@@ -302,28 +302,28 @@
             if (value.count() != 2) {
                 break;
             }
-            QString boardURL = value[ 0 ];
+            QString boardUrl = value[ 0 ];
             QString boardName = value[ 1 ];
-            if (boardURL.contains('/') != 4 || boardURL.right(1) != "/") {
+            if (boardUrl.contains('/') != 4 || boardUrl.right(1) != "/") {
                 // OK: http://pc8.2ch.net/linux/
                 // NG: http://www.machi.to/
                 // NG: http://find.2ch.net/enq/board.php
                 continue;
             }
-            QString oldURL;
-            BoardManager::enrollBoard(boardURL, boardName, oldURL);
-            BoardManager::loadBBSHistory(boardURL);
+            QString oldUrl;
+            BoardManager::enrollBoard(boardUrl, boardName, oldUrl);
+            BoardManager::loadBBSHistory(boardUrl);
             previousBoard = new ListViewItem(categoryItem, previousBoard,
-                    QStringList() << boardName << boardURL);
+                    QStringList() << boardName << boardUrl);
         }
         previous = categoryItem;
     }
 
-    QString boardURL = "http://jbbs.livedoor.jp/computer/18420/" ;
+    QString boardUrl = "http://jbbs.livedoor.jp/computer/18420/" ;
     QString boardName = i18nc("@item:inlistbox", "Kita Board");
-    QString oldURL;
-    new ListViewItem(m_boardList, 0, QStringList() << boardName << boardURL);
-    BoardManager::enrollBoard(boardURL, boardName, oldURL);
+    QString oldUrl;
+    new ListViewItem(m_boardList, 0, QStringList() << boardName << boardUrl);
+    BoardManager::enrollBoard(boardUrl, boardName, oldUrl);
 
     loadExtBoard();
     refreshFavoriteBoards();
@@ -356,11 +356,11 @@
 
                     new ListViewItem(categoryItem,
                                 QStringList() << board_title << board_url);
-                    QString oldURL;
+                    QString oldUrl;
                     int type = Board_Unknown;
                     if (list.size() == 3) type = list[ 2 ].toInt();
                     BoardManager::enrollBoard(
-                            board_url, board_title, oldURL, type);
+                            board_url, board_title, oldUrl, type);
                 }
             }
         }
@@ -379,7 +379,7 @@
     Category current_category;
     current_category.category_name.clear();
     current_category.boardNameList.clear();
-    current_category.boardURLList.clear();
+    current_category.boardUrlList.clear();
     for (it = lines.begin(); it != lines.end(); ++it) {
         QString category_name = getCategory(*it);
         if (!category_name.isEmpty()) {
@@ -388,16 +388,16 @@
             }
             current_category.category_name = category_name;
             current_category.boardNameList.clear();
-            current_category.boardURLList.clear();
+            current_category.boardUrlList.clear();
         } else {
             QRegExp regexp("<A HREF=([^ ]*).*>(.*)</A>", Qt::CaseInsensitive);
             if (regexp.indexIn((*it)) != -1) {
                 QString url = regexp.cap(1);
                 QString title = regexp.cap(2);
-                if (isBoardURL(url)
+                if (isBoardUrl(url)
                         && !current_category.category_name.isEmpty()) {
                     current_category.boardNameList.append(title);
-                    current_category.boardURLList.append(url);
+                    current_category.boardUrlList.append(url);
                 }
             }
         }
@@ -423,10 +423,10 @@
     QList<KUrl>::iterator it;
 
     for (it = boards.begin(); it != boards.end(); ++it) {
-        QString boardURL = (*it).prettyUrl();
-        QString boardName = BoardManager::boardName(boardURL);
+        QString boardUrl = (*it).prettyUrl();
+        QString boardName = BoardManager::boardName(boardUrl);
 
-        new ListViewItem(m_favorites, QStringList() << boardName << boardURL);
+        new ListViewItem(m_favorites, QStringList() << boardName << boardUrl);
     }
 }
 
@@ -435,13 +435,13 @@
     if (! item) return ;
 
     QString boardName = item->text(0);
-    QString boardURL = BoardManager::boardURL(item->text(1));
+    QString boardUrl = BoardManager::boardUrl(item->text(1));
 
-    if (boardURL.isEmpty()) {
+    if (boardUrl.isEmpty()) {
         return ;
     }
 
-    ViewMediator::getInstance()->openBoard(boardURL);
+    ViewMediator::getInstance()->openBoard(boardUrl);
 }
 
 void BBSView::setFont(const QFont& font)
@@ -460,8 +460,8 @@
 {
     QTreeWidgetItem* item = m_boardList->currentItem();
     QString boardName = item->text(0);
-    KUrl boardURL = item->text(1);
-    KRun::runUrl(boardURL, "text/html", 0);
+    KUrl boardUrl = item->text(1);
+    KRun::runUrl(boardUrl, "text/html", 0);
 }
 
 void BBSView::contextMenuEvent(QContextMenuEvent* e)
@@ -481,27 +481,27 @@
         : popup.addAction(m_addToFavoritesAct);
 
     QString boardName = item->text(0);
-    KUrl boardURL = item->text(1);
-    KUrl boardURL_upToDate = BoardManager::boardURL(boardURL);
+    KUrl boardUrl = item->text(1);
+    KUrl boardUrl_upToDate = BoardManager::boardUrl(boardUrl);
     QClipboard* clipboard = QApplication::clipboard();
 
     QAction *action = popup.exec(point);
     if (action == m_openWithBrowserAct) {
-        KRun::runUrl(boardURL, "text/html", this);
+        KRun::runUrl(boardUrl, "text/html", this);
     } else if (action == m_copyUrlAct) {
-        clipboard->setText(boardURL_upToDate.prettyUrl(),
+        clipboard->setText(boardUrl_upToDate.prettyUrl(),
                 QClipboard::Clipboard);
-        clipboard->setText(boardURL_upToDate.prettyUrl(),
+        clipboard->setText(boardUrl_upToDate.prettyUrl(),
                 QClipboard::Selection);
     } else if (action == m_copyTitleAndUrlAct) {
-        clipboard->setText(boardName + '\n' + boardURL_upToDate.prettyUrl(),
+        clipboard->setText(boardName + '\n' + boardUrl_upToDate.prettyUrl(),
                 QClipboard::Clipboard);
-        clipboard->setText(boardName + '\n' + boardURL_upToDate.prettyUrl(),
+        clipboard->setText(boardName + '\n' + boardUrl_upToDate.prettyUrl(),
                 QClipboard::Selection);
     } else if (action == m_addToFavoritesAct) {
-        FavoriteBoards::append(boardURL_upToDate);
+        FavoriteBoards::append(boardUrl_upToDate);
     } else if (action == m_removeFromFavoritesAct) {
-        FavoriteBoards::remove(boardURL);
+        FavoriteBoards::remove(boardUrl);
     }
 }
 
@@ -573,18 +573,18 @@
     if (!item) return;
 
     QString boardName = item->text(0);
-    QString boardURL = BoardManager::boardURL(item->text(1));
-    if (boardURL.isEmpty()) {
+    QString boardUrl = BoardManager::boardUrl(item->text(1));
+    if (boardUrl.isEmpty()) {
         item->setExpanded(!item->isExpanded());
         return ;
     }
 
     switch (e->button()) {
     case Qt::MidButton:
-        ViewMediator::getInstance()->openBoard(boardURL);
+        ViewMediator::getInstance()->openBoard(boardUrl);
         break;
     case Qt::LeftButton:
-        ViewMediator::getInstance()->openBoard(boardURL);
+        ViewMediator::getInstance()->openBoard(boardUrl);
         break;
     default:
         return;

Modified: kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -43,28 +43,28 @@
 BoardTabWidget::~BoardTabWidget()
 {}
 
-void BoardTabWidget::updateBoardView(const KUrl& datURL)
+void BoardTabWidget::updateBoardView(const KUrl& datUrl)
 {
     for(int i=0; i<count(); i++) {
         BoardView* view = isSubjectView(widget(i));
         if(view) {
-            view->slotUpdateSubject(datURL);
+            view->slotUpdateSubject(datUrl);
         }
     }
 }
 
 /* public slots */
-void BoardTabWidget::loadBoard(const KUrl& boardURL)
+void BoardTabWidget::loadBoard(const KUrl& boardUrl)
 {
-    BoardView * view = findView(boardURL);
-    QString boardName = BoardManager::boardName(boardURL);
+    BoardView * view = findView(boardUrl);
+    QString boardName = BoardManager::boardName(boardUrl);
     if (!view) {
         view = createView(boardName);
     }
 
     if (view) {
         setCurrentWidget(view);
-        view->loadBoard(boardURL);
+        view->loadBoard(boardUrl);
     }
 }
 
@@ -80,7 +80,7 @@
 }
 
 /* private */
-BoardView* BoardTabWidget::findView(const KUrl& boardURL)
+BoardView* BoardTabWidget::findView(const KUrl& boardUrl)
 {
     int max = count() - 1;
     if (max <= 0) return 0;
@@ -88,7 +88,7 @@
 
     while (i < max) {
         BoardView * view = isSubjectView(widget(i));
-        if (view && view->boardURL() == boardURL) return view;
+        if (view && view->boardUrl() == boardUrl) return view;
         i++;
     }
 
@@ -230,10 +230,10 @@
     } else if (action == m_showOldLogsAct) {
         tabwidget->slotShowOldLogs(idx);
     } else if (action == m_openBrowserAct) {
-        KRun::runUrl(subjectView->boardURL(), "text/html", this);
+        KRun::runUrl(subjectView->boardUrl(), "text/html", this);
     } else if (action == m_copyTitleAct) {
-        QString cliptxt = BoardManager::boardName(subjectView->boardURL())
-            + '\n' + subjectView->boardURL().prettyUrl();
+        QString cliptxt = BoardManager::boardName(subjectView->boardUrl())
+            + '\n' + subjectView->boardUrl().prettyUrl();
         clipboard->setText(cliptxt , QClipboard::Clipboard);
         clipboard->setText(cliptxt , QClipboard::Selection);
     }

Modified: kita/branches/KITA-KDE4/kita/src/boardtabwidget.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardtabwidget.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/boardtabwidget.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -30,14 +30,14 @@
             explicit BoardTabWidget(QWidget* parent = 0);
             ~BoardTabWidget();
 
-            void updateBoardView(const KUrl& datURL);
+            void updateBoardView(const KUrl& datUrl);
 
         public slots:
             void loadBoard(const KUrl&);
 
         private:
             BoardView* createView(QString label);
-            BoardView* findView(const KUrl& boardURL);
+            BoardView* findView(const KUrl& boardUrl);
             BoardView* isSubjectView(QWidget* w);
 
         protected:

Modified: kita/branches/KITA-KDE4/kita/src/boardview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardview.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/boardview.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -66,8 +66,8 @@
 
 void BoardView::reloadSubject()
 {
-    if (!m_boardURL.isEmpty()) {
-        loadBoard(m_boardURL);
+    if (!m_boardUrl.isEmpty()) {
+        loadBoard(m_boardUrl);
     }
 }
 
@@ -79,15 +79,15 @@
 }
 
 
-const KUrl BoardView::boardURL()
+const KUrl BoardView::boardUrl()
 {
-    return m_boardURL;
+    return m_boardUrl;
 }
 
 void BoardView::toggleShowOldLogs()
 {
     m_showOldLogs = !m_showOldLogs;
-    loadBoard(m_boardURL, false);
+    loadBoard(m_boardUrl, false);
 }
 
 enum {
@@ -113,7 +113,7 @@
         m_prevquery = QStringList();
     }
 
-    m_boardURL = url;
+    m_boardUrl = url;
     m_unreadNum = 0;
     m_readNum = 0;
     m_newNum = 0;
@@ -122,7 +122,7 @@
     QList<Thread*> oldLogList;
     QList<Thread*> threadList;
     BoardManager::getThreadList(
-            m_boardURL, m_showOldLogs, online, threadList, oldLogList);
+            m_boardUrl, m_showOldLogs, online, threadList, oldLogList);
 
     // reset list
     subjectList->clearContents();
@@ -136,21 +136,21 @@
     for (int i = 0; i < count; i++) {
         Thread* thread
             = i < countNew ? threadList.at(i) : oldLogList.at(i - countNew);
-        KUrl datURL = thread->datURL();
+        KUrl datUrl = thread->datUrl();
         for (int j = 0, k = subjectList->columnCount(); j < k; j++) {
             ThreadListViewItem* item = new ThreadListViewItem(j);
             subjectList->setItem(i, j, item);
         }
         int id = (i < countNew ? i + 1 : 0);
         int order = i + 1;
-        updateRow(i, datURL, current, id, order);
+        updateRow(i, datUrl, current, id, order);
     }
     subjectList->setSortingEnabled(true);
 
     if (hideButton->isChecked()) {
         hideButton->toggle();
     }
-    ViewMediator::getInstance()->setMainURLLine(m_boardURL);
+    ViewMediator::getInstance()->setMainUrlLine(m_boardUrl);
 
     switch (GlobalConfig::listSortOrder()) {
     case GlobalConfig::EnumListSortOrder::Mark:
@@ -213,9 +213,9 @@
 {
     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()) {
+        if (subjectList->item(i, ColumnDatUrl)->text() == datUrl.prettyUrl()) {
 
             switch (subjectList->item(i, ColumnMarkOrder)->text().toInt()) {
             case Thread_Readed:
@@ -230,12 +230,12 @@
                 break;
             }
 
-            Thread* thread = Thread::getByURLNew(datURL);
+            Thread* thread = Thread::getByUrlNew(datUrl);
             if (thread == 0)
                 return;
             int id = subjectList->item(i, ColumnId)->text().toInt();
             int order = subjectList->item(i, ColumnIdOrder)->text().toInt();
-            updateRow(i, datURL, current, id, order);
+            updateRow(i, datUrl, current, id, order);
 
             updateKindLabel();
 
@@ -246,12 +246,12 @@
 
 /* if id == 0, this thread is old thread. */
 /* private */
-void BoardView::updateRow(int row, const KUrl& datURL,
+void BoardView::updateRow(int row, const KUrl& datUrl,
         const QDateTime& current, int id, int order)
 {
     QDateTime since;
-    since.setTime_t(datToSince(datURL));
-    DatManager datManager(datURL);
+    since.setTime_t(datToSince(datUrl));
+    DatManager datManager(datUrl);
     QString threadName = datManager.threadName();
     int resNum = datManager.getResNum();
     int readNum = datManager.getReadNum();
@@ -270,7 +270,7 @@
                 ? QString("%1").arg(resNum - viewPos, 4) : QString());
     subjectList->item(row, ColumnSince)
         ->setText(since.toString("yy/MM/dd hh:mm"));
-    subjectList->item(row, ColumnDatUrl)->setText(datURL.prettyUrl());
+    subjectList->item(row, ColumnDatUrl)->setText(datUrl.prettyUrl());
     subjectList->item(row, ColumnSpeed)
         ->setText(QString(" %1 ").arg(speed, 0, 'f', 2));
 

Modified: kita/branches/KITA-KDE4/kita/src/boardview.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardview.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/boardview.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -35,7 +35,7 @@
     public:
         explicit BoardView(BoardTabWidget* parent);
         void init();
-        const KUrl boardURL();
+        const KUrl boardUrl();
         void toggleShowOldLogs();
 
     public slots:
@@ -47,7 +47,7 @@
         void slotUpdateSubject(const KUrl& url);
 
     private:
-        KUrl m_boardURL;
+        KUrl m_boardUrl;
         int m_unreadNum, m_readNum, m_newNum;
         bool m_showOldLogs;
         bool m_enableSizeChange;
@@ -55,7 +55,7 @@
         void updateKindLabel();
         void deleteLog(const KUrl& url);
         void loadLayout();
-        void updateRow(int row, const KUrl& datURL,
+        void updateRow(int row, const KUrl& datUrl,
             const QDateTime& current, int id, int order);
         void saveHeaderOnOff();
         void loadHeaderOnOff();

Modified: kita/branches/KITA-KDE4/kita/src/domtree.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/domtree.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/domtree.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -22,7 +22,7 @@
 
 using namespace Kita;
 
-DomTree::DomTree(const DOM::HTMLDocument& hdoc, const KUrl& datURL)
+DomTree::DomTree(const DOM::HTMLDocument& hdoc, const KUrl& datUrl)
 {
     m_hdoc = hdoc;
     m_bufSize = 0;
@@ -35,7 +35,7 @@
 
     /* get pointer of DatInfo */
     /* Note that m_datURL is already locked in the HTMLPart. */
-    m_datInfo = DatManager(datURL).getDatInfoPointer();
+    m_datInfo = DatManager(datUrl).getDatInfoPointer();
 }
 
 DomTree::~DomTree() {}

Modified: kita/branches/KITA-KDE4/kita/src/domtree.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/domtree.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/domtree.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -47,7 +47,7 @@
         DOM::Element m_kokoyon;
 
     public:
-        DomTree(const DOM::HTMLDocument& hdoc, const KUrl& datURL);
+        DomTree(const DOM::HTMLDocument& hdoc, const KUrl& datUrl);
         ~DomTree();
 
         /* rendering functions */

Modified: kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -68,17 +68,17 @@
     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));
+        since.setTime_t(datToSince(datUrl));
 
-        DatManager datManager(datURL);
+        DatManager datManager(datUrl);
         int viewPos = datManager.getViewPos();
         int resNum = datManager.getResNum();
 
         subjectList->item(i, ColumnBoard)
-            ->setText(BoardManager::boardName(datURL));
+            ->setText(BoardManager::boardName(datUrl));
         subjectList->item(i, ColumnSubject)
             ->setText(datManager.threadName());
         subjectList->item(i, ColumnReadNum)
@@ -93,7 +93,7 @@
         }
         subjectList->item(i, ColumnSince)
             ->setText(since.toString("yy/MM/dd hh:mm"));
-        subjectList->item(i, ColumnDatUrl)->setText(datURL);
+        subjectList->item(i, ColumnDatUrl)->setText(datUrl);
     }
     subjectList->sortItems(ColumnBoard);
     for (int i = 0, j = subjectList->columnCount(); i < j; i++) {
@@ -111,13 +111,13 @@
 {
     if (! item) return ;
 
-    QString itemURL = subjectList->item(item->row(), ColumnDatUrl)->text();
+    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);
+        if (datUrl == itemUrl) {
+            ViewMediator::getInstance()->openThread(datUrl);
         }
     }
 }
@@ -130,10 +130,10 @@
     QList<QString> boardList;
 
     for (int i = 0; FavoriteThreads::count() > i; i++) {
-        QString datURL = FavoriteThreads::getDatUrl(i);
-        QString boardURL = BoardManager::boardURL(datURL);
-        if (boardList.contains(boardURL) == 0) {
-            boardList.append(boardURL);
+        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-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/htmlpart.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -48,7 +48,7 @@
     m_mode = HTMLPART_MODE_MAINPART;
     m_popup = 0;
     m_domtree = 0;
-    m_datURL.clear();
+    m_datUrl.clear();
     m_updatedKokoyon = false;
 
     clearPart();
@@ -72,9 +72,10 @@
     delete m_domtree;
     m_domtree = 0;
 
-    DatManager datManager(m_datURL);
+    DatManager datManager(m_datUrl);
     /* update ViewPos */
-    if (m_mode == HTMLPART_MODE_MAINPART && !m_updatedKokoyon && !m_datURL.isEmpty()) {
+    if (m_mode == HTMLPART_MODE_MAINPART && !m_updatedKokoyon
+            && !m_datUrl.isEmpty()) {
         int readNum = datManager.getReadNum();
         if (readNum) {
             datManager.setViewPos(readNum);
@@ -88,10 +89,10 @@
     m_jumpNumAfterLoading = 0;
     findTextInit();
 
-    if (!m_datURL.isEmpty()) {  /* This part is opened. */
+    if (!m_datUrl.isEmpty()) {  /* This part is opened. */
+        /* This part is on the main thread view. */
+        if (m_mode == HTMLPART_MODE_MAINPART) {
 
-        if (m_mode == HTMLPART_MODE_MAINPART) { /* This part is on the main thread view. */
-
             /* tell Thread class that "thread is closed" */
             datManager.setMainThreadOpened(false);
 
@@ -103,7 +104,7 @@
         }
     }
 
-    m_datURL.clear();
+    m_datUrl.clear();
     m_mode = HTMLPART_MODE_MAINPART;
 }
 
@@ -116,12 +117,12 @@
 
     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. */
-        DatManager datManager(m_datURL);
+        DatManager datManager(m_datUrl);
         /* create DatInfo explicitly to open new thread.   */
         /* Usually, DatInfo is NOT created if ReadNum == 0.*/
         /* See also DatManager::createDatInfo() and        */
@@ -140,7 +141,7 @@
 
     /* create DOM manager */
     if (m_mode == HTMLPART_MODE_MAINPART) {
-        m_domtree = new DomTree(htmlDocument(), m_datURL);
+        m_domtree = new DomTree(htmlDocument(), m_datUrl);
     }
 
     return true;
@@ -151,7 +152,7 @@
 void HTMLPart::connectSignals()
 {
     /* popup */
-    connect(this, SIGNAL(onURL(const QString&)), SLOT(slotOnURL(const QString&)));
+    connect(this, SIGNAL(onURL(const QString&)), SLOT(slotOnUrl(const QString&)));
 
     connect(view(), SIGNAL(leave()), SLOT(slotLeave()));
     connect(view()->verticalScrollBar(), SIGNAL(sliderReleased()), SLOT(slotVSliderReleased()));
@@ -224,7 +225,7 @@
     if (!m_domtree) return ;
 
     int bottom = m_domtree->getBottomResNumber();
-    int readNum = DatManager(m_datURL).getReadNum();
+    int readNum = DatManager(m_datUrl).getReadNum();
     if (bottom != readNum) {
 
         QCursor qc; qc.setShape(Qt::WaitCursor);
@@ -290,10 +291,10 @@
 
 
 /* redraw screen  */
-void HTMLPart::redrawHTMLPart(const KUrl& datURL, bool force)
+void HTMLPart::redrawHTMLPart(const KUrl& datUrl, bool force)
 {
     if (m_domtree == 0) return ;
-    if (m_datURL != datURL) return ;
+    if (m_datUrl != datUrl) return ;
 
     m_domtree->redraw(force);
 }
@@ -335,7 +336,7 @@
         return false;
     if (!m_domtree)
         return false;
-	DatManager datManager(m_datURL);
+	DatManager datManager(m_datUrl);
     if (datManager.getReadNum() == 0)
         return false;
 
@@ -360,7 +361,7 @@
     if (!m_domtree) return false;
     if (m_mode != HTMLPART_MODE_MAINPART) {
         /* If this is not MainPart, then open MainPart.  */
-        ViewMediator::getInstance()->openURL(m_datURL);
+        ViewMediator::getInstance()->openUrl(m_datUrl);
         return false;
     }
 
@@ -369,7 +370,7 @@
     m_jumpNumAfterLoading = jumpNum;
 
     /* DatManager will call back slotReceiveData and slotFinishLoad. */
-    DatManager(m_datURL).updateCache(this);
+    DatManager(m_datUrl).updateCache(this);
     view() ->setFocus();
 
     return true;
@@ -387,7 +388,7 @@
     if (m_mode != HTMLPART_MODE_MAINPART) return ;
     if (!m_domtree) return ;
 
-    int readNum = DatManager(m_datURL).getReadNum();
+    int readNum = DatManager(m_datUrl).getReadNum();
     int bottom = m_domtree->getBottomResNumber();
 
     /* parsing */
@@ -455,7 +456,7 @@
     if (res > 1) {
 
         /* is target valid ? */
-        if (!DatManager(m_datURL).isResValid(res))
+        if (!DatManager(m_datUrl).isResValid(res))
             return false;
 
         ancstr = QString::number(res);
@@ -481,7 +482,7 @@
     if (!m_domtree) return ;
     if (m_mode != HTMLPART_MODE_MAINPART) return ;
 
-    int kokoyon = DatManager(m_datURL).getViewPos();
+    int kokoyon = DatManager(m_datUrl).getViewPos();
     gotoAnchor(QString::number(kokoyon), false);
 }
 
@@ -527,7 +528,7 @@
     }
 
     int bottom = m_domtree->getBottomResNumber();
-    int readNum = DatManager(m_datURL).getReadNum();
+    int readNum = DatManager(m_datUrl).getReadNum();
 
     if (readNum != bottom) {
         showResponses(bottom + 1, readNum);
@@ -707,7 +708,7 @@
 
         showppm = true;
 
-        DatManager datManager(m_datURL);
+        DatManager datManager(m_datUrl);
         // back
         if (!m_anchorStack.isEmpty()) {
             backSubMenu = new KMenu(view());
@@ -831,7 +832,7 @@
                     i18n("Do you want to add '%1' to abone list?",
                                selectedText())) == KMessageBox::Yes) {
                 AboneConfig::aboneWordList().append(selectedText());
-                redrawHTMLPart(m_datURL, false);
+                redrawHTMLPart(m_datUrl, false);
             }
         } else {
             QMenu* menu = action->menu();
@@ -883,7 +884,7 @@
 
     KUrl kurl;
     if (!e->url().string().isEmpty())
-        kurl = KUrl(BoardManager::boardURL(m_datURL), e->url().string());
+        kurl = KUrl(BoardManager::boardUrl(m_datUrl), e->url().string());
 
     m_pushctrl = m_pushmidbt = m_pushrightbt = false;
     if (e->qmouseEvent() ->button() & Qt::RightButton) m_pushrightbt = true;
@@ -893,7 +894,7 @@
     if (e->url() != 0) {
 
         if (e->url().string().at(0) == '#') { /* anchor */
-            kurl = m_datURL;
+            kurl = m_datUrl;
             kurl.setRef(e->url().string().mid(1)) ;
         }
 
@@ -923,7 +924,7 @@
 
 
 /* private slot */
-void HTMLPart::slotOpenURLRequest(const KUrl& urlin, const KParts::OpenUrlArguments&)
+void HTMLPart::slotOpenUrlRequest(const KUrl& urlin, const KParts::OpenUrlArguments&)
 {
     clickAnchor(urlin);
 }
@@ -934,7 +935,7 @@
 void HTMLPart::clickAnchor(const KUrl& urlin)
 {
     QString refstr;
-    KUrl datURL = getDatUrl(urlin , refstr);
+    KUrl datUrl = getDatUrl(urlin , refstr);
 
     /*--------------------*/
     /* Ctrl + right click */
@@ -947,7 +948,7 @@
     /* If this is not anchor, then    */
     /* emit openURLRequest and return */
 
-    if (datURL.host() != m_datURL.host() || datURL.path() != m_datURL.path()) {
+    if (datUrl.host() != m_datUrl.host() || datUrl.path() != m_datUrl.path()) {
 
         /* right click */
         if (m_pushrightbt) {
@@ -959,7 +960,7 @@
         }
         /* right click */
 
-        ViewMediator::getInstance()->openURL(urlin);
+        ViewMediator::getInstance()->openUrl(urlin);
         return ;
     }
 
@@ -1022,7 +1023,7 @@
     if (!refNum) return ;
 
     if (m_mode == HTMLPART_MODE_POPUP) {
-        ViewMediator::getInstance()->openURL(urlin);
+        ViewMediator::getInstance()->openUrl(urlin);
     } else {
         gotoAnchor(QString::number(refNum), true);
     }
@@ -1038,7 +1039,7 @@
     QClipboard * clipboard = QApplication::clipboard();
     QString str, resstr;
     int resNum = refstr.mid(5).toInt();
-    DatManager datManager(m_datURL);
+    DatManager datManager(m_datUrl);
     QString namestr = datManager.getPlainName(resNum);
 
     /* show res tree */
@@ -1048,7 +1049,7 @@
         if (!num) return ;
         QString tmpstr = QString("<DIV>No.%1 : [%2]<BR>").arg(resNum).arg(num);
         tmpstr += htmlstr + "<BR><BR></DIV>";
-        showPopup(m_datURL, tmpstr);
+        showPopup(m_datUrl, tmpstr);
         startMultiPopup();
         return ;
     }
@@ -1138,12 +1139,12 @@
     }
     if (action == resAct) {
         resstr = ">>" + QString::number(resNum) + '\n';
-        ViewMediator::getInstance()->showWriteView(m_datURL, resstr);
+        ViewMediator::getInstance()->showWriteView(m_datUrl, resstr);
     } else if (action == quoteAct) {
         resstr = ">>" + QString::number(resNum) + '\n'
                  + "> " + datManager.getPlainTitle(resNum) + '\n'
                  + "> " + datManager.getPlainBody(resNum).replace('\n', "\n> ") + '\n';
-        ViewMediator::getInstance()->showWriteView(m_datURL, resstr);
+        ViewMediator::getInstance()->showWriteView(m_datUrl, resstr);
     } else if (action == markAct) {
         datManager.setMark(resNum, !datManager.isMarked(resNum));
     } else if (action == copyAct || action == copyUrlAct || action == copyThreadNameAct) {
@@ -1156,7 +1157,7 @@
 
         // url
         if (!str.isEmpty()) str += '\n';
-        str += datManager.threadURL() + '/' + QString::number(resNum)
+        str += datManager.threadUrl() + '/' + QString::number(resNum)
             + '\n';
 
         // body
@@ -1172,13 +1173,13 @@
 
     } else if (action == setKokoYonAct) {
         datManager.setViewPos(resNum);
-        ViewMediator::getInstance()->updateBoardView(m_datURL);
+        ViewMediator::getInstance()->updateBoardView(m_datUrl);
         m_updatedKokoyon = true;
         updateScreen(true, true);
         gotoAnchor(QString::number(resNum), false);
 
     } else if (action == showBrowserAct) {
-        str = datManager.threadURL() + '/' + QString::number(resNum);
+        str = datManager.threadUrl() + '/' + QString::number(resNum);
 
         KRun::runUrl(str, "text/html", view());
     } else if (action == aboneNameAct) {
@@ -1186,7 +1187,7 @@
                 i18n("Do you want to add '%1' to abone list?", namestr),
                 "Kita") == KMessageBox::Yes) {
             AboneConfig::aboneNameList().append(namestr);
-            redrawHTMLPart(m_datURL, false);
+            redrawHTMLPart(m_datUrl, false);
         }
     }
 }
@@ -1205,11 +1206,11 @@
     /* popup */
     if (m_pushrightbt) {
         int num;
-        QString htmlstr = DatManager(m_datURL).getHtmlById(strid, num);
+        QString htmlstr = DatManager(m_datUrl).getHtmlById(strid, num);
         if (num <= 1) return ;
         QString tmpstr = QString("<DIV>ID:%1:[%2]<BR>").arg(strid).arg(num);
         tmpstr += htmlstr + "<BR><BR></DIV>";
-        showPopup(m_datURL, tmpstr);
+        showPopup(m_datUrl, tmpstr);
         startMultiPopup();
     }
 
@@ -1230,7 +1231,7 @@
                     i18n("Do you want to add '%1' to abone list?", strid),
                     "Kita") == KMessageBox::Yes) {
                 AboneConfig::aboneIDList().append(strid);
-                redrawHTMLPart(m_datURL, false);
+                redrawHTMLPart(m_datUrl, false);
             }
         }
     }
@@ -1243,8 +1244,8 @@
 /* This funtcion is called in only clickAnchor().          */ /* private */
 void HTMLPart::showBePopupMenu(const QString& refstr)
 {
-    QString strURL = "http://be.2ch.net/test/p.php?i=" + refstr.mid(5)
-                    + "&u=d:" + DatManager(m_datURL).threadURL() + "/l50";
+    QString strUrl = "http://be.2ch.net/test/p.php?i=" + refstr.mid(5)
+                    + "&u=d:" + DatManager(m_datUrl).threadUrl() + "/l50";
 
     if (m_pushrightbt) {
         // create popup menu
@@ -1266,13 +1267,13 @@
         }
         if (action == copyUrlAct) {
             // copy
-            clipboard->setText(strURL, QClipboard::Clipboard);
-            clipboard->setText(strURL, QClipboard::Selection);
+            clipboard->setText(strUrl, QClipboard::Clipboard);
+            clipboard->setText(strUrl, QClipboard::Selection);
         } else if (action == showBrowserAct) {
-            KRun::runUrl(strURL, "text/html", view());
+            KRun::runUrl(strUrl, "text/html", view());
         }
     } else {
-        KRun::runUrl(strURL, "text/html", 0);
+        KRun::runUrl(strUrl, "text/html", 0);
     }
 }
 
@@ -1301,10 +1302,10 @@
 /* for convenience */ /* public slot */
 void HTMLPart::slotShowResPopup(const QPoint& point, int refNum, int refNum2)
 {
-    QString innerHTML = DatManager(m_datURL).getHtml(refNum, refNum2);
+    QString innerHTML = DatManager(m_datUrl).getHtml(refNum, refNum2);
     if (innerHTML.isEmpty()) return ;
 
-    showPopupCore(m_datURL, innerHTML, point);
+    showPopupCore(m_datUrl, innerHTML, point);
 }
 
 
@@ -1449,7 +1450,7 @@
 
 /*---------------------------------------------------*/
 /* This slot is called when mouse moves onto the URL */ /* private slot */
-void HTMLPart::slotOnURL(const QString& url)
+void HTMLPart::slotOnUrl(const QString& url)
 {
     /* config */
 
@@ -1469,14 +1470,14 @@
 
     /* get reference */
     QString refstr;
-    KUrl datURL = m_datURL;
+    KUrl datUrl = m_datUrl;
     if (url.at(0) == '#') {
         refstr = url.mid(1);
     } else {
-        datURL = getDatUrl(KUrl(m_datURL, url) , refstr);
+        datUrl = getDatUrl(KUrl(m_datUrl, url) , refstr);
     }
 
-    DatManager datManager(m_datURL);
+    DatManager datManager(m_datUrl);
     /*------------------------*/
     /* id popup               */
 
@@ -1490,7 +1491,7 @@
                 + i18nc("@label:textbox This is the first reply", "None")
                 + "</DIV>";
         }
-        showPopup(m_datURL, tmpstr);
+        showPopup(m_datUrl, tmpstr);
         return ;
     }
 
@@ -1509,7 +1510,7 @@
             tmpstr = "<DIV>"
                 + i18nc("@label:textbox There is no reply", "None") + "</DIV>";
         }
-        showPopup(m_datURL, tmpstr);
+        showPopup(m_datUrl, tmpstr);
         return ;
     }
 
@@ -1520,7 +1521,7 @@
     if (url.left(6) == "#abone") {
         int no = url.mid(6).toInt();
         QString tmpstr = datManager.getHtml(no, no, false);
-        showPopup(m_datURL, tmpstr);
+        showPopup(m_datUrl, tmpstr);
         return ;
     }
 
@@ -1548,10 +1549,10 @@
     }
 
     /* another thread ? */
-    if (datURL.host() != m_datURL.host() || datURL.path() != m_datURL.path()) {
+    if (datUrl.host() != m_datUrl.host() || datUrl.path() != m_datUrl.path()) {
 
         /* get board name */
-        QString boardName = BoardManager::boardName(datURL);
+        QString boardName = BoardManager::boardName(datUrl);
         if (!boardName.isEmpty()) innerHTML += '[' + boardName + "] ";
 
         /* If idx file of datURL is not read, thread name cannot be obtained.
@@ -1569,7 +1570,7 @@
     if (!refNum) return ;
     innerHTML += datManager.getHtml(refNum, refNum2);
 
-    if (!innerHTML.isEmpty()) showPopup(datURL, innerHTML);
+    if (!innerHTML.isEmpty()) showPopup(datUrl, innerHTML);
 }
 
 
@@ -1587,9 +1588,9 @@
     unsigned int length = selectText.length();
 
     if ((refNum = stringToPositiveNum(chpt, length)) != -1) {
-        QString innerHTML = DatManager(m_datURL).getHtml(refNum, refNum);
+        QString innerHTML = DatManager(m_datUrl).getHtml(refNum, refNum);
         if (!innerHTML.isEmpty()) {
-            showPopup(m_datURL, innerHTML);
+            showPopup(m_datUrl, innerHTML);
             startMultiPopup();
             return true;
         }

Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/htmlpart.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/htmlpart.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -47,7 +47,7 @@
 
         /* basic information */
         int m_mode;
-        KUrl m_datURL;
+        KUrl m_datUrl;
         bool m_updatedKokoyon;
 
 
@@ -121,7 +121,7 @@
     private:
 
         void clearPart();
-        void redrawHTMLPart(const KUrl& datURL, bool force);
+        void redrawHTMLPart(const KUrl& datUrl, bool force);
 
         /* setup */
         void connectSignals();
@@ -168,14 +168,14 @@
     private slots:
 
         /* click */
-        void slotOpenURLRequest(const KUrl&, const KParts::OpenUrlArguments&);
+        void slotOpenUrlRequest(const KUrl&, const KParts::OpenUrlArguments&);
 
         /* res popup */
         void slotLeave();
         void slotVSliderReleased();
         void slotHSliderReleased();
         void slotHideChildPopup();
-        void slotOnURL(const QString& url);
+        void slotOnUrl(const QString& url);
 
 
     signals:

Modified: kita/branches/KITA-KDE4/kita/src/libkita/access.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/access.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/access.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -33,7 +33,7 @@
 using namespace Kita;
 
 
-Access::Access(const KUrl& datURL) : m_datURL(datURL), m_currentJob(0)
+Access::Access(const KUrl& datUrl) : m_datUrl(datUrl), m_currentJob(0)
 {
     init();
 }
@@ -43,7 +43,7 @@
 {
     m_readNum = 0;
     m_lastLine.clear();
-    m_bbstype = BoardManager::type(m_datURL);
+    m_bbstype = BoardManager::type(m_datUrl);
     m_header = "HTTP/1.1 200 ";  /* dummy header */
     m_dataSize = 0;
     m_threadData.clear();
@@ -55,7 +55,7 @@
     QByteArray orgData;
 
     // get cache path.
-    Cache cache(m_datURL);
+    Cache cache(m_datUrl);
     QString cachePath = cache.getPath();
     if (cachePath.isEmpty()) {
         return;
@@ -100,7 +100,7 @@
 
     m_dataSize += m_threadData.length();
 
-    Cache cache(m_datURL);
+    Cache cache(m_datUrl);
     QString cachePath = cache.getPath();
     if (!cachePath.isEmpty()) {
         QFile file(QFile::encodeName(cachePath));
@@ -125,33 +125,35 @@
     m_lastLine.clear();
 
     /* set URL of data */
-    QString getURL;
+    QString getUrl;
     switch (m_bbstype) {
 
     case Board_MachiBBS:
-        getURL = getThreadURL(m_datURL);
-        if (m_readNum > 0) getURL += "&START=" + QString::number(m_readNum + 1);
+        getUrl = getThreadUrl(m_datUrl);
+        if (m_readNum > 0)
+            getUrl += "&START=" + QString::number(m_readNum + 1);
         InitParseMachiBBS();
         break;
 
     case Board_JBBS:
-        getURL = getThreadURL(m_datURL);
-        getURL.replace("read.cgi", "rawmode.cgi");  /* adhoc... */
-        if (m_readNum > 0) getURL += '/' + QString::number(m_readNum + 1) + '-';
+        getUrl = getThreadUrl(m_datUrl);
+        getUrl.replace("read.cgi", "rawmode.cgi");  /* adhoc... */
+		if (m_readNum > 0)
+            getUrl += '/' + QString::number(m_readNum + 1) + '-';
         break;
 
     default:
-        getURL = m_datURL.prettyUrl();
+        getUrl = m_datUrl.prettyUrl();
     }
 
     /* set UserAgent */
     const QString useragent = QString("Monazilla/1.00 (Kita/%1)").arg("0.200.0"); // TODO
     KIO::SlaveConfig::self() ->setConfigData("http",
-            KUrl(getURL).host(),
+            KUrl(getUrl).host(),
             "UserAgent", useragent);
 
     /* create new job */
-    KIO::TransferJob* job = KIO::get(getURL);
+    KIO::TransferJob* job = KIO::get(getUrl);
     m_currentJob = job;
 
     connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)),
@@ -386,19 +388,19 @@
 //
 QString OfflawAccess::get()
 {
-    QString getURL = datToOfflaw(m_datURL.url());
-    KUrl kgetURL(getURL);
-    kgetURL.addQueryItem("sid", Account::getSessionId());
+    QString getUrl = datToOfflaw(m_datUrl.url());
+    KUrl kgetUrl(getUrl);
+    kgetUrl.addQueryItem("sid", Account::getSessionId());
 
     m_threadData.clear();
     m_invalidDataReceived = false;
 
     KIO::SlaveConfig::self() ->setConfigData("http",
-            KUrl(getURL).host(),
+            KUrl(getUrl).host(),
             "UserAgent",
             QString("Monazilla/1.00 (Kita/%1)").arg("0.200.0")); // TODO
 
-    KIO::TransferJob* job = KIO::get(kgetURL, KIO::Reload, KIO::HideProgressInfo);
+    KIO::TransferJob* job = KIO::get(kgetUrl, KIO::Reload, KIO::HideProgressInfo);
     m_currentJob = job;
 
     connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)),
@@ -422,7 +424,7 @@
     }
 
     if (!m_invalidDataReceived && !m_threadData.isEmpty()) {
-        KUrl url = m_datURL;
+        KUrl url = m_datUrl;
         writeCacheData();
     }
     emit finishLoad();

Modified: kita/branches/KITA-KDE4/kita/src/libkita/access.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/access.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/access.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -32,7 +32,7 @@
         Q_OBJECT
 
     public:
-        Access(const KUrl& datURL);
+        Access(const KUrl& datUrl);
         virtual ~Access() {};
 
         void init();
@@ -50,7 +50,7 @@
         void writeCacheData();
         void emitDatLineList(const QByteArray& dataStream);
 
-        const KUrl m_datURL;
+        const KUrl m_datUrl;
         KIO::Job* m_currentJob;
         QByteArray m_threadData;
         QString m_header;
@@ -79,7 +79,7 @@
         Q_OBJECT
 
     public:
-        OfflawAccess(const KUrl& datURL) : Access(datURL) {};
+        OfflawAccess(const KUrl& datUrl) : Access(datUrl) {};
         virtual ~OfflawAccess() {};
 
         QString get();

Modified: kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -163,7 +163,7 @@
 /* SETTING.TXT */
 
 /* public */
-const QString BoardData::settingURL() const
+const QString BoardData::settingUrl() const
 {
     return m_basePath + "SETTING.TXT";
 }
@@ -193,9 +193,9 @@
 }
 
 /* public */
-const KUrl& BoardData::titleImgURL() const
+const KUrl& BoardData::titleImgUrl() const
 {
-    return m_titleImgURL;
+    return m_titleImgUrl;
 }
 
 /* public */
@@ -206,7 +206,7 @@
             m_defaultName.clear();
             m_linenum = 0;
             m_msgCount = 0;
-            m_titleImgURL.clear();
+            m_titleImgUrl.clear();
         }
 }
 
@@ -229,9 +229,9 @@
 }
 
 /* public */
-void BoardData::setTitleImgURL(const KUrl& url)
+void BoardData::setTitleImgUrl(const KUrl& url)
 {
-    m_titleImgURL = url;
+    m_titleImgUrl = url;
 }
 
 
@@ -301,7 +301,7 @@
 QTextCodec* BoardManager::m_eucJpCodec = 0;
 BoardDataList BoardManager::m_boardDataList;
 BoardData* BoardManager::m_previousBoardData = 0;
-QString BoardManager::m_previousBoardURL;
+QString BoardManager::m_previousBoardUrl;
 
 
 BoardManager::BoardManager()
@@ -316,7 +316,7 @@
 }
 
 /* (hostname)/(rootPath)/(bbsPath)/ */ /* public */ /* static */
-const QString BoardManager::boardURL(const KUrl& url)
+const QString BoardManager::boardUrl(const KUrl& url)
 {
     BoardData * bdata = getBoardData(url);
     if (bdata == 0) return QString();
@@ -325,7 +325,7 @@
 }
 
 /* public */ /* static */
-const QStringList BoardManager::allBoardURLList()
+const QStringList BoardManager::allBoardUrlList()
 {
     QStringList urlList;
     urlList.clear();
@@ -374,7 +374,7 @@
 
 
 /* (hostname)/(rootPath)/(bbsPath)/subject.txt */ /* public */ /* static */
-const QString BoardManager::subjectURL(const KUrl& url)
+const QString BoardManager::subjectUrl(const KUrl& url)
 {
     BoardData * bdata = getBoardData(url);
     if (bdata == 0) return QString();
@@ -438,7 +438,7 @@
     /* get all obtained threads list from cache */
     if (url.prettyUrl() == "http://virtual/obtained/") {
 
-        QStringList bbslist = allBoardURLList();
+        QStringList bbslist = allBoardUrlList();
 
         /* search all cache dirs */
         for (QStringList::iterator it = bbslist.begin() ; it != bbslist.end(); ++it) {
@@ -467,7 +467,7 @@
                 "UserAgent",
                 QString("Monazilla/1.00 (Kita/%1)").arg("0.200.0"));
         QString subjectPath = cache.getSubjectPath();
-        KIO::NetAccess::download(subjectURL(url), subjectPath, 0);
+        KIO::NetAccess::download(subjectUrl(url), subjectPath, 0);
     }
 
     /* open and read subject.txt */
@@ -498,23 +498,23 @@
 
         /* get all file names */
         QString ext = BoardManager::getBoardData(url) ->ext();
-        QString boardURL = BoardManager::getBoardData(url) ->basePath();
+        QString boardUrl = BoardManager::getBoardData(url) ->basePath();
         QStringList filter('*' + ext);
         QStringList flist = d.entryList(filter);
 
         for (QStringList::iterator it = flist.begin(); it != flist.end(); ++it) {
             if ((*it).isEmpty()) continue;
 
-            QString datURL = boardURL + "dat/" + (*it);
+            QString datUrl = boardUrl + "dat/" + (*it);
 
             /* read idx file */
-            Thread* thread = Thread::getByURLNew(datURL);
+            Thread* thread = Thread::getByUrlNew(datUrl);
             if (thread == 0) {
 
-                thread = Thread::getByURL(datURL);
+                thread = Thread::getByUrl(datUrl);
                 if (thread == 0)
                     continue;
-                ThreadIndex threadIndex(datURL);
+                ThreadIndex threadIndex(datUrl);
                 threadIndex.loadIndex(thread, false);
             }
 
@@ -579,9 +579,9 @@
             QString num = regexp.cap(3);
 
             /* get pointer of Thread class */
-            QString datURL = boardURL(url) + "dat/" + fname;
-            Thread* thread = Thread::getByURL(datURL);
-            ThreadIndex threadIndex(datURL);
+            QString datUrl = boardUrl(url) + "dat/" + fname;
+            Thread* thread = Thread::getByUrl(datUrl);
+            ThreadIndex threadIndex(datUrl);
             if (threadList.indexOf(thread) == -1) {
                 threadList.append(thread);
             }
@@ -627,7 +627,7 @@
 
     m_boardDataList.clear();
     m_previousBoardData = 0;
-    m_previousBoardURL.clear();
+    m_previousBoardUrl.clear();
 }
 
 /**
@@ -652,15 +652,15 @@
  *
  */ 
 /* public */ /* static */
-int BoardManager::enrollBoard(const KUrl& url, const QString& boardName, QString& oldURL, int type, bool test)
+int BoardManager::enrollBoard(const KUrl& url, const QString& boardName, QString& oldUrl, int type, bool test)
 {
     QString hostname;
     QString rootPath;
     QString delimiter;
     QString bbsPath;
     QString ext;
-    type = parseBoardURL(url, type, hostname, rootPath, delimiter, bbsPath, ext);
-    oldURL.clear();
+    type = parseBoardUrl(url, type, hostname, rootPath, delimiter, bbsPath, ext);
+    oldUrl.clear();
 
     if (type == Board_Unknown) return Board_enrollFailed;
 
@@ -675,7 +675,7 @@
                     && (*it) ->rootPath() == rootPath) { /* enrolled */
                 return Board_enrollEnrolled;
             } else { /* moved */
-                oldURL = (*it) ->basePath();
+                oldUrl = (*it) ->basePath();
                 return Board_enrollMoved;
             }
         }
@@ -694,7 +694,7 @@
 
 /* parse board URL      */
 /* return board type.   */ /* private */ /* static */
-int BoardManager::parseBoardURL(
+int BoardManager::parseBoardUrl(
 
     /* input */
     const KUrl& url,
@@ -785,7 +785,7 @@
     QString urlstr = url.prettyUrl();
 
     /* cache */
-    if (m_previousBoardData != 0 && m_previousBoardURL == urlstr) return m_previousBoardData;
+    if (m_previousBoardData != 0 && m_previousBoardUrl == urlstr) return m_previousBoardData;
 
     for (BoardDataList::Iterator it = m_boardDataList.begin(); it != m_boardDataList.end(); ++it) {
 
@@ -796,7 +796,7 @@
 
                 /* cache */
                 m_previousBoardData = (*it);
-                m_previousBoardURL = urlstr;
+                m_previousBoardUrl = urlstr;
 
                 return (*it);
             }
@@ -857,27 +857,27 @@
 
 
 /* public */ /* static */
-bool BoardManager::moveBoard(const KUrl& fromURL, const KUrl& toURL)
+bool BoardManager::moveBoard(const KUrl& fromUrl, const KUrl& toUrl)
 {
-    QString oldhost = fromURL.protocol() + "://" + fromURL.host();
-    QString newhost = toURL.protocol() + "://" + toURL.host();
+    QString oldhost = fromUrl.protocol() + "://" + fromUrl.host();
+    QString newhost = toUrl.protocol() + "://" + toUrl.host();
 
     const QRegExp exp("/$");
-    QString oldURL = fromURL.prettyUrl();
-    QString newURL = toURL.prettyUrl();
-    oldURL.remove(exp);
-    newURL.remove(exp);
-    oldURL += '/';
-    newURL += '/';
+    QString oldUrl = fromUrl.prettyUrl();
+    QString newUrl = toUrl.prettyUrl();
+    oldUrl.remove(exp);
+    newUrl.remove(exp);
+    oldUrl += '/';
+    newUrl += '/';
 
-    if (oldURL == newURL) return false;
+    if (oldUrl == newUrl) return false;
 
     /* Is oldURL enrolled? */
-    BoardData* bdata = getBoardData(oldURL);
+    BoardData* bdata = getBoardData(oldUrl);
     if (bdata == 0) {
 
         /* Is newURL enrolled? */
-        bdata = getBoardData(newURL);
+        bdata = getBoardData(newUrl);
         if (bdata == 0) return false;
     }
 
@@ -952,7 +952,7 @@
         QFile file(movedPath);
         if (file.open(QIODevice::WriteOnly)) {
             QTextStream stream(&file);
-            stream << newURL << endl;
+            stream << newUrl << endl;
         }
         file.close();
     }
@@ -977,10 +977,10 @@
 
     /*---------------------------*/
     /* update other information */
-    FavoriteThreads::replace(oldURL, newURL);
-    Thread::replace(oldURL, newURL);
-    ThreadInfo::replace(oldURL, newURL);
-    FavoriteBoards::replace(oldURL, newURL);
+    FavoriteThreads::replace(oldUrl, newUrl);
+    Thread::replace(oldUrl, newUrl);
+    ThreadInfo::replace(oldUrl, newUrl);
+    FavoriteBoards::replace(oldUrl, newUrl);
 
     return true;
 }

Modified: kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -63,7 +63,7 @@
         QString m_defaultName;
         int m_linenum;
         int m_msgCount;
-        KUrl m_titleImgURL;
+        KUrl m_titleImgUrl;
 
         /* keys */
         QStringList m_keyHostList; /* list of host names. They are keys of DB. */
@@ -93,17 +93,17 @@
         const QString& cgiBasePath() const;
 
         /* SETTING.TXT */
-        const QString settingURL() const;
+        const QString settingUrl() const;
         bool settingLoaded() const;
         const QString& defaultName() const;
         int lineNum() const;
         int msgCount() const;
-        const KUrl& titleImgURL() const;
+        const KUrl& titleImgUrl() const;
         void setSettingLoaded(bool set);
         void setDefaultName(const QString& newName);
         void setLineNum(int newLine);
         void setMsgCount(int msgCount);
-        void setTitleImgURL(const KUrl& url);
+        void setTitleImgUrl(const KUrl& url);
 
         /* keys */
         void createKeys(const QStringList& keyHostList);
@@ -124,7 +124,7 @@
     {
         static BoardDataList m_boardDataList;
         static BoardData* m_previousBoardData; /* used in getBoardData() */
-        static QString m_previousBoardURL; /* used in getBoardData() */
+        static QString m_previousBoardUrl; /* used in getBoardData() */
         static QTextCodec* m_cp932Codec;
         static QTextCodec* m_eucJpCodec;
 
@@ -132,13 +132,13 @@
         BoardManager();
         ~BoardManager();
 
-        static const QString boardURL(const KUrl& url);
-        static const QStringList allBoardURLList();
+        static const QString boardUrl(const KUrl& url);
+        static const QStringList allBoardUrlList();
         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 subjectURL(const KUrl& url);
+        static const QString subjectUrl(const KUrl& url);
         static const QString boardName(const KUrl& url);
         static int type(const KUrl& url);
 
@@ -148,19 +148,19 @@
 
         /* BoardData */
         static void clearBoardData();
-        static int enrollBoard(const KUrl& url, const QString& boardName, QString& oldURL,
+        static int enrollBoard(const KUrl& url, const QString& boardName, QString& oldUrl,
                                 int type = Board_Unknown, bool test = false);
         static bool isEnrolled(const KUrl& url);
         static BoardData* getBoardData(const KUrl& url);
 
         /* BBSHISTORY */
         static bool loadBBSHistory(const KUrl& url);
-        static bool moveBoard(const KUrl& fromURL, const KUrl& toURL);
+        static bool moveBoard(const KUrl& fromUrl, const KUrl& toUrl);
 
     private:
 
         /* BoardData */
-        static int parseBoardURL(const KUrl& url, int type, QString& hostname,
+        static int parseBoardUrl(const KUrl& url, int type, QString& hostname,
                                   QString& rootPath, QString& delimiter,
                                   QString& bbsPath, QString& ext);
 

Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -34,25 +34,25 @@
 /*------------------------------------------------------*/
 /* DatInfo stores & handles all information about *.dat */
 
-DatInfo::DatInfo(const KUrl& url) : m_threadIndex(m_datURL),
+DatInfo::DatInfo(const KUrl& url) : m_threadIndex(m_datUrl),
     m_access (0), m_access2(0)
 {
     QString refstr;
-    m_datURL = getDatUrl(url, refstr);
-    m_threadIndex = ThreadIndex(m_datURL);
+    m_datUrl = getDatUrl(url, refstr);
+    m_threadIndex = ThreadIndex(m_datUrl);
     /* get the pointer of Thread class */
-    m_thread = Thread::getByURLNew(m_datURL);
+    m_thread = Thread::getByUrlNew(m_datUrl);
     if (m_thread == 0) {
 
         /* create Thread */
-        m_thread = Thread::getByURL(m_datURL);
+        m_thread = Thread::getByUrl(m_datUrl);
         if (m_thread == 0) return ;
 
         /* read idx file */
         m_threadIndex.loadIndex(m_thread);
     }
 
-    m_thread = Thread::getByURL(m_datURL);
+    m_thread = Thread::getByUrl(m_datUrl);
 
     /* japanese strings */
     m_spacestr = QString::fromUtf8(KITAUTF8_ZENSPACE);
@@ -61,7 +61,7 @@
     m_framestr3 = QString::fromUtf8(KITAUTF8_FRAME3); /* L  */
 
     /* make directory */
-    Cache cache(m_datURL);
+    Cache cache(m_datUrl);
     QString cacheDir = cache.getDirPath();
     if (!mkdir(cacheDir)) return ;
 
@@ -102,7 +102,7 @@
     resetAbonePrivate();
 
     /* create dat loader */
-    m_access = new Access(m_datURL);
+    m_access = new Access(m_datUrl);
 
     connect(m_access, SIGNAL(receiveData(const QStringList&)),
              SLOT(slotReceiveData(const QStringList&)));
@@ -166,7 +166,7 @@
 /* public */
 const KUrl& DatInfo::url() const
 {
-    return m_datURL;
+    return m_datUrl;
 }
 
 
@@ -281,12 +281,12 @@
     m_threadIndex.saveIndex(m_thread);
 
     /* re-try by offlaw.cgi */
-    DatManager datManager(m_datURL);
+    DatManager datManager(m_datUrl);
     if (m_thread->readNum() == 0 && m_access2 == 0
             && datManager.is2chThread()) {
         if (Account::isLogged()) {
             initPrivate(true);
-            m_access2 = new OfflawAccess(m_datURL);
+            m_access2 = new OfflawAccess(m_datUrl);
             connect(m_access2, SIGNAL(receiveData(const QStringList&)),
                      SLOT(slotReceiveData(const QStringList&)));
             connect(m_access2, SIGNAL(finishLoad()), SLOT(slotFinishLoad()));

Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -108,7 +108,7 @@
         Thread* m_thread;
 
         /* basic information */
-        KUrl m_datURL;
+        KUrl m_datUrl;
         ThreadIndex m_threadIndex;
         bool m_broken;
         ResDatVec m_resDatVec;

Modified: kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -188,7 +188,7 @@
 /* public */
 bool DatManager::deleteCache() const
 {
-    Thread* thread = Thread::getByURLNew(m_datUrl);
+    Thread* thread = Thread::getByUrlNew(m_datUrl);
     if (thread == 0)
         return false;
     if (thread->readNum() == 0)
@@ -274,7 +274,7 @@
 /* get name (i.e. subject) of thread from URL of dat file. */ /* public */
 QString DatManager::threadName() const
 {
-    Thread* thread = Thread::getByURLNew(m_datUrl);
+    Thread* thread = Thread::getByUrlNew(m_datUrl);
     return (thread != 0) ? thread->threadName() : QString();
 }
 
@@ -323,7 +323,7 @@
 /* public */
 int DatManager::getResNum() const
 {
-    Thread* thread = Thread::getByURLNew(m_datUrl);
+    Thread* thread = Thread::getByUrlNew(m_datUrl);
     return (thread != 0) ? thread->resNum() : 0;
 }
 
@@ -331,7 +331,7 @@
 /* public */
 int DatManager::getReadNum() const
 {
-    Thread* thread = Thread::getByURLNew(m_datUrl);
+    Thread* thread = Thread::getByUrlNew(m_datUrl);
     return (thread != 0) ? thread->readNum() : 0;
 }
 
@@ -339,7 +339,7 @@
 /* public */
 int DatManager::getViewPos() const
 {
-    Thread* thread = Thread::getByURLNew(m_datUrl);
+    Thread* thread = Thread::getByUrlNew(m_datUrl);
     return (thread != 0) ? thread->viewPos() : 0;
 }
 
@@ -347,7 +347,7 @@
 /* public */
 void DatManager::setViewPos(int num) const
 {
-    Thread* thread = Thread::getByURLNew(m_datUrl);
+    Thread* thread = Thread::getByUrlNew(m_datUrl);
     if (thread != 0)
         thread->setViewPos(num);
 
@@ -439,7 +439,7 @@
 /* public */
 bool DatManager::isMarked(int num) const
 {
-    Thread* thread = Thread::getByURLNew(m_datUrl);
+    Thread* thread = Thread::getByUrlNew(m_datUrl);
     return (thread == 0) ? false : thread->isMarked(num);
 }
 
@@ -447,7 +447,7 @@
 /* public */
 void DatManager::setMark(int num, bool mark) const
 {
-    Thread* thread = Thread::getByURLNew(m_datUrl);
+    Thread* thread = Thread::getByUrlNew(m_datUrl);
     if (thread == 0)
         return;
 
@@ -492,7 +492,7 @@
 /* obsolete */
 
 /* public */
-QString DatManager::threadURL() const
+QString DatManager::threadUrl() const
 {
-    return getThreadURL(m_url);
+    return getThreadUrl(m_url);
 }

Modified: kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -90,7 +90,7 @@
 
         /* obsolete. Don't use them. */
 
-        QString threadURL() const;
+        QString threadUrl() const;
 
     private:
         DatInfo* getDatInfo(bool checkCached = true) const;

Modified: kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -106,12 +106,12 @@
         QDomElement board = document.createElementNS("http://kita.sourceforge.jp/ns/board", "board");
         root.appendChild(board);
 
-        QString boardURL = (*it).url();
+        QString boardUrl = (*it).url();
         QDomElement urlElement = document.createElement("url");
         board.appendChild(urlElement);
-        urlElement.appendChild(document.createTextNode(boardURL));
+        urlElement.appendChild(document.createTextNode(boardUrl));
 
-        QString boardName = BoardManager::boardName(boardURL);
+        QString boardName = BoardManager::boardName(boardUrl);
         QDomElement nameElement = document.createElement("name");
         board.appendChild(nameElement);
         nameElement.appendChild(document.createTextNode(boardName));
@@ -119,14 +119,14 @@
     return document.toString(0);
 }
 
-void FavoriteBoards::replace(const QString& fromURL, const QString& toURL)
+void FavoriteBoards::replace(const QString& fromUrl, const QString& toUrl)
 {
     if (FavoriteBoards::getInstance() == 0) return ;
     QList<KUrl>& boardList = FavoriteBoards::getInstance() ->m_list;
     for (QList<KUrl>::iterator it = boardList.begin(); it != boardList.end(); ++it) {
         QString url = (*it).url();
-        if (url.startsWith(fromURL)) {
-            url = url.replace(0, fromURL.length(), toURL);
+        if (url.startsWith(fromUrl)) {
+            url = url.replace(0, fromUrl.length(), toUrl);
             *it = url;
         }
     }

Modified: kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/favoriteboards.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -42,7 +42,7 @@
         static const QList<KUrl>& boards();
         static bool readFromXML(QString& xml);
         static QString toXML();
-        static void replace(const QString& fromURL, const QString& toURL);
+        static void replace(const QString& fromUrl, const QString& toUrl);
     signals:
         void changed();
     };

Modified: kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -30,7 +30,7 @@
 
 bool FavoriteThreadItem::operator==(const FavoriteThreadItem& item) const
 {
-    return (m_datURL == item.m_datURL);
+    return (m_datUrl == item.m_datUrl);
 }
 
 // FavoriteThreads
@@ -50,21 +50,21 @@
     return instance;
 }
 
-void FavoriteThreads::insert(const QString& datURL)
+void FavoriteThreads::insert(const QString& datUrl)
 {
-    if (! m_threadList.contains(datURL)) {
-        m_threadList.append(datURL);
+    if (! m_threadList.contains(datUrl)) {
+        m_threadList.append(datUrl);
     }
 }
 
-void FavoriteThreads::remove(const QString& datURL)
+void FavoriteThreads::remove(const QString& datUrl)
 {
-    m_threadList.removeAll(datURL);
+    m_threadList.removeAll(datUrl);
 }
 
-bool FavoriteThreads::contains(const QString& datURL)
+bool FavoriteThreads::contains(const QString& datUrl)
 {
-    if (m_threadList.contains(datURL)) {
+    if (m_threadList.contains(datUrl)) {
         return true;
     } else {
         return false;
@@ -102,21 +102,21 @@
 
 void FavoriteThreads::processThreadNode(QDomNode& node)
 {
-    QDomNode datURLNode = node.namedItem("daturl");
+    QDomNode datUrlNode = node.namedItem("daturl");
     QDomNode nameNode = node.namedItem("name");
 
-    if (!datURLNode.isElement() || !nameNode.isElement()) return ;
+    if (!datUrlNode.isElement() || !nameNode.isElement()) return ;
 
-    QString url = datURLNode.toElement().text();
+    QString url = datUrlNode.toElement().text();
     QString name = nameNode.toElement().text();
 
-    KUrl datURL = Kita::getDatUrl(url);
-    Thread* thread = Thread::getByURL(datURL);
+    KUrl datUrl = Kita::getDatUrl(url);
+    Thread* thread = Thread::getByUrl(datUrl);
     thread->setThreadName(name);
-    ThreadIndex threadIndex(datURL);
+    ThreadIndex threadIndex(datUrl);
     threadIndex.loadIndex(thread);
 
-    FavoriteThreads::getInstance() ->insert(datURL.prettyUrl());
+    FavoriteThreads::getInstance() ->insert(datUrl.prettyUrl());
 }
 
 const QString FavoriteThreads::toXML() const
@@ -131,15 +131,15 @@
 
     QList<FavoriteThreadItem>::const_iterator it;
     for (it = threadList().begin(); it != threadList().end(); ++it) {
-        QString datURL = (*it).m_datURL;
+        QString datUrl = (*it).m_datUrl;
         QDomElement threadElement = document.createElementNS("http://kita.sourceforge.jp/ns/thread", "thread");
         root.appendChild(threadElement);
 
-        QDomElement datURLElement = document.createElement("daturl");
-        threadElement.appendChild(datURLElement);
-        datURLElement.appendChild(document.createTextNode(datURL));
+        QDomElement datUrlElement = document.createElement("daturl");
+        threadElement.appendChild(datUrlElement);
+        datUrlElement.appendChild(document.createTextNode(datUrl));
 
-        DatManager datManager(datURL);
+        DatManager datManager(datUrl);
         QString threadName = datManager.threadName();
         QDomElement nameElement = document.createElement("name");
         threadElement.appendChild(nameElement);
@@ -154,12 +154,12 @@
         QDomElement board = document.createElementNS("http://kita.sourceforge.jp/ns/board", "board");
         threadElement.appendChild(board);
 
-        QString boardURL = BoardManager::boardURL(datURL);
-        QDomElement boardURLElement = document.createElement("url");
-        board.appendChild(boardURLElement);
-        boardURLElement.appendChild(document.createTextNode(boardURL));
+        QString boardUrl = BoardManager::boardUrl(datUrl);
+        QDomElement boardUrlElement = document.createElement("url");
+        board.appendChild(boardUrlElement);
+        boardUrlElement.appendChild(document.createTextNode(boardUrl));
 
-        QString boardName = BoardManager::boardName(boardURL);
+        QString boardName = BoardManager::boardName(boardUrl);
         QDomElement boardNameElement = document.createElement("name");
         board.appendChild(boardNameElement);
         boardNameElement.appendChild(document.createTextNode(boardName));
@@ -167,15 +167,15 @@
     return document.toString(0);
 }
 
-void FavoriteThreads::replace(const QString& fromURL, const QString& toURL)
+void FavoriteThreads::replace(const QString& fromUrl, const QString& toUrl)
 {
     if (FavoriteThreads::getInstance() == 0) return ;
     QList<FavoriteThreadItem>& threadList = FavoriteThreads::getInstance() ->m_threadList;
     QList<FavoriteThreadItem>::iterator it;
     for (it = threadList.begin(); it != threadList.end(); ++it) {
-        QString url = (*it).m_datURL;
-        if (url.indexOf(fromURL) == 0) {
-            url = url.replace(0, fromURL.length(), toURL);
+        QString url = (*it).m_datUrl;
+        if (url.indexOf(fromUrl) == 0) {
+            url = url.replace(0, fromUrl.length(), toUrl);
             threadList.erase(it);
             threadList.prepend(url);
             it = threadList.begin();
@@ -186,7 +186,7 @@
 QString FavoriteThreads::getDatUrl(int i)
 {
     if (getInstance() ->m_threadList.count() > i) {
-        return getInstance() ->m_threadList[ i ].m_datURL;
+        return getInstance() ->m_threadList[ i ].m_datUrl;
     } else {
         return QString();
     }

Modified: kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -23,9 +23,9 @@
 class FavoriteThreadItem
 {
 public:
-    QString m_datURL;
+    QString m_datUrl;
     FavoriteThreadItem();
-    FavoriteThreadItem(const QString& datURL) { m_datURL = datURL; }
+    FavoriteThreadItem(const QString& datUrl) { m_datUrl = datUrl; }
     ~FavoriteThreadItem();
 
     bool operator==(const FavoriteThreadItem& item) const;
@@ -45,12 +45,12 @@
 public:
     static FavoriteThreads* getInstance();
 
-    void insert(const QString& datURL);
-    void remove(const QString& datURL);
-    bool contains(const QString& datURL);
+    void insert(const QString& datUrl);
+    void remove(const QString& datUrl);
+    bool contains(const QString& datUrl);
     const QString toXML() const;
     static bool readFromXML(const QString& xml);
-    static void replace(const QString& fromURL, const QString& toURL);
+    static void replace(const QString& fromUrl, const QString& toUrl);
     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-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -32,8 +32,8 @@
 
 /* fro convertURL */
 static int m_prevConvMode;
-static QString m_prevConvURL;
-static QString m_prevConvNewURL;
+static QString m_prevConvUrl;
+static QString m_prevConvNewUrl;
 static QString m_prevConvRefstr;
 
 /* for ParseMachiBBSOneLine */
@@ -181,37 +181,37 @@
 
 KUrl Kita::getDatUrl(const KUrl& url , QString& refstr)
 {
-    return convertURL(URLMODE_DAT, url, refstr);
+    return convertUrl(URLMODE_DAT, url, refstr);
 }
 
 KUrl Kita::getDatUrl(const KUrl& url)
 {
     QString refstr;
-    return convertURL(URLMODE_DAT, url, refstr);
+    return convertUrl(URLMODE_DAT, url, refstr);
 }
 
-QString getThreadURL(const KUrl& url, QString& refstr)
+QString getThreadUrl(const KUrl& url, QString& refstr)
 {
-    return convertURL(URLMODE_THREAD, url, refstr);
+    return convertUrl(URLMODE_THREAD, url, refstr);
 }
 
-QString Kita::getThreadURL(const KUrl& url)
+QString Kita::getThreadUrl(const KUrl& url)
 {
     QString refstr;
-    return convertURL(URLMODE_THREAD, url, refstr);
+    return convertUrl(URLMODE_THREAD, url, refstr);
 }
 
-QString getNewThreadWriteURL(const KUrl& m_datURL)
+QString getNewThreadWriteUrl(const KUrl& m_datUrl)
 {
-    int m_bbstype = BoardManager::type(m_datURL);
+    int m_bbstype = BoardManager::type(m_datUrl);
     QString m_bbscgi;
 
     /* set path of bbs.cgi */
     switch (m_bbstype) {
 
     case Board_JBBS: {
-            QString cgipath = BoardManager::boardRoot(m_datURL)
-                + "/bbs/write.cgi/" + BoardManager::boardId(m_datURL) + '/';
+            QString cgipath = BoardManager::boardRoot(m_datUrl)
+                + "/bbs/write.cgi/" + BoardManager::boardId(m_datUrl) + '/';
 
             cgipath += "new/";
 
@@ -221,7 +221,7 @@
         break;
 
     case Board_MachiBBS: {
-            QString cgipath = BoardManager::boardRoot(m_datURL)
+            QString cgipath = BoardManager::boardRoot(m_datUrl)
                               + "/bbs/write.cgi";
             m_bbscgi = cgipath;
         }
@@ -230,25 +230,25 @@
 
     default:
 
-        m_bbscgi = BoardManager::boardRoot(m_datURL) + "/test/bbs.cgi";
+        m_bbscgi = BoardManager::boardRoot(m_datUrl) + "/test/bbs.cgi";
     }
 
     return m_bbscgi;
 }
 
-QString Kita::getWriteURL(const KUrl& m_datURL)
+QString Kita::getWriteUrl(const KUrl& m_datUrl)
 {
-    int m_bbstype = BoardManager::type(m_datURL);
+    int m_bbstype = BoardManager::type(m_datUrl);
     QString m_bbscgi;
 
     /* set path of bbs.cgi */
     switch (m_bbstype) {
 
     case Board_JBBS: {
-            QString cgipath = BoardManager::boardRoot(m_datURL)
-                + "/bbs/write.cgi/" + BoardManager::boardId(m_datURL) + '/';
+            QString cgipath = BoardManager::boardRoot(m_datUrl)
+                + "/bbs/write.cgi/" + BoardManager::boardId(m_datUrl) + '/';
 
-            cgipath += DatManager(m_datURL).threadId() + '/';
+            cgipath += DatManager(m_datUrl).threadId() + '/';
 
             m_bbscgi = cgipath;
         }
@@ -256,7 +256,7 @@
         break;
 
     case Board_MachiBBS: {
-            QString cgipath = BoardManager::boardRoot(m_datURL)
+            QString cgipath = BoardManager::boardRoot(m_datUrl)
                               + "/bbs/write.cgi";
             m_bbscgi = cgipath;
         }
@@ -265,7 +265,7 @@
 
     default:
 
-        m_bbscgi = BoardManager::boardRoot(m_datURL) + "/test/bbs.cgi";
+        m_bbscgi = BoardManager::boardRoot(m_datUrl) + "/test/bbs.cgi";
     }
 
     return m_bbscgi;
@@ -302,7 +302,7 @@
 refstr : 1-100
                                                             */
 
-QString Kita::convertURL(
+QString Kita::convertUrl(
 
     /* input */
     int mode,   /* if 0, output is dat URL. If 1, output is thread URL */
@@ -316,10 +316,10 @@
     if (url.isEmpty()) return QString();
 
     /* cache */
-    if (m_prevConvMode == mode && m_prevConvURL == url.prettyUrl()) {
+    if (m_prevConvMode == mode && m_prevConvUrl == url.prettyUrl()) {
 
         refstr = m_prevConvRefstr;
-        return m_prevConvNewURL;
+        return m_prevConvNewUrl;
     }
 
     /* Is board enrolled ? */
@@ -368,30 +368,30 @@
     }
 
     /* create new URL */
-    QString newURL;
-    if (mode == URLMODE_DAT) newURL = bdata->basePath() + "dat/" + thread + bdata->ext();
+    QString newUrl;
+    if (mode == URLMODE_DAT) newUrl = bdata->basePath() + "dat/" + thread + bdata->ext();
     else {
-        newURL = bdata->cgiBasePath();
+        newUrl = bdata->cgiBasePath();
 
         switch (bdata->type()) {
 
         case Board_MachiBBS:
-            newURL += "&KEY=" + thread;
+            newUrl += "&KEY=" + thread;
             break;
 
         default:
-            newURL += thread;
+            newUrl += thread;
             break;
         }
     }
 
     /* cache */
     m_prevConvMode = mode;
-    m_prevConvURL = url.prettyUrl();
-    m_prevConvNewURL = newURL;
+    m_prevConvUrl = url.prettyUrl();
+    m_prevConvNewUrl = newUrl;
     m_prevConvRefstr = refstr;
 
-    return newURL;
+    return newUrl;
 }
 
 
@@ -400,10 +400,10 @@
  * http://pc5.2ch.net/linux/dat/1089905503.dat
  * -> http://pc5.2ch.net/test/offlaw.cgi?bbs=linux&key=1089905503
  */
-QString Kita::datToOfflaw(const KUrl& datURL)
+QString Kita::datToOfflaw(const KUrl& datUrl)
 {
     /* TODO: not tested. */
-    KUrl url(datURL);
+    KUrl url(datUrl);
     QString root = url.host();
 
     QStringList list = url.fileName().split('.');
@@ -460,9 +460,9 @@
 }
 
 
-uint Kita::datToSince(const KUrl& datURL)
+uint Kita::datToSince(const KUrl& datUrl)
 {
-    return KUrl(datURL).fileName().section('.', 0, 0).toInt();
+    return KUrl(datUrl).fileName().section('.', 0, 0).toInt();
 }
 
 
@@ -1353,7 +1353,7 @@
     }
 }
 
-bool Kita::isBoardURL(const QString& url)
+bool Kita::isBoardUrl(const QString& url)
 {
     QRegExp url_2ch("http://.*\\.2ch\\.net/.*");
     QRegExp url_bbspink("http://.*\\.bbspink\\.com/.*");

Modified: kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -46,25 +46,25 @@
     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);
-    KDE_EXPORT QString getWriteURL(const KUrl& datURL);
-    QString getNewThreadWriteURL(const KUrl& datURL);
+    QString getThreadUrl(const KUrl& url, QString& refstr);
+    KDE_EXPORT QString getThreadUrl(const KUrl& url);
+    KDE_EXPORT QString getWriteUrl(const KUrl& datUrl);
+    QString getNewThreadWriteUrl(const KUrl& datUrl);
 
-    QString convertURL(int mode, const KUrl& url , QString& refstr);
+    QString convertUrl(int mode, const KUrl& url , QString& refstr);
 
-    QString datToOfflaw(const KUrl& datURL);
+    QString datToOfflaw(const KUrl& datUrl);
 
 
     /*------------------------------*/
     /* utilities */
     bool mkdir(const QString& path);
     QString unescape(const QString& str);
-    KDE_EXPORT uint datToSince(const KUrl& datURL);
+    KDE_EXPORT uint datToSince(const KUrl& datUrl);
     int isEqual(const QChar *cdat, const QString& str);
     KDE_EXPORT int stringToPositiveNum(const QChar *cdat, const unsigned int length);
     KDE_EXPORT QString getCategory(const QString& line);
-    KDE_EXPORT bool isBoardURL(const QString& url);
+    KDE_EXPORT bool isBoardUrl(const QString& url);
     KDE_EXPORT QString fontToString(const QFont& font);
 
     /*------------------------------*/

Modified: kita/branches/KITA-KDE4/kita/src/libkita/parsemisc.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/parsemisc.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/parsemisc.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -23,12 +23,12 @@
     class ParseMisc
     {
     public:
-        static KUrl parseURL(const KUrl& url , QString& refstr)
+        static KUrl parseUrl(const KUrl& url , QString& 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/thread.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/thread.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/thread.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -16,16 +16,16 @@
 
 QMultiHash<QString, Thread*>* Thread::m_threadDict = 0;
 
-Thread::Thread(const KUrl& datURL)
-        : m_datURL(datURL), m_threadName(0) , m_resNum(0), m_readNum(0), m_viewPos(0)
+Thread::Thread(const KUrl& datUrl)
+        : m_datUrl(datUrl), m_threadName(0) , m_resNum(0), m_readNum(0), m_viewPos(0)
 {}
 
 Thread::~Thread()
 {}
 
-const KUrl& Thread::datURL() const
+const KUrl& Thread::datUrl() const
 {
-    return m_datURL;
+    return m_datUrl;
 }
 
 /* public */
@@ -125,30 +125,30 @@
 
 /* static functions */
 
-Thread* Thread::getByURL(const KUrl& datURL)
+Thread* Thread::getByUrl(const KUrl& datUrl)
 {
     if (m_threadDict == 0) {
         m_threadDict = new QMultiHash<QString, Thread*>();
     }
 
-    Thread* thread = m_threadDict->value(datURL.prettyUrl());
+    Thread* thread = m_threadDict->value(datUrl.prettyUrl());
     if (thread) return thread;
 
-    Thread* newThread = new Thread(datURL);
-    m_threadDict->insert(datURL.prettyUrl(), newThread);
+    Thread* newThread = new Thread(datUrl);
+    m_threadDict->insert(datUrl.prettyUrl(), newThread);
 
     return newThread;
 }
 
 /* static & public */
-Thread* Thread::getByURLNew(const KUrl& datURL)
+Thread* Thread::getByUrlNew(const KUrl& datUrl)
 {
     if (m_threadDict == 0) return 0;
 
-    return m_threadDict->value(datURL.prettyUrl());
+    return m_threadDict->value(datUrl.prettyUrl());
 }
 
-void Thread::replace(const QString& fromURL, const QString& toURL)
+void Thread::replace(const QString& fromUrl, const QString& toUrl)
 {
     if (m_threadDict == 0) return ;
 	QHashIterator<QString, Thread*> it(*m_threadDict);
@@ -156,10 +156,10 @@
         it.next();
         QString url = it.key();
         Thread* thread = it.value();
-        if (url.indexOf(fromURL) == 0) {
+        if (url.indexOf(fromUrl) == 0) {
             m_threadDict->remove(url);
-            url = url.replace(0, fromURL.length(), toURL);
-            thread->m_datURL = url;
+            url = url.replace(0, fromUrl.length(), toUrl);
+            thread->m_datUrl = url;
             m_threadDict->insert(url, thread);
             it.toFront();
         }

Modified: kita/branches/KITA-KDE4/kita/src/libkita/thread.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/thread.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/thread.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -24,7 +24,7 @@
     {
         static QMultiHash<QString, Thread*>* m_threadDict;
 
-        KUrl m_datURL;
+        KUrl m_datUrl;
         QString m_threadName;
         int m_resNum;
         int m_readNum;
@@ -32,10 +32,10 @@
         QList<int> m_markList;
 
     public:
-        Thread(const KUrl& datURL);
+        Thread(const KUrl& datUrl);
         ~Thread();
 
-        const KUrl& datURL() const;
+        const KUrl& datUrl() const;
 
         const QString& threadName() const;
         void setThreadName(const QString& name);
@@ -56,9 +56,9 @@
 
         /*----------------------*/
 
-        static Thread* getByURL(const KUrl& datURL);
-        static Thread* getByURLNew(const KUrl& datURL);
-        static void replace(const QString& fromURL, const QString& toURL);
+        static Thread* getByUrl(const KUrl& datUrl);
+        static Thread* getByUrlNew(const KUrl& datUrl);
+        static void replace(const QString& fromUrl, const QString& toUrl);
     };
 }
 

Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -145,9 +145,9 @@
     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);
+    ThreadInfo::setReadNum(datUrl.prettyUrl(), num);
 }
 
 
@@ -174,8 +174,8 @@
 
     /* use obsoleted "cache" file */
     if (!resNum) {
-        KUrl datURL = getDatUrl(m_url);
-        resNum = ThreadInfo::readNum(datURL.prettyUrl());
+        KUrl datUrl = getDatUrl(m_url);
+        resNum = ThreadInfo::readNum(datUrl.prettyUrl());
         if (resNum)
             config.group("").writeEntry("ResNum", resNum);
     }
@@ -212,8 +212,8 @@
 
         /* use obsoleted "cache" file */
         if (!readNum) {
-            KUrl datURL = getDatUrl(m_url);
-            readNum = ThreadInfo::readNum(datURL.prettyUrl());
+            KUrl datUrl = getDatUrl(m_url);
+            readNum = ThreadInfo::readNum(datUrl.prettyUrl());
         }
 
         if (readNum)

Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -47,7 +47,7 @@
     instance->m_readDict.insert(url, num);
 }
 
-void ThreadInfo::replace(const QString& fromURL, const QString& toURL)
+void ThreadInfo::replace(const QString& fromUrl, const QString& toUrl)
 {
     QMap<QString, int>::Iterator it;
     ThreadInfo* instance = ThreadInfo::getInstance();
@@ -56,8 +56,8 @@
     for (it = instance->m_readDict.begin(); it != instance->m_readDict.end(); ++it) {
         QString url = it.key();
         int num = it.value();
-        if (url.indexOf(fromURL) == 0) {
-            url = url.replace(0, fromURL.length(), toURL);
+        if (url.indexOf(fromUrl) == 0) {
+            url = url.replace(0, fromUrl.length(), toUrl);
             instance->m_readDict.erase(it);
             instance->m_readDict.insert(url, num);
             it = instance->m_readDict.begin(); // TODO もっと早い方法は?

Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/libkita/threadinfo.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -26,7 +26,7 @@
         static ThreadInfo* getInstance();
         static void setReadNum(const QString& url, int num);
         static int readNum(const QString& url);
-        static void replace(const QString& fromURL, const QString& toURL);
+        static void replace(const QString& fromUrl, const QString& toUrl);
         static void removeThreadInfo(const QString& url);
         KDE_EXPORT friend QDataStream& operator<<(QDataStream& s, ThreadInfo& c);
         KDE_EXPORT friend QDataStream& operator>>(QDataStream& s, ThreadInfo& c);

Modified: kita/branches/KITA-KDE4/kita/src/respopup.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/respopup.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/respopup.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -30,7 +30,7 @@
 
 
     public:
-        ResPopup(KHTMLView* view, const KUrl& datURL);
+        ResPopup(KHTMLView* view, const KUrl& datUrl);
         ~ResPopup();
         void setText(const QString& str);
         void adjustSize();

Modified: kita/branches/KITA-KDE4/kita/src/threadlistview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadlistview.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/threadlistview.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -69,8 +69,8 @@
 
     m_openWithBrowserAct
         = new KAction(i18nc("@action:inmenu", "Open with Web Browser") , this);
-    m_copyURLAct = new KAction(i18nc("@action:inmenu", "Copy URL"), this);
-    m_copyTitleAndURLAct
+    m_copyUrlAct = new KAction(i18nc("@action:inmenu", "Copy URL"), this);
+    m_copyTitleAndUrlAct
         = new KAction(i18nc("@action:inmenu", "Copy title and URL"), this);
     m_favoritesAct = new KAction(this);
     m_deleteLogAct = new KAction(i18nc("@action:inmenu", "Delete Log"), this);
@@ -165,8 +165,8 @@
     if (!item) return;
     for (int i = 0, j = subjectList->columnCount(); i < j; i++)
         subjectList->item(item->row(), i)->setSelected(true);
-    KUrl datURL = subjectList->item(item->row(), ColumnDatUrl)->text();
-    ViewMediator::getInstance()->openThread(datURL);
+    KUrl datUrl = subjectList->item(item->row(), ColumnDatUrl)->text();
+    ViewMediator::getInstance()->openThread(datUrl);
 }
 
 void ThreadListView::hideColumn(int col)
@@ -187,18 +187,18 @@
         return;
     }
 
-    QString datURL = subjectList->item(item->row(), ColumnDatUrl)->text();
-    DatManager datManager(datURL);
-    QString threadURL = datManager.threadURL();
+    QString datUrl = subjectList->item(item->row(), ColumnDatUrl)->text();
+    DatManager datManager(datUrl);
+    QString threadUrl = datManager.threadUrl();
 
     // create popup menu.
     KMenu popup(0);
 
     popup.addAction(m_openWithBrowserAct);
-    popup.addAction(m_copyURLAct);
-    popup.addAction(m_copyTitleAndURLAct);
+    popup.addAction(m_copyUrlAct);
+    popup.addAction(m_copyTitleAndUrlAct);
 
-    bool isFavorites = FavoriteThreads::getInstance()->contains(datURL);
+    bool isFavorites = FavoriteThreads::getInstance()->contains(datUrl);
     m_favoritesAct->setText(isFavorites
         ? i18nc("@action:inmenu", "Remove from Favorites")
         : i18nc("@action:inmenu", "Add to Favorites"));
@@ -219,32 +219,32 @@
         return;
     }
     if (action == m_openWithBrowserAct) {
-        KRun::runUrl(threadURL, "text/html", this);
-    } else if (action == m_copyURLAct) {
-        clipboard->setText(threadURL, QClipboard::Clipboard);
-        clipboard->setText(threadURL, QClipboard::Selection);
-    } else if (action == m_copyTitleAndURLAct) {
-        QString cliptxt = datManager.threadName() + '\n' + threadURL;
+        KRun::runUrl(threadUrl, "text/html", this);
+    } else if (action == m_copyUrlAct) {
+        clipboard->setText(threadUrl, QClipboard::Clipboard);
+        clipboard->setText(threadUrl, QClipboard::Selection);
+    } else if (action == m_copyTitleAndUrlAct) {
+        QString cliptxt = datManager.threadName() + '\n' + threadUrl;
         clipboard->setText(cliptxt , QClipboard::Clipboard);
         clipboard->setText(cliptxt , QClipboard::Selection);
     } else if (action == m_favoritesAct) {
-        ViewMediator::getInstance()->bookmark(datURL, !isFavorites);
+        ViewMediator::getInstance()->bookmark(datUrl, !isFavorites);
     } else if (action == m_deleteLogAct) {
-        deleteLog(threadURL);
+        deleteLog(threadUrl);
     } else if (action == m_propertyAct) {
             QWidget* widget = new QWidget;
             Ui::ThreadProperty* propertyWidget
                 = new Ui::ThreadProperty;
             propertyWidget->setupUi(widget);
-            propertyWidget->threadURLLabel->setText(threadURL);
-            propertyWidget->datURLLabel->setText(datURL);
+            propertyWidget->threadUrlLabel->setText(threadUrl);
+            propertyWidget->datUrlLabel->setText(datUrl);
 
             propertyWidget->threadNameLabel
                 ->setText(datManager.threadName());
             propertyWidget->cachePathLabel
-                ->setText(Cache(datURL).getPath());
+                ->setText(Cache(datUrl).getPath());
             propertyWidget->indexPathLabel
-                ->setText(Cache(datURL).getIndexPath());
+                ->setText(Cache(datUrl).getIndexPath());
             propertyWidget->resNumLabel
                 ->setText(QString::number(datManager.getResNum()));
             propertyWidget->readNumLabel
@@ -252,7 +252,7 @@
             propertyWidget->viewPosLabel
                 ->setText(QString::number(datManager.getViewPos()));
 
-            ThreadIndex threadIndex(datURL);
+            ThreadIndex threadIndex(datUrl);
             propertyWidget->idx_threadNameWithIndexLabel
                 ->setText(threadIndex.getSubject());
             propertyWidget->idx_resNumLabel
@@ -263,7 +263,7 @@
                 ->setText(QString::number(threadIndex.getViewPos()));
 
             propertyWidget->cache_readNumLabel
-                ->setText(QString::number(ThreadInfo::readNum(datURL)));
+                ->setText(QString::number(ThreadInfo::readNum(datUrl)));
             widget->show();
     }
 }

Modified: kita/branches/KITA-KDE4/kita/src/threadlistview.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadlistview.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/threadlistview.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -54,8 +54,8 @@
 
     private:
         KAction* m_openWithBrowserAct;
-        KAction* m_copyURLAct;
-        KAction* m_copyTitleAndURLAct;
+        KAction* m_copyUrlAct;
+        KAction* m_copyTitleAndUrlAct;
         KAction* m_favoritesAct;
         KAction* m_propertyAct;
     };

Modified: kita/branches/KITA-KDE4/kita/src/threadproperty.ui
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadproperty.ui	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/threadproperty.ui	2009-08-09 12:35:19 UTC (rev 2542)
@@ -12,7 +12,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <widget class="QLabel" name="threadURLLabel0">
+    <widget class="QLabel" name="threadUrlLabel0">
      <property name="text">
       <string>Thread URL</string>
      </property>
@@ -22,7 +22,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="QLabel" name="threadURLLabel">
+    <widget class="QLabel" name="threadUrlLabel">
      <property name="text">
       <string/>
      </property>
@@ -32,7 +32,7 @@
     </widget>
    </item>
    <item row="1" column="0">
-    <widget class="QLabel" name="datURLLabel0">
+    <widget class="QLabel" name="datUrlLabel0">
      <property name="text">
       <string>Dat URL</string>
      </property>
@@ -42,7 +42,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="QLabel" name="datURLLabel">
+    <widget class="QLabel" name="datUrlLabel">
      <property name="text">
       <string/>
      </property>

Modified: kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -48,8 +48,8 @@
 void ThreadTabWidget::slotShowMainThread(const KUrl& url)
 {
     QString refstr;
-    KUrl datURL = ParseMisc::parseURL(url, refstr);
-    QString threadName = DatManager(datURL).threadName();
+    KUrl datUrl = ParseMisc::parseUrl(url, refstr);
+    QString threadName = DatManager(datUrl).threadName();
     int jumpNum = 0;
 
     int viewMode = VIEWMODE_MAINVIEW;
@@ -62,15 +62,15 @@
         else jumpNum = refstr.toInt();
     }
 
-    ThreadView* view = findMainView(datURL);
+    ThreadView* view = findMainView(datUrl);
 
     if (view) {
 
         setCurrentWidget(view);
 
-        if (view->threadURL().isEmpty()) {
+        if (view->threadUrl().isEmpty()) {
             /* Show on the default view */
-            view->showThread(datURL, jumpNum);
+            view->showThread(datUrl, jumpNum);
         } else {
             /* The view is already shown */
             /* TODO: jump to jumpNum after reloading */
@@ -82,12 +82,12 @@
         ThreadView * newView = createView(threadName);
 
         if (newView) {
-            newView->showThread(datURL, jumpNum);
+            newView->showThread(datUrl, jumpNum);
             setCurrentWidget(newView);
         }
     }
 
-    slotUpdateThreadTab(datURL);
+    slotUpdateThreadTab(datUrl);
 }
 
 /* close "all" views which URL is url. */ /* public slot */
@@ -95,14 +95,14 @@
 {
     int max = count();
     if (max == 0) return ;
-    KUrl datURL = ParseMisc::parseURLonly(url);
+    KUrl datUrl = ParseMisc::parseUrlOnly(url);
 
     int i, i2;
     i = i2 = 0;
     while (i < max) {
         ThreadView * view = isThreadView(widget(i));
         if (view) {
-            if (view->datURL() == datURL) {
+            if (view->datUrl() == datUrl) {
                 slotCloseTab(i2);
                 i2--;
             }
@@ -127,7 +127,7 @@
 /* private */
 ThreadView* ThreadTabWidget::findMainView(const KUrl& url)
 {
-    KUrl datURL = ParseMisc::parseURLonly(url);
+    KUrl datUrl = ParseMisc::parseUrlOnly(url);
 
     int max = count();
     if (max == 0) return 0;
@@ -138,8 +138,8 @@
         if (view) {
             if (view->getViewMode() == VIEWMODE_MAINVIEW) {
 
-                if (view->datURL() == datURL
-                        || view->datURL().isEmpty()  /* default view */
+                if (view->datUrl() == datUrl
+                        || view->datUrl().isEmpty()  /* default view */
                   ) return view;
             }
         }
@@ -160,11 +160,11 @@
 /* private slots */
 void ThreadTabWidget::slotUpdateThreadTab(const KUrl& url)
 {
-    KUrl datURL = ParseMisc::parseURLonly(url);
+    KUrl datUrl = ParseMisc::parseUrlOnly(url);
 
-    ThreadView * view = findMainView(datURL);
+    ThreadView * view = findMainView(datUrl);
     if (view) {
-        QString threadName = DatManager(datURL).threadName();
+        QString threadName = DatManager(datUrl).threadName();
 
         setTabText(indexOf(view), threadName);
         setTabToolTip(indexOf(view), threadName);
@@ -185,7 +185,7 @@
     if (count() == 0) {
         ViewMediator::getInstance()->setMainCaption(QString());
         ViewMediator::getInstance()->setMainStatus(QString());
-        ViewMediator::getInstance()->setMainURLLine(KUrl());
+        ViewMediator::getInstance()->setMainUrlLine(KUrl());
 
         /* default view */
         ThreadView * threadView = createView(i18nc("@title:tab", "Thread"));

Modified: kita/branches/KITA-KDE4/kita/src/threadtabwidget.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadtabwidget.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/threadtabwidget.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -24,7 +24,7 @@
         ~ThreadTabWidget();
 
     public slots:
-        void slotShowMainThread(const KUrl& datURL);
+        void slotShowMainThread(const KUrl& datUrl);
         void slotCloseThreadTab(const KUrl& url);
         void slotUpdateThreadTab(const KUrl& url);
 

Modified: kita/branches/KITA-KDE4/kita/src/threadview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadview.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/threadview.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -144,7 +144,7 @@
     m_viewmode = VIEWMODE_MAINVIEW;
     m_rescode = 200;
     m_serverTime = 0;
-    m_datURL.clear();
+    m_datUrl.clear();
 
 }
 
@@ -157,14 +157,14 @@
     }
 }
 
-const KUrl ThreadView::threadURL() const
+const KUrl ThreadView::threadUrl() const
 {
-    return getThreadURL(m_datURL);
+    return getThreadUrl(m_datUrl);
 }
 
-const KUrl ThreadView::datURL() const
+const KUrl ThreadView::datUrl() const
 {
-    return m_datURL;
+    return m_datUrl;
 }
 
 void ThreadView::slotDOMNodeActivated(const DOM::Node& node)
@@ -178,13 +178,13 @@
     } // end of Anchor tags.
 }
 
-void ThreadView::setSubjectLabel(const QString& boardName, const QString& threadName, const QString& boardURL)
+void ThreadView::setSubjectLabel(const QString& boardName, const QString& threadName, const QString& boardUrl)
 {
     QString disp;
     if (boardName.isEmpty()) {
         disp = threadName;
     } else {
-        disp = QString("<a href=\"%1\">[%2]</a> %3").arg(boardURL).arg(boardName).arg(threadName);
+        disp = QString("<a href=\"%1\">[%2]</a> %3").arg(boardUrl).arg(boardName).arg(threadName);
     }
 
     //disp.truncate(MAX_LABEL_LENGTH);
@@ -204,7 +204,7 @@
 
     // don't emit SIGNAL(toggled())
     disconnect(bookmarkButton, SIGNAL(toggled(bool)), this, SLOT(slotBookmarkButtonClicked(bool)));
-    if (FavoriteThreads::getInstance() ->contains(m_datURL.prettyUrl())) {
+    if (FavoriteThreads::getInstance() ->contains(m_datUrl.prettyUrl())) {
         bookmarkButton->setChecked(true);
     } else {
         bookmarkButton->setChecked(false);
@@ -218,7 +218,7 @@
 /*--------------------*/  /* private slots */
 void ThreadView::slotWriteButtonClicked(const QString& resStr)
 {
-    ViewMediator::getInstance()->showWriteView(m_datURL, resStr);
+    ViewMediator::getInstance()->showWriteView(m_datUrl, resStr);
 }
 
 
@@ -247,7 +247,7 @@
 
 void ThreadView::slotBookmarkButtonClicked(bool on)
 {
-    ViewMediator::getInstance()->bookmark(m_datURL.prettyUrl(), on);
+    ViewMediator::getInstance()->bookmark(m_datUrl.prettyUrl(), on);
 }
 
 
@@ -264,7 +264,7 @@
 /* public slot */ /* virtual */
 void ThreadView::setFocus()
 {
-    ViewMediator::getInstance()->changeWriteTab(m_datURL);
+    ViewMediator::getInstance()->changeWriteTab(m_datUrl);
     showStatusBar(QString());
     m_threadPart->view() ->setFocus();
 }
@@ -277,18 +277,18 @@
 /*-------*/
 /* setup */
 /*-------*/
-void ThreadView::setup(const KUrl& datURL, int mode)
+void ThreadView::setup(const KUrl& datUrl, int mode)
 {
     /* config. */
 
     /*---------------------------------------*/
     /* setup                                 */
 
-    m_datURL = getDatUrl(datURL);
+    m_datUrl = getDatUrl(datUrl);
 
     /* setup HTMLPart */
     int partMode = HTMLPART_MODE_MAINPART;
-    m_threadPart->setup(partMode, m_datURL);
+    m_threadPart->setup(partMode, m_datUrl);
 
     /* mode. Mode is defined in threadview.h */
     m_viewmode = mode;
@@ -302,19 +302,19 @@
 /* Show thread                                            */
 /* This function is called from ThreadTabWidget class */
 /*--------------------------------------------------------*/
-void ThreadView::showThread(const KUrl& datURL, int num)
+void ThreadView::showThread(const KUrl& datUrl, int num)
 {
     /* If this widget is not parent, then do nothing. */
     if (m_viewmode != VIEWMODE_MAINVIEW) return ;
 
-    if (num == 0) num = DatManager(datURL).getViewPos();
+    if (num == 0) num = DatManager(datUrl).getViewPos();
 
     if (topLevelWidget() ->isMinimized()) topLevelWidget() ->showNormal();
     topLevelWidget() ->raise();
     activateWindow();
 
     /* setup */
-    setup(datURL, VIEWMODE_MAINVIEW);
+    setup(datUrl, VIEWMODE_MAINVIEW);
 
     /* get log from cahce */
     m_rescode = 200;
@@ -357,7 +357,7 @@
         return ;
     }
 
-    DatManager(m_datURL).stopLoading();
+    DatManager(m_datUrl).stopLoading();
 }
 
 
@@ -366,12 +366,12 @@
 /*-----------------------------------------*/
 void ThreadView::showStatusBar(const QString &information)
 {
-    if (m_datURL.isEmpty()) return ;
+    if (m_datUrl.isEmpty()) return ;
     QString info = information;
     QString captionStr;
     QString infostr;
     QString errstr;
-    DatManager datManager(m_datURL);
+    DatManager datManager(m_datUrl);
     int viewPos = datManager.getViewPos();
     int resNum = datManager.getResNum();
     bool broken = datManager.isBroken();
@@ -397,7 +397,7 @@
 
         ViewMediator::getInstance()->setMainCaption(captionStr);
         ViewMediator::getInstance()->setMainStatus(infostr);
-        ViewMediator::getInstance()->setMainURLLine(getThreadURL(m_datURL));
+        ViewMediator::getInstance()->setMainUrlLine(getThreadUrl(m_datUrl));
 
         return ;
         break;
@@ -415,16 +415,16 @@
 /* update information */ /* public */
 void ThreadView::slotUpdateInfo()
 {
-    DatManager datManager(m_datURL);
+    DatManager datManager(m_datUrl);
     m_rescode = datManager.getResponseCode();
     m_serverTime = datManager.getServerTime();
 
     /* uptate information */
-    setSubjectLabel(BoardManager::boardName(m_datURL),
+    setSubjectLabel(BoardManager::boardName(m_datUrl),
                      datManager.threadName()
                      + QString(" (%1)")
                      .arg(datManager.getReadNum()),
-                     BoardManager::boardURL(m_datURL));
+                     BoardManager::boardUrl(m_datUrl));
     updateButton();
 
     gotoCombo->clear();
@@ -436,8 +436,8 @@
     gotoCombo->addItem(QString::fromUtf8(KITAUTF8_SAIGO));
     gotoCombo->adjustSize();
 
-    ViewMediator::getInstance()->updateBoardView(m_datURL);
-    ViewMediator::getInstance()->updateThreadView(m_datURL);
+    ViewMediator::getInstance()->updateBoardView(m_datUrl);
+    ViewMediator::getInstance()->updateThreadView(m_datUrl);
 
     showStatusBar("");
 
@@ -452,7 +452,7 @@
 /*------------------------*/  /* private slots */
 void ThreadView::slotSearchButton()
 {
-    if (m_datURL.isEmpty()) return ; /* Nothing is shown on the screen.*/
+    if (m_datUrl.isEmpty()) return ; /* Nothing is shown on the screen.*/
 
     QString str = searchCombo->currentText();
     if (str.at(0) == ':') {
@@ -489,7 +489,7 @@
 /* private */
 void ThreadView::slotSearchPrivate(bool rev)
 {
-    if (m_datURL.isEmpty()) return ; /* Nothing is shown on the screen.*/
+    if (m_datUrl.isEmpty()) return ; /* Nothing is shown on the screen.*/
 
     /* jump */
     QString str = searchCombo->currentText();
@@ -500,7 +500,7 @@
 
     QStringList query;
     query += searchCombo->currentText();
-    DatManager datManager(m_datURL);
+    DatManager datManager(m_datUrl);
     int ResNum = datManager.getResNum();
     for (int i = 1; i <= ResNum; i++) {
 
@@ -545,21 +545,21 @@
 
 void ThreadView::slotDeleteButtonClicked()
 {
-    if (m_datURL.isEmpty())
+    if (m_datUrl.isEmpty())
         return;
 
-    DatManager datManager(m_datURL);
+    DatManager datManager(m_datUrl);
     int rescode = datManager.getResponseCode();
     if ((rescode != 200 && rescode != 206)
-            || FavoriteThreads::getInstance()->contains(m_datURL.prettyUrl())) {
+            || FavoriteThreads::getInstance()->contains(m_datUrl.prettyUrl())) {
         if (KMessageBox::warningYesNo(this, i18n("Do you want to delete Log?"),
                 "Kita") != KMessageBox::Ok)
             return;
     }
 
     if (datManager.deleteCache()) {
-        m_parent->slotCloseThreadTab(m_datURL);
-        ViewMediator::getInstance()->updateBoardView(m_datURL);
+        m_parent->slotCloseThreadTab(m_datUrl);
+        ViewMediator::getInstance()->updateBoardView(m_datUrl);
     }
 }
 

Modified: kita/branches/KITA-KDE4/kita/src/threadview.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadview.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/threadview.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -54,18 +54,18 @@
     public:
         ThreadView(ThreadTabWidget* parent);
         ~ThreadView();
-        const KUrl threadURL() const;
-        const KUrl datURL() const;
+        const KUrl threadUrl() const;
+        const KUrl datUrl() const;
         const QString selectedText() const;
 
-        void setup(const KUrl& datURL, int mode);
+        void setup(const KUrl& datUrl, int mode);
         void showStatusBar(const QString& information);
         int getViewMode() { return m_viewmode; }
 
     public slots:
         virtual void setFocus();
 
-        void showThread(const KUrl& datURL, int num);
+        void showThread(const KUrl& datUrl, int num);
         void setFont(const QFont& font);
         void slotReloadButton(int jumpNum = 0);
         void slotStopLoading();
@@ -83,14 +83,14 @@
     private:
         void insertSearchCombo();
         void setSubjectLabel(const QString& boardName,
-                const QString& threadName, const QString& boardURL);
+                const QString& threadName, const QString& boardUrl);
         void updateButton();
 
         ThreadView(const ThreadView&);
         ThreadView& operator=(const ThreadView&);
 
         int m_serverTime;
-        KUrl m_datURL;
+        KUrl m_datUrl;
         HTMLPart* m_threadPart;
 
         bool m_revsearch;

Modified: kita/branches/KITA-KDE4/kita/src/viewmediator.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/viewmediator.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/viewmediator.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -76,7 +76,7 @@
     m_mainWindow->setMainStatus(statusStr);
 }
 
-void ViewMediator::setMainURLLine(const KUrl& url)
+void ViewMediator::setMainUrlLine(const KUrl& url)
 {
     Q_ASSERT(m_mainWindow);
 
@@ -90,11 +90,11 @@
     m_mainWindow->setCaption(str);
 }
 
-void ViewMediator::bookmark(const QString& datURL, bool on)
+void ViewMediator::bookmark(const QString& datUrl, bool on)
 {
     Q_ASSERT(m_mainWindow);
 
-    m_mainWindow->bookmark(datURL, on);
+    m_mainWindow->bookmark(datUrl, on);
 }
 
 bool ViewMediator::isActive()
@@ -106,25 +106,25 @@
     return false;
 }
 
-void ViewMediator::updateBoardView(const KUrl& datURL)
+void ViewMediator::updateBoardView(const KUrl& datUrl)
 {
     Q_ASSERT(m_boardTabWidget);
 
-    m_boardTabWidget->updateBoardView(datURL);
+    m_boardTabWidget->updateBoardView(datUrl);
 }
 
-void ViewMediator::updateThreadView(const KUrl& datURL)
+void ViewMediator::updateThreadView(const KUrl& datUrl)
 {
     Q_ASSERT(m_threadTabWidget);
 
-    m_threadTabWidget->slotUpdateThreadTab(datURL);
+    m_threadTabWidget->slotUpdateThreadTab(datUrl);
 }
 
-void ViewMediator::changeWriteTab(const KUrl& datURL)
+void ViewMediator::changeWriteTab(const KUrl& datUrl)
 {
     Q_ASSERT(m_writeTabWidget);
 
-    m_writeTabWidget->slotChangeWriteTab(datURL);
+    m_writeTabWidget->slotChangeWriteTab(datUrl);
 }
 
 void ViewMediator::updateFavoriteListView()
@@ -134,7 +134,7 @@
     m_favoriteListView->refresh();
 }
 
-void ViewMediator::openURL(const KUrl& url)
+void ViewMediator::openUrl(const KUrl& url)
 {
     // open thread.
     if (DatManager(url).isThreadEnrolled()) {

Modified: kita/branches/KITA-KDE4/kita/src/viewmediator.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/viewmediator.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/viewmediator.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -54,15 +54,15 @@
         void openBoard(const KUrl& url);
         void openThread(const KUrl& url);
         void setMainStatus(const QString& statusStr);
-        void setMainURLLine(const KUrl& url);
+        void setMainUrlLine(const KUrl& url);
         void setMainCaption(const QString& str);
-        void bookmark(const QString& datURL, bool on);
+        void bookmark(const QString& datUrl, bool on);
         bool isActive();
-        void updateBoardView(const KUrl& datURL);
-        void updateThreadView(const KUrl& datURL);
-        void changeWriteTab(const KUrl& datURL);
+        void updateBoardView(const KUrl& datUrl);
+        void updateThreadView(const KUrl& datUrl);
+        void changeWriteTab(const KUrl& datUrl);
         void updateFavoriteListView();
-        void openURL(const KUrl& url);
+        void openUrl(const KUrl& url);
 
     private:
         ViewMediator(const ViewMediator&);

Modified: kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -85,8 +85,8 @@
 /* private */
 WriteView* WriteTabWidget::findWriteView(const KUrl& url)
 {
-    KUrl datURL = getDatUrl(url);
-    if (datURL.isEmpty()) return 0;
+    KUrl datUrl = getDatUrl(url);
+    if (datUrl.isEmpty()) return 0;
 
     int max = count();
     if (max == 0) return 0;
@@ -94,7 +94,7 @@
     for(int i=0; i < max; i++) {
         WriteView * view = isWriteView(widget (i));
         if (view) {
-            if (view->datURL() == datURL) return view;
+            if (view->datUrl() == datUrl) return view;
         }
     }
 

Modified: kita/branches/KITA-KDE4/kita/src/writeview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/writeview.cpp	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/writeview.cpp	2009-08-09 12:35:19 UTC (rev 2542)
@@ -48,9 +48,9 @@
         : QWidget(parent)
 {
     setupUi(this);
-    m_datURL = getDatUrl(url);
-    m_bbstype = BoardManager::type(m_datURL);
-    m_bbscgi = getWriteURL(m_datURL);
+    m_datUrl = getDatUrl(url);
+    m_bbstype = BoardManager::type(m_datUrl);
+    m_bbscgi = getWriteUrl(m_datUrl);
     m_parent = parent;
 
     initUI();
@@ -79,7 +79,7 @@
     bodyText->setFont(font);
     bodyText->setTabChangesFocus(true);
 
-    boardNameLabel->setText(BoardManager::boardName(m_datURL));
+    boardNameLabel->setText(BoardManager::boardName(m_datUrl));
 
     // setup name field.
     nameLine->setText(WriteConfig::defaultName());
@@ -114,7 +114,7 @@
     }
 
     // init thread name field.
-    threadNameLine->setText(DatManager(m_datURL).threadName());
+    threadNameLine->setText(DatManager(m_datUrl).threadName());
     threadNameLine->setReadOnly(true);
     threadNameLine->setFrame(false);
     threadNameLine->setFocusPolicy(Qt::NoFocus);
@@ -142,9 +142,9 @@
 
 
 /* public information */
-const KUrl WriteView::datURL() const
+const KUrl WriteView::datUrl() const
 {
-    return m_datURL;
+    return m_datUrl;
 }
 
 const QString WriteView::threadName() const
@@ -154,12 +154,12 @@
 
 const QString WriteView::boardId() const
 {
-    return BoardManager::boardId(m_datURL);
+    return BoardManager::boardId(m_datUrl);
 }
 
 const QString WriteView::boardName() const
 {
-    return BoardManager::boardName(m_datURL);
+    return BoardManager::boardName(m_datUrl);
 }
 /* public slot */ /* virtual */
 void WriteView::setFocus()
@@ -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:
@@ -215,7 +215,7 @@
     QString postStr = buildPostMessage();
 
     /* referrer */
-    QString refStr = BoardManager::boardURL(m_datURL);
+    QString refStr = BoardManager::boardUrl(m_datUrl);
 
     m_array.clear();
 
@@ -298,7 +298,7 @@
         setMessage(QString());
 
         /* reload thread */
-        ViewMediator::getInstance()->openThread(m_datURL);
+        ViewMediator::getInstance()->openThread(m_datUrl);
 
         m_parent->slotCloseCurrentTab();
 
@@ -338,7 +338,7 @@
 
 int WriteView::getWriteResNum()
 {
-    return DatManager(m_datURL).getReadNum() + 1;
+    return DatManager(m_datUrl).getReadNum() + 1;
 }
 
 /* private slot */
@@ -366,7 +366,7 @@
 /* save post log */ /* private */
 void WriteView::logPostMessage()
 {
-    QString threadURL = DatManager(m_datURL).threadURL();
+    QString threadUrl = DatManager(m_datUrl).threadUrl();
 
     QDateTime now = QDateTime::currentDateTime();
     QString logPath = KStandardDirs::locateLocal("appdata", "log.txt");
@@ -379,7 +379,7 @@
         stream << "Date   : " << now.toString("yyyy/MM/dd hh:mm:ss") << endl; // current time
         stream << "Board  : " << boardName() << endl;
         stream << "Thread : " << threadName() << endl;
-        stream << "URL    : " << threadURL << endl;
+        stream << "URL    : " << threadUrl << endl;
         stream << "Name   : " << name() << endl;
         stream << "Mail   : " << mail() << endl << endl;
         stream << body() << endl;

Modified: kita/branches/KITA-KDE4/kita/src/writeview.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/writeview.h	2009-08-09 11:31:09 UTC (rev 2541)
+++ kita/branches/KITA-KDE4/kita/src/writeview.h	2009-08-09 12:35:19 UTC (rev 2542)
@@ -49,7 +49,7 @@
         QByteArray m_array;
         KUrl m_bbscgi;
         int m_bbstype;
-        KUrl m_datURL;
+        KUrl m_datUrl;
         QString m_mailswap;
 
         void initUI();
@@ -68,7 +68,7 @@
         void setMessage(const QString& bodyStr);
         void insertMessage(const QString& str);
 
-        const KUrl datURL() const;
+        const KUrl datUrl() const;
         const QString threadName() const;
         const QString boardName() const;
         const QString boardId() const;




Kita-svn メーリングリストの案内
Back to archive index