diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:53 -0600 |
| commit | 508a49f9ef02a7b03411c8e9953ba79c99b91c0c (patch) | |
| tree | 1df40da8f05d010a3e175c3d48e3529cccf2e067 /kompare/libdiff2 | |
| parent | 19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff) | |
| download | tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kompare/libdiff2')
| -rw-r--r-- | kompare/libdiff2/diffmodel.cpp | 2 | ||||
| -rw-r--r-- | kompare/libdiff2/komparemodellist.cpp | 4 | ||||
| -rw-r--r-- | kompare/libdiff2/kompareprocess.cpp | 2 | ||||
| -rw-r--r-- | kompare/libdiff2/levenshteintable.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp index 1b3822b0..82c3625d 100644 --- a/kompare/libdiff2/diffmodel.cpp +++ b/kompare/libdiff2/diffmodel.cpp @@ -21,7 +21,7 @@ #include <tqvaluelist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "difference.h" #include "diffhunk.h" diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp index 8bb6cf83..2a701b24 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -30,9 +30,9 @@ #include <kdebug.h> #include <kdirwatch.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "difference.h" #include "diffhunk.h" diff --git a/kompare/libdiff2/kompareprocess.cpp b/kompare/libdiff2/kompareprocess.cpp index f66b4e0d..08913d7c 100644 --- a/kompare/libdiff2/kompareprocess.cpp +++ b/kompare/libdiff2/kompareprocess.cpp @@ -25,7 +25,7 @@ #include <kcharsets.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "diffsettings.h" #include "kompareprocess.h" diff --git a/kompare/libdiff2/levenshteintable.cpp b/kompare/libdiff2/levenshteintable.cpp index 7e4ddbbe..2a78e719 100644 --- a/kompare/libdiff2/levenshteintable.cpp +++ b/kompare/libdiff2/levenshteintable.cpp @@ -21,7 +21,7 @@ #include <tqstring.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "levenshteintable.h" |