use KConfig XT (partially)

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

diff --git a/kita/src/libkita/config_xt.kcfg b/kita/src/libkita/config_xt.kcfg
index dd4539d..0dd214a 100644 (file)
--- a/kita/src/libkita/config_xt.kcfg
+++ b/kita/src/libkita/config_xt.kcfg
@@ -46,7 +46,14 @@
         <default>24</default>
     </entry>
     <entry name="AboneChain" type="Bool">
-        <label>Whethere abone responses recursively(secret config).</label>
+        <label>Whether abone responses recursively(secret config).</label>
+        <default>false</default>
+    </entry>
+    <entry name="CheckResponsed" type="Bool">
+        <label>Whether check responsed responses or not(secret config).</label>
+    </entry>
+    <entry name="CopyOnClick" type="Bool">
+        <label>Whether copy URL on click or not(secret config).</label>
         <default>false</default>
     </entry>
   </group>

diff --git a/kita/src/libkita/datinfo.cpp b/kita/src/libkita/datinfo.cpp
index 3394bf3..0af09f4 100644 (file)
--- a/kita/src/libkita/datinfo.cpp
+++ b/kita/src/libkita/datinfo.cpp
@@ -258,7 +258,7 @@ bool DatInfo::copyOneLineToResDat( const QString& line )
     if ( num == 1 ) parseDat( num );
 
     /* search all responses which are responsed by this line. */
-    if ( KitaConfig::checkResponsed() ) {
+    if ( Kita::Config::checkResponsed() ) {
 
         if ( parseDat( num ) && !checkAbonePrivate( num ) ) { /* parse line here to get AncList */
 

diff --git a/kita/src/libkita/kitaconfig.cpp b/kita/src/libkita/kitaconfig.cpp
index 6ec60af..16f330a 100644 (file)
--- a/kita/src/libkita/kitaconfig.cpp
+++ b/kita/src/libkita/kitaconfig.cpp
@@ -33,9 +33,7 @@ KitaConfig::KitaConfig()
         m_aboneIDList( KitaConfig::defaultAboneIDList() ),
         m_aboneWordList( KitaConfig::defaultAboneWordList() ),
         m_sortOrder( static_cast<SortOrder>( KitaConfig::defaultSortOrder() ) ),
-        m_partMimeList( KitaConfig::defaultPartMimeList() ),
-        m_checkResponsed( KitaConfig::defaultCheckResponsed() ),
-        m_copyOnClick( KitaConfig::defaultCopyOnClick() )
+        m_partMimeList( KitaConfig::defaultPartMimeList() )
 {}
 
 KitaConfig::~KitaConfig()
@@ -46,7 +44,6 @@ void KitaConfig::writeConfig( KConfig* config )
     config->setGroup( "Global" );
     config->writeEntry( "SortOrder", KitaConfig::sortOrder() );
     config->writeEntry( "PartMimeList", KitaConfig::partMimeList() );
-    config->writeEntry( "CheckResponsed", KitaConfig::checkResponsed() );
 }
 
 void KitaConfig::readConfig( KConfig* config )
@@ -54,8 +51,6 @@ void KitaConfig::readConfig( KConfig* config )
     config->setGroup( "Global" );
 
     KitaConfig::setSortOrder( config->readNumEntry( "SortOrder", KitaConfig::defaultSortOrder() ) );
-    KitaConfig::setCheckResponsed( config->readBoolEntry( "CheckResponsed", KitaConfig::defaultCheckResponsed() ) );
-    KitaConfig::setCopyOnClick( config->readBoolEntry( "CopyOnClick", KitaConfig::defaultCopyOnClick() ) );
     {
         // MIME list
         QStringList mimeList = config->readListEntry( "PartMimeList" );

diff --git a/kita/src/libkita/kitaconfig.h b/kita/src/libkita/kitaconfig.h
index e1e589b..bc69be9 100644 (file)
--- a/kita/src/libkita/kitaconfig.h
+++ b/kita/src/libkita/kitaconfig.h
@@ -39,8 +39,6 @@ private:
     QStringList m_aboneWordList;
     SortOrder m_sortOrder;
     QStringList m_partMimeList;
-    bool m_checkResponsed;
-    bool m_copyOnClick;
 
     KitaConfig();
     virtual ~KitaConfig();
@@ -90,15 +88,6 @@ public:
     static void setPartMimeList( const QString& value )
     { getInstance() ->m_partMimeList = QStringList::split( ',', value ); }
     static QStringList defaultPartMimeList();
-
-    static bool checkResponsed() { return getInstance() ->m_checkResponsed; }
-    static void setCheckResponsed( bool value ) { getInstance() ->m_checkResponsed = value; }
-    static bool defaultCheckResponsed() { return true; }
-
-    // read only (hidden setting)
-    static bool copyOnClick() { return getInstance() ->m_copyOnClick; }
-    static void setCopyOnClick( bool value ) { getInstance() ->m_copyOnClick = value; }
-    static bool defaultCopyOnClick() { return false; }
 };
 
 #endif

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index 46a0ed7..e642496 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -828,7 +828,7 @@ void KitaMainWindow::slotOpenURLRequestExt(
 
     /*  open url with web browser, etc. */
     if ( mimetype != QString::null ) {
-        if ( KitaConfig::copyOnClick() ) {
+        if ( Kita::Config::copyOnClick() ) {
             QClipboard * clipboard = QApplication::clipboard();
             clipboard->setText( url.prettyURL(), QClipboard::Clipboard );
             clipboard->setText( url.prettyURL(), QClipboard::Selection );
@@ -884,7 +884,7 @@ void KitaMainWindow::slotOpenURLRequestExt(
         }
     }
 
-    if ( KitaConfig::copyOnClick() ) {
+    if ( Kita::Config::copyOnClick() ) {
         QClipboard * clipboard = QApplication::clipboard();
         clipboard->setText( url.prettyURL(), QClipboard::Clipboard );
         clipboard->setText( url.prettyURL(), QClipboard::Selection );

diff --git a/kita/src/thread/htmlpart.cpp b/kita/src/thread/htmlpart.cpp
index 4a8c5fe..4631dda 100644 (file)
--- a/kita/src/thread/htmlpart.cpp
+++ b/kita/src/thread/htmlpart.cpp
@@ -375,7 +375,7 @@ void KitaHTMLPart::updateScreen( bool showHeaderEtc, bool clock )
     /* change color of number of the res which is responsed. */
     if ( m_mode == HTMLPART_MODE_MAINPART || m_mode == HTMLPART_MODE_NAVI ) {
 
-        if ( KitaConfig::checkResponsed() ) m_domtree->changeColorOfAllResponsedNumber();
+        if ( Kita::Config::checkResponsed() ) m_domtree->changeColorOfAllResponsedNumber();
     }
 
     /*----------------------------*/