Finally here: the long awaited auto reconnect! Your auto reconnect settings

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

diff --git a/src/qtui/settingspages/identitiessettingspage.h b/src/qtui/settingspages/identitiessettingspage.h
index b2c5021..c0c862b 100644 (file)
--- a/src/qtui/settingspages/identitiessettingspage.h
+++ b/src/qtui/settingspages/identitiessettingspage.h
@@ -27,7 +27,7 @@
 #include "ui_identitiessettingspage.h"
 #include "ui_createidentitydlg.h"
 #include "ui_saveidentitiesdlg.h"
-#include "ui_nickeditdlgnew.h"
+#include "ui_nickeditdlg.h"
 
 class QAbstractItemModel;
 
@@ -102,7 +102,7 @@ class SaveIdentitiesDlg : public QDialog {
   Q_OBJECT
 
   public:
-    SaveIdentitiesDlg(QList<Identity *> toCreate, QList<Identity *> toUpdate, QList<IdentityId> toRemove, QWidget *parent = 0);
+    SaveIdentitiesDlg(const QList<Identity *> &toCreate, const QList<Identity *> &toUpdate, const QList<IdentityId> &toRemove, QWidget *parent = 0);
 
   private slots:
     void clientEvent();
@@ -110,18 +110,18 @@ class SaveIdentitiesDlg : public QDialog {
   private:
     Ui::SaveIdentitiesDlg ui;
 
-    QList<Identity *> toCreate, toUpdate;
-    QList<IdentityId> toRemove;
+    //QList<Identity *> toCreate, toUpdate;
+    //QList<IdentityId> toRemove;
 
     int numevents, rcvevents;
 
 };
 
-class NickEditDlgNew : public QDialog {
+class NickEditDlg : public QDialog {
   Q_OBJECT
 
   public:
-    NickEditDlgNew(const QString &oldnick, const QStringList &existing = QStringList(), QWidget *parent = 0);
+    NickEditDlg(const QString &oldnick, const QStringList &existing = QStringList(), QWidget *parent = 0);
 
     QString nick() const;
 
@@ -129,7 +129,7 @@ class NickEditDlgNew : public QDialog {
     void on_nickEdit_textChanged(const QString &);
 
   private:
-    Ui::NickEditDlgNew ui;
+    Ui::NickEditDlg ui;
 
     QString oldNick;
     QStringList existing;