From cc8548e49e193fc0fc7d782f9144b59744e68c47 Mon Sep 17 00:00:00 2001
From: ikemo <ikemo@56b19765-1e22-0410-a548-a0f45d66c51a>
Date: Thu, 4 May 2006 01:56:42 +0000
Subject: [PATCH] refactoring.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1847 56b19765-1e22-0410-a548-a0f45d66c51a
---
 kita/src/write/newthreadwriteview.cpp | 27 +++++++--------------------
 kita/src/write/newthreadwriteview.h   |  2 +-
 kita/src/write/writetabwidget.cpp     |  4 ++--
 kita/src/write/writeview.cpp          | 10 ----------
 kita/src/write/writeview.h            | 17 +++++++++++++++--
 5 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/kita/src/write/newthreadwriteview.cpp b/kita/src/write/newthreadwriteview.cpp
index 8b73cc5..6db54d5 100644
--- a/kita/src/write/newthreadwriteview.cpp
+++ b/kita/src/write/newthreadwriteview.cpp
@@ -24,8 +24,6 @@ KitaNewThreadWriteView::KitaNewThreadWriteView(QWidget* parent, const char* name
 {
     if ( !m_cp932Codec ) m_cp932Codec = new QCp932Codec();
 
-    m_mode = mode;
-
     m_datURL = Kita::BoardManager::boardURL( url );
     QString dummyPath = "dat/dummy" + Kita::BoardManager::ext( url );
     m_datURL.addPath( dummyPath );
@@ -213,9 +211,7 @@ void KitaNewThreadWriteView::processPostFinished()
     }
 
     /* re-post new thread message. adhock... */
-    if ( m_mode == WRITEMODE_NEWTHREAD
-                && response.contains( ckstr )
-                && response.contains( "subbbs.cgi" ) ) {
+    if ( response.contains( ckstr ) && response.contains( "subbbs.cgi" ) ) {
         /* re-post message to create the new thread */
         if ( KMessageBox::questionYesNo( 0,
                                          QTextCodec::codecForName( "utf8" ) ->toUnicode( KITAUTF8_WRITENEWTHREAD ),
@@ -232,23 +228,14 @@ void KitaNewThreadWriteView::processPostFinished()
 
     case K2ch_True:
 
-        /* save log */
-        logPostMessage();
-
-        /* clear message */
-        setMessage( QString::null );
-
-        /* reload thread */
-        if ( m_mode == WRITEMODE_NORMAL ) {
-
-            emit openURLRequestExt( m_datURL, KParts::URLArgs(), "kita_open_2chthread", 0 );
-
-            emit closeCurrentTab(); /* to KitaWriteTabWidget */
-        }
+        {
+            /* save log */
+            logPostMessage();
 
-        /* reload board */
-        else {
+            /* clear message */
+            setMessage( QString::null );
 
+            /* reload board */
             QString board = Kita::BoardManager::boardURL( m_datURL );
             emit openURLRequestExt( board, KParts::URLArgs(), "kita_open_2chboard", 0 );
 
diff --git a/kita/src/write/newthreadwriteview.h b/kita/src/write/newthreadwriteview.h
index 15702bc..b99d6ae 100644
--- a/kita/src/write/newthreadwriteview.h
+++ b/kita/src/write/newthreadwriteview.h
@@ -27,7 +27,7 @@ class KitaNewThreadWriteView : public KitaWriteView
     void processPostFinished();
 
 public:
-    KitaNewThreadWriteView(QWidget* parent, const char* name, const KURL& url, int mode, const QString& newThreadName);
+    KitaNewThreadWriteView(QWidget* parent, const char* name, const KURL& url, const QString& newThreadName);
 
     ~KitaNewThreadWriteView();
 
diff --git a/kita/src/write/writetabwidget.cpp b/kita/src/write/writetabwidget.cpp
index 60690ae..e3a4dbd 100644
--- a/kita/src/write/writetabwidget.cpp
+++ b/kita/src/write/writetabwidget.cpp
@@ -96,7 +96,7 @@ void KitaWriteTabWidget::openWriteView( int mode, const KURL& url,
         /* write res */
         KitaWriteView* new_dlg;
         threadName = Kita::DatManager::threadName( url );
-        new_dlg = new KitaWriteView( this, "write dialog", url, WRITEMODE_NORMAL );
+        new_dlg = new KitaWriteView( this, "write dialog", url );
         new_dlg->setMessage( resStr );
         connect( new_dlg, SIGNAL( closeCurrentTab() ), SLOT( slotCloseCurrentTab() ) );
         addTab( new_dlg, threadName );
@@ -106,7 +106,7 @@ void KitaWriteTabWidget::openWriteView( int mode, const KURL& url,
         /* create new thread */
         KitaNewThreadWriteView* new_dlg;
         threadName = i18n( "New Thread" );
-        new_dlg = new KitaNewThreadWriteView( this, "write dialog", url, WRITEMODE_NEWTHREAD, subject );
+        new_dlg = new KitaNewThreadWriteView( this, "write dialog", url, subject );
         new_dlg->setMessage( resStr );
         connect( new_dlg, SIGNAL( closeCurrentTab() ), SLOT( slotCloseCurrentTab() ) );
         addTab( new_dlg, threadName );
diff --git a/kita/src/write/writeview.cpp b/kita/src/write/writeview.cpp
index 3a9b778..8c742e1 100644
--- a/kita/src/write/writeview.cpp
+++ b/kita/src/write/writeview.cpp
@@ -45,16 +45,6 @@
 #include <qcheckbox.h>
 #include <qlayout.h>
 
-/* result code */
-enum{
-    K2ch_Unknown,
-    K2ch_True,
-    K2ch_False,
-    K2ch_Error,
-    K2ch_Check,
-    K2ch_Cookie,
-    K2ch_NewThread
-};
 
 
 /*--------------------------------------------------------------------*/
diff --git a/kita/src/write/writeview.h b/kita/src/write/writeview.h
index 9fa41c3..5ea52fd 100644
--- a/kita/src/write/writeview.h
+++ b/kita/src/write/writeview.h
@@ -26,6 +26,17 @@ enum{
     WRITEMODE_NEWTHREAD
 };
 
+/* result code */
+enum{
+    K2ch_Unknown,
+    K2ch_True,
+    K2ch_False,
+    K2ch_Error,
+    K2ch_Check,
+    K2ch_Cookie,
+    K2ch_NewThread
+};
+
 
 /**
  * 
@@ -35,11 +46,11 @@ class KitaWriteView : public KitaWriteDialogBase
 {
     Q_OBJECT
 
-    QCString m_array;
     bool m_error;
     KitaHTMLPart *m_preview;
 
 protected:
+    QCString m_array;
     KURL m_bbscgi;
     int m_bbstype;
     KURL m_datURL;
@@ -87,11 +98,13 @@ private:
     QString getMachiBBSPostStr();
     QString getJBBSPostStr();
     QString getFlashCGIPostStr();
+    void set2chCookieStr( KIO::TransferJob* job );
+
+protected:
     void logPostMessage();
     int resultCode( const QString& response ) const;
     QString resultMessage( const QString& response ) const;
     QString resultTitle( const QString& response ) const;
-    void set2chCookieStr( KIO::TransferJob* job );
 
 
 signals:
-- 
2.11.0