commit 5f60ce14f213cc6a083bc73b6b0732de6fb30249
tree ec516e59a62993a8cccb1204498c7e6eacb35da2
parent bb5af810a77529e187da33cc251ca29b2459b7c2
author David Hubner <hubnerd@hubnerd.com> 1382896895 +0000
committer David Hubner <hubnerd@hubnerd.com> 1382896895 +0000
gpgsig -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQGcBAABAgAGBQJSbVVgAAoJEEVbZo8Q17wJ4PYL/RCheJ8levXtB/E77X2ZSaXD
 zSRAYmFet4EFW1fPHElCRJdXNIhn3cFJhGYqvqEhNjBTX2BQfHgAMMgi/HvG0TWT
 kzxvwHaQBb+G+2V6pIFSoU46e2wf2EeD0xC4EXkxssI2swuf3P48/1eyw8THP3vI
 5IS6utbzQD7yITENaLjQY77Rh0dN8e4QcKn4Q/NhyWKadYYvswWEpwkWrc4/uf58
 dGti4hGwsStDltHTec4t4nPv2+M2NRI/SPNSp1NmE915/OhIOeEEMEMJJRZWPKQG
 mgcBCEQF20NDmYxIYduNZrcDJZpSapoljKWwrJSSKNflauIqKSZV8Cah0Qt5W+nx
 P5UfbLvs4uSu1On/ggUeOrKgylKhPKck7Gfp2iDjsYHSDHT0fff4Hl6nrL96jJnK
 wyvdKyO+INLNT5VSOdwrXDvsm0t4XflX1DJgxwonEjyNm4czfn9HKtzwKoRZbYw4
 gZaGPO2KVvXMLzOkRIBf6FGSWHxW7Y4tzukyAsJJTw==
 =dYAL
 -----END PGP SIGNATURE-----

    Change sidepanel events from activated to clicked
    
    Change the events due to the single click, double click setting
    in KDE not being taken into account.
    
    BUG: 326291
    FIXED-IN: 4.12

diff --git a/kinfocenter/infocenter.cpp b/kinfocenter/infocenter.cpp
index 9d2285f..9657a86 100644
--- a/kinfocenter/infocenter.cpp
+++ b/kinfocenter/infocenter.cpp
@@ -70,7 +70,7 @@ KInfoCenter::KInfoCenter() : KXmlGuiWindow( 0, Qt::WindowContextHelpButtonHint )
     createToolBar();
 
     //TreeWidget
-    connect(m_sideMenu,SIGNAL(activated(const KcmTreeItem*)),this,SLOT(itemClickedSlot(const KcmTreeItem*)));
+    connect(m_sideMenu,SIGNAL(clicked(const KcmTreeItem*)),this,SLOT(itemClickedSlot(const KcmTreeItem*)));
 
     //SearchBox
     connect(m_searchText, SIGNAL(textChanged(QString)), m_sideMenu, SLOT(filterSideMenuSlot(QString)));
@@ -103,7 +103,7 @@ KInfoCenter::~KInfoCenter()
     delete m_toolTips;
 
     //TreeWidget
-    disconnect(m_sideMenu,SIGNAL(activated(const KcmTreeItem*)),this,SLOT(itemClickedSlot(const KcmTreeItem*)));
+    disconnect(m_sideMenu,SIGNAL(clicked(const KcmTreeItem*)),this,SLOT(itemClickedSlot(const KcmTreeItem*)));
 
     //SearchBox
     disconnect(m_searchText, SIGNAL(textChanged(QString)), m_sideMenu, SLOT(filterSideMenuSlot(QString)));
diff --git a/kinfocenter/sidepanel.cpp b/kinfocenter/sidepanel.cpp
index a4d31d8..649be46 100644
--- a/kinfocenter/sidepanel.cpp
+++ b/kinfocenter/sidepanel.cpp
@@ -46,25 +46,25 @@ SidePanel::SidePanel(QWidget *parent) : QTreeView(parent)
 
     setMouseTracking(true);
     setModel(m_proxyModel);
-    connect(this,SIGNAL(activated(QModelIndex)),this,SLOT(activatedSlot(QModelIndex)));
+    connect(this,SIGNAL(clicked(QModelIndex)),this,SLOT(clickedSlot(QModelIndex)));
 }
 
 SidePanel::~SidePanel()
 {
-    disconnect(this,SIGNAL(activated(QModelIndex)),this,SLOT(activatedSlot(QModelIndex)));
+    disconnect(this,SIGNAL(clicked(QModelIndex)),this,SLOT(clickedSlot(QModelIndex)));
 
     delete m_proxyModel;
     delete m_model;
 }
 
-void SidePanel::activatedSlot(const QModelIndex &index)
+void SidePanel::clickedSlot(const QModelIndex &index)
 {
     if(index.isValid() == false) {
         return;
     }
 
     const KcmTreeItem *item = static_cast<KcmTreeItem*>(m_proxyModel->mapToSource(index).internalPointer());
-    emit activated(item);
+    emit clicked(item);
 }
 
 void SidePanel::changeToFirstValidItem()
@@ -75,7 +75,7 @@ void SidePanel::changeToFirstValidItem()
     }
 
     setCurrentIndex(rootIndex);
-    emit activatedSlot(rootIndex);
+    emit clickedSlot(rootIndex);
 }
 
 QModelIndex SidePanel::mapToProxySource(const QModelIndex& index)
diff --git a/kinfocenter/sidepanel.h b/kinfocenter/sidepanel.h
index 2ad4a40..ae15a3e 100644
--- a/kinfocenter/sidepanel.h
+++ b/kinfocenter/sidepanel.h
@@ -81,14 +81,14 @@ class SidePanel : public QTreeView
         /**
         * Emitted when menu item is clicked
         */
-        void activated(const KcmTreeItem *);
+        void clicked(const KcmTreeItem *);
 
         private Q_SLOTS:
 
         /**
         * Triggered when treeview item is clicked
         */
-        void activatedSlot(const QModelIndex &index);
+        void clickedSlot(const QModelIndex &index);
 
         public Q_SLOTS: