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 /kicker/extensions/kasbar/kasprefsdlg.cpp | |
parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kicker/extensions/kasbar/kasprefsdlg.cpp')
-rw-r--r-- | kicker/extensions/kasbar/kasprefsdlg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index 9a5e75ddc..978b6ae44 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -65,9 +65,9 @@ #include <kcolorbutton.h> #include <tdeconfig.h> #include <kdialogbase.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "kastasker.h" |