refactoring.

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

diff --git a/kita/src/libkita/board.cpp b/kita/src/libkita/board.cpp
index 508b56c..de2bb5e 100644 (file)
--- a/kita/src/libkita/board.cpp
+++ b/kita/src/libkita/board.cpp
@@ -144,28 +144,6 @@ const QPtrList<Thread> Board::getThreadList( const QString& boardURL )
     return threadList;
 }
 
-Board* Board::getByURL( const QString& boardURL )
-{
-    // FIXME: null¥ª¥Ö¥¸¥§¥¯¥È¤òÍ×µá¤Î¤¿¤Ó¤Ëºî¤Ã¤Æ¤¤¤ë¡£
-    if ( boardURL.isNull() ) {
-        return new NullBoard();
-    }
-
-    if ( m_boardDict == 0 ) {
-        // FIXME: setAutoDelete¤ò²Ã¤¨¤ÆÆ°¤¯¤³¤È¤ò³Î¤«¤á¤ë¤³¤È
-        m_boardDict = new QDict<Board>();
-    }
-
-    if ( m_boardDict->find( boardURL ) ) {
-        return m_boardDict->find( boardURL );
-    }
-
-    Board* newBoard = new Board( boardURL );
-    m_boardDict->insert( boardURL, newBoard );
-
-    return newBoard;
-}
-
 void Board::setName( const QString& boardURL, const QString& boardName )
 {
     if ( boardURL.isNull() ) {
@@ -189,7 +167,7 @@ void Board::setName( const QString& boardURL, const QString& boardName )
 const QString& Board::getName( const QString& boardURL )
 {
     if ( m_boardDict->find( boardURL ) ) {
-        return Board::getByURL( boardURL ) ->m_boardName;
+        return m_boardDict->find( boardURL ) ->m_boardName;
     } else {
         return QString::null;
     }
@@ -219,9 +197,3 @@ bool Board::isWritingSupported( const KURL& boardURL )
         return false;
     }
 }
-
-NullBoard::NullBoard()
-{}
-
-NullBoard::~ NullBoard()
-{}

diff --git a/kita/src/libkita/board.h b/kita/src/libkita/board.h
index 11976bf..7f48b70 100644 (file)
--- a/kita/src/libkita/board.h
+++ b/kita/src/libkita/board.h
@@ -38,9 +38,8 @@ namespace Kita
         static QCp932Codec* m_cp932Codec;
         static QEucJpCodec* m_eucJpCodec;
         Board( const QString& boardURL, const QString boardName = QString::null );
-        static Board* getByURL( const QString& boardURL );
-    protected:
         Board();
+
     public:
         ~Board();
 
@@ -52,13 +51,6 @@ namespace Kita
 
         static bool isWritingSupported( const KURL& boardURL );
     };
-
-    class NullBoard : public Board
-    {
-    public:
-        NullBoard();
-        ~NullBoard();
-    };
 }
 
 #endif