diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kicker/menuext/konsole | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kicker/menuext/konsole')
| -rw-r--r-- | kicker/menuext/konsole/konsole_mnu.cpp | 4 | ||||
| -rw-r--r-- | kicker/menuext/konsole/konsolebookmarkmenu.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index a99ca24e0..c9439c8db 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -31,10 +31,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqfileinfo.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <krun.h> #include <kshell.h> #include <ksimpleconfig.h> diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index 420a17c3b..0860cc123 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -17,7 +17,7 @@ #include <tqfile.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, |