From ac0beffd0c3f81164f839f223df69ad2b665c0d9 Mon Sep 17 00:00:00 2001
From: tux3 <barrdetwix@gmail.com>
Date: Fri, 5 Jun 2015 15:39:01 +0200
Subject: [PATCH] Fix #1792

---
 src/widget/form/settings/avform.cpp        | 2 +-
 src/widget/form/settings/avform.h          | 2 +-
 src/widget/form/settings/genericsettings.h | 1 -
 src/widget/form/settings/privacyform.cpp   | 2 +-
 src/widget/form/settings/privacyform.h     | 3 +--
 src/widget/form/settingswidget.cpp         | 1 -
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/widget/form/settings/avform.cpp b/src/widget/form/settings/avform.cpp
index fbc9a92d3..4e75c58d6 100644
--- a/src/widget/form/settings/avform.cpp
+++ b/src/widget/form/settings/avform.cpp
@@ -74,7 +74,7 @@ AVForm::~AVForm()
     }
 }
 
-void AVForm::present()
+void AVForm::showEvent(QShowEvent*)
 {
     getAudioOutDevices();
     getAudioInDevices();
diff --git a/src/widget/form/settings/avform.h b/src/widget/form/settings/avform.h
index b6c2d17e4..a4a458a91 100644
--- a/src/widget/form/settings/avform.h
+++ b/src/widget/form/settings/avform.h
@@ -33,7 +33,6 @@ class AVForm : public GenericForm
 public:
     AVForm();
     ~AVForm();
-    virtual void present();
 
 private:
     void getAudioInDevices();
@@ -58,6 +57,7 @@ private slots:
     void onResProbingFinished(QList<QSize> res);
 
     virtual void hideEvent(QHideEvent*);
+    virtual void showEvent(QShowEvent*);
     
 protected:
     bool eventFilter(QObject *o, QEvent *e);    
diff --git a/src/widget/form/settings/genericsettings.h b/src/widget/form/settings/genericsettings.h
index e3d395dfd..0bd284a15 100644
--- a/src/widget/form/settings/genericsettings.h
+++ b/src/widget/form/settings/genericsettings.h
@@ -24,7 +24,6 @@ public:
     GenericForm(const QString &name, const QPixmap &icon) : formName(name), formIcon(icon) {;}
     ~GenericForm() {;}
 
-    virtual void present() {}
     QString getFormName() {return formName;}
     QPixmap getFormIcon() {return formIcon;}
 
diff --git a/src/widget/form/settings/privacyform.cpp b/src/widget/form/settings/privacyform.cpp
index f3d70ae59..0c2c4006c 100644
--- a/src/widget/form/settings/privacyform.cpp
+++ b/src/widget/form/settings/privacyform.cpp
@@ -65,7 +65,7 @@ void PrivacyForm::setNospam()
         Core::getInstance()->setNospam(nospam);
 }
 
-void PrivacyForm::present()
+void PrivacyForm::showEvent(QShowEvent*)
 {
     bodyUI->nospamLineEdit->setText(Core::getInstance()->getSelfId().noSpam);
     bodyUI->cbTypingNotification->setChecked(Settings::getInstance().isTypingNotificationEnabled());
diff --git a/src/widget/form/settings/privacyform.h b/src/widget/form/settings/privacyform.h
index ab88acd58..2feaf41a0 100644
--- a/src/widget/form/settings/privacyform.h
+++ b/src/widget/form/settings/privacyform.h
@@ -28,14 +28,13 @@ public:
     PrivacyForm();
     ~PrivacyForm();
 
-    virtual void present();
-
 private slots:
     void onEnableLoggingUpdated();
     void onTypingNotificationEnabledUpdated();
     void setNospam();
     void generateRandomNospam();
     void onNospamEdit();
+    virtual void showEvent(QShowEvent*);
 
 private:
     Ui::PrivacySettings* bodyUI;
diff --git a/src/widget/form/settingswidget.cpp b/src/widget/form/settingswidget.cpp
index e41144870..d524bfa41 100644
--- a/src/widget/form/settingswidget.cpp
+++ b/src/widget/form/settingswidget.cpp
@@ -83,7 +83,6 @@ void SettingsWidget::onTabChanged(int index)
 {
     this->settingsWidgets->setCurrentIndex(index);
     GenericForm* currentWidget = static_cast<GenericForm*>(this->settingsWidgets->widget(index));
-    currentWidget->present();
     nameLabel->setText(currentWidget->getFormName());
     imgLabel->setPixmap(currentWidget->getFormIcon().scaledToHeight(40, Qt::SmoothTransformation));
 }