projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a sane default for IRC server port :)
[quassel.git]
/
src
/
qtui
/
coreconnectdlg.h
diff --git
a/src/qtui/coreconnectdlg.h
b/src/qtui/coreconnectdlg.h
index
4714a01
..
69e3839
100644
(file)
--- a/
src/qtui/coreconnectdlg.h
+++ b/
src/qtui/coreconnectdlg.h
@@
-23,6
+23,8
@@
#include <QAbstractSocket>
#include <QAbstractSocket>
+#include "types.h"
+
#include "ui_coreconnectdlg.h"
#include "ui_coreaccounteditdlg.h"
#include "ui_coreconnectdlg.h"
#include "ui_coreaccounteditdlg.h"
@@
-77,10
+79,10
@@
class CoreConnectDlg : public QDialog {
private:
Ui::CoreConnectDlg ui;
private:
Ui::CoreConnectDlg ui;
-
QString
autoConnectAccount;
- QHash<
QString
, QVariantMap> accounts;
- QVariantMap account;
-
QString accountName
;
+
AccountId
autoConnectAccount;
+ QHash<
AccountId
, QVariantMap> accounts;
+ QVariantMap account
Data
;
+
AccountId account
;
bool doingAutoConnect;
bool doingAutoConnect;
@@
-91,9
+93,8
@@
class CoreAccountEditDlg : public QDialog {
Q_OBJECT
public:
Q_OBJECT
public:
- CoreAccountEditDlg(
const QString &name
, const QVariantMap &data, const QStringList &existing = QStringList(), QWidget *parent = 0);
+ CoreAccountEditDlg(
AccountId id
, const QVariantMap &data, const QStringList &existing = QStringList(), QWidget *parent = 0);
- QString accountName() const;
QVariantMap accountData();
private slots:
QVariantMap accountData();
private slots: