summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:53:11 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:53:11 -0600
commit6153e009214cb682a6625129cc09b24cd99b0883 (patch)
tree96e6c35f52dcc4613c4bb667b14064c91fb2c9bd
parent9970d64621fcd23bc0bb1bb9c696790d5e77a99e (diff)
downloadlibtdeldap-6153e009.tar.gz
libtdeldap-6153e009.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--src/ldaplogindlg.cpp2
-rw-r--r--src/ldappasswddlg.cpp2
-rw-r--r--src/libtdeldap.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/ldaplogindlg.cpp b/src/ldaplogindlg.cpp
index ca5bab9..5a5acd1 100644
--- a/src/ldaplogindlg.cpp
+++ b/src/ldaplogindlg.cpp
@@ -24,7 +24,7 @@
#include <tdeapplication.h>
#include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
diff --git a/src/ldappasswddlg.cpp b/src/ldappasswddlg.cpp
index bf20404..b3c5f5a 100644
--- a/src/ldappasswddlg.cpp
+++ b/src/ldappasswddlg.cpp
@@ -18,7 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <ktextedit.h>
#include <knuminput.h>
diff --git a/src/libtdeldap.cpp b/src/libtdeldap.cpp
index 1c1e2cb..6d61ab2 100644
--- a/src/libtdeldap.cpp
+++ b/src/libtdeldap.cpp
@@ -28,8 +28,8 @@
#include <tqcheckbox.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
#include <kpassdlg.h>
#include <ksimpleconfig.h>