diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:59:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:59:53 -0600 |
| commit | 508a49f9ef02a7b03411c8e9953ba79c99b91c0c (patch) | |
| tree | 1df40da8f05d010a3e175c3d48e3529cccf2e067 /kompare/libdialogpages | |
| parent | 19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff) | |
| download | tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kompare/libdialogpages')
| -rw-r--r-- | kompare/libdialogpages/diffpage.cpp | 2 | ||||
| -rw-r--r-- | kompare/libdialogpages/filespage.cpp | 2 | ||||
| -rw-r--r-- | kompare/libdialogpages/viewpage.cpp | 2 | ||||
| -rw-r--r-- | kompare/libdialogpages/viewsettings.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp index b5f4f2df..5111346e 100644 --- a/kompare/libdialogpages/diffpage.cpp +++ b/kompare/libdialogpages/diffpage.cpp @@ -30,7 +30,7 @@ #include <kdialog.h> #include <keditlistbox.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <ktrader.h> #include <kurlcombobox.h> #include <kurlrequester.h> diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp index 041cff46..b855a52f 100644 --- a/kompare/libdialogpages/filespage.cpp +++ b/kompare/libdialogpages/filespage.cpp @@ -24,7 +24,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlcombobox.h> #include <kurlrequester.h> diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp index cf8ef75f..b09f6b3d 100644 --- a/kompare/libdialogpages/viewpage.cpp +++ b/kompare/libdialogpages/viewpage.cpp @@ -28,7 +28,7 @@ #include <kcolorbutton.h> #include <kdialog.h> #include <tdefontcombo.h> -#include <klocale.h> +#include <tdelocale.h> #include "viewpage.h" #include "viewsettings.h" diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp index 902f4091..02d158cb 100644 --- a/kompare/libdialogpages/viewsettings.cpp +++ b/kompare/libdialogpages/viewsettings.cpp @@ -20,7 +20,7 @@ #include <tqfont.h> #include <tdeconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "viewsettings.h" |