Mercurial > hg > easyhg
annotate common_osx.mm @ 294:fc9d411ff6e7
Fix some breakages from prior merge commit (oops); make merge result use more-information dialog
| author | Chris Cannam |
|---|---|
| date | Mon, 21 Feb 2011 18:20:29 +0000 |
| parents | 68aebc316898 |
| 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 |