remove bbsviewbase

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

diff --git a/kita/src/bbs/Makefile.am b/kita/src/bbs/Makefile.am
index ffb7a2a..fdcc35a 100644 (file)
--- a/kita/src/bbs/Makefile.am
+++ b/kita/src/bbs/Makefile.am
@@ -3,4 +3,4 @@ METASOURCES = AUTO
 noinst_HEADERS =  bbstabwidget.h bbsview.h
 lib_LTLIBRARIES =  libkitabbs.la
 libkitabbs_la_LDFLAGS = $(all_libraries)
-libkitabbs_la_SOURCES =  bbstabwidget.cpp bbsview.cpp bbsviewbase.ui
+libkitabbs_la_SOURCES =  bbstabwidget.cpp bbsview.cpp

diff --git a/kita/src/bbs/bbsview.cpp b/kita/src/bbs/bbsview.cpp
index b34f653..59f3968 100644 (file)
--- a/kita/src/bbs/bbsview.cpp
+++ b/kita/src/bbs/bbsview.cpp
@@ -30,6 +30,7 @@
 #include <qmessagebox.h>
 #include <qtoolbutton.h>
 #include <qcombobox.h>
+#include <qlayout.h>
 
 #include "bbsview.h"
 
@@ -59,9 +60,33 @@ namespace Kita
 QCp932Codec* KitaBBSView::m_cp932Codec = NULL;
 
 KitaBBSView::KitaBBSView( QWidget *parent, const char *name )
-        : KitaBBSViewBase( parent, name )
-        , m_favorites( 0 )
+        : m_favorites( 0 )
 {
+    /* copied from Base class */
+    if ( !name )
+       setName( "KitaBBSViewBase" );
+    KitaBBSViewBaseLayout = new QVBoxLayout( this, 0, 0, "KitaBBSViewBaseLayout"); 
+
+    layout10 = new QHBoxLayout( 0, 0, 6, "layout10"); 
+
+    SearchCombo = new QComboBox( FALSE, this, "SearchCombo" );
+    SearchCombo->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)4, 0, 0, SearchCombo->sizePolicy().hasHeightForWidth() ) );
+    SearchCombo->setEditable( TRUE );
+    SearchCombo->setSizeLimit( 10 );
+    layout10->addWidget( SearchCombo );
+    spacer2 = new QSpacerItem( 467, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
+    layout10->addItem( spacer2 );
+    KitaBBSViewBaseLayout->addLayout( layout10 );
+
+    m_boardList = new KListView( this, "m_boardList" );
+    m_boardList->setRootIsDecorated( TRUE );
+    m_boardList->setTreeStepSize( 10 );
+    m_boardList->setFullWidth( TRUE );
+    KitaBBSViewBaseLayout->addWidget( m_boardList );
+    resize( QSize(600, 482).expandedTo(minimumSizeHint()) );
+    clearWState( WState_Polished );
+    /* copy end */
+
     m_boardList->setSorting( -1 );
     m_boardList->addColumn( i18n( "board name" ) );
     m_boardList->header() ->setClickEnabled( FALSE );

diff --git a/kita/src/bbs/bbsview.h b/kita/src/bbs/bbsview.h
index eae1f9c..8a795bf 100644 (file)
--- a/kita/src/bbs/bbsview.h
+++ b/kita/src/bbs/bbsview.h
@@ -15,10 +15,14 @@
 
 #include <qwidget.h>
 
-#include "bbsviewbase.h"
-
 class KURL;
+class KListView;
 class QCp932Codec;
+class QSpacerItem;
+class QListViewItem;
+class QComboBox;
+class QVBoxLayout;
+class QHBoxLayout;
 
 namespace Kita
 {
@@ -31,7 +35,7 @@ namespace Kita
  *
  * @author Hideki Ikemoto <ikemo@users.sourceforge.jp>
  **/
-class KitaBBSView : public KitaBBSViewBase
+class KitaBBSView : public QWidget
 {
     Q_OBJECT
     Kita::ListViewItem* m_favorites;
@@ -49,6 +53,13 @@ class KitaBBSView : public KitaBBSViewBase
     QValueList<Kita::Category> getCategoryList( const QString& html ) const;
 
     void saveOpened();
+    QComboBox* SearchCombo;
+    KListView* m_boardList;
+
+protected:
+    QVBoxLayout* KitaBBSViewBaseLayout;
+    QHBoxLayout* layout10;
+    QSpacerItem* spacer2;
 
 private slots:
     void loadBoard( QListViewItem* item );