summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:55 -0600
commitf0f5e464be031d7ae55dfc37dec330137e840ded (patch)
tree10b8c7d8c3c970ac006bdfda4109d3e23657ef14
parentba44a6b6dedfc96d5ce33c31ad2df4c22e124f76 (diff)
downloadkcmldapmanager-f0f5e464be031d7ae55dfc37dec330137e840ded.tar.gz
kcmldapmanager-f0f5e464be031d7ae55dfc37dec330137e840ded.zip
Rename many classes and header files to avoid conflicts with KDE4
-rw-r--r--src/groupconfigdlg.cpp2
-rw-r--r--src/ldapmgr.cpp2
-rw-r--r--src/ldapmgr.h2
-rw-r--r--src/serviceconfigdlg.cpp2
-rw-r--r--src/userconfigdlg.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/groupconfigdlg.cpp b/src/groupconfigdlg.cpp
index 3621977..977ac32 100644
--- a/src/groupconfigdlg.cpp
+++ b/src/groupconfigdlg.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/ldapmgr.cpp b/src/ldapmgr.cpp
index 18f9f52..716c88b 100644
--- a/src/ldapmgr.cpp
+++ b/src/ldapmgr.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/ldapmgr.h b/src/ldapmgr.h
index ffb44a4..c4244bb 100644
--- a/src/ldapmgr.h
+++ b/src/ldapmgr.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/serviceconfigdlg.cpp b/src/serviceconfigdlg.cpp
index cd5eaae..4e29b61 100644
--- a/src/serviceconfigdlg.cpp
+++ b/src/serviceconfigdlg.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/userconfigdlg.cpp b/src/userconfigdlg.cpp
index a048df4..57af8c4 100644
--- a/src/userconfigdlg.cpp
+++ b/src/userconfigdlg.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>