Mercurial > hg > easyhg
annotate src/common_osx.mm @ 505:1c05e7576ea5
Fix bug #292: "Merge that results in no changes leaves interface in inconsistent state." Show uncommitted state whenever a merge is present, even if no file changes
| author | Chris Cannam |
|---|---|
| date | Mon, 17 Oct 2011 16:25:02 +0100 |
| parents | 2d3f1e5d8638 |
| children |
| rev | line source |
|---|---|
| Chris@62 | 1 |
| Chris@62 | 2 #include "common.h" |
| Chris@62 | 3 |
| Chris@62 | 4 #include <QString> |
| Chris@62 | 5 |
| Chris@62 | 6 #ifdef Q_OS_MAC |
| Chris@62 | 7 |
| Chris@62 | 8 #include <Foundation/Foundation.h> |
| Chris@62 | 9 |
| Chris@62 | 10 QString getUserRealName() |
| Chris@62 | 11 { |
| Chris@62 | 12 NSString *s = NSFullUserName(); |
| Chris@62 | 13 return QString::fromLocal8Bit([s UTF8String]); |
| Chris@62 | 14 } |
| Chris@62 | 15 |
| Chris@62 | 16 #endif |