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

List:       kde-commits
Subject:    KDE/kdelibs/kfile
From:       Kevin Ottens <ervin () kde ! org>
Date:       2007-04-06 13:48:19
Message-ID: 1175867299.043506.24869.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 651085 by ervin:

No more KUrlBar and KFileSpeedBar.
The KUrlBarItemDialog will survive as KFilePlaceEditDialog since it's 
used in KFilePlacesView.


 M  +1 -2      CMakeLists.txt  
 A             kfileplaceeditdialog.cpp   kurlbar.cpp#651046 [License: LGPL]
 A             kfileplaceeditdialog.h   kurlbar.h#651046 [License: LGPL]
 M  +5 -5      kfileplacesview.cpp  
 D             kfilespeedbar.cpp  
 D             kfilespeedbar.h  
 D             kurlbar.cpp  
 D             kurlbar.h  


--- trunk/KDE/kdelibs/kfile/CMakeLists.txt #651084:651085
@@ -22,7 +22,6 @@
   kfilebookmarkhandler.cpp
   kfilefiltercombo.cpp
   kfilepreview.cpp
-  kfilespeedbar.cpp
   kfiletreebranch.cpp
   kfileview.cpp
   kfilewidget.cpp
@@ -30,8 +29,8 @@
   kfileplacesmodel.cpp
   kfileplacesselector.cpp
   kfileplacesview.cpp
+  kfileplaceeditdialog.cpp
   kprotocolcombo.cpp
-  kurlbar.cpp
   kurlbutton.cpp
   kurlnavigatorbutton.cpp
   kurlnavigator.cpp
--- trunk/KDE/kdelibs/kfile/kfileplacesview.cpp #651084:651085
@@ -29,7 +29,7 @@
 #include <kjob.h>
 #include <solid/volume.h>
 
-#include "kurlbar.h"
+#include "kfileplaceeditdialog.h"
 #include "kfileplacesmodel.h"
 
 class KFilePlacesView::Private
@@ -111,8 +111,8 @@
         QString iconName;
         bool appLocal = false;
 
-        if (KUrlBarItemDialog::getInformation(true, url, description,
-                                              iconName, appLocal, 64, this))
+        if (KFilePlaceEditDialog::getInformation(true, url, description,
+                                                 iconName, appLocal, 64, this))
         {
             QString appName;
             if (appLocal) appName = KGlobal::mainComponent().componentName();
@@ -127,8 +127,8 @@
         QString iconName = bookmark.icon();
         bool appLocal = !bookmark.metaDataItem("OnlyInApp").isEmpty();
 
-        if (KUrlBarItemDialog::getInformation(true, url, description,
-                                              iconName, appLocal, 64, this))
+        if (KFilePlaceEditDialog::getInformation(true, url, description,
+                                                 iconName, appLocal, 64, this))
         {
             QString appName;
             if (appLocal) appName = KGlobal::mainComponent().componentName();
[prev in list] [next in list] [prev in thread] [next in thread]