diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kcontrol/tdefontinst/viewpart | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/tdefontinst/viewpart')
| -rw-r--r-- | kcontrol/tdefontinst/viewpart/FontPreview.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/viewpart/FontViewPart.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/viewpart/FontViewerApp.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp index 151dfc888..41367d586 100644 --- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp +++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp @@ -28,7 +28,7 @@ #include "FontPreview.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> #include <tqimage.h> #include <stdlib.h> diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp index d04d1b3dc..2f289649b 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp @@ -31,7 +31,7 @@ #include "Misc.h" #include "KfiConstants.h" #include "KfiPrint.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqpushbutton.h> #include <tqframe.h> @@ -46,7 +46,7 @@ #include <tqtimer.h> #include <tdeio/netaccess.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kstdaction.h> #include <tdeaction.h> diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp index 45aeffe88..df1fa92d2 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp @@ -31,8 +31,8 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <klibloader.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdefiledialog.h> #include <tdeconfig.h> |