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/modules/presenter | |
| parent | b2de6514213d205907e8de3dd17f8eb80d868a4f (diff) | |
| download | tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kview/modules/presenter')
4 files changed, 9 insertions, 9 deletions
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp index c3682d5f..5cda7ee0 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.cpp +++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp @@ -22,9 +22,9 @@ #include <tqcheckbox.h> #include <tqframe.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kgenericfactory.h> diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui index b3f8cf48..d00950f4 100644 --- a/kview/modules/presenter/imagelistdialog.ui +++ b/kview/modules/presenter/imagelistdialog.ui @@ -260,7 +260,7 @@ <include location="global" impldecl="in implementation">kurl.h</include> <include location="global" impldecl="in implementation">tdefiledialog.h</include> <include location="global" impldecl="in implementation">tqstring.h</include> - <include location="global" impldecl="in implementation">kmessagebox.h</include> + <include location="global" impldecl="in implementation">tdemessagebox.h</include> <include location="local" impldecl="in implementation">imagelistitem.h</include> <include location="local" impldecl="in implementation">imagelistdialog.ui.h</include> </includes> diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp index e2f2ef87..065bccaa 100644 --- a/kview/modules/presenter/kviewpresenter.cpp +++ b/kview/modules/presenter/kviewpresenter.cpp @@ -33,10 +33,10 @@ #include <kpushbutton.h> #include <tdeapplication.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <knuminput.h> #include <tdefiledialog.h> @@ -44,8 +44,8 @@ #include <kimageviewer/viewer.h> #include <kimageviewer/canvas.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <kurldrag.h> typedef KGenericFactory<KViewPresenter> KViewPresenterFactory; diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp index df9622b8..3d6de8b4 100644 --- a/kview/modules/presenter/kviewpresenterconfmodule.cpp +++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp @@ -24,9 +24,9 @@ #include <tqcheckbox.h> #include <tqframe.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> KViewPresenterConfModule::KViewPresenterConfModule( TQObject * parent ) |