refactoring.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1559 56b19765-1e22-0410-a548-a0f45d66c51a

diff --git a/kita/src/favoritelistview.cpp b/kita/src/favoritelistview.cpp
index 085d77d..082d362 100644 (file)
--- a/kita/src/favoritelistview.cpp
+++ b/kita/src/favoritelistview.cpp
@@ -77,7 +77,7 @@ void FavoriteListView::update()
         KListViewItem* item = new KListViewItem( subjectList );
         item->setText( Col_Board, Kita::BoardManager::boardName( datURL ) );
         item->setText( Col_Subject, Kita::DatManager::threadName( datURL ) );
-        item->setText( Col_Read, QString( "%1" ).arg( viewPos, 4 ) );
+        item->setText( Col_ReadNum, QString( "%1" ).arg( viewPos, 4 ) );
         if ( resNum > 0 ) {
             item->setText( Col_ResNum, QString( "%1" ).arg( resNum, 4 ) );
             if ( resNum != viewPos ) {
@@ -114,7 +114,7 @@ void FavoriteListView::slotUpdateSubject( const KURL& url )
             int resNum = Kita::DatManager::getResNum( datURL );
             int viewPos = Kita::DatManager::getViewPos( datURL );
             item->setText( Col_ResNum, QString( "%1" ).arg( resNum, 4 ) );
-            item->setText( Col_Read, QString( "%1" ).arg( viewPos, 4 ) );
+            item->setText( Col_ReadNum, QString( "%1" ).arg( viewPos, 4 ) );
         }
     }
 }

diff --git a/kita/src/kitasubjectview.cpp b/kita/src/kitasubjectview.cpp
index 63c3bf5..568bd66 100644 (file)
--- a/kita/src/kitasubjectview.cpp
+++ b/kita/src/kitasubjectview.cpp
@@ -301,7 +301,7 @@ void KitaSubjectView::updateListViewItem( QListViewItem* item, Kita::Thread* thr
     item->setText( Col_IDOrder, QString().setNum( order ) );
     item->setText( Col_Subject, threadName );
     item->setText( Col_ResNum, QString( "%1" ).arg( resNum, 4 ) );
-    item->setText( Col_Read, ( viewPos > 0 ) ? QString( "%1" ).arg( viewPos, 4 ) : QString( "" ) );
+    item->setText( Col_ReadNum, ( viewPos > 0 ) ? QString( "%1" ).arg( viewPos, 4 ) : QString( "" ) );
     item->setText( Col_Unread, ( viewPos > 0 && resNum > viewPos ) ? QString( "%1" ).arg( resNum - viewPos, 4 ) : QString( "" ) );
     item->setText( Col_Since, since.toString( "yy/MM/dd hh:mm" ) );
     item->setText( Col_DatURL, datURL.prettyURL() );

diff --git a/kita/src/listviewitem.cpp b/kita/src/listviewitem.cpp
index 82edd8c..6795b2b 100644 (file)
--- a/kita/src/listviewitem.cpp
+++ b/kita/src/listviewitem.cpp
@@ -85,7 +85,7 @@ namespace Kita
     {
        switch ( col ) {
        case Col_ResNum:
-       case Col_Read:
+       case Col_ReadNum:
        case Col_Unread:
            return i->key( col, ascending ).toInt() - key( col, ascending ).toInt();
        case Col_ID:

diff --git a/kita/src/listviewitem.h b/kita/src/listviewitem.h
index 058656f..5454b5b 100644 (file)
--- a/kita/src/listviewitem.h
+++ b/kita/src/listviewitem.h
@@ -14,19 +14,22 @@
 #include <klistview.h>
 
 enum SubjectRows {
-    Col_Mark,
+    Col_Begin = 0,
+    Col_Mark = 0,
     Col_ID,
     Col_Icon,
     Col_Subject,
     Col_ResNum,
-    Col_Read,
+    Col_ReadNum,
+    Col_ViewPos,
     Col_Unread,
     Col_Since,
     Col_Speed,
     Col_Board,
     Col_DatURL,
     Col_MarkOrder,
-    Col_IDOrder    
+    Col_IDOrder,
+    Col_End = Col_IDOrder
 };
 
 

diff --git a/kita/src/threadlistview.cpp b/kita/src/threadlistview.cpp
index 633514f..f100af0 100644 (file)
--- a/kita/src/threadlistview.cpp
+++ b/kita/src/threadlistview.cpp
@@ -33,7 +33,7 @@ struct Col_Attr ThreadListView::s_colAttr[] = {
     {"", "Icon", "Col_Icon", true},
     {"Title", "Subject", "Col_Subject", true},
     {"ResNum", "ResNum", "Col_ResNum", true},
-    {"ReadNum", "Read", "Col_Read", true},
+    {"ReadNum", "Read", "Col_ReadNum", true},
     {"ViewPos", "ViewPos", "Col_ViewPos", true},
     {"Unread", "Unread", "Col_Unread", true},
     {"Since", "Since", "Col_Since", true},
@@ -199,7 +199,7 @@ int ThreadListViewItem::compare( QListViewItem* i, int col, bool ascending ) con
 {
     switch ( col ) {
     case Col_ResNum:
-    case Col_Read:
+    case Col_ReadNum:
     case Col_Unread:
         return i->key( col, ascending ).toInt() - key( col, ascending ).toInt();
     case Col_ID:

diff --git a/kita/src/threadlistview.h b/kita/src/threadlistview.h
index 51ef045..ddf832a 100644 (file)
--- a/kita/src/threadlistview.h
+++ b/kita/src/threadlistview.h
@@ -22,7 +22,7 @@ enum ThreadListViewRows {
     Col_Icon,
     Col_Subject,
     Col_ResNum,
-    Col_Read,
+    Col_ReadNum,
     Col_ViewPos,
     Col_Unread,
     Col_Since,