diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 23:15:40 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 23:15:40 -0600 |
commit | 08396682f3324c6c1266be6a084793b261ada6a4 (patch) | |
tree | 2b20125911d9adc6d1a213563267b97827b3cdff /src/libgui/editor_manager.cpp | |
parent | 6f617c4181afa90f3eba14139d4f92eb98834899 (diff) | |
download | piklab-08396682f3324c6c1266be6a084793b261ada6a4.tar.gz piklab-08396682f3324c6c1266be6a084793b261ada6a4.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/libgui/editor_manager.cpp')
-rw-r--r-- | src/libgui/editor_manager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp index 47bf16b..2656e39 100644 --- a/src/libgui/editor_manager.cpp +++ b/src/libgui/editor_manager.cpp @@ -15,8 +15,8 @@ #include <klocale.h> #include <kiconloader.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include "text_editor.h" #include "hex_editor.h" |