diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:04 -0600 |
| commit | 783715b853042d24841e3e888051f3a184e78a40 (patch) | |
| tree | 33ce107e439bb622368ba17b8a2a6485ef28e3b5 /khexedit/parts | |
| parent | 980088ed866120f458c10c1ec64295e84ad8ba82 (diff) | |
| download | tdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'khexedit/parts')
| -rw-r--r-- | khexedit/parts/kbytesedit/kbyteseditwidget.cpp | 2 | ||||
| -rw-r--r-- | khexedit/parts/kpart/khepart.cpp | 4 | ||||
| -rw-r--r-- | khexedit/parts/kpart/khepartfactory.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp index 342e1cc..7c1d6c4 100644 --- a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp +++ b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp @@ -18,7 +18,7 @@ // qt specific #include <tqlayout.h> // kde specific -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <tdeapplication.h> // lib specific diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp index f7afb56..e23e26a 100644 --- a/khexedit/parts/kpart/khepart.cpp +++ b/khexedit/parts/kpart/khepart.cpp @@ -16,11 +16,11 @@ // kde specific -#include <klocale.h> +#include <tdelocale.h> //#include <kinstance.h> #include <tdeaction.h> #include <kstdaction.h> -//#include <kglobalsettings.h> +//#include <tdeglobalsettings.h> // app specific #include "khexedit.h" #include "kcharcodec.h" diff --git a/khexedit/parts/kpart/khepartfactory.cpp b/khexedit/parts/kpart/khepartfactory.cpp index b7116e6..7a9cce4 100644 --- a/khexedit/parts/kpart/khepartfactory.cpp +++ b/khexedit/parts/kpart/khepartfactory.cpp @@ -18,7 +18,7 @@ // kde specific #include <kinstance.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> // app specific #include "khepart.h" #include "khepartfactory.h" |