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 /konsole/konsole/konsole.cpp | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konsole/konsole/konsole.cpp')
| -rw-r--r-- | konsole/konsole/konsole.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 3e3fde7ff..25d9d65be 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -101,8 +101,8 @@ Time to start a requirement list. #include <kkeydialog.h> #include <kstandarddirs.h> #include <tqpainter.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <krootpixmap.h> #include <krun.h> #include <kstdaction.h> @@ -110,7 +110,7 @@ Time to start a requirement list. #include <kdebug.h> #include <kipc.h> #include <dcopclient.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <knotifydialog.h> #undef B0 #include <kprinter.h> @@ -121,7 +121,7 @@ Time to start a requirement list. #include <kshell.h> #include <tqlabel.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <sys/wait.h> #include <sys/stat.h> #include <signal.h> |