← Back to branch summary

~ubuntu-branches/ubuntu/saucy/quassel/saucy-proposed

« back to all changes in this revision

Viewing changes to src/common/identity.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-02-17 12:49:50 UTC
  • mto: This revision was merged to the branch mainline in revision 59.
  • Revision ID: james.westby@ubuntu.com-20100217124950-v9hajw5d2xa6fszn
Tags: upstream-0.6~beta1
Import upstream version 0.6~beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common/identity.cpp
76
76
  init();
77
77
}
78
78
 
 
79
#ifdef Q_WS_WIN
 
80
#ifdef UNICODE
 
81
QString tcharToQString(TCHAR *tchar){
 
82
  return QString::fromUtf16( reinterpret_cast<ushort*>(tchar));
 
83
}
 
84
#else
 
85
QString tcharToQString(TCHAR *tchar){
 
86
  return QString::fromLocal8Bit(tchar);
 
87
}
 
88
#endif
 
89
 
 
90
#endif
79
91
void Identity::init() {
80
92
  setObjectName(QString::number(id().toInt()));
81
93
  setAllowClientUpdates(true);
102
114
  DWORD  bufCharCount = 128;
103
115
  //if(GetUserNameEx(/* NameSamCompatible */ 1, infoBuf, &bufCharCount))
104
116
  if(GetUserNameEx(NameSamCompatible, infoBuf, &bufCharCount)) {
105
 
    QString nickName(infoBuf);
 
117
    QString nickName(tcharToQString(infoBuf));
106
118
    int lastBs = nickName.lastIndexOf('\\');
107
119
    if(lastBs != -1) {
108
120
      nickName = nickName.mid(lastBs + 1);
138
150
  TCHAR  infoBuf[128];
139
151
  DWORD  bufCharCount = 128;
140
152
  if(GetUserName(infoBuf, &bufCharCount))
141
 
    return QString(infoBuf);
 
153
    return tcharToQString(infoBuf);
142
154
  else
143
155
    return generalDefault;
144
156
#else