refactoring.

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

diff --git a/kita/src/write/newthreadwriteview.cpp b/kita/src/write/newthreadwriteview.cpp
index 4a178dc..1e87b0e 100644 (file)
--- a/kita/src/write/newthreadwriteview.cpp
+++ b/kita/src/write/newthreadwriteview.cpp
@@ -50,7 +50,6 @@ KitaNewThreadWriteView::~KitaNewThreadWriteView()
 QString KitaNewThreadWriteView::getPostStr()
 {
     QString sessionID;
-    QString boardID = Kita::BoardManager::boardID( m_datURL );
     int serverTime = QDateTime::currentDateTime().toTime_t() - 10 * 60;
 
     /* login */
@@ -59,18 +58,17 @@ QString KitaNewThreadWriteView::getPostStr()
     }
 
     return K2ch::buildNewThreadPostStr( name(), mail(),
-                                        body(), boardID,
+                                        body(), boardID(),
                                         threadName(), serverTime,
                                         sessionID );
 }
 
 QString KitaNewThreadWriteView::getMachiBBSPostStr()
 {
-    QString boardID = Kita::BoardManager::boardID( m_datURL );
     int serverTime = QDateTime::currentDateTime().toTime_t() - 10 * 60;
 
     return MachiBBS::buildNewThreadPostStr( name(), mail(),
-                                            body(), boardID,
+                                            body(), boardID(),
                                             threadName(), serverTime );
 }
 
@@ -78,21 +76,18 @@ QString KitaNewThreadWriteView::getMachiBBSPostStr()
 /* create posting message for JBBS */ /* private */ /* private */
 QString KitaNewThreadWriteView::getJBBSPostStr()
 {
-    QString boardID = Kita::BoardManager::boardID( m_datURL );
     int serverTime = QDateTime::currentDateTime().toTime_t() - 10 * 60;
 
     return JBBS::buildNewThreadPostStr( name(), mail(),
-                                        body(), boardID,
+                                        body(), boardID(),
                                         threadName(), serverTime );
 }
 
 /* create posting message for Flash CGI */ /* private */ /* private */
 QString KitaNewThreadWriteView::getFlashCGIPostStr()
 {
-    QString boardID = Kita::BoardManager::boardID( m_datURL );
-
     return FlashCGI::buildNewThreadPostStr( name(), mail(),
-                                            body(), boardID,
+                                            body(), boardID(),
                                             threadName() );
 }
 

diff --git a/kita/src/write/writeview.cpp b/kita/src/write/writeview.cpp
index 4d5a748..af02865 100644 (file)
--- a/kita/src/write/writeview.cpp
+++ b/kita/src/write/writeview.cpp
@@ -223,6 +223,11 @@ const QString KitaWriteView::threadName() const
     return threadNameLine->text();
 }
 
+const QString KitaWriteView::boardID() const
+{
+    return Kita::BoardManager::boardID( m_datURL );
+}
+
 /* public slot */ /* virtual */
 void KitaWriteView::setFocus()
 {
@@ -460,7 +465,6 @@ bool KitaWriteView::slotBodyTextChanged()
 QString KitaWriteView::getPostStr()
 {
     QString sessionID;
-    QString boardID = Kita::BoardManager::boardID( m_datURL );
     QString threadID = Kita::DatManager::threadID( m_datURL );
     int serverTime = Kita::DatManager::getServerTime( m_datURL );
 
@@ -470,19 +474,18 @@ QString KitaWriteView::getPostStr()
     }
 
     return K2ch::buildPostStr( name(), mail(),
-                               body(), boardID,
+                               body(), boardID(),
                                threadID, serverTime,
                                sessionID );
 }
 
 QString KitaWriteView::getMachiBBSPostStr()
 {
-    QString boardID = Kita::BoardManager::boardID( m_datURL );
     QString threadID = Kita::DatManager::threadID( m_datURL );
     int serverTime = Kita::DatManager::getServerTime( m_datURL );
 
     return MachiBBS::buildPostStr( name(), mail(),
-                                   body(), boardID,
+                                   body(), boardID(),
                                    threadID, serverTime );
 }
 
@@ -490,12 +493,11 @@ QString KitaWriteView::getMachiBBSPostStr()
 /* create posting message for JBBS */ /* private */ /* private */
 QString KitaWriteView::getJBBSPostStr()
 {
-    QString boardID = Kita::BoardManager::boardID( m_datURL );
     QString threadID = Kita::DatManager::threadID( m_datURL );
     int serverTime = Kita::DatManager::getServerTime( m_datURL );
 
     return JBBS::buildPostStr( name(), mail(),
-                               body(), boardID,
+                               body(), boardID(),
                                threadID, serverTime );
 }
 
@@ -503,13 +505,12 @@ QString KitaWriteView::getJBBSPostStr()
 /* create posting message for Flash CGI */ /* private */ /* private */
 QString KitaWriteView::getFlashCGIPostStr()
 {
-    QString boardID = Kita::BoardManager::boardID( m_datURL );
     QString threadID = Kita::DatManager::threadID( m_datURL );
 
     QString ret;
 
     return FlashCGI::buildPostStr( name(), mail(),
-                                   body(), boardID,
+                                   body(), boardID(),
                                    threadID );
 }
 

diff --git a/kita/src/write/writeview.h b/kita/src/write/writeview.h
index 2166d3f..e14fcff 100644 (file)
--- a/kita/src/write/writeview.h
+++ b/kita/src/write/writeview.h
@@ -75,6 +75,7 @@ public:
     const QString body() const;
     const KURL datURL() const;
     const QString threadName() const;
+    const QString boardID() const;
 
 public slots: