From 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:55:37 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 tdmlib/dmctl.cpp          | 2 +-
 tdmlib/kgreet_classic.cpp | 2 +-
 tdmlib/kgreet_pam.cpp     | 2 +-
 tdmlib/kgreet_winbind.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tdmlib')

diff --git a/tdmlib/dmctl.cpp b/tdmlib/dmctl.cpp
index bdcc51cf5..cd970c5e6 100644
--- a/tdmlib/dmctl.cpp
+++ b/tdmlib/dmctl.cpp
@@ -21,7 +21,7 @@
 
 #ifdef Q_WS_X11
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 
 #include <tqregexp.h>
diff --git a/tdmlib/kgreet_classic.cpp b/tdmlib/kgreet_classic.cpp
index c04061a54..3d1cedc19 100644
--- a/tdmlib/kgreet_classic.cpp
+++ b/tdmlib/kgreet_classic.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "themer/tdmthemer.h"
 #include "themer/tdmitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
 #include <kuser.h>
diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp
index de42defa4..b16dfb440 100644
--- a/tdmlib/kgreet_pam.cpp
+++ b/tdmlib/kgreet_pam.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "themer/tdmthemer.h"
 #include "themer/tdmlabel.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
 #include <kuser.h>
diff --git a/tdmlib/kgreet_winbind.cpp b/tdmlib/kgreet_winbind.cpp
index c9cfe243f..aa7e39b18 100644
--- a/tdmlib/kgreet_winbind.cpp
+++ b/tdmlib/kgreet_winbind.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "themer/tdmthemer.h"
 #include "themer/tdmitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <klineedit.h>
-- 
cgit v1.2.3