projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #102 from mamarley/qcaqt5
[quassel.git]
/
src
/
qtui
/
settingspages
/
networkssettingspage.h
diff --git
a/src/qtui/settingspages/networkssettingspage.h
b/src/qtui/settingspages/networkssettingspage.h
index
a658884
..
1162a63
100644
(file)
--- a/
src/qtui/settingspages/networkssettingspage.h
+++ b/
src/qtui/settingspages/networkssettingspage.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
2
by the Quassel Project *
+ * Copyright (C) 2005-201
5
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-21,10
+21,11
@@
#ifndef NETWORKSSETTINGSPAGE_H
#define NETWORKSSETTINGSPAGE_H
#ifndef NETWORKSSETTINGSPAGE_H
#define NETWORKSSETTINGSPAGE_H
-#include <Q
Pixmap
>
+#include <Q
Icon
>
#include "network.h"
#include "settingspage.h"
#include "network.h"
#include "settingspage.h"
+#include "clientidentity.h"
#include "ui_networkssettingspage.h"
#include "ui_networkadddlg.h"
#include "ui_networkssettingspage.h"
#include "ui_networkadddlg.h"
@@
-65,6
+66,10
@@
private slots:
void clientIdentityRemoved(IdentityId);
void clientIdentityUpdated();
void clientIdentityRemoved(IdentityId);
void clientIdentityUpdated();
+#ifdef HAVE_SSL
+ void sslUpdated();
+#endif
+
void on_networkList_itemSelectionChanged();
void on_addNetwork_clicked();
void on_deleteNetwork_clicked();
void on_networkList_itemSelectionChanged();
void on_addNetwork_clicked();
void on_deleteNetwork_clicked();
@@
-86,8
+91,11
@@
private:
NetworkId currentId;
QHash<NetworkId, NetworkInfo> networkInfos;
bool _ignoreWidgetChanges;
NetworkId currentId;
QHash<NetworkId, NetworkInfo> networkInfos;
bool _ignoreWidgetChanges;
+#ifdef HAVE_SSL
+ CertIdentity *_cid;
+#endif
- Q
Pixmap
connectedIcon, connectingIcon, disconnectedIcon;
+ Q
Icon
connectedIcon, connectingIcon, disconnectedIcon;
void reset();
bool testHasChanged();
void reset();
bool testHasChanged();