projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply suggestions from code review
[quassel.git]
/
src
/
client
/
clientsettings.cpp
diff --git
a/src/client/clientsettings.cpp
b/src/client/clientsettings.cpp
index
d44ad6a
..
e4a76c3
100644
(file)
--- a/
src/client/clientsettings.cpp
+++ b/
src/client/clientsettings.cpp
@@
-23,10
+23,8
@@
#include <utility>
#include <QHostAddress>
#include <utility>
#include <QHostAddress>
+#include <QSslSocket>
#include <QStringList>
#include <QStringList>
-#ifdef HAVE_SSL
-# include <QSslSocket>
-#endif
#include "client.h"
#include "quassel.h"
#include "client.h"
#include "quassel.h"
@@
-298,7
+296,7
@@
void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickT
NotificationSettings::HighlightNickType NotificationSettings::highlightNick() const
{
NotificationSettings::HighlightNickType NotificationSettings::highlightNick() const
{
- return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick",
Current
Nick).toInt();
+ return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick",
No
Nick).toInt();
}
void NotificationSettings::setNicksCaseSensitive(bool cs)
}
void NotificationSettings::setNicksCaseSensitive(bool cs)