diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kate/app/kbookmarkhandler.cpp | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kate/app/kbookmarkhandler.cpp')
| -rw-r--r-- | kate/app/kbookmarkhandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp index 35fa87fec..2ff3c7e63 100644 --- a/kate/app/kbookmarkhandler.cpp +++ b/kate/app/kbookmarkhandler.cpp @@ -25,21 +25,21 @@ #include <tqtextstream.h> #include <kbookmarkimporter.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <ksavefile.h> #include <kstandarddirs.h> #include <kdiroperator.h> -#include <kaction.h> +#include <tdeaction.h> #include "kbookmarkhandler.h" #include "kbookmarkhandler.moc" -KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu* kpopupmenu ) +KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu* tdepopupmenu ) : TQObject( parent, "KBookmarkHandler" ), KBookmarkOwner(), mParent( parent ), - m_menu( kpopupmenu ), + m_menu( tdepopupmenu ), m_importStream( 0L ) { if (!m_menu) |