From 04a30d8803ea728a787fc33ed2870967427ab953 Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Sun, 4 Apr 2010 22:51:39 +0000
Subject: Do expensive loading operations in the Dolphin Preferences when
 getting the QShowEvent and not the QPolish event.

svn path=/trunk/KDE/kdebase/apps/; revision=1111143
---
 src/settings/servicessettingspage.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/settings/servicessettingspage.cpp')

diff --git a/src/settings/servicessettingspage.cpp b/src/settings/servicessettingspage.cpp
index 14de2d4ae..98b26e358 100644
--- a/src/settings/servicessettingspage.cpp
+++ b/src/settings/servicessettingspage.cpp
@@ -34,12 +34,12 @@
 #include <kstandarddirs.h>
 
 #include <QCheckBox>
-#include <QEvent>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
 #include <QListWidget>
 #include <QPushButton>
+#include <QShowEvent>
 
 ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
@@ -131,14 +131,14 @@ void ServicesSettingsPage::restoreDefaults()
     }
 }
 
-bool ServicesSettingsPage::event(QEvent* event)
+void ServicesSettingsPage::showEvent(QShowEvent* event)
 {
-    if ((event->type() == QEvent::Polish) && !m_initialized) {
+    if (!event->spontaneous() && !m_initialized) {
         QMetaObject::invokeMethod(this, "loadServices", Qt::QueuedConnection);
         QMetaObject::invokeMethod(this, "loadVersionControlSystems", Qt::QueuedConnection);
         m_initialized = true;
     }
-    return SettingsPageBase::event(event);
+    SettingsPageBase::showEvent(event);
 }
 
 void ServicesSettingsPage::loadServices()
-- 
cgit v1.3