X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fidentity.cpp;fp=src%2Fcommon%2Fidentity.cpp;h=5fe2d07024830c992e2c58250ff415004317a5ba;hp=e31735a37b697d8d1a5f2595106814e94d40c33d;hb=99678e189313b168c410fa15cd10cb673b73c8a2;hpb=c1572b1c1d6effb21083c6b09f08b30824827a98 diff --git a/src/common/identity.cpp b/src/common/identity.cpp index e31735a3..5fe2d070 100644 --- a/src/common/identity.cpp +++ b/src/common/identity.cpp @@ -35,7 +35,7 @@ # include #endif -#ifdef Q_OS_WIN32 +#ifdef Q_OS_WIN # include # include # define SECURITY_WIN32 @@ -78,7 +78,7 @@ Identity::Identity(const Identity &other, QObject *parent) } -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #ifdef UNICODE QString tcharToQString(TCHAR *tchar) { @@ -120,7 +120,7 @@ QString Identity::defaultNick() if (!userName.isEmpty()) nick = userName; -#elif defined(Q_OS_WIN32) +#elif defined(Q_OS_WIN) TCHAR infoBuf[128]; DWORD bufCharCount = 128; //if(GetUserNameEx(/* NameSamCompatible */ 1, infoBuf, &bufCharCount)) @@ -159,7 +159,7 @@ QString Identity::defaultRealName() else return generalDefault; -#elif defined(Q_OS_WIN32) +#elif defined(Q_OS_WIN) TCHAR infoBuf[128]; DWORD bufCharCount = 128; if (GetUserName(infoBuf, &bufCharCount))