Ported to KBookmarkManager::closestBookmark - which even solves another TODO about...

[dolphin.git] / src / protocolcombo.cpp

diff --git a/src/protocolcombo.cpp b/src/protocolcombo.cpp
index d8ae46031044dfab084211a8dd229f93adc19ff1..729102973e1bfb96030c67e6093bff8de32cf1a6 100644 (file)
--- a/src/protocolcombo.cpp
+++ b/src/protocolcombo.cpp
@@ -14,10 +14,10 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *

- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *

  ***************************************************************************/
 
  ***************************************************************************/
 

-#include <q3popupmenu.h>
+#include <QMenu>

 
 #include <kdebug.h>
 #include <kprotocolinfo.h>
 
 #include <kdebug.h>
 #include <kprotocolinfo.h>


@@ -34,7 +34,7 @@ ProtocolCombo::ProtocolCombo(const QString& protocol, UrlNavigator* parent)
     qSort(m_protocols);
     QStringList::iterator it = m_protocols.begin();
     QStringList::iterator itEnd = m_protocols.end();
     qSort(m_protocols);
     QStringList::iterator it = m_protocols.begin();
     QStringList::iterator itEnd = m_protocols.end();

-    Q3PopupMenu* menu = new Q3PopupMenu(this);
+    QMenu* menu = new QMenu(this);

     while (it != itEnd)
     {
         //kDebug() << "info for " << *it << " "
     while (it != itEnd)
     {
         //kDebug() << "info for " << *it << " "


@@ -42,6 +42,9 @@ ProtocolCombo::ProtocolCombo(const QString& protocol, UrlNavigator* parent)
         //TODO: wow this is ugly. or .. is it? ;) we need a way to determine
         //      if a protocol is appropriate for use in a file manager. hum!
         //if (KProtocolInfo::capabilities(*it).findIndex("filemanager") == -1)
         //TODO: wow this is ugly. or .. is it? ;) we need a way to determine
         //      if a protocol is appropriate for use in a file manager. hum!
         //if (KProtocolInfo::capabilities(*it).findIndex("filemanager") == -1)

+
+        // DF: why not just supportsListing?
+

         if (KProtocolInfo::protocolClass(*it) == ":" ||
             !KProtocolManager::supportsWriting(*it))
         {
         if (KProtocolInfo::protocolClass(*it) == ":" ||
             !KProtocolManager::supportsWriting(*it))
         {