summaryrefslogtreecommitdiffstats
path: root/kfloppy
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:04 -0600
commit783715b853042d24841e3e888051f3a184e78a40 (patch)
tree33ce107e439bb622368ba17b8a2a6485ef28e3b5 /kfloppy
parent980088ed866120f458c10c1ec64295e84ad8ba82 (diff)
downloadtdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz
tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kfloppy')
-rw-r--r--kfloppy/floppy.cpp4
-rw-r--r--kfloppy/format.cpp2
-rw-r--r--kfloppy/zip.cpp2
3 files changed, 4 insertions, 4 deletions
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>