summaryrefslogtreecommitdiffstats
path: root/kdf
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 /kdf
parent980088ed866120f458c10c1ec64295e84ad8ba82 (diff)
downloadtdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz
tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kdf')
-rw-r--r--kdf/disks.cpp2
-rw-r--r--kdf/disks.h2
-rw-r--r--kdf/distdelist.h2
-rw-r--r--kdf/kdf.h2
-rw-r--r--kdf/kdfconfig.cpp2
-rw-r--r--kdf/kdfwidget.cpp2
-rw-r--r--kdf/kwikdisk.cpp4
-rw-r--r--kdf/mntconfig.cpp2
-rw-r--r--kdf/tdeconftest.cpp2
9 files changed, 10 insertions, 10 deletions
diff --git a/kdf/disks.cpp b/kdf/disks.cpp
index c8a19d4..1084380 100644
--- a/kdf/disks.cpp
+++ b/kdf/disks.cpp
@@ -24,7 +24,7 @@
#include <tqfileinfo.h>
#include <tqdir.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include "disks.h"
diff --git a/kdf/disks.h b/kdf/disks.h
index 83b0d5d..0a0d529 100644
--- a/kdf/disks.h
+++ b/kdf/disks.h
@@ -35,7 +35,7 @@
#include <tdeio/global.h>
#include <kprogress.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
class DiskEntry : public TQObject
{
diff --git a/kdf/distdelist.h b/kdf/distdelist.h
index 81871b2..49e2a1b 100644
--- a/kdf/distdelist.h
+++ b/kdf/distdelist.h
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
//#include <kcontrol.h>
// defines the os-type
diff --git a/kdf/kdf.h b/kdf/kdf.h
index 9543650..c365294 100644
--- a/kdf/kdf.h
+++ b/kdf/kdf.h
@@ -23,7 +23,7 @@
#define __KDF_H__
#include <tdemainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include "kdfwidget.h"
diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp
index 7ea7590..1180d6d 100644
--- a/kdf/kdfconfig.cpp
+++ b/kdf/kdfconfig.cpp
@@ -38,7 +38,7 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include "listview.h"
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index edaa7c1..7c5121d 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -37,7 +37,7 @@
#include <tdeapplication.h>
#include <kcmenumngr.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kprocess.h>
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index 76c07c3..67416c7 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -36,11 +36,11 @@
#include <tqpainter.h>
#include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <krun.h>
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index 6867fdf..e70f915 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -37,7 +37,7 @@
#include <tdeapplication.h>
#include <tdefiledialog.h>
#include <kicondialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "listview.h"
#include "mntconfig.h"
diff --git a/kdf/tdeconftest.cpp b/kdf/tdeconftest.cpp
index d6fe847..ff806f9 100644
--- a/kdf/tdeconftest.cpp
+++ b/kdf/tdeconftest.cpp
@@ -37,7 +37,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
static const char description[] =