refactoring.

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

diff --git a/kita/src/libkita/k2ch.cpp b/kita/src/libkita/k2ch.cpp
index 3d2b082..fc8d0a4 100644 (file)
--- a/kita/src/libkita/k2ch.cpp
+++ b/kita/src/libkita/k2ch.cpp
@@ -53,3 +53,36 @@ QString K2ch::buildPostStr( const QString& name, const QString& mail,
 
     return ret;
 }
+
+
+QString K2ch::buildNewThreadPostStr( const QString & name, const QString & mail,
+                                     const QString & body, const QString & boardID,
+                                     const QString & threadName, int serverTime,
+                                     const QString & sessionID )
+{
+    QString ret;
+    QCp932Codec codec;
+
+    int mib = codec.mibEnum();
+
+    ( ret += "submit=" ) += "%90V%8bK%83X%83%8c%83b%83h%8d%ec%90%ac"; /* sinki thread sakusei */
+
+    /* subject */
+    ( ret += "&subject=" ) += KURL::encode_string( threadName, mib );
+
+    /* from, mail, message, bbs */
+    ( ret += "&FROM=" ) += KURL::encode_string( name, mib );
+    ( ret += "&mail=" ) += KURL::encode_string( mail, mib );
+    ( ret += "&MESSAGE=" ) += KURL::encode_string( body, mib );
+    ( ret += "&bbs=" ) += boardID;
+
+    /* time */
+    ( ret += "&time=" ) += QString::number( serverTime );
+
+    /* login */
+    if ( ! sessionID.isEmpty() ) {
+        ( ret += "&sid=" ) += sessionID;
+    }
+
+    return ret;
+}

diff --git a/kita/src/libkita/k2ch.h b/kita/src/libkita/k2ch.h
index 2300b25..6cf58f8 100644 (file)
--- a/kita/src/libkita/k2ch.h
+++ b/kita/src/libkita/k2ch.h
@@ -17,6 +17,7 @@
 class K2ch {
 public:
     static QString buildPostStr( const QString& name, const QString& mail, const QString& body, const QString& boardID, const QString& threadID, int serverTime, const QString& sessionID );
+    static QString buildNewThreadPostStr( const QString& name, const QString& mail, const QString& body, const QString& boardID, const QString& threadName, int serverTime, const QString& sessionID );
 
 private:
     K2ch();

diff --git a/kita/src/write/newthreadwriteview.cpp b/kita/src/write/newthreadwriteview.cpp
index bc36d24..94dfbde 100644 (file)
--- a/kita/src/write/newthreadwriteview.cpp
+++ b/kita/src/write/newthreadwriteview.cpp
@@ -14,6 +14,7 @@
 #include "libkita/account.h"
 #include "libkita/kita-utf8.h"
 #include "libkita/kita_misc.h"
+#include "libkita/k2ch.h"
 
 #include <klineedit.h>
 #include <klocale.h>
@@ -45,33 +46,19 @@ KitaNewThreadWriteView::~KitaNewThreadWriteView()
 /* create posting message for 2ch */ /* private */
 QString KitaNewThreadWriteView::getPostStr()
 {
-    QString ret;
-
-    int mib = m_cp932Codec->mibEnum();
-    int serverTime;
-
-    serverTime = QDateTime::currentDateTime().toTime_t() - 10 * 60;
-    ( ret += "submit=" ) += "%90V%8bK%83X%83%8c%83b%83h%8d%ec%90%ac"; /* sinki thread sakusei */
-
-    /* subject */
-    ( ret += "&subject=" ) += KURL::encode_string( threadName->text(), mib );
-
-    /* from, mail, message, bbs */
-    ( ret += "&FROM=" ) += KURL::encode_string( nameLine->text(), mib );
-    ( ret += "&mail=" ) += KURL::encode_string( mailLine->text(), mib );
-    ( ret += "&MESSAGE=" ) += KURL::encode_string( bodyText->text(), mib );
-    ( ret += "&bbs=" ) += Kita::BoardManager::boardID( m_datURL );
-
-    /* time */
-    ( ret += "&time=" ) += QString::number( serverTime );
+    QString sessionID;
+    QString boardID = Kita::BoardManager::boardID( m_datURL );
+    int serverTime = QDateTime::currentDateTime().toTime_t() - 10 * 60;
 
     /* login */
     if ( Kita::DatManager::is2chThread( m_datURL ) && Kita::Account::isLogged() ) {
-        ret += "&sid=";
-        ret += KURL::encode_string( Kita::Account::getSessionID() );
+        sessionID = KURL::encode_string( Kita::Account::getSessionID() );
     }
 
-    return ret;
+    return K2ch::buildNewThreadPostStr( name(), mail(),
+                                        body(), boardID,
+                                        threadName->text(), serverTime,
+                                        sessionID );
 }
 
 QString KitaNewThreadWriteView::getMachiBBSPostStr()