[Kita-svn] [2419] - Col_* -> Column*

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2009年 7月 18日 (土) 06:28:16 JST


Revision: 2419
          http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2419
Author:   nogu
Date:     2009-07-18 06:28:15 +0900 (Sat, 18 Jul 2009)

Log Message:
-----------
- Col_* -> Column*
- slotMouseButtonClicked -> slotItemClicked
- Col_Attr -> ColumnAttribute

Modified Paths:
--------------
    kita/branches/KITA-KDE4/kita/src/boardview.cpp
    kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp
    kita/branches/KITA-KDE4/kita/src/threadlistview.cpp
    kita/branches/KITA-KDE4/kita/src/threadlistview.h
    kita/branches/KITA-KDE4/kita/src/threadlistviewitem.cpp
    kita/branches/KITA-KDE4/kita/src/threadlistviewitem.h

Modified: kita/branches/KITA-KDE4/kita/src/boardview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardview.cpp	2009-07-16 15:39:57 UTC (rev 2418)
+++ kita/branches/KITA-KDE4/kita/src/boardview.cpp	2009-07-17 21:28:15 UTC (rev 2419)
@@ -53,8 +53,8 @@
     connect(closeButton, SIGNAL(clicked()),
              SLOT(slotCloseButton()));
 
-    connect(subjectList, SIGNAL(columnResized(int, int, int)),
-             SLOT(slotSizeChange(int, int, int)));
+    //connect(subjectList, SIGNAL(columnResized(int, int, int)),
+    //         SLOT(slotSizeChange(int, int, int))); TODO
 
     loadLayout();
     loadHeaderOnOff();
@@ -172,10 +172,10 @@
 
     switch (Kita::Config::listSortOrder()) {
     case Kita::Config::EnumListSortOrder::Mark:
-        subjectList->sortItems(Col_Mark);
+        subjectList->sortItems(ColumnMark);
         break;
     case Kita::Config::EnumListSortOrder::ID:
-        subjectList->sortItems(Col_ID);
+        subjectList->sortItems(ColumnId);
         break;
     default:
         // do nothing
@@ -237,9 +237,9 @@
 
     KUrl datURL = Kita::getDatURL(url);
     for (int i = 0, j = subjectList->rowCount(); i < j; i++) {
-        if (subjectList->item(i, Col_DatURL)->text() == datURL.prettyUrl()) {
+        if (subjectList->item(i, ColumnDatUrl)->text() == datURL.prettyUrl()) {
 
-            switch (subjectList->item(i, Col_MarkOrder)->text().toInt()) {
+            switch (subjectList->item(i, ColumnMarkOrder)->text().toInt()) {
             case Thread_Readed :
             case Thread_Read : m_readNum--; break;
             case Thread_New : m_newNum--; break;
@@ -248,8 +248,8 @@
 
             Kita::Thread* thread = Kita::Thread::getByURLNew(datURL);
             if (thread == 0) return ;
-            int id = subjectList->item(i, Col_ID)->text().toInt();
-            int order = subjectList->item(i, Col_IDOrder)->text().toInt();
+            int id = subjectList->item(i, ColumnId)->text().toInt();
+            int order = subjectList->item(i, ColumnIdOrder)->text().toInt();
             updateListViewItem(subjectList->item(i, 0),
                     datURL, current, id, order);
 
@@ -276,55 +276,55 @@
     int viewPos = Kita::DatManager::getViewPos(datURL);
     double speed = resNum / (since.secsTo(current) / (60.0 * 60.0 * 24.0));
 
-    if (id) subjectList->item(row, Col_ID)->setText(QString::number(id));
-    subjectList->item(row, Col_IDOrder)->setText(QString::number(order));
-    subjectList->item(row, Col_Subject)->setText(threadName);
-    subjectList->item(row, Col_ResNum)->setText(QString("%1").arg(resNum, 4));
-    subjectList->item(row, Col_ReadNum)
+    if (id) subjectList->item(row, ColumnId)->setText(QString::number(id));
+    subjectList->item(row, ColumnIdOrder)->setText(QString::number(order));
+    subjectList->item(row, ColumnSubject)->setText(threadName);
+    subjectList->item(row, ColumnResNum)->setText(QString("%1").arg(resNum, 4));
+    subjectList->item(row, ColumnReadNum)
         ->setText((viewPos > 0) ? QString("%1").arg(viewPos, 4) : QString());
-    subjectList->item(row, Col_Unread)
+    subjectList->item(row, ColumnUnread)
         ->setText((viewPos > 0 && resNum > viewPos)
                 ? QString("%1").arg(resNum - viewPos, 4) : QString());
-    subjectList->item(row, Col_Since)
+    subjectList->item(row, ColumnSince)
         ->setText(since.toString("yy/MM/dd hh:mm"));
-    subjectList->item(row, Col_DatURL)->setText(datURL.prettyUrl());
-    subjectList->item(row, Col_Speed)
+    subjectList->item(row, ColumnDatUrl)->setText(datURL.prettyUrl());
+    subjectList->item(row, ColumnSpeed)
         ->setText(QString(" %1 ").arg(speed, 0, 'f', 2));
 
     /* set mark order */
 
     if (!id) { /* old thread */
-        subjectList->item(row, Col_MarkOrder)
+        subjectList->item(row, ColumnMarkOrder)
             ->setText(QString::number(Thread_Old));
     } else if (readNum > 0 && (resNum > readNum || resNum > viewPos)) {
         /* There are new responses. */
-        subjectList->item(row, Col_Mark)->setIcon(QIcon(SmallIcon("unread")));
+        subjectList->item(row, ColumnMark)->setIcon(QIcon(SmallIcon("unread")));
         m_unreadNum++;
-        subjectList->item(row, Col_MarkOrder)
+        subjectList->item(row, ColumnMarkOrder)
             ->setText(QString::number(Thread_HasUnread));
     } else if (readNum > 0) { /* Cache exists */
-        subjectList->item(row, Col_Mark)->setIcon(QIcon(SmallIcon("read")));
+        subjectList->item(row, ColumnMark)->setIcon(QIcon(SmallIcon("read")));
         m_readNum++;
-        subjectList->item(row, Col_MarkOrder)
+        subjectList->item(row, ColumnMarkOrder)
             ->setText(QString::number((viewPos > 1000)
                     ? Thread_Readed : Thread_Read));
     } else if (since.secsTo(current) < 3600 * Kita::Config::markTime()) {
         /* new thread */
-        subjectList->item(row, Col_Mark)
+        subjectList->item(row, ColumnMark)
             ->setIcon(QIcon(SmallIcon("newthread")));
         m_newNum++;
-        subjectList->item(row, Col_MarkOrder)
+        subjectList->item(row, ColumnMarkOrder)
             ->setText(QString::number(Thread_New));
     } else { /* normal */
-        subjectList->item(row, Col_MarkOrder)
+        subjectList->item(row, ColumnMarkOrder)
             ->setText(QString::number(Thread_Normal));
-        subjectList->item(row, Col_Mark)->setIcon(QIcon());
+        subjectList->item(row, ColumnMark)->setIcon(QIcon());
     }
 
     // no effect: m_unreadNum, m_readNum, m_newNum, markOrder
     if (Kita::DatManager::isMainThreadOpened(datURL) && resNum == readNum) {
         /* opened */
-        subjectList->item(row, Col_Mark)->setIcon(QIcon(SmallIcon("open")));
+        subjectList->item(row, ColumnMark)->setIcon(QIcon(SmallIcon("open")));
     }
 }
 
@@ -335,7 +335,7 @@
         return;
     }
 
-    QString datURL = subjectList->item(item->row(), Col_DatURL)->text();
+    QString datURL = subjectList->item(item->row(), ColumnDatUrl)->text();
     QString threadURL = Kita::DatManager::threadURL(datURL);
     bool isFavorites = FavoriteThreads::getInstance()->contains(datURL);
 
@@ -465,8 +465,10 @@
         QMouseEvent * mouseEvent = static_cast<QMouseEvent *>(e);
         if (mouseEvent->button() == Qt::RightButton) {
             KMenu popup;
-            for (int i = Col_Begin; i <= Col_End; i++) {
-                if (i != Col_Subject && i != Col_MarkOrder && i != Col_IDOrder) {
+            for (int i = ColumnBegin; i <= ColumnEnd; i++) {
+                if (i != ColumnSubject
+                        && i != ColumnMarkOrder
+                        && i != ColumnIdOrder) {
                     KAction* action = new KAction(s_colAttr[ i ].itemName, this);
                     action->setCheckable(true);
                     action->setChecked(subjectList->columnWidth(i) != 0);
@@ -507,7 +509,7 @@
     KConfig config(configPath);
 
     KConfigGroup group = config.group("Column");
-    for (int i = Col_Begin; i <= Col_End; i++) {
+    for (int i = ColumnBegin; i <= ColumnEnd; i++) {
         if (subjectList->columnWidth(i) != 0) {
             group.writeEntry(s_colAttr[ i ].keyName, true);
         } else {
@@ -523,7 +525,7 @@
     KConfig config(configPath);
 
     KConfigGroup group = config.group("Column");
-    for (int i = Col_Begin; i <= Col_End; i++) {
+    for (int i = ColumnBegin; i <= ColumnEnd; i++) {
         bool isShown = group.readEntry(
                 s_colAttr[ i ].keyName, s_colAttr[ i ].showDefault);
         if (isShown) {

Modified: kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp	2009-07-16 15:39:57 UTC (rev 2418)
+++ kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp	2009-07-17 21:28:15 UTC (rev 2419)
@@ -42,7 +42,7 @@
     connect(ReloadButton, SIGNAL(clicked()),
              SLOT(reload()));
 
-    showColumn(Col_Board);
+    showColumn(ColumnBoard);
 }
 
 /**
@@ -71,25 +71,25 @@
         int viewPos = Kita::DatManager::getViewPos(datURL);
         int resNum = Kita::DatManager::getResNum(datURL);
 
-        subjectList->setItem(i, Col_Board,
+        subjectList->setItem(i, ColumnBoard,
                 new QTableWidgetItem(Kita::BoardManager::boardName(datURL)));
-        subjectList->setItem(i, Col_Subject,
+        subjectList->setItem(i, ColumnSubject,
                 new QTableWidgetItem(Kita::DatManager::threadName(datURL)));
-        subjectList->setItem(i, Col_ReadNum,
+        subjectList->setItem(i, ColumnReadNum,
                 new QTableWidgetItem(QString("%1").arg(viewPos, 4)));
         if (resNum > 0) {
-            subjectList->setItem(i, Col_ResNum,
+            subjectList->setItem(i, ColumnResNum,
                     new QTableWidgetItem(QString("%1").arg(resNum, 4)));
         }
         if (resNum != 0 && resNum != viewPos) {
-            subjectList->setItem(i, Col_Unread, new QTableWidgetItem(
+            subjectList->setItem(i, ColumnUnread, new QTableWidgetItem(
                         QString("%1").arg(resNum - viewPos, 4)));
         }
-        subjectList->setItem(i, Col_Since,
+        subjectList->setItem(i, ColumnSince,
                 new QTableWidgetItem(since.toString("yy/MM/dd hh:mm")));
-        subjectList->setItem(i, Col_DatURL, new QTableWidgetItem(datURL));
+        subjectList->setItem(i, ColumnDatUrl, new QTableWidgetItem(datURL));
     }
-    subjectList->sortItems(Col_Board);
+    subjectList->sortItems(ColumnBoard);
     for (int i = 0, j = subjectList->columnCount(); i < j; i++) {
         subjectList->resizeColumnToContents(i);
     }
@@ -106,7 +106,7 @@
     QTableWidgetItem* item = subjectList->item(row, column);
     if (! item) return ;
 
-    QString itemURL = subjectList->item(item->row(), Col_DatURL)->text();
+    QString itemURL = subjectList->item(item->row(), ColumnDatUrl)->text();
 
     for (int i = 0; FavoriteThreads::count() > i; i++) {
         QString datURL = FavoriteThreads::getDatURL(i);
@@ -141,7 +141,7 @@
     KAction* removeFromFavoritesAct = new KAction(i18n("Remove from Favorites"), this);
     popup.addAction(removeFromFavoritesAct);
 
-    QString datURL = subjectList->item(item->row(), Col_DatURL)->text();
+    QString datURL = subjectList->item(item->row(), ColumnDatUrl)->text();
     QString threadURL = Kita::DatManager::threadURL(datURL);
 
     QClipboard* clipboard = QApplication::clipboard();

Modified: kita/branches/KITA-KDE4/kita/src/threadlistview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadlistview.cpp	2009-07-16 15:39:57 UTC (rev 2418)
+++ kita/branches/KITA-KDE4/kita/src/threadlistview.cpp	2009-07-17 21:28:15 UTC (rev 2419)
@@ -20,23 +20,23 @@
 
 using namespace Kita;
 
-struct Col_Attr ThreadListView::s_colAttr[] =
+struct ColumnAttribute ThreadListView::s_colAttr[] =
     {
         // labelName, itemName, keyName, showDefault
-        { " ",              I18N_NOOP("Mark"),      "Col_Mark",      true  },
-        { "No.",            I18N_NOOP("ID"),        "Col_ID",        true  },
-        { " ",              I18N_NOOP("Icon"),      "Col_Icon",      true  },
-        { "Title",          I18N_NOOP("Subject"),   "Col_Subject",   true  },
-        { "ResNum",         I18N_NOOP("ResNum"),    "Col_ResNum",    true  },
-        { "ReadNum",        I18N_NOOP("ReadNum"),   "Col_ReadNum",   true  },
-        { "ViewPos",        I18N_NOOP("ViewPos"),   "Col_ViewPos",   false },
-        { "Unread",         I18N_NOOP("Unread"),    "Col_Unread",    true  },
-        { "Since",          I18N_NOOP("Since"),     "Col_Since",     true  },
-        { "Thread's speed", I18N_NOOP("Speed"),     "Col_Speed",     true  },
-        { "Board",          I18N_NOOP("Board"),     "Col_Board",     false },
-        { "Dat URL",        I18N_NOOP("DatURL"),    "Col_DatURL",    false },
-        { "Mark Order",     I18N_NOOP("MarkOrder"), "Col_MarkOrder", false },
-        { "ID Order",       I18N_NOOP("IDOrder"),   "Col_IDOrder",   false }
+        { " ",              I18N_NOOP("Mark"),      "ColumnMark",      true  },
+        { "No.",            I18N_NOOP("ID"),        "ColumnId",        true  },
+        { " ",              I18N_NOOP("Icon"),      "ColumnIcon",      true  },
+        { "Title",          I18N_NOOP("Subject"),   "ColumnSubject",   true  },
+        { "ResNum",         I18N_NOOP("ResNum"),    "ColumnResNum",    true  },
+        { "ReadNum",        I18N_NOOP("ReadNum"),   "ColumnReadNum",   true  },
+        { "ViewPos",        I18N_NOOP("ViewPos"),   "ColumnViewPos",   false },
+        { "Unread",         I18N_NOOP("Unread"),    "ColumnUnread",    true  },
+        { "Since",          I18N_NOOP("Since"),     "ColumnSince",     true  },
+        { "Thread's speed", I18N_NOOP("Speed"),     "ColumnSpeed",     true  },
+        { "Board",          I18N_NOOP("Board"),     "ColumnBoard",     false },
+        { "Dat URL",        I18N_NOOP("DatURL"),    "ColumnDatUrl",    false },
+        { "Mark Order",     I18N_NOOP("MarkOrder"), "ColumnMarkOrder", false },
+        { "ID Order",       I18N_NOOP("IDOrder"),   "ColumnIdOrder",   false }
     };
 
 ThreadListView::ThreadListView(QWidget* parent)
@@ -47,13 +47,13 @@
     ReloadButton->setIcon(SmallIcon("view-refresh"));
     closeButton->setIcon(SmallIcon("tab-close"));
 
-    subjectList->setColumnCount(Col_End - Col_Begin + 1);
+    subjectList->setColumnCount(ColumnEnd - ColumnBegin + 1);
     subjectList->setContextMenuPolicy(Qt::CustomContextMenu);
     subjectList->setShowGrid(false);
     subjectList->setSortingEnabled(true);
     subjectList->verticalHeader()->setVisible(false);
     QStringList labels;
-    for (int i = Col_Begin; i <= Col_End; i++) {
+    for (int i = ColumnBegin; i <= ColumnEnd; i++) {
         labels << i18n(s_colAttr[i].labelName);
         if (!s_colAttr[i].showDefault) {
             hideColumn(i);
@@ -68,7 +68,7 @@
     connect(HideButton, SIGNAL(toggled(bool)),
              SLOT(slotHideButton(bool)));
     connect(subjectList, SIGNAL(itemClicked(QTableWidgetItem*)),
-             SLOT(slotMouseButtonClicked(QTableWidgetItem*)));
+             SLOT(slotItemClicked(QTableWidgetItem*)));
 }
 
 ThreadListView::~ThreadListView() {}
@@ -121,13 +121,13 @@
     m_prevquery = query;
 
     for (int i = 0, j = subjectList->rowCount(); i < j; i++) {
-        subjectList->item(i, Col_Icon)->setIcon(QIcon());
+        subjectList->item(i, ColumnIcon)->setIcon(QIcon());
 
         QStringList::const_iterator queryIt = query.begin();
         for (; queryIt != query.end(); ++queryIt) {
-            if (subjectList->item(i, Col_Subject)
+            if (subjectList->item(i, ColumnSubject)
                     ->text().contains(*queryIt, Qt::CaseInsensitive)) {
-                subjectList->item(i, Col_Icon)
+                subjectList->item(i, ColumnIcon)
                     ->setIcon(QIcon(SmallIcon("edit-find")));
                 m_hitList.append(subjectList->item(i, 0));
                 break;
@@ -139,7 +139,7 @@
 void ThreadListView::clearSearch()
 {
     for (int i = 0, j = subjectList->rowCount(); i < j; i++) {
-        subjectList->item(i, Col_Icon)->setIcon(QIcon());
+        subjectList->item(i, ColumnIcon)->setIcon(QIcon());
         subjectList->showRow(i);
     }
 }
@@ -147,7 +147,7 @@
 void ThreadListView::slotHideButton(bool on)
 {
     for (int i = 0, j = subjectList->rowCount(); i < j; i++) {
-        if (on && !subjectList->item(i, Col_Icon)->icon().isNull()) {
+        if (on && !subjectList->item(i, ColumnIcon)->icon().isNull()) {
             subjectList->hideRow(i);
         } else {
             subjectList->showRow(i);
@@ -155,12 +155,12 @@
     }
 }
 
-void ThreadListView::slotMouseButtonClicked(QTableWidgetItem* item)
+void ThreadListView::slotItemClicked(QTableWidgetItem* item)
 {
     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(), Col_DatURL)->text();
+    KUrl datURL = subjectList->item(item->row(), ColumnDatUrl)->text();
     ViewMediator::getInstance()->openThread(datURL);
 }
 

Modified: kita/branches/KITA-KDE4/kita/src/threadlistview.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadlistview.h	2009-07-16 15:39:57 UTC (rev 2418)
+++ kita/branches/KITA-KDE4/kita/src/threadlistview.h	2009-07-17 21:28:15 UTC (rev 2419)
@@ -14,7 +14,7 @@
 
 #include "ui_threadlistviewbase.h"
 
-struct Col_Attr
+struct ColumnAttribute
 {
     const char* labelName; /// for header's label
     QString itemName;  /// for header's popupItem
@@ -38,7 +38,7 @@
         virtual ~ThreadListView();
 
     protected:
-        static struct Col_Attr s_colAttr[];
+        static struct ColumnAttribute s_colAttr[];
         QStringList m_prevquery;
         unsigned m_nextHitIndex;
         QList<QTableWidgetItem *> m_hitList;
@@ -52,7 +52,7 @@
 
     protected slots:
         void slotHideButton(bool on);
-        void slotMouseButtonClicked(QTableWidgetItem*);
+        void slotItemClicked(QTableWidgetItem*);
 
     private slots:
         void slotSearchButton();

Modified: kita/branches/KITA-KDE4/kita/src/threadlistviewitem.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadlistviewitem.cpp	2009-07-16 15:39:57 UTC (rev 2418)
+++ kita/branches/KITA-KDE4/kita/src/threadlistviewitem.cpp	2009-07-17 21:28:15 UTC (rev 2419)
@@ -22,17 +22,17 @@
     QString thisText = text();
     QString otherText = other.text();
     switch (m_column) {
-    case Col_ResNum:
-    case Col_ReadNum:
-    case Col_Unread:
+    case ColumnResNum:
+    case ColumnReadNum:
+    case ColumnUnread:
         return thisText.toInt() > otherText.toInt();
-    case Col_ID:
+    case ColumnId:
         return thisText.toInt() > otherText.toInt();
-    case Col_Mark:
+    case ColumnMark:
         return QString::localeAwareCompare(thisText, otherText) > 0;
-    case Col_Since:
+    case ColumnSince:
         return QString::localeAwareCompare(thisText, otherText) > 0;
-    case Col_Speed:
+    case ColumnSpeed:
         return thisText.toDouble() * 1000 > otherText.toDouble() * 1000;
     default:
         return QString::localeAwareCompare(thisText, otherText) > 0;

Modified: kita/branches/KITA-KDE4/kita/src/threadlistviewitem.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadlistviewitem.h	2009-07-16 15:39:57 UTC (rev 2418)
+++ kita/branches/KITA-KDE4/kita/src/threadlistviewitem.h	2009-07-17 21:28:15 UTC (rev 2419)
@@ -14,22 +14,22 @@
 #include <QtGui/QTableWidgetItem>
 
 enum ThreadListCol {
-    Col_Begin = 0,
-    Col_Mark = 0,
-    Col_ID,
-    Col_Icon,
-    Col_Subject,
-    Col_ResNum,
-    Col_ReadNum,
-    Col_ViewPos,
-    Col_Unread,
-    Col_Since,
-    Col_Speed,
-    Col_Board,
-    Col_DatURL,
-    Col_MarkOrder,
-    Col_IDOrder,
-    Col_End = Col_IDOrder
+    ColumnBegin = 0,
+    ColumnMark = 0,
+    ColumnId,
+    ColumnIcon,
+    ColumnSubject,
+    ColumnResNum,
+    ColumnReadNum,
+    ColumnViewPos,
+    ColumnUnread,
+    ColumnSince,
+    ColumnSpeed,
+    ColumnBoard,
+    ColumnDatUrl,
+    ColumnMarkOrder,
+    ColumnIdOrder,
+    ColumnEnd = ColumnIdOrder
 };
 
 namespace Kita




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