1 files changed, 9 insertions, 8 deletions

diff --git a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
index f26efe0..e77c5ab 100644
--- a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
+++ b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
@@ -1,79 +1,80 @@
 /*
     This file is part of KDEPim/Pi.
     Copyright (c) 2004 Ulf Schenk
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 
 #include <qlayout.h>
 
 #include <kdebug.h>
 //#include <klocale.h>
 //#include <stdlib.h>
 
 #include "kdepimconfigwidget.h"
 
 #include "kcmkdepimconfig.h"
 #include "kprefs.h"
 #include "kpimglobalprefs.h"
 
 #ifndef _WIN32_
 extern "C"
 {
-  KCModule *create_kabconfig( KPimGlobalPrefs* prefs, QWidget *parent, const char * ) {
-    return new KCMKdePimConfig( prefs, parent, "kcmkdepimconfig" );
+  KCModule *create_kabconfig(QWidget *parent, const char * ) {
+    return new KCMKdePimConfig(parent, "kcmkdepimconfig" );
   }
 }
 #endif
 
-KCMKdePimConfig::KCMKdePimConfig( KPimGlobalPrefs* prefs, QWidget *parent, const char *name )
-  : KCModule( prefs, parent, name )
+KCMKdePimConfig::KCMKdePimConfig(QWidget *parent, const char *name )
+  : KCModule( KPimGlobalPrefs::instance(), parent, name )
 {
     //abort();
   QVBoxLayout *layout = new QVBoxLayout( this );
-  mConfigWidget = new KDEPIMConfigWidget( this, "mConfigWidget" );
+  mConfigWidget = new KDEPIMConfigWidget( (KPimGlobalPrefs*)getPreferences(), this, "KDEPIMConfigWidget" );
   layout->addWidget( mConfigWidget );
   layout->setSpacing( 0 );
   layout->setMargin( 0 );
 
   connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) );
 }
 
 void KCMKdePimConfig::load()
 {
-  mConfigWidget->restoreSettings((KPimGlobalPrefs*)getPreferences());
+  mConfigWidget->readConfig();
 }
 
 void KCMKdePimConfig::save()
 {
-  mConfigWidget->saveSettings((KPimGlobalPrefs*)getPreferences());
+  mConfigWidget->writeConfig();
 }
 
 void KCMKdePimConfig::defaults()
 {
-  mConfigWidget->defaults((KPimGlobalPrefs*)getPreferences());
+  qDebug("KCMKdePimConfig::defaults()");
+  mConfigWidget->setDefaults();
 }