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/komparepart | |
| parent | 19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff) | |
| download | tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kompare/komparepart')
| -rw-r--r-- | kompare/komparepart/kompare_part.cpp | 6 | ||||
| -rw-r--r-- | kompare/komparepart/komparelistview.cpp | 4 | ||||
| -rw-r--r-- | kompare/komparepart/kompareprefdlg.cpp | 2 | ||||
| -rw-r--r-- | kompare/komparepart/komparesplitter.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index 8443a37a..7cc62ef8 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -29,11 +29,11 @@ #include <kdebug.h> #include <tdefiletreeview.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstdaction.h> #include <kinstance.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeparts/genericfactory.h> //#include <ktempdir.h> diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp index 77158e9f..31b946bd 100644 --- a/kompare/komparepart/komparelistview.cpp +++ b/kompare/komparepart/komparelistview.cpp @@ -25,8 +25,8 @@ #include <tqtimer.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include "diffmodel.h" #include "diffhunk.h" diff --git a/kompare/komparepart/kompareprefdlg.cpp b/kompare/komparepart/kompareprefdlg.cpp index f920d03d..399f7e3f 100644 --- a/kompare/komparepart/kompareprefdlg.cpp +++ b/kompare/komparepart/kompareprefdlg.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "diffpage.h" #include "viewpage.h" diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp index 0f4e1a7b..09e670b2 100644 --- a/kompare/komparepart/komparesplitter.cpp +++ b/kompare/komparepart/komparesplitter.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "diffmodel.h" #include "difference.h" |