From 1e96f57fe8a556a7efbad927a20d47c6ecf14a43 Mon Sep 17 00:00:00 2001 From: ikemo Date: Thu, 16 Feb 2006 14:46:59 +0000 Subject: [PATCH] move to KConfig XT git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1778 56b19765-1e22-0410-a548-a0f45d66c51a --- kita/src/libkita/config_xt.kcfg | 4 ++++ kita/src/libkita/kitaconfig.cpp | 3 --- kita/src/libkita/kitaconfig.h | 5 ----- kita/src/prefs/prefs.cpp | 6 +++--- kita/src/thread/htmlpart.cpp | 6 +++--- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/kita/src/libkita/config_xt.kcfg b/kita/src/libkita/config_xt.kcfg index dbb0e80..af4b69d 100644 --- a/kita/src/libkita/config_xt.kcfg +++ b/kita/src/libkita/config_xt.kcfg @@ -33,5 +33,9 @@ + + + 100 + diff --git a/kita/src/libkita/kitaconfig.cpp b/kita/src/libkita/kitaconfig.cpp index 36797af..728ec05 100644 --- a/kita/src/libkita/kitaconfig.cpp +++ b/kita/src/libkita/kitaconfig.cpp @@ -39,7 +39,6 @@ KitaConfig::KitaConfig() m_aboneChain( KitaConfig::defaultAboneChain() ), m_MarkTime( KitaConfig::defaultMarkTime() ), m_sortOrder( static_cast( KitaConfig::defaultSortOrder() ) ), - m_showNum( KitaConfig::defaultShowNum() ), m_partMimeList( KitaConfig::defaultPartMimeList() ), m_BeMailAddress( KitaConfig::defaultBeMailAddress() ), m_BeAuthCode( KitaConfig::defaultBeAuthCode() ), @@ -62,7 +61,6 @@ void KitaConfig::writeConfig( KConfig* config ) config->setGroup( "Global" ); config->writeEntry( "MarkTime", KitaConfig::MarkTime() ); config->writeEntry( "SortOrder", KitaConfig::sortOrder() ); - config->writeEntry( "ShowNum", KitaConfig::showNum() ); config->writeEntry( "UseStyleSheet", KitaConfig::useStyleSheet() ); config->writeEntry( "PartMimeList", KitaConfig::partMimeList() ); config->writeEntry( "AboneChain", KitaConfig::aboneChain() ); @@ -94,7 +92,6 @@ void KitaConfig::readConfig( KConfig* config ) KitaConfig::setMarkTime( config->readUnsignedNumEntry( "MarkTime", KitaConfig::defaultMarkTime() ) ); KitaConfig::setSortOrder( config->readNumEntry( "SortOrder", KitaConfig::defaultSortOrder() ) ); - KitaConfig::setShowNum( config->readNumEntry( "ShowNum", KitaConfig::defaultShowNum() ) ); KitaConfig::setUseStyleSheet( config->readBoolEntry( "UseStyleSheet", KitaConfig::defaultUseStyleSheet() ) ); KitaConfig::setAboneChain( config->readBoolEntry( "AboneChain", KitaConfig::defaultAboneChain() ) ); KitaConfig::setCheckResponsed( config->readBoolEntry( "CheckResponsed", KitaConfig::defaultCheckResponsed() ) ); diff --git a/kita/src/libkita/kitaconfig.h b/kita/src/libkita/kitaconfig.h index 747125d..92c8e37 100644 --- a/kita/src/libkita/kitaconfig.h +++ b/kita/src/libkita/kitaconfig.h @@ -45,7 +45,6 @@ private: bool m_aboneChain; int m_MarkTime; SortOrder m_sortOrder; - int m_showNum; QStringList m_partMimeList; QString m_userID; QString m_password; @@ -133,10 +132,6 @@ public: static void setSortOrder( int order ) { getInstance() ->m_sortOrder = static_cast( order ); } static int defaultSortOrder() { return Order_Mark; } - static int showNum() { return getInstance() ->m_showNum; } - static void setShowNum( int num ) { getInstance() ->m_showNum = num; } - static int defaultShowNum() { return 100; } - static QStringList& partMimeList() { return getInstance() ->m_partMimeList; } static void setPartMimeList( const QStringList value ) { getInstance() ->m_partMimeList = value; } static void setPartMimeList( const QString& value ) diff --git a/kita/src/prefs/prefs.cpp b/kita/src/prefs/prefs.cpp index cb961b6..6bcd032 100644 --- a/kita/src/prefs/prefs.cpp +++ b/kita/src/prefs/prefs.cpp @@ -242,7 +242,7 @@ UIPrefPage::UIPrefPage( QWidget* parent ) MarkTimespinBox->setValue( KitaConfig::MarkTime() ); showMailCheckBox->setChecked( Kita::Config::showMailAddress() ); orderGroup->setButton( KitaConfig::sortOrder() ); - showNumSpin->setValue( KitaConfig::showNum() ); + showNumSpin->setValue( Kita::Config::showNum() ); useExtPartCheck->setChecked( Kita::Config::usePart() ); partMimeList->setText( KitaConfig::partMimeList().join( "," ) ); @@ -266,7 +266,7 @@ void UIPrefPage::apply() KitaConfig::setMarkTime( MarkTimespinBox->value() ); Kita::Config::setShowMailAddress( showMailCheckBox->isChecked() ); KitaConfig::setSortOrder( orderGroup->id( orderGroup->selected() ) ); - KitaConfig::setShowNum( showNumSpin->value() ); + Kita::Config::setShowNum( showNumSpin->value() ); Kita::Config::setUsePart( useExtPartCheck->isChecked() ); KitaConfig::setPartMimeList( partMimeList->text() ); } @@ -277,7 +277,7 @@ void UIPrefPage::reset() MarkTimespinBox->setValue( KitaConfig::defaultMarkTime() ); showMailCheckBox->setChecked( false ); // FIXME: don't write default value here. orderGroup->setButton( KitaConfig::defaultSortOrder() ); - showNumSpin->setValue( KitaConfig::defaultShowNum() ); + showNumSpin->setValue( 100 ); // FIXME: don't write default value here. useExtPartCheck->setChecked( true ); // FIXME: don't write default value here. partMimeList->setText( KitaConfig::defaultPartMimeList().join( "," ) ); } diff --git a/kita/src/thread/htmlpart.cpp b/kita/src/thread/htmlpart.cpp index d9bf253..3ee52dd 100644 --- a/kita/src/thread/htmlpart.cpp +++ b/kita/src/thread/htmlpart.cpp @@ -479,7 +479,7 @@ bool KitaHTMLPart::load( int centerNum ) /* config */ - int showNum = KitaConfig::showNum(); + int showNum = Kita::Config::showNum(); if ( showNum == 0 ) showNum = 10000; /*--------------------------------*/ @@ -546,7 +546,7 @@ void KitaHTMLPart::slotReceiveData() const int delta = 20; const int oneAfterAnother = TRUE; - int showNum = KitaConfig::showNum(); + int showNum = Kita::Config::showNum(); if ( showNum == 0 ) showNum = 5000; /* TODO: fix it. */ /*--------------------------------*/ @@ -587,7 +587,7 @@ void KitaHTMLPart::slotReceiveData() void KitaHTMLPart::slotFinishLoad() { /* config */ - int showNum = KitaConfig::showNum(); + int showNum = Kita::Config::showNum(); if ( showNum == 0 ) showNum = 5000; /* TODO: fix it. */ /*--------------------------------*/ -- 2.11.0