projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ldap: Remove warnings
[quassel.git]
/
src
/
core
/
ldapauthenticator.h
diff --git
a/src/core/ldapauthenticator.h
b/src/core/ldapauthenticator.h
index
a0c8720
..
ff05c4f
100644
(file)
--- a/
src/core/ldapauthenticator.h
+++ b/
src/core/ldapauthenticator.h
@@
-34,7
+34,14
@@
#include "core.h"
// Link against LDAP.
#include "core.h"
// Link against LDAP.
+/* We should use openldap on windows if at all possible, rather than trying to
+ * write some kind of compatiblity routine.
+#ifdef Q_CC_MSVC
+#include <windows.h>
+#include <winldap.h>
+#else*/
#include <ldap.h>
#include <ldap.h>
+//#endif
// Default LDAP server port.
#define DEFAULT_LDAP_PORT 389
// Default LDAP server port.
#define DEFAULT_LDAP_PORT 389
@@
-50,7
+57,7
@@
public:
public slots:
/* General */
bool isAvailable() const;
public slots:
/* General */
bool isAvailable() const;
- QString
displayName
() const;
+ QString
backendId
() const;
QString description() const;
virtual QStringList setupKeys() const;
virtual QVariantMap setupDefaults() const;
QString description() const;
virtual QStringList setupKeys() const;
virtual QVariantMap setupDefaults() const;