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/lib | |
| parent | 980088ed866120f458c10c1ec64295e84ad8ba82 (diff) | |
| download | tdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'khexedit/lib')
| -rw-r--r-- | khexedit/lib/codecs/ktextcharcodec.cpp | 4 | ||||
| -rw-r--r-- | khexedit/lib/kbufferdrag.cpp | 4 | ||||
| -rw-r--r-- | khexedit/lib/kcharcolumn.cpp | 4 | ||||
| -rw-r--r-- | khexedit/lib/khexedit.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp index 6b27670..22c065d 100644 --- a/khexedit/lib/codecs/ktextcharcodec.cpp +++ b/khexedit/lib/codecs/ktextcharcodec.cpp @@ -18,8 +18,8 @@ // qt specific #include "tqtextcodec.h" // kde specific -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcharsets.h> // lib specific #include "ktextcharcodec.h" diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp index 83d2afc..1d7cec9 100644 --- a/khexedit/lib/kbufferdrag.cpp +++ b/khexedit/lib/kbufferdrag.cpp @@ -19,8 +19,8 @@ #include <tqcstring.h> #include <tqtextcodec.h> // kde specific -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> // lib specific #include "kbordercoltextexport.h" #include "koffsetcoltextexport.h" diff --git a/khexedit/lib/kcharcolumn.cpp b/khexedit/lib/kcharcolumn.cpp index a075d05..8fbffbb 100644 --- a/khexedit/lib/kcharcolumn.cpp +++ b/khexedit/lib/kcharcolumn.cpp @@ -21,8 +21,8 @@ #include <tqpainter.h> // kde specific #include <kcharsets.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> // lib specific #include "kcolumnsview.h" #include "kbuffercursor.h" diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp index edba5d7..4873fa3 100644 --- a/khexedit/lib/khexedit.cpp +++ b/khexedit/lib/khexedit.cpp @@ -30,7 +30,7 @@ #include <tqapplication.h> // kde specific #ifndef TQT_ONLY -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #endif // lib specific #include "kdatabuffer.h" |