diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:50 -0600 |
| commit | dbf3ee6a200368cbe33ce33f06a1534aa5de241b (patch) | |
| tree | 5a4e7bffa0a86437e9b6e099497468113e63fa96 /src/kdiff3_part.cpp | |
| parent | 5d58fe4201cc465d1bc54f4c9530c653af7809a8 (diff) | |
| download | kdiff3-dbf3ee6a200368cbe33ce33f06a1534aa5de241b.tar.gz kdiff3-dbf3ee6a200368cbe33ce33f06a1534aa5de241b.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/kdiff3_part.cpp')
| -rw-r--r-- | src/kdiff3_part.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp index eb0fe8a..e611425 100644 --- a/src/kdiff3_part.cpp +++ b/src/kdiff3_part.cpp @@ -29,8 +29,8 @@ #include "kdiff3.h" #include "fileaccess.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <iostream> #include "version.h" @@ -252,7 +252,7 @@ bool KDiff3Part::saveFile() // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> TDEInstance* KDiff3PartFactory::s_instance = 0L; TDEAboutData* KDiff3PartFactory::s_about = 0L; |