summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:52 -0600
commita5d36de72a70fe5f06faaeccfeb4539f35f51d8b (patch)
treef197db7230f12b66ee6934729d5ab3670279e13b
parentd11b2f6a6cb58a91d0ee154d0db54afff6d494c9 (diff)
downloadkcmldap-a5d36de7.tar.gz
kcmldap-a5d36de7.zip
Rename many classes and header files to avoid conflicts with KDE4
-rw-r--r--src/bondwizard.cpp2
-rw-r--r--src/ldapbonding.cpp2
-rw-r--r--src/ldapbonding.h2
-rw-r--r--src/ldappasswddlg.cpp2
-rw-r--r--src/realmpropertiesdialog.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/bondwizard.cpp b/src/bondwizard.cpp
index c869447..3cf97b1 100644
--- a/src/bondwizard.cpp
+++ b/src/bondwizard.cpp
@@ -35,7 +35,7 @@
#include <kstandarddirs.h>
#include <klocale.h>
#include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <krun.h>
#include <kmessagebox.h>
#include <tdeconfig.h>
diff --git a/src/ldapbonding.cpp b/src/ldapbonding.cpp
index fc94f46..14bed6d 100644
--- a/src/ldapbonding.cpp
+++ b/src/ldapbonding.cpp
@@ -28,7 +28,7 @@
#include <kglobalsettings.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kopenwith.h>
#include <kpropertiesdialog.h>
#include <tdeio/job.h>
diff --git a/src/ldapbonding.h b/src/ldapbonding.h
index ff227ae..787cf07 100644
--- a/src/ldapbonding.h
+++ b/src/ldapbonding.h
@@ -24,7 +24,7 @@
#include <tdecmodule.h>
#include <kaboutdata.h>
#include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tdefileitem.h>
#include <kglobalsettings.h>
#include <tqpushbutton.h>
diff --git a/src/ldappasswddlg.cpp b/src/ldappasswddlg.cpp
index 03d4dcd..f018957 100644
--- a/src/ldappasswddlg.cpp
+++ b/src/ldappasswddlg.cpp
@@ -22,7 +22,7 @@
#include <klineedit.h>
#include <ktextedit.h>
#include <knuminput.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
#include <tqlistbox.h>
#include <kpushbutton.h>
#include <tqpixmap.h>
diff --git a/src/realmpropertiesdialog.cpp b/src/realmpropertiesdialog.cpp
index eaf09e2..c57cc4f 100644
--- a/src/realmpropertiesdialog.cpp
+++ b/src/realmpropertiesdialog.cpp
@@ -22,7 +22,7 @@
#include <klineedit.h>
#include <ktextedit.h>
#include <knuminput.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
#include <tqlistbox.h>
#include <kpushbutton.h>
#include <tqpixmap.h>