[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim
From:       Andre Heinecke <aheinecke () intevation ! de>
Date:       2010-11-29 14:30:36
Message-ID: 20101129143036.4B12DAC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1202065 by aheinecke:

Fix the ldap config kcm to run on wince and enable it again


 M  +5 -1      libkdepim/ldap/kcmldap.cpp  
 M  +2 -6      mobile/contacts/configwidget.cpp  


--- trunk/KDE/kdepim/libkdepim/ldap/kcmldap.cpp #1202064:1202065
@@ -49,8 +49,8 @@
 
 #include "addhostdialog_p.h"
 
+#ifndef Q_OS_WINCE
 K_PLUGIN_FACTORY( KCMLdapFactory, registerPlugin<KCMLdap>(); )
-#ifndef _WIN32_WCE
 K_EXPORT_PLUGIN( KCMLdapFactory( "kcmldap" ) )
 #endif
 
@@ -84,7 +84,11 @@
 };
 
 KCMLdap::KCMLdap( QWidget *parent, const QVariantList& )
+#ifdef Q_OS_WINCE
+  : KCModule( KGlobal::activeComponent(), parent )
+#else
   : KCModule( KCMLdapFactory::componentData(), parent )
+#endif // Q_OS_WINCE
 {
   KAboutData *about = new KAboutData( I18N_NOOP( "kcmldap" ), 0,
                                       ki18n( "LDAP Server Settings" ),
--- trunk/KDE/kdepim/mobile/contacts/configwidget.cpp #1202064:1202065
@@ -41,14 +41,10 @@
 #ifndef _WIN32_WCE
   mLdapConfigWidget = new KCModuleProxy( QLatin1String( "kcmldap" ) );
 #else
-#if 0
   mLdapConfigWidget = new KCMLdap(this,QVariantList());
 #endif
-#endif
 
-#ifndef _WIN32_WCE
   ui.ldapServerSettingsLayout->addWidget( mLdapConfigWidget, 1, 1 );
-#endif
 
   mMapServiceBox = ui.kcfg_MapService;
 
@@ -67,7 +63,7 @@
   Settings::self()->setMapService( mMapServiceBox->findData( addressUrl ) );
   mManager->updateWidgets();
 
-#if 0 //ndef _WIN32_WCE
+#ifndef _WIN32_WCE
   mLdapConfigWidget->load();
 #endif
 }
@@ -83,7 +79,7 @@
   group.writeEntry( "AddressUrl", addressUrl );
   config.sync();
 
-#if 0 //ndef _WIN32_WCE
+#ifndef _WIN32_WCE
   mLdapConfigWidget->save();
 #endif
 }
[prev in list] [next in list] [prev in thread] [next in thread]