diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:57:18 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:57:18 -0600 |
| commit | 958d14ea303abe33fce2c259c1000f18171e4229 (patch) | |
| tree | 61bc8236ab3aa4bc27ca205740322f8df50baff1 /kview/kviewviewer | |
| parent | b2de6514213d205907e8de3dd17f8eb80d868a4f (diff) | |
| download | tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kview/kviewviewer')
| -rw-r--r-- | kview/kviewviewer/config/kviewviewerpluginsconfig.cpp | 4 | ||||
| -rw-r--r-- | kview/kviewviewer/imagesettings.cpp | 2 | ||||
| -rw-r--r-- | kview/kviewviewer/kviewkonqextension.cpp | 4 | ||||
| -rw-r--r-- | kview/kviewviewer/kviewviewer.cpp | 4 | ||||
| -rw-r--r-- | kview/kviewviewer/test/main.cpp | 2 | ||||
| -rw-r--r-- | kview/kviewviewer/test/test.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp index 122190f9..af444cdd 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp @@ -20,8 +20,8 @@ #include <kpluginselector.h> #include <kgenericfactory.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <ksimpleconfig.h> #include <kplugininfo.h> diff --git a/kview/kviewviewer/imagesettings.cpp b/kview/kviewviewer/imagesettings.cpp index 0ee58b78..1cb82f58 100644 --- a/kview/kviewviewer/imagesettings.cpp +++ b/kview/kviewviewer/imagesettings.cpp @@ -21,7 +21,7 @@ #include <tqcheckbox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> ImageSettings::ImageSettings( TQWidget * parent, const char * name ) diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp index 0fba3ab0..43f1fa5d 100644 --- a/kview/kviewviewer/kviewkonqextension.cpp +++ b/kview/kviewviewer/kviewkonqextension.cpp @@ -29,8 +29,8 @@ #include <kprinter.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> KViewKonqExtension::KViewKonqExtension( KImageViewer::Canvas * canvas, KViewViewer *parent, const char *name ) diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index 59ef17b7..8bfe4cd2 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -43,8 +43,8 @@ #include <tdeparts/genericfactory.h> #include <tdeparts/componentfactory.h> #include <tdeparts/plugin.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <tdeapplication.h> #include <kimageio.h> #include <tdestdaccel.h> diff --git a/kview/kviewviewer/test/main.cpp b/kview/kviewviewer/test/main.cpp index 2dc70dcf..1fa9d7bf 100644 --- a/kview/kviewviewer/test/main.cpp +++ b/kview/kviewviewer/test/main.cpp @@ -2,7 +2,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char description[] = I18N_NOOP("KView Viewer Part Test"); diff --git a/kview/kviewviewer/test/test.cpp b/kview/kviewviewer/test/test.cpp index f4a286ec..87b0d1c8 100644 --- a/kview/kviewviewer/test/test.cpp +++ b/kview/kviewviewer/test/test.cpp @@ -7,7 +7,7 @@ #include <kurl.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeparts/componentfactory.h> #include <tdeapplication.h> |