From kde-commits  Sat Jan 08 20:12:11 2011
From: Peter Simonsson <peter.simonsson () gmail ! com>
Date: Sat, 08 Jan 2011 20:12:11 +0000
To: kde-commits
Subject: [Konversation] 328dc3b: Clean up the ServerListDialog code
Message-Id: <20110108201211.89A07A6092 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129451757118072

commit 328dc3b3ed7601c35b2b52802effeeac4a40e4b6
branch master
Author: Peter Simonsson <peter.simonsson@gmail.com>
Date:   Sat Jan 8 21:10:00 2011 +0100

    Clean up the ServerListDialog code
    
    No need to duplicate pointers, let's inherit the Ui class instead

diff --git a/src/irc/serverlistdialog.cpp b/src/irc/serverlistdialog.cpp
index ec50c7d..7b0a5be 100644
--- a/src/irc/serverlistdialog.cpp
+++ b/src/irc/serverlistdialog.cpp
@@ -15,7 +15,6 @@
 #include "application.h"
 #include "servergroupdialog.h"
 #include "connectionsettings.h"
-#include "ui_serverlistdialogui.h"
 
 #include <QCheckBox>
 #include <QHeaderView>
@@ -55,19 +54,13 @@ namespace Konversation
     }
 
     ServerListDialog::ServerListDialog(const QString& title, QWidget *parent)
-        : KDialog(parent)
+    : KDialog(parent), Ui::ServerListDialogUI()
     {
         setCaption(title);
         setButtons(Ok|Close);
 
-        m_mainWidget = new Ui::ServerListDialogUI();
-        m_mainWidget->setupUi(mainWidget());
+        setupUi(mainWidget());
         mainWidget()->layout()->setMargin(0);
-        m_serverList = m_mainWidget->m_serverList;
-        m_addButton = m_mainWidget->m_addButton;
-        m_delButton = m_mainWidget->m_delButton;
-        m_editButton = m_mainWidget->m_editButton;
-        m_showAtStartup = m_mainWidget->m_showAtStartup;
 
         setButtonGuiItem(Ok, KGuiItem(i18n("C&onnect"), "network-connect", i18n("Connect to the server"), i18n("Click here to connect to the selected IRC network and channel.")));
 
@@ -114,7 +107,6 @@ namespace Konversation
         KConfigGroup config(KGlobal::config(), "ServerListDialog");
         config.writeEntry("Size", size());
         config.writeEntry("ServerListHeaderState", m_serverList->header()->saveState());
-        delete m_mainWidget;
     }
 
     void ServerListDialog::slotClose()
diff --git a/src/irc/serverlistdialog.h b/src/irc/serverlistdialog.h
index 67614e2..7cabbbc 100644
--- a/src/irc/serverlistdialog.h
+++ b/src/irc/serverlistdialog.h
@@ -16,15 +16,13 @@
 #include "common.h"
 #include "servergroupsettings.h"
 #include "serverlistview.h"
+#include "ui_serverlistdialogui.h"
 #include <kdialog.h>
 
 class ConnectionSettings;
 class QTreeWidgetItem;
 class QCheckBox;
-namespace Ui
-{
-class ServerListDialogUI;
-}
+
 namespace Konversation
 {
     class ServerListItem : public QTreeWidgetItem
@@ -39,7 +37,7 @@ namespace Konversation
             };
     };
 
-    class ServerListDialog : public KDialog
+    class ServerListDialog : public KDialog, private Ui::ServerListDialogUI
     {
         Q_OBJECT
 
@@ -88,12 +86,6 @@ namespace Konversation
 
         private:
             int selectedChildrenCount(QTreeWidgetItem* item);
-            Ui::ServerListDialogUI* m_mainWidget;
-            QPushButton* m_addButton;
-            QPushButton* m_delButton;
-            QPushButton* m_editButton;
-            QCheckBox* m_showAtStartup;
-            ServerListView* m_serverList;
 
             bool m_selectedItem;
             int m_selectedServerGroupId;