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

List:       kde-commits
Subject:    [kcoreaddons] src/lib/util: Use KCOREADDONS_NO_DEPRECATED instead of KDE_NO_DEPRECATED
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2014-02-23 11:53:39
Message-ID: E1WHXcp-0006Zc-Sx () scm ! kde ! org
[Download RAW message or body]

Git commit fa5a6e77b6f0d70fc7dbe781c9d15a377d35e786 by Alex Merry.
Committed on 15/01/2014 at 13:48.
Pushed by alexmerry into branch 'master'.

Use KCOREADDONS_NO_DEPRECATED instead of KDE_NO_DEPRECATED

KCOREADDONS_NO_DEPRECATED is the macro controlled by
generate_export_header; KDE_NO_DEPRECATED is left over from kdelibs.

REVIEW: 115028

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

http://commits.kde.org/kcoreaddons/fa5a6e77b6f0d70fc7dbe781c9d15a377d35e786

diff --git a/src/lib/util/kuser.h b/src/lib/util/kuser.h
index 2b6e6ed..dc24b5b 100644
--- a/src/lib/util/kuser.h
+++ b/src/lib/util/kuser.h
@@ -176,7 +176,7 @@ public:
      * @return the full name of the user or QString() if user is invalid
      * @deprecated use property(KUser::FullName) instead
      */
-#ifndef KDE_NO_DEPRECATED
+#ifndef KCOREADDONS_NO_DEPRECATED
     KCOREADDONS_DEPRECATED QString fullName() const;
 #endif
 =

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

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

-#ifndef KDE_NO_DEPRECATED
+#ifndef KCOREADDONS_NO_DEPRECATED
 QString KUser::fullName() const
 {
     return (d->userInfo ? QString::fromUtf16((ushort *) d->userInfo->usri1=
1_full_name) : QString());

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