mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-20 08:51:24 +00:00
adapt code
svn path=/trunk/KDE/kdebase/libkonq/; revision=466736
This commit is contained in:
parent
f9b1155a52
commit
c5e2973576
|
@ -63,6 +63,7 @@
|
|||
#include <unistd.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <QX11Info>
|
||||
#include <kauthorized.h>
|
||||
|
||||
KBookmarkManager * KonqBookmarkManager::s_bookmarkManager;
|
||||
|
||||
|
@ -506,7 +507,7 @@ void KonqOperations::doFileCopy()
|
|||
}
|
||||
|
||||
bool linkOnly = false;
|
||||
if (isDesktopFile && !kapp->authorize("run_desktop_files") &&
|
||||
if (isDesktopFile && !KAuthorized::authorizeKAction("run_desktop_files") &&
|
||||
(m_destURL.path(1) == KGlobalSettings::desktopPath()) )
|
||||
{
|
||||
linkOnly = true;
|
||||
|
@ -514,7 +515,7 @@ void KonqOperations::doFileCopy()
|
|||
|
||||
if ( !mlst.isEmpty() && m_destURL.protocol() == "trash" )
|
||||
{
|
||||
if ( itemIsOnDesktop && !kapp->authorize("editable_desktop_icons") )
|
||||
if ( itemIsOnDesktop && !KAuthorized::authorizeKAction("editable_desktop_icons") )
|
||||
{
|
||||
delete this;
|
||||
return;
|
||||
|
|
|
@ -318,7 +318,7 @@ bool KonqPopupMenu::KIOSKAuthorizedAction(KConfig& cfg)
|
|||
it != list.end();
|
||||
++it)
|
||||
{
|
||||
if (!kapp->authorize((*it).stripWhiteSpace()))
|
||||
if (!KAuthorized::authorize((*it).stripWhiteSpace()))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
@ -461,7 +461,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
|
|||
KAction *actNewWindow = 0;
|
||||
|
||||
if (( kpf & ShowProperties ) && isKDesktop &&
|
||||
!kapp->authorize("editable_desktop_icons"))
|
||||
!KAuthorized::authorizeKAction("editable_desktop_icons"))
|
||||
{
|
||||
kpf &= ~ShowProperties; // remove flag
|
||||
}
|
||||
|
@ -993,7 +993,7 @@ void KonqPopupMenu::slotPopupNewView()
|
|||
{
|
||||
KURL::List::ConstIterator it = m_lstPopupURLs.begin();
|
||||
for ( ; it != m_lstPopupURLs.end(); it++ )
|
||||
(void) new KRun(*it);
|
||||
(void) new KRun(*it,this);
|
||||
}
|
||||
|
||||
void KonqPopupMenu::slotPopupNewDir()
|
||||
|
|
Loading…
Reference in a new issue