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

List:       kde-commits
Subject:    kdeaddons/konq-plugins/rellinks
From:       Kevin Krammer <kevin.krammer () gmx ! at>
Date:       2004-07-01 10:23:06
Message-ID: 20040701102306.C59D499B2 () office ! kde ! org
[Download RAW message or body]

CVS commit by krake: 

Action for "First" appeared twice in toolbar while action for "Last" was
missing. Fixed.


  M +11 -3     plugin_rellinks.cpp   1.31
  M +1 -0      plugin_rellinks.h   1.17


--- kdeaddons/konq-plugins/rellinks/plugin_rellinks.cpp  #1.30:1.31
@@ -215,5 +215,5 @@ RelLinksPlugin::RelLinksPlugin(QObject *
 /** Destructor */
 RelLinksPlugin::~RelLinksPlugin() {
-    if ( m_toolBar && m_toolBar->isVisible() )
+    if (m_toolBar != 0)
         m_toolBar->saveSettings(kconfig, "Position");
     delete kconfig;
@@ -276,4 +276,6 @@ void RelLinksPlugin::delayedSetup()
     QObject::connect(m_toolBar, SIGNAL(moved(BarPosition)), this, SLOT(toolbarMoved()));
 
+    // be sure to know when m_toolBar is no longer usable in case it is destroyed by its parent
+    QObject::connect(m_toolBar, SIGNAL(destroyed()), this, SLOT(toolbarDestroyed()));
 
     kaction_map["home"]->plug(m_toolBar);
@@ -282,5 +284,5 @@ void RelLinksPlugin::delayedSetup()
     kaction_map["prev"]->plug(m_toolBar);
     kaction_map["next"]->plug(m_toolBar);
-    kaction_map["begin"]->plug(m_toolBar);
+    kaction_map["last"]->plug(m_toolBar);
     kaction_map["search"]->plug(m_toolBar);
     m_toolBar->insertSeparator();
@@ -442,4 +444,10 @@ void RelLinksPlugin::toolbarMoved()
 }
 
+void RelLinksPlugin::toolbarDestroyed()
+{
+    m_toolBar = 0;
+}
+
+
 /** Menu links */
 void RelLinksPlugin::goToLink(const QString & rel, int id) {

--- kdeaddons/konq-plugins/rellinks/plugin_rellinks.h  #1.16:1.17
@@ -86,4 +86,5 @@ private slots:
 
     void toolbarMoved();
+    void toolbarDestroyed();
 
     void goHome();


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