diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:18 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:18 -0600 |
| commit | 958d14ea303abe33fce2c259c1000f18171e4229 (patch) | |
| tree | 61bc8236ab3aa4bc27ca205740322f8df50baff1 /kpdf/shell | |
| parent | b2de6514213d205907e8de3dd17f8eb80d868a4f (diff) | |
| download | tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kpdf/shell')
| -rw-r--r-- | kpdf/shell/main.cpp | 2 | ||||
| -rw-r--r-- | kpdf/shell/shell.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kpdf/shell/main.cpp b/kpdf/shell/main.cpp index 09ba5613..b159e79e 100644 --- a/kpdf/shell/main.cpp +++ b/kpdf/shell/main.cpp @@ -16,7 +16,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char description[] = I18N_NOOP("kpdf, a kde pdf viewer based on xpdf"); diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp index 6e85080d..209f8760 100644 --- a/kpdf/shell/shell.cpp +++ b/kpdf/shell/shell.cpp @@ -25,12 +25,12 @@ #include <kedittoolbar.h> #include <tdefiledialog.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstdaction.h> #include <kurl.h> #include <kdebug.h> -#include <klocale.h> -#include <kmenubar.h> +#include <tdelocale.h> +#include <tdemenubar.h> #include <tdeparts/componentfactory.h> #include <tdeio/netaccess.h> #include <tdemainwindowiface.h> |