summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/bondfinishpage.h2
-rw-r--r--src/bondrealmpage.cpp1
-rw-r--r--src/bondrealmpage.h2
-rw-r--r--src/ldapbonding.cpp (renamed from src/ldap.cpp)2
-rw-r--r--src/ldapbonding.h (renamed from src/ldap.h)6
-rw-r--r--src/realmpropertiesdialog.h2
7 files changed, 10 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index ba0703e..90c6ea3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,10 @@
-INCLUDES = $(all_includes)
+INCLUDES = $(all_includes) $(KDE_INCLUDES)/tde
METASOURCES = AUTO
# Install this plugin in the KDE modules directory
kde_module_LTLIBRARIES = kcm_ldap.la
-kcm_ldap_la_SOURCES = ldap.cpp ldapconfigbase.ui realmpropertiesdialog.cpp bondintropage.cpp bondintropagedlg.ui bondrealmpage.cpp bondrealmpagedlg.ui bondfinishpage.cpp bondfinishpagedlg.ui bondwizard.cpp ldappasswddlg.cpp
+kcm_ldap_la_SOURCES = ldapbonding.cpp ldapconfigbase.ui realmpropertiesdialog.cpp bondintropage.cpp bondintropagedlg.ui bondrealmpage.cpp bondrealmpagedlg.ui bondfinishpage.cpp bondfinishpagedlg.ui bondwizard.cpp ldappasswddlg.cpp
kcm_ldap_la_LIBADD = -lkio $(LIB_TDEUI)
kcm_ldap_la_LDFLAGS = -avoid-version -module -no-undefined \
$(all_libraries)
diff --git a/src/bondfinishpage.h b/src/bondfinishpage.h
index c737904..c5250ef 100644
--- a/src/bondfinishpage.h
+++ b/src/bondfinishpage.h
@@ -21,7 +21,7 @@
#ifndef BONDFINISHPAGE_H
#define BONDFINISHPAGE_H
-#include "ldap.h"
+#include "ldapbonding.h"
#include "bondfinishpagedlg.h"
diff --git a/src/bondrealmpage.cpp b/src/bondrealmpage.cpp
index e244e84..3707f9c 100644
--- a/src/bondrealmpage.cpp
+++ b/src/bondrealmpage.cpp
@@ -21,6 +21,7 @@
#include <tqstringlist.h>
#include <tqlabel.h>
#include <tqmap.h>
+#include <tqpushbutton.h>
#include <kapplication.h>
#include <ksimpleconfig.h>
diff --git a/src/bondrealmpage.h b/src/bondrealmpage.h
index 21b8169..117d537 100644
--- a/src/bondrealmpage.h
+++ b/src/bondrealmpage.h
@@ -21,7 +21,7 @@
#ifndef BONDREALMPAGE_H
#define BONDREALMPAGE_H
-#include "ldap.h"
+#include "ldapbonding.h"
#include "bondrealmpagedlg.h"
diff --git a/src/ldap.cpp b/src/ldapbonding.cpp
index 9895f0f..9c9d9b5 100644
--- a/src/ldap.cpp
+++ b/src/ldapbonding.cpp
@@ -45,7 +45,7 @@
#include <tdesu/process.h>
-#include "ldap.h"
+#include "ldapbonding.h"
#include "bondwizard.h"
#include "ldappasswddlg.h"
#include "realmpropertiesdialog.h"
diff --git a/src/ldap.h b/src/ldapbonding.h
index 124411d..ac7979a 100644
--- a/src/ldap.h
+++ b/src/ldapbonding.h
@@ -18,8 +18,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef _LDAP_H_
-#define _LDAP_H_
+#ifndef _KCMLDAP_H_
+#define _KCMLDAP_H_
#include <kcmodule.h>
#include <kaboutdata.h>
@@ -95,4 +95,4 @@ class LDAPConfig: public KCModule
TQString m_ignoredUsers;
};
-#endif
+#endif // _KCMLDAP_H_
diff --git a/src/realmpropertiesdialog.h b/src/realmpropertiesdialog.h
index c696cf0..00d9d0d 100644
--- a/src/realmpropertiesdialog.h
+++ b/src/realmpropertiesdialog.h
@@ -23,7 +23,7 @@
#include <kdialogbase.h>
-#include "ldap.h"
+#include "ldapbonding.h"
#include "bondrealmpage.h"
class RealmPropertiesDialog : public KDialogBase