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

List:       kde-commits
Subject:    kdelibs/kio/bookmarks
From:       Alexander Kellett <lypanov () kde ! org>
Date:       2003-06-17 17:38:57
[Download RAW message or body]

CVS commit by lypanov: 

shuffle toolbarfilter class def
fix url dropping on toolbar by adding a "!" :)


  M +20 -20    kbookmarkbar.cc   1.80


--- kdelibs/kio/bookmarks/kbookmarkbar.cc  #1.79:1.80
@@ -68,4 +68,23 @@ QPtrDict<KBookmarkBarPrivate>* dPtrTempl
 #define dptr() KBookmarkBarPrivate::d(this)
 
+// usage of KXBELBookmarkImporterImpl is just plain evil, but it reduces code dup. so...
+class ToolbarFilter : public KXBELBookmarkImporterImpl {
+public:
+    ToolbarFilter() : m_visible(false) { ; }
+    void filterInto( const KBookmarkGroup &grp ) { traverse(grp); }
+private:
+    virtual void visit( const KBookmark & );
+    virtual void visitEnter( const KBookmarkGroup & );
+    virtual void visitLeave( const KBookmarkGroup & );
+signals:
+    void newBookmark( const QString & text, const QCString & url, const QString & additionalInfo );
+    void newFolder( const QString & text, bool open, const QString & additionalInfo );
+    void newSeparator();
+    void endFolder();
+private:
+    bool m_visible;
+    KBookmarkGroup m_visibleStart;
+};
+
 KBookmarkBar::KBookmarkBar( KBookmarkManager* mgr,
                             KBookmarkOwner *_owner, KToolBar *_toolBar,
@@ -339,5 +358,5 @@ bool KBookmarkBar::eventFilter( QObject 
         removeTempSep();
         QDropEvent *dev = (QDropEvent*)e;
-        if ( KBookmarkDrag::canDecode( dev ) )
+        if ( !KBookmarkDrag::canDecode( dev ) )
            return false;
         QValueList<KBookmark> list = KBookmarkDrag::decode( dev );
@@ -378,23 +397,4 @@ bool KBookmarkBar::eventFilter( QObject 
     return false;
 }
-
-// usage of KXBELBookmarkImporterImpl is just plain evil, but it reduces code dup. so...
-class ToolbarFilter : public KXBELBookmarkImporterImpl {
-public:
-    ToolbarFilter() : m_visible(false) { ; }
-    void filterInto( const KBookmarkGroup &grp ) { traverse(grp); }
-private:
-    virtual void visit( const KBookmark & );
-    virtual void visitEnter( const KBookmarkGroup & );
-    virtual void visitLeave( const KBookmarkGroup & );
-signals:
-    void newBookmark( const QString & text, const QCString & url, const QString & additionalInfo );
-    void newFolder( const QString & text, bool open, const QString & additionalInfo );
-    void newSeparator();
-    void endFolder();
-private:
-    bool m_visible;
-    KBookmarkGroup m_visibleStart;
-};
 
 static bool showInToolbar( const KBookmark &bk ) {


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