refactoring.

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

diff --git a/kita/src/favoritelistview.cpp b/kita/src/favoritelistview.cpp
index c2e7c9b..82c4861 100644 (file)
--- a/kita/src/favoritelistview.cpp
+++ b/kita/src/favoritelistview.cpp
@@ -73,7 +73,7 @@ void FavoriteListView::update()
     const Kita::Board* board = thread->getBoard();
 
     int readNum = cache->readNum( thread->datURL() );
-    int resNum = cache->resNum( thread->datURL() );
+    int resNum = cache->resNum( thread->datURL() );  // TODO unused variables.
 
     new KListViewItem( this,
                        board->name(),

diff --git a/kita/src/libkita/thread.cpp b/kita/src/libkita/thread.cpp
index 68d8798..d1deb15 100644 (file)
--- a/kita/src/libkita/thread.cpp
+++ b/kita/src/libkita/thread.cpp
@@ -20,6 +20,7 @@
 
 #include <qwidget.h>
 #include <qapplication.h>
+#include <qregexp.h>
 
 #include "board.h"
 #include "qcp932codec.h"
@@ -382,6 +383,27 @@ void ThreadAccess::killJob()
   if( m_currentJob ) m_currentJob->kill();
 }
 
+int ThreadAccess::serverTime()
+{
+    // parse HTTP headers
+    QStringList headerList = QStringList::split( "\n", getHeader() );
+    QRegExp regexp( "Date: (...), (..) (...) (....) (..:..:..) .*" );
+    QString dateStr = headerList.grep(regexp)[0];
+    if( regexp.search(dateStr) == -1 ) {
+        // invalid date format
+        return QDateTime::currentDateTime().toTime_t();
+    } else {
+        // I hate this format ;p
+        QString usLocalDateStr = regexp.cap(1) + " " + regexp.cap(3) + " " +
+                                 regexp.cap(2) + " " + regexp.cap(5) + " " +
+                                 regexp.cap(4);
+
+        // 1970/01/01 00:00:00 GMT
+        QDateTime zeroTime(QDate(1970, 1, 1), QTime(0, 0));
+        return zeroTime.secsTo(QDateTime::fromString(usLocalDateStr));
+    }
+}
+
 void ThreadFactory::insertThread( Thread& thread )
 {
   if( ! instance ) {

diff --git a/kita/src/libkita/thread.h b/kita/src/libkita/thread.h
index c8e7903..6108c1a 100644 (file)
--- a/kita/src/libkita/thread.h
+++ b/kita/src/libkita/thread.h
@@ -111,6 +111,7 @@ namespace Kita {
     QString get();
     QString getHeader() const { return m_header; }
     void killJob();
+    int serverTime();
   private:
     void enter_loop();
   private slots:

diff --git a/kita/src/part/kitathreadview.cpp b/kita/src/part/kitathreadview.cpp
index c6af2c6..c116ae9 100644 (file)
--- a/kita/src/part/kitathreadview.cpp
+++ b/kita/src/part/kitathreadview.cpp
@@ -145,30 +145,10 @@ void KitaThreadView::showThread( const Kita::Thread& thread )
   m_access = new Kita::ThreadAccess( thread );
   connect( m_access, SIGNAL( redirection( const QString& ) ), SIGNAL( setLocationBarURL( const QString& ) ) );
   QString result = m_access->get();
-  m_serverTime = getServerTimeFromHttpHeaders( m_access->getHeader() );
+  m_serverTime = m_access->serverTime();
   update( result );
 }
 
-int KitaThreadView::getServerTimeFromHttpHeaders( const QString& headers )
-{
-  // parse HTTP headers
-  QStringList headerList = QStringList::split("\n", headers);
-  QRegExp regexp("Date: (...), (..) (...) (....) (..:..:..) .*");
-  QString dateStr = headerList.grep(regexp)[0];
-  if(regexp.search(dateStr) == -1) {
-    // invalid date format
-    return QDateTime::currentDateTime().toTime_t();
-  } else {
-    // I hate this format ;p
-    QString usLocalDateStr = regexp.cap(1) + " " + regexp.cap(3) + " " +
-                             regexp.cap(2) + " " + regexp.cap(5) + " " + regexp.cap(4);
-
-    // 1970/01/01 00:00:00 GMT
-    QDateTime zeroTime(QDate(1970, 1, 1), QTime(0, 0));
-    return zeroTime.secsTo(QDateTime::fromString(usLocalDateStr));
-  }
-}
-
 void KitaThreadView::setSubjectLabel(const QString& boardName, const QString& threadName)
 {
   QString disp;

diff --git a/kita/src/part/kitathreadview.h b/kita/src/part/kitathreadview.h
index d338987..a66dcf5 100644 (file)
--- a/kita/src/part/kitathreadview.h
+++ b/kita/src/part/kitathreadview.h
@@ -75,7 +75,6 @@ private: // Private attributes
 
   void insertSearchCombo();
   KURL filterReadCGI( const KURL& );
-  int getServerTimeFromHttpHeaders( const QString& headers );
   void setSubjectLabel( const QString& boardName, const QString& threadName );
   KitaWriteDialog* openDialog( const Kita::PostInfo& info );
   const QString footer( int ) const;