summaryrefslogtreecommitdiffstats
path: root/kicker/menuext/konsole
diff options
context:
space:
mode:
authorAutomated System <[email protected]>2013-02-15 22:07:52 -0600
committerAutomated System <[email protected]>2013-02-15 22:07:52 -0600
commit0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch)
tree8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /kicker/menuext/konsole
parentb2502b94cf23298f676853d91188b2cacc6ab0bd (diff)
parent77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff)
downloadtdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz
tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kicker/menuext/konsole')
-rw-r--r--kicker/menuext/konsole/konsole_mnu.cpp4
-rw-r--r--kicker/menuext/konsole/konsolebookmarkmenu.cpp2
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,