From 031412b4cca1b46d6e8f3a99d535b65eda6e0906 Mon Sep 17 00:00:00 2001 From: ikemo Date: Wed, 3 May 2006 09:21:27 +0000 Subject: [PATCH] refactoring. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1829 56b19765-1e22-0410-a548-a0f45d66c51a --- kita/src/libkita/kita_misc.cpp | 35 +++++++++++++++++++++++++++++++++++ kita/src/libkita/kita_misc.h | 1 + kita/src/write/writeview.cpp | 27 +-------------------------- 3 files changed, 37 insertions(+), 26 deletions(-) diff --git a/kita/src/libkita/kita_misc.cpp b/kita/src/libkita/kita_misc.cpp index fa64714..b2353ca 100644 --- a/kita/src/libkita/kita_misc.cpp +++ b/kita/src/libkita/kita_misc.cpp @@ -15,6 +15,7 @@ #include "kita-utf16.h" #include "kitaconfig.h" #include "config_xt.h" +#include "datmanager.h" #include #include @@ -255,6 +256,40 @@ QString Kita::getThreadURL( const KURL& url ) return convertURL( URLMODE_THREAD, url, refstr ); } +QString Kita::getWriteURL( const KURL& m_datURL ) +{ + int m_bbstype = Kita::BoardManager::type( m_datURL ); + QString m_bbscgi; + + /* set path of bbs.cgi */ + switch ( m_bbstype ) { + + case Kita::Board_JBBS: { + QString cgipath = Kita::BoardManager::boardRoot( m_datURL ) + + "/bbs/write.cgi/" + Kita::BoardManager::boardID( m_datURL ) + "/"; + + cgipath += Kita::DatManager::threadID( m_datURL ) + "/"; + + m_bbscgi = cgipath; + } + + break; + + case Kita::Board_MachiBBS: { + QString cgipath = Kita::BoardManager::boardRoot( m_datURL ) + + "/bbs/write.cgi"; + m_bbscgi = cgipath; + } + + break; + + default: + + m_bbscgi = Kita::BoardManager::boardRoot( m_datURL ) + "/test/bbs.cgi"; + } + + return m_bbscgi; +} /* convert thread URL, and get reference. If mode = URLMODE_DAT, output is URL of dat file. diff --git a/kita/src/libkita/kita_misc.h b/kita/src/libkita/kita_misc.h index 46ba3b0..d4c4c3a 100644 --- a/kita/src/libkita/kita_misc.h +++ b/kita/src/libkita/kita_misc.h @@ -54,6 +54,7 @@ namespace Kita QString getThreadURL( const KURL& url, QString& refstr ); QString getThreadURL( const KURL& url ); + QString getWriteURL( const KURL& datURL ); QString convertURL( int mode, const KURL& url , QString& refstr ); diff --git a/kita/src/write/writeview.cpp b/kita/src/write/writeview.cpp index 7962757..647288f 100644 --- a/kita/src/write/writeview.cpp +++ b/kita/src/write/writeview.cpp @@ -84,32 +84,7 @@ KitaWriteView::KitaWriteView( QWidget* parent, const char* name, const KURL& url m_bbstype = Kita::BoardManager::type( m_datURL ); - /* set path of bbs.cgi */ - switch ( m_bbstype ) { - - case Kita::Board_JBBS: { - QString cgipath = Kita::BoardManager::boardRoot( m_datURL ) - + "/bbs/write.cgi/" + Kita::BoardManager::boardID( m_datURL ) + "/"; - - cgipath += Kita::DatManager::threadID( m_datURL ) + "/"; - - m_bbscgi = cgipath; - } - - break; - - case Kita::Board_MachiBBS: { - QString cgipath = Kita::BoardManager::boardRoot( m_datURL ) - + "/bbs/write.cgi"; - m_bbscgi = cgipath; - } - - break; - - default: - - m_bbscgi = Kita::BoardManager::boardRoot( m_datURL ) + "/test/bbs.cgi"; - } + m_bbscgi = Kita::getWriteURL( m_datURL ); initUI( newThreadName ); } -- 2.11.0