projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use 'using' instead of 'typedef'
[quassel.git]
/
src
/
common
/
identity.cpp
diff --git
a/src/common/identity.cpp
b/src/common/identity.cpp
index
afdff7d
..
e2cd936
100644
(file)
--- a/
src/common/identity.cpp
+++ b/
src/common/identity.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
8
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 *
@@
-35,14
+35,13
@@
# include <unistd.h>
#endif
# include <unistd.h>
#endif
-#ifdef Q_OS_WIN
32
+#ifdef Q_OS_WIN
# include <windows.h>
# include <Winbase.h>
# define SECURITY_WIN32
# include <Security.h>
#endif
# include <windows.h>
# include <Winbase.h>
# define SECURITY_WIN32
# include <Security.h>
#endif
-INIT_SYNCABLE_OBJECT(Identity)
Identity::Identity(IdentityId id, QObject *parent)
: SyncableObject(parent),
_identityId(id)
Identity::Identity(IdentityId id, QObject *parent)
: SyncableObject(parent),
_identityId(id)
@@
-78,7
+77,7
@@
Identity::Identity(const Identity &other, QObject *parent)
}
}
-#ifdef Q_
W
S_WIN
+#ifdef Q_
O
S_WIN
#ifdef UNICODE
QString tcharToQString(TCHAR *tchar)
{
#ifdef UNICODE
QString tcharToQString(TCHAR *tchar)
{
@@
-120,7
+119,7
@@
QString Identity::defaultNick()
if (!userName.isEmpty())
nick = userName;
if (!userName.isEmpty())
nick = userName;
-#elif defined(Q_OS_WIN
32
)
+#elif defined(Q_OS_WIN)
TCHAR infoBuf[128];
DWORD bufCharCount = 128;
//if(GetUserNameEx(/* NameSamCompatible */ 1, infoBuf, &bufCharCount))
TCHAR infoBuf[128];
DWORD bufCharCount = 128;
//if(GetUserNameEx(/* NameSamCompatible */ 1, infoBuf, &bufCharCount))
@@
-159,7
+158,7
@@
QString Identity::defaultRealName()
else
return generalDefault;
else
return generalDefault;
-#elif defined(Q_OS_WIN
32
)
+#elif defined(Q_OS_WIN)
TCHAR infoBuf[128];
DWORD bufCharCount = 128;
if (GetUserName(infoBuf, &bufCharCount))
TCHAR infoBuf[128];
DWORD bufCharCount = 128;
if (GetUserName(infoBuf, &bufCharCount))
@@
-191,8
+190,8
@@
void Identity::setToDefaults()
setDetachAwayReasonEnabled(false);
setIdent("quassel");
setKickReason(tr("Kindergarten is elsewhere!"));
setDetachAwayReasonEnabled(false);
setIdent("quassel");
setKickReason(tr("Kindergarten is elsewhere!"));
- setPartReason(tr("http://quassel-irc.org - Chat comfortably. Anywhere."));
- setQuitReason(tr("http://quassel-irc.org - Chat comfortably. Anywhere."));
+ setPartReason(tr("http
s
://quassel-irc.org - Chat comfortably. Anywhere."));
+ setQuitReason(tr("http
s
://quassel-irc.org - Chat comfortably. Anywhere."));
}
}
@@
-389,8
+388,3
@@
QDataStream &operator>>(QDataStream &in, Identity &id)
id.fromVariantMap(i);
return in;
}
id.fromVariantMap(i);
return in;
}
-
-
-#ifdef HAVE_SSL
-INIT_SYNCABLE_OBJECT(CertManager)
-#endif // HAVE_SSL