summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/kpimprefs.cpp6
-rw-r--r--microkde/kdecore/kprefs.cpp1
2 files changed, 3 insertions, 4 deletions
diff --git a/libkdepim/kpimprefs.cpp b/libkdepim/kpimprefs.cpp
index a05e65f..d68ccb6 100644
--- a/libkdepim/kpimprefs.cpp
+++ b/libkdepim/kpimprefs.cpp
@@ -34,47 +34,45 @@ $Id$
34#include <kdebug.h> 34#include <kdebug.h>
35 35
36#include "kpimprefs.h" 36#include "kpimprefs.h"
37 37
38KPimPrefs::KPimPrefs( const QString &name ) : 38KPimPrefs::KPimPrefs( const QString &name ) :
39 KPrefs( name ) 39 KPrefs( name )
40{ 40{
41#ifdef _WIN32_ 41#ifdef _WIN32_
42 QString hdp= locateLocal("data","korganizer")+"\\\\"; 42 QString hdp= locateLocal("data","korganizer")+"\\\\";
43#else 43#else
44 QString hdp= locateLocal("data","korganizer")+"/"; 44 QString hdp= locateLocal("data","korganizer")+"/";
45#endif 45#endif
46 config()->setGroup("SyncOptions"); 46 setCurrentGroup("SyncOptions");
47 addItemString("PassiveSyncPort",&mPassiveSyncPort,"9197" ); 47 addItemString("PassiveSyncPort",&mPassiveSyncPort,"9197" );
48 addItemString("PassiveSyncPw",&mPassiveSyncPw,"abc" ); 48 addItemString("PassiveSyncPw",&mPassiveSyncPw,"abc" );
49 addItemString("LastSyncedLocalFile", &mLastSyncedLocalFile ,hdp +"lastsync.ics" ); 49 addItemString("LastSyncedLocalFile", &mLastSyncedLocalFile ,hdp +"lastsync.ics" );
50 addItemBool("PassiveSyncWithDesktop",&mPassiveSyncWithDesktop,false ); 50 addItemBool("PassiveSyncWithDesktop",&mPassiveSyncWithDesktop,false );
51 addItemBool("PassiveSyncAutoStart",&mPassiveSyncAutoStart,false ); 51 addItemBool("PassiveSyncAutoStart",&mPassiveSyncAutoStart,false );
52 addItemInt("RingSyncAlgoPrefs",&mRingSyncAlgoPrefs,3); 52 addItemInt("RingSyncAlgoPrefs",&mRingSyncAlgoPrefs,3);
53} 53}
54 54
55KPimPrefs::~KPimPrefs() 55KPimPrefs::~KPimPrefs()
56{ 56{
57} 57}
58 58
59void KPimPrefs::usrSetDefaults() 59void KPimPrefs::usrSetDefaults()
60{ 60{
61 setCategoryDefaults(); 61 setCategoryDefaults();
62} 62}
63 63
64void KPimPrefs::usrReadConfig() 64void KPimPrefs::usrReadConfig()
65{ 65{
66 kdDebug(5300) << "KPimPrefs::usrReadConfig()" << endl; 66 config()->setGroup("General");
67
68 config()->setGroup("General");
69 mCustomCategories = config()->readListEntry("Custom Categories"); 67 mCustomCategories = config()->readListEntry("Custom Categories");
70 if (mCustomCategories.isEmpty()) setCategoryDefaults(); 68 if (mCustomCategories.isEmpty()) setCategoryDefaults();
71} 69}
72 70
73 71
74void KPimPrefs::usrWriteConfig() 72void KPimPrefs::usrWriteConfig()
75{ 73{
76 config()->setGroup("General"); 74 config()->setGroup("General");
77 config()->writeEntry("Custom Categories",mCustomCategories); 75 config()->writeEntry("Custom Categories",mCustomCategories);
78} 76}
79 77
80void KPimPrefs::setCategoryDefaults() 78void KPimPrefs::setCategoryDefaults()
diff --git a/microkde/kdecore/kprefs.cpp b/microkde/kdecore/kprefs.cpp
index 71050e7..0220a34 100644
--- a/microkde/kdecore/kprefs.cpp
+++ b/microkde/kdecore/kprefs.cpp
@@ -388,24 +388,25 @@ void KPrefsItemIntList::readConfig(KConfig *config)
388 *mReference = config->readIntListEntry(mName); 388 *mReference = config->readIntListEntry(mName);
389} 389}
390 390
391 391
392QString *KPrefs::mCurrentGroup = 0; 392QString *KPrefs::mCurrentGroup = 0;
393 393
394KPrefs::KPrefs(const QString &configname) 394KPrefs::KPrefs(const QString &configname)
395{ 395{
396 if (!configname.isEmpty()) { 396 if (!configname.isEmpty()) {
397 //qDebug("KPrefs::KPrefs %s",configname.latin1() ); 397 //qDebug("KPrefs::KPrefs %s",configname.latin1() );
398 mConfig = new KConfig(locateLocal("config",configname)); 398 mConfig = new KConfig(locateLocal("config",configname));
399 } else { 399 } else {
400 qDebug("KPrefs::Global config ");
400 mConfig = KGlobal::config(); 401 mConfig = KGlobal::config();
401 } 402 }
402 403
403 mItems.setAutoDelete(true); 404 mItems.setAutoDelete(true);
404 405
405 // Set default group 406 // Set default group
406 if (mCurrentGroup == 0) mCurrentGroup = new QString("No Group"); 407 if (mCurrentGroup == 0) mCurrentGroup = new QString("No Group");
407} 408}
408 409
409KPrefs::~KPrefs() 410KPrefs::~KPrefs()
410{ 411{
411 if (mConfig != KGlobal::config()) { 412 if (mConfig != KGlobal::config()) {