use KConfig XT (partially)

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

diff --git a/kita/src/libkita/config_xt.kcfg b/kita/src/libkita/config_xt.kcfg
index 9ba432e..dd4539d 100644 (file)
--- a/kita/src/libkita/config_xt.kcfg
+++ b/kita/src/libkita/config_xt.kcfg
@@ -82,6 +82,9 @@
         <label>Whether login automatically or not.</label>
         <default>false</default>
     </entry>
+    <entry name="Password" type="Password">
+        <label>Maru password</label>
+    </entry>
   </group>
   <group name="Write">
     <entry name="DefaultName" type="String">

diff --git a/kita/src/libkita/kitaconfig.cpp b/kita/src/libkita/kitaconfig.cpp
index 7614dc0..6ec60af 100644 (file)
--- a/kita/src/libkita/kitaconfig.cpp
+++ b/kita/src/libkita/kitaconfig.cpp
@@ -34,7 +34,6 @@ KitaConfig::KitaConfig()
         m_aboneWordList( KitaConfig::defaultAboneWordList() ),
         m_sortOrder( static_cast<SortOrder>( KitaConfig::defaultSortOrder() ) ),
         m_partMimeList( KitaConfig::defaultPartMimeList() ),
-        m_password( KitaConfig::defaultPassword() ),
         m_checkResponsed( KitaConfig::defaultCheckResponsed() ),
         m_copyOnClick( KitaConfig::defaultCopyOnClick() )
 {}
@@ -48,9 +47,6 @@ void KitaConfig::writeConfig( KConfig* config )
     config->writeEntry( "SortOrder", KitaConfig::sortOrder() );
     config->writeEntry( "PartMimeList", KitaConfig::partMimeList() );
     config->writeEntry( "CheckResponsed", KitaConfig::checkResponsed() );
-
-    config->setGroup( "Account" );
-    config->writeEntry( "Password", encryptStr( KitaConfig::password() ) );
 }
 
 void KitaConfig::readConfig( KConfig* config )
@@ -74,26 +70,6 @@ void KitaConfig::readConfig( KConfig* config )
     config->setGroup( "Color" );
     Kita::Config::setThreadColor( config->readColorEntry( "Thread", &Qt::black ) );
     Kita::Config::setPopupColor( config->readColorEntry( "Popup", &Qt::black ) );
-
-    config->setGroup( "Account" );
-    KitaConfig::setPassword( decryptStr( config->readEntry( "Password" , KitaConfig::defaultPassword() ) ) );
-}
-
-/*
- * encryptStr and decryptStr are copied from kdepim/kmail/kmaccount.{h,cpp}
- */
-QString KitaConfig::encryptStr( const QString& aStr )
-{
-    QString result;
-    for ( uint i = 0; i < aStr.length(); i++ )
-        result += ( aStr[ i ].unicode() < 0x20 ) ? aStr[ i ] :
-                  QChar( 0x1001F - aStr[ i ].unicode() );
-    return result;
-}
-
-QString KitaConfig::decryptStr( const QString& aStr )
-{
-    return encryptStr( aStr );
 }
 
 QString KitaConfig::defaultStyleSheetText()

diff --git a/kita/src/libkita/kitaconfig.h b/kita/src/libkita/kitaconfig.h
index fd469df..e1e589b 100644 (file)
--- a/kita/src/libkita/kitaconfig.h
+++ b/kita/src/libkita/kitaconfig.h
@@ -39,15 +39,12 @@ private:
     QStringList m_aboneWordList;
     SortOrder m_sortOrder;
     QStringList m_partMimeList;
-    QString m_password;
     bool m_checkResponsed;
     bool m_copyOnClick;
 
     KitaConfig();
     virtual ~KitaConfig();
 
-    static QString encryptStr( const QString& str );
-    static QString decryptStr( const QString& str );
 public:
     static void writeConfig( KConfig* config );
     static void readConfig( KConfig* config );
@@ -94,10 +91,6 @@ public:
     { getInstance() ->m_partMimeList = QStringList::split( ',', value ); }
     static QStringList defaultPartMimeList();
 
-    static QString password() { return getInstance() ->m_password; }
-    static void setPassword( const QString pass ) { getInstance() ->m_password = pass; }
-    static QString defaultPassword() { return ""; }
-
     static bool checkResponsed() { return getInstance() ->m_checkResponsed; }
     static void setCheckResponsed( bool value ) { getInstance() ->m_checkResponsed = value; }
     static bool defaultCheckResponsed() { return true; }

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index 8e7ad2d..46a0ed7 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -1204,7 +1204,7 @@ void KitaMainWindow::slotEditCopy()
 
 void KitaMainWindow::login()
 {
-    if ( Kita::Account::login( Kita::Config::userID(), KitaConfig::password() ) ) {
+    if ( Kita::Account::login( Kita::Config::userID(), Kita::Config::password() ) ) {
         slotSetMainStatusbar( i18n( "Login succeeded." ) );
     } else {
         slotSetMainStatusbar( i18n( "Login failed." ) );

diff --git a/kita/src/prefs/loginprefpage.cpp b/kita/src/prefs/loginprefpage.cpp
index e59aee6..9ae1257 100644 (file)
--- a/kita/src/prefs/loginprefpage.cpp
+++ b/kita/src/prefs/loginprefpage.cpp
@@ -22,7 +22,7 @@ LoginPrefPage::LoginPrefPage( QWidget *parent )
         : LoginPrefBase( parent )
 {
     userIDLine->setText( Kita::Config::userID() );
-    passwordLine->insert( KitaConfig::password() );
+    passwordLine->insert( Kita::Config::password() );
     autoLoginCheckBox->setChecked( Kita::Config::autoLogin() );
     BeMailAddressLine->setText( Kita::Config::beMailAddress() );
     BeAuthCodeLine->insert( Kita::Config::beAuthCode() );
@@ -41,7 +41,7 @@ LoginPrefPage::~LoginPrefPage()
 void LoginPrefPage::apply()
 {
     Kita::Config::setUserID( userIDLine->text() );
-    KitaConfig::setPassword( passwordLine->password() );
+    Kita::Config::setPassword( passwordLine->password() );
     Kita::Config::setAutoLogin( autoLoginCheckBox->isChecked() );
     Kita::Config::setBeMailAddress( BeMailAddressLine->text() );
     Kita::Config::setBeAuthCode( BeAuthCodeLine->text() );