SVN commit 467328 by aseigo:

more porting


 M  +1 -1      core/containerarea.cpp  
 M  +2 -2      ui/browser_dlg.cpp  
 M  +6 -5      ui/browser_mnu.cpp  


--- trunk/KDE/kdebase/kicker/kicker/core/containerarea.cpp #467327:467328
@@ -1250,7 +1250,7 @@
                 if (menu->exec(mapToGlobal(ev->pos())) == fileManager)
                 {
                     a = new BrowserButtonContainer(url.path(), m_opMenu,
-                                                   KMimeType::iconForURL(url),
+                                                   KMimeType::iconNameForURL(url),
                                                    m_contents);
                 }
                 else
--- trunk/KDE/kdebase/kicker/kicker/ui/browser_dlg.cpp #467327:467328
@@ -64,7 +64,7 @@
     if ( icon.isEmpty() ) {
         KURL u;
         u.setPath( path );
-        iconBtn->setIcon( KMimeType::iconForURL( u ) );
+        iconBtn->setIcon( KMimeType::iconNameForURL( u ) );
     }
     else
         iconBtn->setIcon( icon );
@@ -89,7 +89,7 @@
         pathInput->setText( dir );
         KURL u;
         u.setPath( dir );
-        iconBtn->setIcon( KMimeType::iconForURL( u ) );
+        iconBtn->setIcon( KMimeType::iconNameForURL( u ) );
     }
 }
 
--- trunk/KDE/kdebase/kicker/kicker/ui/browser_mnu.cpp #467327:467328
@@ -143,7 +143,7 @@
 
     KURL url;
     url.setPath(path());
-    if (!KAuthorized::authorizeKActionURLAction("list", KURL(), url))
+    if (!KAuthorized::authorizeURLAction("list", KURL(), url))
     {
         insertItem(i18n("Not Authorized to Read Folder"));
         return;
@@ -152,7 +152,8 @@
     // insert file manager and terminal entries
     // only the first part menu got them
     if(_startid == 0 && !_filesOnly) {
-       insertTitle(path());
+       // FIXME: no more menu titles so NOW WHAT?!
+       // insertTitle(path());
        insertItem(CICON("kfm"), i18n("Open in File Manager"), this, SLOT(slotOpenFileManager()));
         if (KAuthorized::authorizeKAction("shell_access"))
             insertItem(CICON("terminal"), i18n("Open in Terminal"), this, SLOT(slotOpenTerminal()));
@@ -389,7 +390,7 @@
     if((_lastpress - e->pos()).manhattanLength() < 12) return;
 
     // get id
-    int id = KMenu::actionId(actionAt(_lastpress));
+    int id = static_cast<QMenuItem*>(actionAt(_lastpress))->id();
     if(!_filemap.contains(id)) return;
 
     // reset _lastpress
@@ -466,7 +467,7 @@
 
 void PanelBrowserMenu::slotOpenFileManager()
 {
-    new KRun(path());
+    new KRun(path(), this);
 }
 
 void PanelBrowserMenu::slotMimeCheck()
@@ -490,7 +491,7 @@
 
 //    KMimeType::Ptr mt = KMimeType::findByURL(url, 0, true, false);
 //    QString icon(mt->icon(url, true));
-    QString icon = KMimeType::iconForURL( url );
+    QString icon = KMimeType::iconNameForURL( url );
 //    kdDebug() << url.url() << ": " << icon << endl;
 
     file = KStringHandler::cEmSqueeze( file, fontMetrics(), 20 );