X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fidentity.cpp;h=ea7e3ee9dea878be2ba286b690618a00b6287aac;hb=2e8eab59dd72e37a740d16d9484502d077aef64d;hp=e31735a37b697d8d1a5f2595106814e94d40c33d;hpb=9d54503555534a2c554f09a33df6afa33d6308ec;p=quassel.git

diff --git a/src/common/identity.cpp b/src/common/identity.cpp
index e31735a3..ea7e3ee9 100644
--- a/src/common/identity.cpp
+++ b/src/common/identity.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -35,7 +35,7 @@
 #  include <unistd.h>
 #endif
 
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
 #  include <windows.h>
 #  include <Winbase.h>
 #  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))