projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trying to fix random segfault upon connect...
[quassel.git]
/
src
/
qtgui
/
coreconnectdlg.h
diff --git
a/src/qtgui/coreconnectdlg.h
b/src/qtgui/coreconnectdlg.h
index
53fc425
..
384e257
100644
(file)
--- a/
src/qtgui/coreconnectdlg.h
+++ b/
src/qtgui/coreconnectdlg.h
@@
-22,28
+22,47
@@
#define _CORECONNECTDLG_H
#include "ui_coreconnectdlg.h"
#define _CORECONNECTDLG_H
#include "ui_coreconnectdlg.h"
+#include "global.h"
class CoreConnectDlg: public QDialog {
Q_OBJECT
public:
class CoreConnectDlg: public QDialog {
Q_OBJECT
public:
- CoreConnectDlg(QWidget *);
+ CoreConnectDlg(QWidget *parent, bool doAutoConnect = false);
+ ~CoreConnectDlg();
QVariant getCoreState();
QVariant getCoreState();
+ bool willDoInternalAutoConnect();
+
+ public slots:
+ void doAutoConnect();
+
private slots:
private slots:
+ void createAccount();
+ void removeAccount();
+ void accountChanged(const QString & = "");
+ void setAccountEditEnabled(bool);
+ void autoConnectToggled(bool);
+ bool checkInputValid();
void hostEditChanged(QString);
void hostSelected();
void hostEditChanged(QString);
void hostSelected();
+ void doConnect();
void coreConnected();
void coreConnectionError(QString);
void coreConnected();
void coreConnectionError(QString);
- void updateProgressBar(quint32 bytes, quint32 avail);
+ //void coreConnectionMsg(const QString &);
+ //void coreConnectionProgress(uint partial, uint total);
+ void updateProgressBar(uint partial, uint total);
void recvCoreState(QVariant);
private:
Ui::CoreConnectDlg ui;
QVariant coreState;
void recvCoreState(QVariant);
private:
Ui::CoreConnectDlg ui;
QVariant coreState;
+ void cancelConnect();
void setStartState();
void setStartState();
+ VarMap accountData;
+ QString curacc;
};
#endif
};
#endif