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

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/plasmagenericshell
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-11-23 21:34:27
Message-ID: 20101123213427.0B6E8AC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1200076 by aseigo:

guard the selected item pointer to avoid crashes


 M  +3 -6      abstracticonlist.cpp  


--- trunk/KDE/kdebase/workspace/libs/plasmagenericshell/abstracticonlist.cpp \
#1200075:1200076 @@ -47,14 +47,11 @@
 
 AbstractIconList::AbstractIconList(Plasma::Location loc, QGraphicsItem *parent)
     : Plasma::ScrollWidget(parent),
+      m_orientation((loc == Plasma::LeftEdge || loc == Plasma::RightEdge) ? \
Qt::Vertical : Qt::Horizontal), +      m_location(loc),
       m_searchDelayTimer(new QTimer(this)),
       m_iconSize(16)
 {
-    m_selectedItem = 0;
-    m_location = loc;
-    m_orientation = ((loc == Plasma::LeftEdge || loc == \
                Plasma::RightEdge)?Qt::Vertical:Qt::Horizontal);
-
-    //timer stuff
     m_searchDelayTimer->setSingleShot(true);
     m_searchDelayTimer->setInterval(SEARCH_DELAY);
     connect(m_searchDelayTimer, SIGNAL(timeout()), this, SLOT(setSearch()));
@@ -182,7 +179,7 @@
 void AbstractIconList::itemSelected(Plasma::AbstractIcon *icon)
 {
     if (m_selectedItem) {
-        m_selectedItem->setSelected(false);
+        m_selectedItem.data()->setSelected(false);
     }
 
     icon->setSelected(true);


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