diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:45:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:45:50 -0600 |
| commit | dbf3ee6a200368cbe33ce33f06a1534aa5de241b (patch) | |
| tree | 5a4e7bffa0a86437e9b6e099497468113e63fa96 /src/optiondialog.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/optiondialog.cpp')
| -rw-r--r-- | src/optiondialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index 1bd4372..324edbe 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -37,9 +37,9 @@ #include <kcolorbtn.h> #include <tdefontdialog.h> // For TDEFontChooser #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdemainwindow.h> //For tdetoolbar.h //#include <kkeydialog.h> @@ -52,7 +52,7 @@ #include <iostream> #ifndef KREPLACEMENTS_H -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #endif static TQString s_historyEntryStartRegExpToolTip; |