From 3d14b99db558034c2217a232d73051f9747505cd Mon Sep 17 00:00:00 2001
From: ikemo <ikemo@56b19765-1e22-0410-a548-a0f45d66c51a>
Date: Tue, 20 May 2003 15:03:53 +0000
Subject: [PATCH] refactoring...

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@248 56b19765-1e22-0410-a548-a0f45d66c51a
---
 kita/src/kitaboardview.cpp | 33 ++++++++++++++++++++-------------
 kita/src/kitaboardview.h   |  1 +
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/kita/src/kitaboardview.cpp b/kita/src/kitaboardview.cpp
index 03b227e..2564ef9 100644
--- a/kita/src/kitaboardview.cpp
+++ b/kita/src/kitaboardview.cpp
@@ -56,6 +56,22 @@ Kita::Board KitaBoardView::getBoard(QString line)
   }
 }
 
+bool KitaBoardView::isBoardUrl(const KURL& url)
+{
+  QRegExp url_2ch("http://.*\\.2ch\\.net/.*");
+  QRegExp url_bbspink("http://.*\\.bbspink\\.com/.*");
+  QRegExp url_www_2ch("http://www\\.2ch\\.net/.*");
+
+  if ( url.isEmpty() ) return false;
+
+  QString str = url.prettyURL();
+
+  if ( url_2ch.search(str) == -1 && url_bbspink.search(str) == -1 ) return false;
+  if ( url_www_2ch.search(str) != -1 ) return false;
+
+  return true;
+}
+
 void KitaBoardView::loadBoardList()
 {
   QString tmpFile;
@@ -75,10 +91,6 @@ void KitaBoardView::loadBoardList()
       QStringList lines = QStringList::split("\n", html);
       QStringList::iterator it;
 
-      QRegExp url_2ch("http://.*\\.2ch\\.net/.*");
-      QRegExp url_bbspink("http://.*\\.bbspink\\.com/.*");
-      QRegExp url_www_2ch("http://www\\.2ch\\.net/.*");
-
       KListViewItem* current_category = 0;
       KListViewItem* current_board = 0;
       for(it = lines.begin(); it != lines.end(); ++it)
@@ -94,14 +106,9 @@ void KitaBoardView::loadBoardList()
           }
         } else {
           Kita::Board board = getBoard(*it);
-          if( ! board.url().isEmpty() ) {
-
-            if( current_category != 0 &&
-                (url_2ch.search(board.url().prettyURL()) != -1 || url_bbspink.search(board.url().prettyURL()) != -1) &&
-                url_www_2ch.search(board.url().prettyURL()) == -1 )
-            {
-              current_board = new KListViewItem(current_category, current_board, board.name(), board.url().prettyURL());
-            }
+
+          if( current_category != 0 && isBoardUrl(board.url()) == true ) {
+            current_board = new KListViewItem(current_category, current_board, board.name(), board.url().prettyURL());
           }
         }
       }
@@ -116,7 +123,7 @@ void KitaBoardView::slotLoadBoard(QListViewItem* item)
 {
   QString boardName = item->text(0);
   KURL url = item->text(1);
-  
+
   if(item->text(1).isEmpty()) {
     return;
   }
diff --git a/kita/src/kitaboardview.h b/kita/src/kitaboardview.h
index 24d2815..ea181ff 100644
--- a/kita/src/kitaboardview.h
+++ b/kita/src/kitaboardview.h
@@ -31,6 +31,7 @@ class KitaBoardView : public KitaBoardViewBase
 
   QString getCategory(QString line);
   Kita::Board getBoard(QString line);
+  bool isBoardUrl(const KURL& url);
 public:
   KitaBoardView(QWidget *parent, const char *name=0);
   ~KitaBoardView();
-- 
2.11.0