refactoring.

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

diff --git a/kita/src/libkita/board.cpp b/kita/src/libkita/board.cpp
index e9be310..e34adb3 100644 (file)
--- a/kita/src/libkita/board.cpp
+++ b/kita/src/libkita/board.cpp
@@ -26,11 +26,6 @@
 
 #include "qcp932codec.h"
 
-enum {
-    Board_MachiBBS,
-    Board_2ch
-};
-
 using namespace Kita;
 
 QDict<Board>* Board::m_boardDict = 0;
@@ -64,16 +59,6 @@ const QString Board::getID( const QString& boardURL )
     return Board::getByURL( boardURL )->id();
 }
 
-int Board::type( const QString& boardURL )
-{
-    QRegExp url_machibbs( "http://.*\\.machi\\.to/.*" );
-    if ( url_machibbs.search( boardURL ) == -1 ) {
-        return Board_2ch;
-    } else {
-        return Board_MachiBBS;
-    }
-}
-
 const QPtrList<Thread> Board::getThreadList( const QString& boardURL )
 {
     if ( boardURL.isEmpty() ) {
@@ -98,7 +83,7 @@ const QPtrList<Thread> Board::getThreadList( const QString& boardURL )
         // parse subject.txt(only one format...)
         // FIXME: need to refactoring
         QRegExp regexp;
-        switch ( Kita::Board::type( boardURL ) ) {
+        switch ( Kita::boardType( boardURL ) ) {
         case Board_MachiBBS:
             regexp.setPattern( "(\\d+\\.cgi),(.*)\\((\\d+)\\)" );
             break;

diff --git a/kita/src/libkita/board.h b/kita/src/libkita/board.h
index a17ee13..a26b4ae 100644 (file)
--- a/kita/src/libkita/board.h
+++ b/kita/src/libkita/board.h
@@ -42,8 +42,6 @@ namespace Kita
         const QString& name() const;
         const QString id() const;
         static const QString getID( const QString& boardURL );
-
-        static int type( const QString& boardURL );
         
         static void setName( const QString& boardURL, const QString& boardName );
         static const QString& getName( const QString& boardURL );

diff --git a/kita/src/libkita/kita_misc.cpp b/kita/src/libkita/kita_misc.cpp
index 7ff74a9..b3cb6bb 100644 (file)
--- a/kita/src/libkita/kita_misc.cpp
+++ b/kita/src/libkita/kita_misc.cpp
@@ -135,3 +135,13 @@ QString Kita::unescape( const QString& str )
     QString ret = str;
     return ret.replace( "&lt;", "<" ).replace( "&gt;", ">" ).replace( "&amp;", "&" );
 }
+
+int Kita::boardType( const QString& url )
+{
+    QRegExp url_machibbs( "http://.*\\.machi\\.to/.*" );
+    if ( url_machibbs.search( url ) == -1 ) {
+        return Board_2ch;
+    } else {
+        return Board_MachiBBS;
+    }
+}

diff --git a/kita/src/libkita/kita_misc.h b/kita/src/libkita/kita_misc.h
index d6ef9a5..5885240 100644 (file)
--- a/kita/src/libkita/kita_misc.h
+++ b/kita/src/libkita/kita_misc.h
@@ -15,6 +15,10 @@
 
 namespace Kita
 {
+    enum {
+        Board_MachiBBS,
+        Board_2ch
+    };
 
     /**
      * @author Hideki Ikemoto
@@ -28,6 +32,7 @@ namespace Kita
     QString datToCache( const QString& datURL );
     QString httpToK2ch( const QString& httpURL );
     QString unescape( const QString& str );
+    int boardType( const QString& url );
 }
 
 #endif