* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 2 insertions, 0 deletions

diff --git a/libkdepim/ldapclient.h b/libkdepim/ldapclient.h
index 5167660e2..cf3f55827 100644
--- a/libkdepim/ldapclient.h
+++ b/libkdepim/ldapclient.h
@@ -256,6 +256,7 @@ class KDE_EXPORT LdapSearch : public QObject
     void startSearch( const TQString& txt );
     void cancelSearch();
     bool isAvailable() const;
+    void updateCompletionWeights();
 
     TQValueList< LdapClient* > clients() const { return mClients; }
 
@@ -276,6 +277,7 @@ class KDE_EXPORT LdapSearch : public QObject
     void slotFileChanged( const TQString& );
 
   private:
+    void readWeighForClient( LdapClient *client, KConfig *config, int clientNumber );
     void readConfig();
     void finish();
     void makeSearchData( TQStringList& ret, LdapResultList& resList );