diff options
Diffstat (limited to 'libkonq/konq_popupmenu.cpp')
-rw-r--r-- | libkonq/konq_popupmenu.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/libkonq/konq_popupmenu.cpp b/libkonq/konq_popupmenu.cpp index 4c90b651a..4ed65e189 100644 --- a/libkonq/konq_popupmenu.cpp +++ b/libkonq/konq_popupmenu.cpp @@ -30,7 +30,7 @@ #include <kiconloader.h> #include <kinputdialog.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kxmlguifactory.h> #include <kxmlguibuilder.h> #include <tdeparts/componentfactory.h> @@ -38,7 +38,7 @@ #include <assert.h> #include <tdefileshare.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "kpropertiesdialog.h" #include "knewmenu.h" @@ -287,7 +287,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list, name.setNum( id ); name.prepend( isBuiltin ? "builtinservice_" : "userservice_" ); TDEAction * act = new TDEAction( TQString((*it).m_strName).replace('&',"&&"), 0, - this, TQT_SLOT( slotRunService() ), + this, TQ_SLOT( slotRunService() ), &m_ownActions, name ); if ( !(*it).m_strIcon.isEmpty() ) @@ -314,13 +314,13 @@ bool KonqPopupMenu::KIOSKAuthorizedAction(TDEConfig& cfg) } TQStringList list = cfg.readListEntry("X-TDE-AuthorizeAction"); - if (kapp && !list.isEmpty()) + if (tdeApp && !list.isEmpty()) { for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (!kapp->authorize((*it).stripWhiteSpace())) + if (!tdeApp->authorize((*it).stripWhiteSpace())) { return false; } @@ -430,10 +430,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) d->localURLSlotFired = false; TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(m_sViewURL); if (localURLJob) { - connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool))); - connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed())); + connect(localURLJob, TQ_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQ_SLOT(slotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool))); + connect(localURLJob, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotLocalURLKIODestroyed())); while (!d->localURLSlotFired) { - kapp->eventLoop()->enterLoop(); + tdeApp->eventLoop()->enterLoop(); } if (d->localURLResultIsLocal) { realURL = d->localURLResultURL; @@ -459,7 +459,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) || (m_sMimeType == "media/builtin-printers") || (m_sMimeType == "media/builtin-trash") || (m_sMimeType == "media/builtin-webbrowser")) ) { - KSimpleConfig cfg( firstPopupURL.path(), true ); + TDESimpleConfig cfg( firstPopupURL.path(), true ); cfg.setDesktopGroup(); isTrashLink = ( cfg.readEntry("Type") == "Link" && cfg.readEntry("URL") == "trash:/" ); } @@ -488,10 +488,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if (!isCurrentTrash) addMerge( "konqueror" ); - bool isKDesktop = TQCString( kapp->name() ) == "kdesktop"; + bool isKDesktop = TQCString( tdeApp->name() ) == "kdesktop"; if (( kpf & ShowProperties ) && isKDesktop && - !kapp->authorize("editable_desktop_icons")) + !tdeApp->authorize("editable_desktop_icons")) { kpf &= ~ShowProperties; // remove flag } @@ -501,7 +501,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( ((kpf & ShowNewWindow) != 0) && sReading && !isEncryptedMediaFile) { TQString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" ); - TDEAction *actNewWindow = new TDEAction( openStr, "window-new", 0, this, TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" ); + TDEAction *actNewWindow = new TDEAction( openStr, "window-new", 0, this, TQ_SLOT( slotPopupNewView() ), &m_ownActions, "newview" ); actNewWindow->setToolTip( i18n( "Open item in a new window" ) ); addAction( actNewWindow ); addSeparator(); @@ -523,14 +523,14 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory) { - TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder-new", 0, this, TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" ); + TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder-new", 0, this, TQ_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" ); addAction( actNewDir ); addSeparator(); } } } else if ( isIntoTrash ) { // Trashed item, offer restoring - act = new TDEAction( i18n( "&Restore" ), 0, this, TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" ); + act = new TDEAction( i18n( "&Restore" ), 0, this, TQ_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" ); addAction( act ); } @@ -584,7 +584,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) addDel = true; } else { - TDEConfigGroup configGroup( kapp->config(), "KDE" ); + TDEConfigGroup configGroup( tdeApp->config(), "KDE" ); if ( configGroup.readBoolEntry( "ShowDeleteCommand", false ) ) addDel = true; } @@ -598,8 +598,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) } if ( isCurrentTrash ) { - act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" ); - KSimpleConfig trashConfig( "trashrc", true ); + act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQ_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" ); + TDESimpleConfig trashConfig( "trashrc", true ); trashConfig.setGroup( "Status" ); act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) ); addAction( act ); @@ -631,10 +631,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) else caption = i18n("&Bookmark This File"); - act = new TDEAction( caption, "bookmark_add", 0, this, TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" ); + act = new TDEAction( caption, "bookmark_add", 0, this, TQ_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" ); if (m_lstItems.count() > 1) act->setEnabled(false); - if (kapp->authorizeTDEAction("bookmarks")) + if (tdeApp->authorizeTDEAction("bookmarks")) addAction( act ); if (bIsLink) addGroup( "linkactions" ); @@ -662,7 +662,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) // get builtin services, like mount/unmount s.builtin = KDEDesktopMimeType::builtinServices( urlForServiceMenu ); const TQString path = urlForServiceMenu.path(); - KSimpleConfig cfg( path, true ); + TDESimpleConfig cfg( path, true ); cfg.setDesktopGroup(); const TQString priority = cfg.readEntry("X-TDE-Priority"); const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" ); @@ -684,7 +684,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if (isDirectory && isSingleLocal) { TQString dotDirectoryFile = urlForServiceMenu.path(1).append(".directory"); - KSimpleConfig cfg( dotDirectoryFile, true ); + TDESimpleConfig cfg( dotDirectoryFile, true ); cfg.setDesktopGroup(); if (KIOSKAuthorizedAction(cfg)) @@ -704,7 +704,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) const TQStringList::ConstIterator eEnd = entries.end(); for (; eIt != eEnd; ++eIt ) { - KSimpleConfig cfg( *eIt, true ); + TDESimpleConfig cfg( *eIt, true ); cfg.setDesktopGroup(); if (!KIOSKAuthorizedAction(cfg)) @@ -715,7 +715,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( cfg.hasKey( "X-TDE-ShowIfRunning" ) ) { const TQString app = cfg.readEntry( "X-TDE-ShowIfRunning" ); - if ( !kapp->dcopClient()->isApplicationRegistered( app.utf8() ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( app.utf8() ) ) continue; } if ( cfg.hasKey( "X-TDE-ShowIfDcopCall" ) ) @@ -723,7 +723,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) TQString dcopcall = cfg.readEntry( "X-TDE-ShowIfDcopCall" ); const TQCString app = TQString(dcopcall.section(' ', 0,0)).utf8(); - //if( !kapp->dcopClient()->isApplicationRegistered( app )) + //if( !tdeApp->dcopClient()->isApplicationRegistered( app )) // continue; //app does not exist so cannot send call TQByteArray dataToSend; @@ -739,7 +739,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) continue; //Be safe. } - if(!kapp->dcopClient()->call( app, object, + if(!tdeApp->dcopClient()->call( app, object, function.utf8(), dataToSend, replyType, replyData, true, 1000)) continue; @@ -839,7 +839,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) TDETrader::OfferList offers; - if (kapp->authorizeTDEAction("openwith")) + if (tdeApp->authorizeTDEAction("openwith")) { TQString constraint = "Type == 'Application' and DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'"; TQString subConstraint = " and '%1' in ServiceTypes"; @@ -915,7 +915,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) actionName = i18n( "Open with %1" ).arg( actionName ); act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0, - this, TQT_SLOT( slotRunService() ), + this, TQ_SLOT( slotRunService() ), &m_ownActions, nam.prepend( "appservice_" ) ); addAction( act, menu ); @@ -932,12 +932,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { openWithActionName = i18n( "&Open With..." ); } - TDEAction *openWithAct = new TDEAction( openWithActionName, 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); + TDEAction *openWithAct = new TDEAction( openWithActionName, 0, this, TQ_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); addAction( openWithAct, menu ); } else // no app offers -> Open With... { - act = new TDEAction( i18n( "&Open With..." ), 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); + act = new TDEAction( i18n( "&Open With..." ), 0, this, TQ_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); addAction( act ); } @@ -991,7 +991,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( KPropertiesDialog::canDisplay( m_lstItems ) && (kpf & ShowProperties) ) { - act = new TDEAction( i18n( "&Properties" ), "edit", 0, this, TQT_SLOT( slotPopupProperties() ), + act = new TDEAction( i18n( "&Properties" ), "edit", 0, this, TQ_SLOT( slotPopupProperties() ), &m_ownActions, "properties" ); addAction( act ); } @@ -1005,7 +1005,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( KFileShare::authorization() == KFileShare::Authorized ) { addSeparator(); - act = new TDEAction( i18n("Share"), 0, this, TQT_SLOT( slotOpenShareFileDialog() ), + act = new TDEAction( i18n("Share"), 0, this, TQ_SLOT( slotOpenShareFileDialog() ), &m_ownActions, "sharefile" ); addAction( act ); } @@ -1221,7 +1221,7 @@ void KonqPopupMenu::slotLocalURL(TDEIO::LocalURLJob *job, const KURL& url, bool d->localURLSlotFired = true; d->localURLResultURL = url; d->localURLResultIsLocal = isLocal; - kapp->eventLoop()->exitLoop(); + tdeApp->eventLoop()->exitLoop(); } void KonqPopupMenu::slotLocalURLKIODestroyed() @@ -1230,7 +1230,7 @@ void KonqPopupMenu::slotLocalURLKIODestroyed() d->localURLSlotFired = true; d->localURLResultURL = KURL(); d->localURLResultIsLocal = false; - kapp->eventLoop()->exitLoop(); + tdeApp->eventLoop()->exitLoop(); } } |