[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kcoreaddons] src/lib/util: Inline deprecated KUser::fullName() method
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2014-02-23 11:53:40
Message-ID: E1WHXcq-0006Zc-Bc () scm ! kde ! org
[Download RAW message or body]

Git commit 88a0d9828aa5b7e108ac259e1d60f38061c93027 by Alex Merry.
Committed on 06/02/2014 at 16:57.
Pushed by alexmerry into branch 'master'.

Inline deprecated KUser::fullName() method

REVIEW: 115028

M  +4    -1    src/lib/util/kuser.h
M  +0    -7    src/lib/util/kuser_unix.cpp
M  +0    -7    src/lib/util/kuser_win.cpp

http://commits.kde.org/kcoreaddons/88a0d9828aa5b7e108ac259e1d60f38061c93027

diff --git a/src/lib/util/kuser.h b/src/lib/util/kuser.h
index dc24b5b..42c8115 100644
--- a/src/lib/util/kuser.h
+++ b/src/lib/util/kuser.h
@@ -177,7 +177,10 @@ public:
      * @deprecated use property(KUser::FullName) instead
      */
 #ifndef KCOREADDONS_NO_DEPRECATED
-    KCOREADDONS_DEPRECATED QString fullName() const;
+    KCOREADDONS_DEPRECATED QString fullName() const
+    {
+        return property(FullName).toString();
+    }
 #endif
 =

     /**
diff --git a/src/lib/util/kuser_unix.cpp b/src/lib/util/kuser_unix.cpp
index 7a6fc15..aa2f907 100644
--- a/src/lib/util/kuser_unix.cpp
+++ b/src/lib/util/kuser_unix.cpp
@@ -158,13 +158,6 @@ QString KUser::loginName() const
     return d->loginName;
 }
 =

-#ifndef KCOREADDONS_NO_DEPRECATED
-QString KUser::fullName() const
-{
-    return d->properties[FullName].toString();
-}
-#endif
-
 QString KUser::homeDir() const
 {
     return d->homeDir;
diff --git a/src/lib/util/kuser_win.cpp b/src/lib/util/kuser_win.cpp
index 6d89582..06759af 100644
--- a/src/lib/util/kuser_win.cpp
+++ b/src/lib/util/kuser_win.cpp
@@ -191,13 +191,6 @@ QString KUser::loginName() const
     return (d->userInfo ? QString::fromUtf16((ushort *) d->userInfo->usri1=
1_name) : QString());
 }
 =

-#ifndef KCOREADDONS_NO_DEPRECATED
-QString KUser::fullName() const
-{
-    return (d->userInfo ? QString::fromUtf16((ushort *) d->userInfo->usri1=
1_full_name) : QString());
-}
-#endif
-
 QString KUser::homeDir() const
 {
     return QDir::fromNativeSeparators(QString::fromLocal8Bit(qgetenv("USER=
PROFILE")));
[prev in list] [next in list] [prev in thread] [next in thread]