Providing proper defaults for nick and realname on Mac OS using CoreServices

[quassel.git] / src / common / identity.cpp

diff --git a/src/common/identity.cpp b/src/common/identity.cpp
index 4eadff9..31b8a4a 100644 (file)
--- a/src/common/identity.cpp
+++ b/src/common/identity.cpp
@@ -18,10 +18,15 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 

+#include "identity.h"
+

 #include <QMetaProperty>
 #include <QVariantMap>
 
 #include <QMetaProperty>
 #include <QVariantMap>
 

-#include "identity.h"
+#ifdef Q_OS_MAC
+#  include <CoreServices/CoreServices.h>
+#  include "mac_utils.h"
+#endif

 
 Identity::Identity(IdentityId id, QObject *parent)
   : SyncableObject(parent),
 
 Identity::Identity(IdentityId id, QObject *parent)
   : SyncableObject(parent),


@@ -61,11 +66,27 @@ void Identity::init() {
   setAllowClientUpdates(true);
 }
 
   setAllowClientUpdates(true);
 }
 

+QString Identity::defaultNick() {
+#ifdef Q_OS_MAC
+  return CFStringToQString(CSCopyUserName(true));
+#else
+  return QString("quassel%1").arg(qrand() & 0xff); // FIXME provide more sensible default nicks
+#endif
+}
+
+QString Identity::defaultRealName() {
+#ifdef Q_OS_MAC
+  return CFStringToQString(CSCopyUserName(false));
+#else
+  return tr("Quassel IRC User");
+#endif
+}
+

 void Identity::setToDefaults() {
   setIdentityName(tr("<empty>"));
 void Identity::setToDefaults() {
   setIdentityName(tr("<empty>"));

-  setRealName(tr("Quassel IRC User"));
+  setRealName(defaultRealName());

   QStringList n;
   QStringList n;

-  n << QString("quassel%1").arg(qrand() & 0xff); // FIXME provide more sensible default nicks
+  n << defaultNick();

   setNicks(n);
   setAwayNick("");
   setAwayNickEnabled(false);
   setNicks(n);
   setAwayNick("");
   setAwayNickEnabled(false);