Fixes #583 - identity settings: clicking delete or rename crashes client if there...

[quassel.git] / src / qtui / settingspages / identitiessettingspage.h

diff --git a/src/qtui/settingspages/identitiessettingspage.h b/src/qtui/settingspages/identitiessettingspage.h
index 1ef8223..27be75c 100644 (file)
--- a/src/qtui/settingspages/identitiessettingspage.h
+++ b/src/qtui/settingspages/identitiessettingspage.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,13 +24,11 @@
 #include "clientidentity.h"
 #include "settingspage.h"
 
+#include "identityeditwidget.h"
+
 #include "ui_identitiessettingspage.h"
 #include "ui_createidentitydlg.h"
 #include "ui_saveidentitiesdlg.h"
-#include "ui_nickeditdlg.h"
-
-#include <QSslCertificate>
-#include <QSslKey>
 
 class QAbstractItemModel;
 
@@ -46,9 +44,6 @@ public slots:
   void save();
   void load();
 
-protected:
-  virtual bool eventFilter(QObject *watched, QEvent *event);
-
 private slots:
   void coreConnectionStateChanged(bool);
   void clientIdentityCreated(IdentityId);
@@ -61,21 +56,12 @@ private slots:
   void on_deleteIdentity_clicked();
   void on_renameIdentity_clicked();
 
-  void on_addNick_clicked();
-  void on_deleteNick_clicked();
-  void on_renameNick_clicked();
-  void on_nickUp_clicked();
-  void on_nickDown_clicked();
-
-  void on_continueUnsecured_clicked();
-  void on_clearOrLoadKeyButton_clicked();
-  void on_clearOrLoadCertButton_clicked();
+#ifdef HAVE_SSL
+  void continueUnsecured();
+#endif
   void widgetHasChanged();
   void setWidgetStates();
 
-  void sslDragEnterEvent(QDragEnterEvent *event);
-  void sslDropEvent(QDropEvent *event, bool isCert);
-
 private:
   Ui::IdentitiesSettingsPage ui;
 
@@ -90,17 +76,20 @@ private:
   void insertIdentity(CertIdentity *identity);
   void removeIdentity(Identity *identity);
   void renameIdentity(IdentityId id, const QString &newName);
-  void displayIdentity(CertIdentity *, bool dontsave = false);
-  void saveToIdentity(CertIdentity *);
 
+#ifdef HAVE_SSL
   QSslKey keyByFilename(const QString &filename);
   void showKeyState(const QSslKey &key);
   QSslCertificate certByFilename(const QString &filename);
   void showCertState(const QSslCertificate &cert);
+#endif
 
   bool testHasChanged();
 };
 
+// ==============================
+//  Various Dialogs
+// ==============================
 class CreateIdentityDlg : public QDialog {
   Q_OBJECT
 
@@ -117,6 +106,8 @@ private:
   Ui::CreateIdentityDlg ui;
 };
 
+
+
 class SaveIdentitiesDlg : public QDialog {
   Q_OBJECT
 
@@ -132,23 +123,6 @@ private:
   int numevents, rcvevents;
 };
 
-class NickEditDlg : public QDialog {
-  Q_OBJECT
 
-public:
-  NickEditDlg(const QString &oldnick, const QStringList &existing = QStringList(), QWidget *parent = 0);
-
-  QString nick() const;
-
-private slots:
-  void on_nickEdit_textChanged(const QString &);
-
-private:
-  Ui::NickEditDlg ui;
-
-  QString oldNick;
-  QStringList existing;
-
-};
 
 #endif