From c0695dee383cf8b5a856dc412a54238926599956 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:13:12 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- src/libgui/console.cpp | 2 +- src/libgui/hex_editor.h | 2 +- src/libgui/text_editor.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libgui') diff --git a/src/libgui/console.cpp b/src/libgui/console.cpp index b2e30d7..aab7b88 100644 --- a/src/libgui/console.cpp +++ b/src/libgui/console.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include ConsoleView::ConsoleView(TQWidget *parent) diff --git a/src/libgui/hex_editor.h b/src/libgui/hex_editor.h index 420eeeb..e0684a0 100644 --- a/src/libgui/hex_editor.h +++ b/src/libgui/hex_editor.h @@ -10,7 +10,7 @@ #ifndef HEX_EDITOR_H #define HEX_EDITOR_H -#include +#include #include "device_editor.h" #include "devices/base/hex_buffer.h" diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp index dca5827..077b8d8 100644 --- a/src/libgui/text_editor.cpp +++ b/src/libgui/text_editor.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "main_global.h" #include "gui_debug_manager.h" @@ -101,7 +101,7 @@ void TextEditor::addView() v->setFocus(); v->child(0, "KateViewInternal")->installEventFilter(this); KTextEditor::PopupMenuInterface *pmi = KTextEditor::popupMenuInterface(v); - pmi->installPopup(&Main::popup("ktexteditor_popup")); + pmi->installPopup(&Main::popup("tdetexteditor_popup")); // dispatch available space between views TQValueList list = _split->sizes(); -- cgit v1.2.1