diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /tdeprint/kjobviewer | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeprint/kjobviewer')
| -rw-r--r-- | tdeprint/kjobviewer/kjobviewer.cpp | 6 | ||||
| -rw-r--r-- | tdeprint/kjobviewer/main.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp index 73613dfe8..0d456b1ec 100644 --- a/tdeprint/kjobviewer/kjobviewer.cpp +++ b/tdeprint/kjobviewer/kjobviewer.cpp @@ -26,14 +26,14 @@ #include <tqpixmap.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <ksystemtray.h> #include <kdebug.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <twin.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> class JobTray : public KSystemTray { diff --git a/tdeprint/kjobviewer/main.cpp b/tdeprint/kjobviewer/main.cpp index ed1b4f3bb..a7e43fe81 100644 --- a/tdeprint/kjobviewer/main.cpp +++ b/tdeprint/kjobviewer/main.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include "kjobviewer.h" -#include <klocale.h> +#include <tdelocale.h> #include <stdlib.h> static TDECmdLineOptions options[] = { |