From 36bbdfa18dbe35434e943a86407b6a26081eea8a Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Sun, 16 Feb 2014 12:13:29 -0600
Subject: [PATCH] Fix unintended renaming

---
 krusader/Panel/krpopupmenu.cpp | 12 ++++++------
 krusader/Panel/krpopupmenu.h   |  8 ++++----
 krusader/Panel/listpanel.cpp   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/krusader/Panel/krpopupmenu.cpp b/krusader/Panel/krpopupmenu.cpp
index e3ad8f3..62ffbb9 100644
--- a/krusader/Panel/krpopupmenu.cpp
+++ b/krusader/Panel/krpopupmenu.cpp
@@ -40,7 +40,7 @@ void KrPopupMenu::run(const TQPoint &pos, ListPanel *panel) {
 
 KrPopupMenu::KrPopupMenu(ListPanel *thePanel, TQWidget *parent) : TDEPopupMenu(parent), panel(thePanel), empty(false), 
 	multipleSelections(false),actions(0) {
-#ifdef __LIBKONTQ__
+#ifdef __LIBKONQ__
 	konqMenu = 0;
 #endif
 	
@@ -114,13 +114,13 @@ KrPopupMenu::KrPopupMenu(ListPanel *thePanel, TQWidget *parent) : TDEPopupMenu(p
 		_items.append( new KFileItem( url,  file->vfile_getMime(), file->vfile_getMode() ) );
    }
    
-#ifdef __LIBKONTQ__
+#ifdef __LIBKONQ__
 	// -------------- konqueror menu
    actions = new TDEActionCollection(this);
 	konqMenu = new KonqPopupMenu( KonqBookmarkManager::self(), _items, panel->func->files()->vfs_getOrigin(), *actions, 0, this, 
                            KonqPopupMenu::NoFlags, KParts::BrowserExtension::DefaultPopupItems );
-   insertItem( TQPixmap(), konqMenu, KONTQ_MENU_ID );
-   changeItem( KONTQ_MENU_ID, i18n( "Konqueror Menu" ) );
+   insertItem( TQPixmap(), konqMenu, KONQ_MENU_ID );
+   changeItem( KONQ_MENU_ID, i18n( "Konqueror Menu" ) );
 #endif
    
 	// ------------- 'create new' submenu
@@ -202,7 +202,7 @@ KrPopupMenu::KrPopupMenu(ListPanel *thePanel, TQWidget *parent) : TDEPopupMenu(p
 
 KrPopupMenu::~KrPopupMenu() {
 	if (actions) delete actions;
-#ifdef __LIBKONTQ__
+#ifdef __LIBKONQ__
 	if (konqMenu) delete konqMenu;
 #endif	
 }
@@ -262,7 +262,7 @@ void KrPopupMenu::performAction(int id) {
                  TQString(), KStdGuiItem::cont(), "Shred" ) == KMessageBox::Continue )
                KShred::shred( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ) );
          	break;
-         case OPEN_KONTQ_ID :
+         case OPEN_KONQ_ID :
          	kapp->startServiceByDesktopName( "konqueror", panel->func->files() ->vfs_getFile( item->name() ).url() );
          	break;
          case CHOOSE_ID : // open-with dialog
diff --git a/krusader/Panel/krpopupmenu.h b/krusader/Panel/krpopupmenu.h
index b0385a1..cec8225 100644
--- a/krusader/Panel/krpopupmenu.h
+++ b/krusader/Panel/krpopupmenu.h
@@ -7,7 +7,7 @@
 #include "listpanel.h"
 #include "krpreviewpopup.h"
 #include "../UserAction/useractionpopupmenu.h"
-#ifdef __LIBKONTQ__
+#ifdef __LIBKONQ__
 #include <konq_popupmenu.h>
 #include <konqbookmarkmanager.h>
 #endif
@@ -29,11 +29,11 @@ protected:
 	enum ID {
 		OPEN_ID,
 		OPEN_WITH_ID,
-		OPEN_KONTQ_ID,
+		OPEN_KONQ_ID,
 		OPEN_TERM_ID,
 		OPEN_TAB_ID,
 		PREVIEW_ID,
-		KONTQ_MENU_ID,
+		KONQ_MENU_ID,
 		CHOOSE_ID,
 		DELETE_ID,
 		COPY_ID,
@@ -70,7 +70,7 @@ private:
    KrViewItem *item; // the (first) selected item
    KFileItemList _items;
    TQValueList<KServiceOffer> offers;
-#ifdef __LIBKONTQ__
+#ifdef __LIBKONQ__
    KonqPopupMenu *konqMenu;
 #endif
 };
diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp
index e0ee969..5a065e9 100644
--- a/krusader/Panel/listpanel.cpp
+++ b/krusader/Panel/listpanel.cpp
@@ -95,7 +95,7 @@ YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
 #include "../Dialogs/popularurls.h"
 #include "krpopupmenu.h"
 
-#ifdef __LIBKONTQ__
+#ifdef __LIBKONQ__
 #include <konq_popupmenu.h>
 #include <konqbookmarkmanager.h>
 #endif