move Kita::ListViewItem to kitaui/

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

diff --git a/kita/src/board/threadlistviewitem.cpp b/kita/src/board/threadlistviewitem.cpp
index 95ac5ad..905d5bf 100644 (file)
--- a/kita/src/board/threadlistviewitem.cpp
+++ b/kita/src/board/threadlistviewitem.cpp
@@ -10,93 +10,32 @@
 
 #include "threadlistviewitem.h"
 
+using namespace Kita;
 
-namespace Kita
-{
-    ListViewItem::ListViewItem( QListView *parent, QListViewItem *after,
-                                QString label1, QString label2, QString label3, QString label4,
-                                QString label5, QString label6, QString label7, QString label8 )
-            : KListViewItem( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 )
-    {
-        init();
-    }
-
-    ListViewItem::ListViewItem( QListViewItem *parent, QListViewItem *after,
-                                QString label1, QString label2, QString label3, QString label4,
-                                QString label5, QString label6, QString label7, QString label8 )
-            : KListViewItem( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 )
-    {
-        init();
-    }
-
-    ListViewItem::ListViewItem( QListView* parent, QString label1, QString label2 )
-            : KListViewItem( parent, label1, label2 )
-    {
-        init();
-    }
-
-    ListViewItem::ListViewItem( QListViewItem* parent, QString label1, QString label2 )
-            : KListViewItem( parent, label1, label2 )
-    {
-        init();
-    }
+SubjectListViewItem::SubjectListViewItem( QListView* parent )
+        : Kita::ListViewItem( parent )
+{}
 
-    ListViewItem::~ListViewItem()
-    {}
-
-    /* private */
-    void ListViewItem::init()
-    {
-        QColorGroup colors = listView() ->viewport() ->colorGroup();
-        m_textColor = colors.text();
-        m_baseColor = colors.base();
-    }
+SubjectListViewItem::~SubjectListViewItem()
+{}
 
-    /* public */
-    void ListViewItem::setColor( QColor textColor, QColor baseColor )
-    {
-        m_textColor = textColor;
-        m_baseColor = baseColor;
-    }
-
-    /* public */ /* virtual */
-    void ListViewItem::paintCell( QPainter *p, const QColorGroup &cg,
-                                  int column, int width, int align )
-    {
-        QColorGroup color = cg;
-        color.setColor( QColorGroup::Text, m_textColor );
-        color.setColor( QColorGroup::Base, m_baseColor );
-        KListViewItem::paintCell( p, color, column, width, align );
-    }
-
-    /*----------------------------------------*/
-
-
-    SubjectListViewItem::SubjectListViewItem( QListView* parent )
-            : Kita::ListViewItem( parent )
-    {}
-
-    SubjectListViewItem::~SubjectListViewItem()
-    {}
-
-    /* public */ /* virtual */
-    int SubjectListViewItem::compare( QListViewItem* i, int col, bool ascending ) const
-    {
-        switch ( col ) {
-        case Col_ResNum:
-        case Col_ReadNum:
-        case Col_Unread:
-            return i->key( col, ascending ).toInt() - key( col, ascending ).toInt();
-        case Col_ID:
-            return key( Col_IDOrder, ascending ).toInt() - i->key( Col_IDOrder, ascending ).toInt();
-        case Col_Mark:
-            return QString::localeAwareCompare( i->key( Col_MarkOrder, ascending ), key( Col_MarkOrder, ascending ) );
-        case Col_Since:
-            return QString::localeAwareCompare( i->key( col, ascending ), key( col, ascending ) );
-        case Col_Speed:
-            return static_cast<int>( i->key( col, ascending ).toDouble() * 1000 - key( col, ascending ).toDouble() * 1000 );
-        default:
-            return QString::localeAwareCompare( key( col, ascending ), i->key( col, ascending ) );
-        }
+/* public */ /* virtual */
+int SubjectListViewItem::compare( QListViewItem* i, int col, bool ascending ) const
+{
+    switch ( col ) {
+    case Col_ResNum:
+    case Col_ReadNum:
+    case Col_Unread:
+        return i->key( col, ascending ).toInt() - key( col, ascending ).toInt();
+    case Col_ID:
+        return key( Col_IDOrder, ascending ).toInt() - i->key( Col_IDOrder, ascending ).toInt();
+    case Col_Mark:
+        return QString::localeAwareCompare( i->key( Col_MarkOrder, ascending ), key( Col_MarkOrder, ascending ) );
+    case Col_Since:
+        return QString::localeAwareCompare( i->key( col, ascending ), key( col, ascending ) );
+    case Col_Speed:
+        return static_cast<int>( i->key( col, ascending ).toDouble() * 1000 - key( col, ascending ).toDouble() * 1000 );
+    default:
+        return QString::localeAwareCompare( key( col, ascending ), i->key( col, ascending ) );
     }
 }

diff --git a/kita/src/board/threadlistviewitem.h b/kita/src/board/threadlistviewitem.h
index 803c92d..d027845 100644 (file)
--- a/kita/src/board/threadlistviewitem.h
+++ b/kita/src/board/threadlistviewitem.h
@@ -8,10 +8,10 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 
-#ifndef _KITALISTVIEWITEM_H_
-#define _KITALISTVIEWITEM_H_
+#ifndef _KITATHREADLISTVIEWITEM_H_
+#define _KITATHREADLISTVIEWITEM_H_
 
-#include <klistview.h>
+#include "kitaui/listviewitem.h"
 
 enum SubjectRows {
     Col_Begin = 0,
@@ -32,43 +32,8 @@ enum SubjectRows {
     Col_End = Col_IDOrder
 };
 
-
 namespace Kita
 {
-    class ListViewItem : public KListViewItem
-    {
-        QColor m_textColor;  /* text color */
-        QColor m_baseColor;  /* background color */
-
-    public:
-
-        ListViewItem( QListView *parent, QListViewItem *after,
-                      QString, QString = QString::null,
-                      QString = QString::null, QString = QString::null,
-                      QString = QString::null, QString = QString::null,
-                      QString = QString::null, QString = QString::null );
-
-        ListViewItem( QListViewItem *parent, QListViewItem *after,
-                      QString, QString = QString::null,
-                      QString = QString::null, QString = QString::null,
-                      QString = QString::null, QString = QString::null,
-                      QString = QString::null, QString = QString::null );
-
-        ListViewItem( QListView* parent, QString = QString::null, QString = QString::null );
-
-        ListViewItem( QListViewItem* parent, QString = QString::null, QString = QString::null );
-
-        ~ListViewItem();
-
-        void setColor( QColor textColor, QColor baseColor );
-        virtual void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int align );
-
-    private:
-        void init();
-    };
-
-    /*----------------------------------------*/
-
     /* for KitaSubjectView */
     class SubjectListViewItem : public Kita::ListViewItem
     {
@@ -78,10 +43,6 @@ namespace Kita
     public:
         virtual int compare( QListViewItem* i, int col, bool ascending ) const;
     };
-
 }
 
-
-
-
 #endif

diff --git a/kita/src/kitaboardview.cpp b/kita/src/kitaboardview.cpp
index 78ed00d..59a8375 100644 (file)
--- a/kita/src/kitaboardview.cpp
+++ b/kita/src/kitaboardview.cpp
@@ -30,7 +30,9 @@
 
 #include "kitaboardview.h"
 #include "kita.h"
-#include "board/threadlistviewitem.h"
+
+#include "kitaui/listviewitem.h"
+
 #include "libkita/qcp932codec.h"
 #include "libkita/favoriteboards.h"
 #include "libkita/kitaconfig.h"

diff --git a/kita/src/kitaui/Makefile.am b/kita/src/kitaui/Makefile.am
index ed752d1..ade412d 100644 (file)
--- a/kita/src/kitaui/Makefile.am
+++ b/kita/src/kitaui/Makefile.am
@@ -2,5 +2,5 @@ INCLUDES = -I$(top_srcdir)/kita/src/libkita $(all_includes)
 METASOURCES = AUTO
 lib_LTLIBRARIES =  libkitaui.la
 libkitaui_la_LDFLAGS = $(all_libraries)
-libkitaui_la_SOURCES = tabwidgetbase.cpp
-noinst_HEADERS = tabwidgetbase.h
+libkitaui_la_SOURCES = tabwidgetbase.cpp listviewitem.cpp
+noinst_HEADERS = tabwidgetbase.h listviewitem.h

diff --git a/kita/src/kitaui/listviewitem.cpp b/kita/src/kitaui/listviewitem.cpp
new file mode 100644 (file)
index 0000000..181121e
--- /dev/null
+++ b/kita/src/kitaui/listviewitem.cpp
@@ -0,0 +1,69 @@
+/***************************************************************************
+*   Copyright (C) 2004 by Kita Developers                                 *
+*   ikemo@users.sourceforge.jp                                            *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+***************************************************************************/
+
+#include "listviewitem.h"
+
+using namespace Kita;
+
+ListViewItem::ListViewItem( QListView *parent, QListViewItem *after,
+                            QString label1, QString label2, QString label3, QString label4,
+                            QString label5, QString label6, QString label7, QString label8 )
+        : KListViewItem( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 )
+{
+    init();
+}
+
+ListViewItem::ListViewItem( QListViewItem *parent, QListViewItem *after,
+                            QString label1, QString label2, QString label3, QString label4,
+                            QString label5, QString label6, QString label7, QString label8 )
+        : KListViewItem( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 )
+{
+    init();
+}
+
+ListViewItem::ListViewItem( QListView* parent, QString label1, QString label2 )
+        : KListViewItem( parent, label1, label2 )
+{
+    init();
+}
+
+ListViewItem::ListViewItem( QListViewItem* parent, QString label1, QString label2 )
+        : KListViewItem( parent, label1, label2 )
+{
+    init();
+}
+
+ListViewItem::~ListViewItem()
+{}
+
+/* private */
+void ListViewItem::init()
+{
+    QColorGroup colors = listView() ->viewport() ->colorGroup();
+    m_textColor = colors.text();
+    m_baseColor = colors.base();
+}
+
+/* public */
+void ListViewItem::setColor( QColor textColor, QColor baseColor )
+{
+    m_textColor = textColor;
+    m_baseColor = baseColor;
+}
+
+/* public */ /* virtual */
+void ListViewItem::paintCell( QPainter *p, const QColorGroup &cg,
+                              int column, int width, int align )
+{
+    QColorGroup color = cg;
+    color.setColor( QColorGroup::Text, m_textColor );
+    color.setColor( QColorGroup::Base, m_baseColor );
+    KListViewItem::paintCell( p, color, column, width, align );
+}

diff --git a/kita/src/kitaui/listviewitem.h b/kita/src/kitaui/listviewitem.h
new file mode 100644 (file)
index 0000000..a531de0
--- /dev/null
+++ b/kita/src/kitaui/listviewitem.h
@@ -0,0 +1,51 @@
+/***************************************************************************
+*   Copyright (C) 2004 by Kita Developers                                 *
+*   ikemo@users.sourceforge.jp                                            *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+***************************************************************************/
+
+#ifndef _KITALISTVIEWITEM_H_
+#define _KITALISTVIEWITEM_H_
+
+#include <klistview.h>
+
+namespace Kita
+{
+    class ListViewItem : public KListViewItem
+    {
+        QColor m_textColor;  /* text color */
+        QColor m_baseColor;  /* background color */
+
+    public:
+
+        ListViewItem( QListView *parent, QListViewItem *after,
+                      QString, QString = QString::null,
+                      QString = QString::null, QString = QString::null,
+                      QString = QString::null, QString = QString::null,
+                      QString = QString::null, QString = QString::null );
+
+        ListViewItem( QListViewItem *parent, QListViewItem *after,
+                      QString, QString = QString::null,
+                      QString = QString::null, QString = QString::null,
+                      QString = QString::null, QString = QString::null,
+                      QString = QString::null, QString = QString::null );
+
+        ListViewItem( QListView* parent, QString = QString::null, QString = QString::null );
+
+        ListViewItem( QListViewItem* parent, QString = QString::null, QString = QString::null );
+
+        ~ListViewItem();
+
+        void setColor( QColor textColor, QColor baseColor );
+        virtual void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int align );
+
+    private:
+        void init();
+    };
+}
+
+#endif