[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/libkonq
From:       David Faure <faure () kde ! org>
Date:       2007-02-20 11:42:49
Message-ID: 1171971769.419687.24224.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 635594 by dfaure:

setGroup--


 M  +3 -2      knewmenu.cpp  
 M  +7 -6      konq_operations.cc  
 M  +3 -3      konq_popupmenu.cc  
 M  +1 -1      konq_popupmenu.h  


--- trunk/KDE/kdebase/libkonq/knewmenu.cpp #635593:635594
@@ -556,8 +556,9 @@
                 // But in case of a renaming (due to a conflict), the real path is \
                in m_destPath
                 kDebug(1203) << " destUrl=" << destUrl.path() << " " << " \
d->m_destPath=" << d->m_destPath << endl;  KDesktopFile df( d->m_destPath );
-                df.writeEntry( "Icon", KProtocolInfo::icon( d->m_linkURL.protocol() \
                ) );
-                df.writePathEntry( "URL", d->m_linkURL.prettyUrl() );
+                KConfigGroup group = df.desktopGroup();
+                group.writeEntry( "Icon", KProtocolInfo::icon( \
d->m_linkURL.protocol() ) ); +                group.writePathEntry( "URL", \
d->m_linkURL.prettyUrl() );  df.sync();
             }
             else
--- trunk/KDE/kdebase/libkonq/konq_operations.cc #635593:635594
@@ -397,6 +397,7 @@
     {
         // Local .desktop file. What type ?
         KDesktopFile desktopFile( m_destUrl.path() );
+        KConfigGroup desktopGroup = desktopFile.desktopGroup();
         if ( desktopFile.hasApplicationType() )
         {
             QString error;
@@ -407,8 +408,8 @@
         else
         {
             // Device or Link -> adjust dest
-            if ( desktopFile.hasDeviceType() && desktopFile.hasKey("MountPoint") ) {
-                QString point = desktopFile.readEntry( "MountPoint" );
+            if ( desktopFile.hasDeviceType() && desktopGroup.hasKey("MountPoint") ) \
{ +                QString point = desktopGroup.readEntry( "MountPoint" );
                 m_destUrl.setPath( point );
                 QString dev = desktopFile.readDevice();
                 QString mp = KIO::findDeviceMountPoint( dev );
@@ -419,16 +420,16 @@
 #ifndef Q_WS_WIN
                 else
                 {
-                    const bool ro = desktopFile.readEntry( "ReadOnly", false );
-                    const QByteArray fstype = desktopFile.readEntry( "FSType" \
).toLatin1(); +                    const bool ro = desktopGroup.readEntry( \
"ReadOnly", false ); +                    const QByteArray fstype = \
                desktopGroup.readEntry( "FSType" ).toLatin1();
                     KAutoMount* am = new KAutoMount( ro, fstype, dev, point, \
                m_destUrl.path(), false );
                     connect( am, SIGNAL( finished() ), this, SLOT( doDropFileCopy() \
) );  }
 #endif
                 return;
             }
-            else if ( desktopFile.hasLinkType() && desktopFile.hasKey("URL") ) {
-                m_destUrl = desktopFile.readPathEntry("URL");
+            else if ( desktopFile.hasLinkType() && desktopGroup.hasKey("URL") ) {
+                m_destUrl = desktopGroup.readPathEntry("URL");
                 doDropFileCopy();
                 return;
             }
--- trunk/KDE/kdebase/libkonq/konq_popupmenu.cc #635593:635594
@@ -284,7 +284,7 @@
     return count;
 }
 
-bool KonqPopupMenu::KIOSKAuthorizedAction(KConfig& cfg)
+bool KonqPopupMenu::KIOSKAuthorizedAction(const KConfigGroup& cfg)
 {
     if ( !cfg.hasKey( "X-KDE-AuthorizeAction") )
     {
@@ -648,7 +648,7 @@
             KDesktopFile desktopFile(  dotDirectoryFile );
             const KConfigGroup cfg = desktopFile.desktopGroup();
 
-            if (KIOSKAuthorizedAction(desktopFile))
+            if (KIOSKAuthorizedAction(cfg))
             {
                 const QString priority = cfg.readEntry("X-KDE-Priority");
                 const QString submenuName = cfg.readEntry( "X-KDE-Submenu" );
@@ -668,7 +668,7 @@
             KDesktopFile desktopFile( *eIt );
             const KConfigGroup cfg = desktopFile.desktopGroup();
 
-            if (!KIOSKAuthorizedAction(desktopFile))
+            if (!KIOSKAuthorizedAction(cfg))
             {
                 continue;
             }
--- trunk/KDE/kdebase/libkonq/konq_popupmenu.h #635593:635594
@@ -154,7 +154,7 @@
   void addPlugins( );
   int  insertServicesSubmenus(const QMap<QString, ServiceList>& list, QDomElement& \
menu, bool isBuiltin);  int  insertServices(const ServiceList& list, QDomElement& \
                menu, bool isBuiltin);
-  bool KIOSKAuthorizedAction(KConfig& cfg);
+  bool KIOSKAuthorizedAction(const KConfigGroup& cfg);
 
   class KonqPopupMenuPrivate;
   KonqPopupMenuPrivate *d;


[prev in list] [next in list] [prev in thread] [next in thread]