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

---
 kfloppy/floppy.cpp | 4 ++--
 kfloppy/format.cpp | 2 +-
 kfloppy/zip.cpp    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kfloppy')

diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp
index c3ee414..91593a6 100644
--- a/kfloppy/floppy.cpp
+++ b/kfloppy/floppy.cpp
@@ -32,14 +32,14 @@
 
 #include <tdeconfig.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <khelpmenu.h>
 #include <kpushbutton.h>
 #include <tdepopupmenu.h>
 #include <tdeapplication.h>
 #include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <dcopref.h>
diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp
index 1b26329..5c3729c 100644
--- a/kfloppy/format.cpp
+++ b/kfloppy/format.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp
index 2f9dd5d..a35a715 100644
--- a/kfloppy/zip.cpp
+++ b/kfloppy/zip.cpp
@@ -38,7 +38,7 @@
 #include <tqtimer.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
 
-- 
cgit v1.2.1