projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qt4-b-gone: Remove all code supporting Qt < 5.5 and KDE4
[quassel.git]
/
src
/
common
/
ircuser.cpp
diff --git
a/src/common/ircuser.cpp
b/src/common/ircuser.cpp
index
5018911
..
65dcbe1
100644
(file)
--- a/
src/common/ircuser.cpp
+++ b/
src/common/ircuser.cpp
@@
-161,10
+161,11
@@
void IrcUser::setAccount(const QString &account)
}
}
-void IrcUser::setAway(
const bool &
away)
+void IrcUser::setAway(
bool
away)
{
if (away != _away) {
_away = away;
{
if (away != _away) {
_away = away;
+ markAwayChanged();
SYNC(ARG(away))
emit awaySet(away);
}
SYNC(ARG(away))
emit awaySet(away);
}
@@
-175,6
+176,7
@@
void IrcUser::setAwayMessage(const QString &awayMessage)
{
if (!awayMessage.isEmpty() && _awayMessage != awayMessage) {
_awayMessage = awayMessage;
{
if (!awayMessage.isEmpty() && _awayMessage != awayMessage) {
_awayMessage = awayMessage;
+ markAwayChanged();
SYNC(ARG(awayMessage))
}
}
SYNC(ARG(awayMessage))
}
}
@@
-219,17
+221,16
@@
void IrcUser::setIrcOperator(const QString &ircOperator)
// This function is only ever called by SYNC calls from legacy cores (pre-0.13).
// Therefore, no SYNC call is needed here.
// This function is only ever called by SYNC calls from legacy cores (pre-0.13).
// Therefore, no SYNC call is needed here.
-void IrcUser::setLastAwayMessage(
const int &
lastAwayMessage)
+void IrcUser::setLastAwayMessage(
int
lastAwayMessage)
{
{
- QDateTime lastAwayMessageTime = QDateTime();
- lastAwayMessageTime.setTimeSpec(Qt::UTC);
#if QT_VERSION >= 0x050800
#if QT_VERSION >= 0x050800
-
lastAwayMessageTime.
fromSecsSinceEpoch(lastAwayMessage);
+
QDateTime lastAwayMessageTime = QDateTime::
fromSecsSinceEpoch(lastAwayMessage);
#else
// toSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now.
// See https://doc.qt.io/qt-5/qdatetime.html#toMSecsSinceEpoch
#else
// toSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now.
// See https://doc.qt.io/qt-5/qdatetime.html#toMSecsSinceEpoch
-
lastAwayMessageTime.
fromMSecsSinceEpoch(lastAwayMessage * 1000);
+
QDateTime lastAwayMessageTime = QDateTime::
fromMSecsSinceEpoch(lastAwayMessage * 1000);
#endif
#endif
+ lastAwayMessageTime.setTimeSpec(Qt::UTC);
setLastAwayMessageTime(lastAwayMessageTime);
}
setLastAwayMessageTime(lastAwayMessageTime);
}