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

List:       kde-commits
Subject:    KDE/kdelibs/kio/bookmarks
From:       Daniel Teske <teske () squorn ! de>
Date:       2007-09-02 19:51:30
Message-ID: 1188762690.650863.12823.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 707733 by teske:

A little simpler code for KImportetBookmarkMenu.



 M  +2 -28     kbookmarkmenu.cc  
 M  +2 -16     kbookmarkmenu_p.h  


--- trunk/KDE/kdelibs/kio/bookmarks/kbookmarkmenu.cc #707732:707733
@@ -581,7 +581,7 @@
   parentMenu()->disconnect(SIGNAL(aboutToShow()));
 
   // not NSImporter, but kept old name for BC reasons
-  KBookmarkMenuImporter importer( manager(), this, m_actionCollection );
+  KBookmarkMenuImporter importer( manager(), this );
   importer.openBookmarks(m_location, m_type);
 }
 
@@ -856,8 +856,7 @@
 void KBookmarkMenuImporter::newBookmark( const QString & text, const QString & url, \
const QString & )  {
   KBookmark bm = KBookmark::standaloneBookmark(text, url, QString("html"));
-  KAction * action = new KImportedBookmarkAction(bm, mstack.top()->owner(), this);
-  m_actionCollection->addAction(action->objectName(), action);
+  KAction * action = new KBookmarkAction(bm, mstack.top()->owner(), this);
   mstack.top()->parentMenu()->addAction(action);
   mstack.top()->m_actions.append( action );
 }
@@ -866,7 +865,6 @@
 {
   QString _text = KStringHandler::csqueeze(text).replace( '&', "&&" );
   KActionMenu * actionMenu = new KImportedBookmarkActionMenu( KIcon("folder"), \
                _text, this );
-  m_actionCollection->addAction( actionMenu->objectName(), actionMenu );
   mstack.top()->parentMenu()->addAction(actionMenu);
   mstack.top()->m_actions.append( actionMenu );
   KImportedBookmarkMenu *subMenu = new KImportedBookmarkMenu( m_pManager, \
m_menu->owner(), actionMenu->menu()); @@ -929,29 +927,5 @@
 {
 }
 
-
-KImportedBookmarkAction::KImportedBookmarkAction(const KBookmark &bk, \
                KBookmarkOwner* owner, QObject *parent )
-: KAction( KStringHandler::csqueeze(bk.text()).replace('&', "&&"), parent),
-  KBookmarkActionInterface(bk),
-  m_pOwner(owner)
-{
-  setIcon(KIcon(bookmark().icon()));
-  setToolTip( bookmark().url().pathOrUrl() );
-  connect(this, SIGNAL( triggered(Qt::MouseButtons, Qt::KeyboardModifiers) ),
-          SLOT( slotSelected(Qt::MouseButtons, Qt::KeyboardModifiers) ));
-}
-
-KImportedBookmarkAction::~KImportedBookmarkAction()
-{
-}
-
-void KImportedBookmarkAction::slotSelected(Qt::MouseButtons mb, \
                Qt::KeyboardModifiers km)
-{
-  if( !m_pOwner )
-    new KRun( bookmark().url() ,(QWidget*)0);
-  else
-    m_pOwner->openBookmark( bookmark(), mb, km );
-}
-
 #include "kbookmarkmenu.moc"
 #include "kbookmarkmenu_p.moc"
--- trunk/KDE/kdelibs/kio/bookmarks/kbookmarkmenu_p.h #707732:707733
@@ -136,8 +136,8 @@
 {
   Q_OBJECT
 public:
-  KBookmarkMenuImporter( KBookmarkManager* mgr, KImportedBookmarkMenu * menu, \
                KActionCollection * act ) :
-     m_menu(menu), m_actionCollection(act), m_pManager(mgr) {}
+  KBookmarkMenuImporter( KBookmarkManager* mgr, KImportedBookmarkMenu * menu ) :
+     m_menu(menu), m_pManager(mgr) {}
 
   void openBookmarks( const QString &location, const QString &type );
   void connectToImporter( const QObject &importer );
@@ -151,7 +151,6 @@
 protected:
   QStack<KImportedBookmarkMenu*> mstack;
   KImportedBookmarkMenu * m_menu;
-  KActionCollection * m_actionCollection;
   KBookmarkManager* m_pManager;
 };
 
@@ -167,17 +166,4 @@
   {}
 };
 
-class KImportedBookmarkAction : public KAction, public KBookmarkActionInterface
-{
-  Q_OBJECT
-public:
-  KImportedBookmarkAction(const KBookmark &bk, KBookmarkOwner* owner, QObject \
                *parent );
-  ~KImportedBookmarkAction();
-
-public Q_SLOTS:
-  void slotSelected(Qt::MouseButtons mb, Qt::KeyboardModifiers km);
-private:
-  KBookmarkOwner * m_pOwner;
-};
-
 #endif


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