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

---
 tdeprint/lpdunix/klpdunixprinterimpl.cpp | 2 +-
 tdeprint/lpdunix/kmlpdunixmanager.cpp    | 2 +-
 tdeprint/lpdunix/kmlpdunixuimanager.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'tdeprint/lpdunix')

diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
index 4237bda59..e628a1c41 100644
--- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp
+++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmacroexpander.h>
 
 KLpdUnixPrinterImpl::KLpdUnixPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp
index 232a49eb0..7a291f6df 100644
--- a/tdeprint/lpdunix/kmlpdunixmanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp
@@ -26,7 +26,7 @@
 #include <tqfileinfo.h>
 #include <tqtextstream.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/tdeprint/lpdunix/kmlpdunixuimanager.cpp b/tdeprint/lpdunix/kmlpdunixuimanager.cpp
index 686dfecbb..b7f059f1a 100644
--- a/tdeprint/lpdunix/kmlpdunixuimanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixuimanager.cpp
@@ -21,7 +21,7 @@
 #include "kpqtpage.h"
 #include "kprinterpropertydialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMLpdUnixUiManager::KMLpdUnixUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMUiManager(parent,name)
-- 
cgit v1.2.1