Fix unintended renaming

feat/lzip-support
Darrell Anderson 11 years ago
parent 1515a72ef4
commit 36bbdfa18d

@ -40,7 +40,7 @@ void KrPopupMenu::run(const TQPoint &pos, ListPanel *panel) {
KrPopupMenu::KrPopupMenu(ListPanel *thePanel, TQWidget *parent) : TDEPopupMenu(parent), panel(thePanel), empty(false), KrPopupMenu::KrPopupMenu(ListPanel *thePanel, TQWidget *parent) : TDEPopupMenu(parent), panel(thePanel), empty(false),
multipleSelections(false),actions(0) { multipleSelections(false),actions(0) {
#ifdef __LIBKONTQ__ #ifdef __LIBKONQ__
konqMenu = 0; konqMenu = 0;
#endif #endif
@ -114,13 +114,13 @@ KrPopupMenu::KrPopupMenu(ListPanel *thePanel, TQWidget *parent) : TDEPopupMenu(p
_items.append( new KFileItem( url, file->vfile_getMime(), file->vfile_getMode() ) ); _items.append( new KFileItem( url, file->vfile_getMime(), file->vfile_getMode() ) );
} }
#ifdef __LIBKONTQ__ #ifdef __LIBKONQ__
// -------------- konqueror menu // -------------- konqueror menu
actions = new TDEActionCollection(this); actions = new TDEActionCollection(this);
konqMenu = new KonqPopupMenu( KonqBookmarkManager::self(), _items, panel->func->files()->vfs_getOrigin(), *actions, 0, this, konqMenu = new KonqPopupMenu( KonqBookmarkManager::self(), _items, panel->func->files()->vfs_getOrigin(), *actions, 0, this,
KonqPopupMenu::NoFlags, KParts::BrowserExtension::DefaultPopupItems ); KonqPopupMenu::NoFlags, KParts::BrowserExtension::DefaultPopupItems );
insertItem( TQPixmap(), konqMenu, KONTQ_MENU_ID ); insertItem( TQPixmap(), konqMenu, KONQ_MENU_ID );
changeItem( KONTQ_MENU_ID, i18n( "Konqueror Menu" ) ); changeItem( KONQ_MENU_ID, i18n( "Konqueror Menu" ) );
#endif #endif
// ------------- 'create new' submenu // ------------- 'create new' submenu
@ -202,7 +202,7 @@ KrPopupMenu::KrPopupMenu(ListPanel *thePanel, TQWidget *parent) : TDEPopupMenu(p
KrPopupMenu::~KrPopupMenu() { KrPopupMenu::~KrPopupMenu() {
if (actions) delete actions; if (actions) delete actions;
#ifdef __LIBKONTQ__ #ifdef __LIBKONQ__
if (konqMenu) delete konqMenu; if (konqMenu) delete konqMenu;
#endif #endif
} }
@ -262,7 +262,7 @@ void KrPopupMenu::performAction(int id) {
TQString(), KStdGuiItem::cont(), "Shred" ) == KMessageBox::Continue ) TQString(), KStdGuiItem::cont(), "Shred" ) == KMessageBox::Continue )
KShred::shred( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ) ); KShred::shred( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ) );
break; break;
case OPEN_KONTQ_ID : case OPEN_KONQ_ID :
kapp->startServiceByDesktopName( "konqueror", panel->func->files() ->vfs_getFile( item->name() ).url() ); kapp->startServiceByDesktopName( "konqueror", panel->func->files() ->vfs_getFile( item->name() ).url() );
break; break;
case CHOOSE_ID : // open-with dialog case CHOOSE_ID : // open-with dialog

@ -7,7 +7,7 @@
#include "listpanel.h" #include "listpanel.h"
#include "krpreviewpopup.h" #include "krpreviewpopup.h"
#include "../UserAction/useractionpopupmenu.h" #include "../UserAction/useractionpopupmenu.h"
#ifdef __LIBKONTQ__ #ifdef __LIBKONQ__
#include <konq_popupmenu.h> #include <konq_popupmenu.h>
#include <konqbookmarkmanager.h> #include <konqbookmarkmanager.h>
#endif #endif
@ -29,11 +29,11 @@ protected:
enum ID { enum ID {
OPEN_ID, OPEN_ID,
OPEN_WITH_ID, OPEN_WITH_ID,
OPEN_KONTQ_ID, OPEN_KONQ_ID,
OPEN_TERM_ID, OPEN_TERM_ID,
OPEN_TAB_ID, OPEN_TAB_ID,
PREVIEW_ID, PREVIEW_ID,
KONTQ_MENU_ID, KONQ_MENU_ID,
CHOOSE_ID, CHOOSE_ID,
DELETE_ID, DELETE_ID,
COPY_ID, COPY_ID,
@ -70,7 +70,7 @@ private:
KrViewItem *item; // the (first) selected item KrViewItem *item; // the (first) selected item
KFileItemList _items; KFileItemList _items;
TQValueList<KServiceOffer> offers; TQValueList<KServiceOffer> offers;
#ifdef __LIBKONTQ__ #ifdef __LIBKONQ__
KonqPopupMenu *konqMenu; KonqPopupMenu *konqMenu;
#endif #endif
}; };

@ -95,7 +95,7 @@ YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD
#include "../Dialogs/popularurls.h" #include "../Dialogs/popularurls.h"
#include "krpopupmenu.h" #include "krpopupmenu.h"
#ifdef __LIBKONTQ__ #ifdef __LIBKONQ__
#include <konq_popupmenu.h> #include <konq_popupmenu.h>
#include <konqbookmarkmanager.h> #include <konqbookmarkmanager.h>
#endif #endif

Loading…
Cancel
Save