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/fileaccess.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/fileaccess.cpp')
| -rw-r--r-- | src/fileaccess.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp index 44f3037..4fe0952 100644 --- a/src/fileaccess.cpp +++ b/src/fileaccess.cpp @@ -12,7 +12,7 @@ #include <iostream> #include <cstdlib> #include <tdeio/global.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "optiondialog.h" #include <tqlayout.h> #include <tqlabel.h> @@ -22,12 +22,12 @@ #include <tqeventloop.h> #include "common.h" -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqdir.h> #include <tqregexp.h> #include <tqtextstream.h> #include <vector> -#include <klocale.h> +#include <tdelocale.h> #include <sys/types.h> #include <sys/stat.h> |