diff --git a/libs/global/kis_shared_ptr.h b/libs/global/kis_shared_ptr.h
index c75e1cc671..b9f1c93602 100644
--- a/libs/global/kis_shared_ptr.h
+++ b/libs/global/kis_shared_ptr.h
@@ -1,526 +1,526 @@
 /*
  *  Copyright (c) 2005 Frerich Raabe <raabe@kde.org>
  *  Copyright (c) 2006,2010 Cyrille Berger <cberger@cberger.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef KIS_SHAREDPTR_H
 #define KIS_SHAREDPTR_H
 
 #include <QtGlobal>
 
 #include <kis_debug.h>
 
 #include "kis_memory_leak_tracker.h"
 
 template<class T>
 class KisWeakSharedPtr;
 
 /**
  * KisSharedPtr is a shared pointer similar to KSharedPtr and
  * boost::shared_ptr. The difference with KSharedPtr is that our
  * constructor is not explicit.
  *
  * A shared pointer is a wrapper around a real pointer. The shared
  * pointer keeps a reference count, and when the reference count drops
  * to 0 the contained pointer is deleted. You can use the shared
  * pointer just as you would use a real pointer.
  *
  * See also also item 28 and 29 of More Effective C++ and
  * http://bugs.kde.org/show_bug.cgi?id=52261 as well as
  * http://www.boost.org/libs/smart_ptr/shared_ptr.htm.
  *
  * Advantage of KisSharedPtr over boost pointer or QSharedPointer?
  *
  * The difference with boost share pointer is that in
  * boost::shared_ptr, the counter is kept inside the smart pointer,
  * meaning that you should never never remove the pointer from its
  * smart pointer object, because if you do that, and somewhere in the
  * code, the pointer is put back in a smart pointer, then you have two
  * counters, and when one reach zero, then the object gets deleted
  * while some other code thinks the pointer is still valid.
  *
  * Disadvantage of KisSharedPtr compared to boost pointer?
  *
  * KisSharedPtr requires the class to inherits KisShared.
  *
- * Difference with QSharedDataPointer
+ * Difference with QSharedPointer
  *
- * QSharedDataPointer and KisSharedPtr are very similar, but
- * QSharedDataPointer has an explicit constructor which makes it more
- * painful to use in some constructions. And QSharedDataPointer
+ * QSharedPointer and KisSharedPtr are very similar, but
+ * QSharedPointer has an explicit constructor which makes it more
+ * painful to use in some constructions. And QSharedPointer
  * doesn't offer a weak pointer.
  */
 template<class T>
 class KisSharedPtr
 {
     friend class KisWeakSharedPtr<T>;
 public:
     /**
      * Creates a null pointer.
      */
     inline KisSharedPtr()
             : d(0) { }
 
     /**
      * Creates a new pointer.
      * @param p the pointer
      */
     inline KisSharedPtr(T* p)
             : d(p) {
         ref();
     }
 
     inline KisSharedPtr(const KisWeakSharedPtr<T>& o);
 
     // Free the pointer and set it to new value
     void attach(T* p);
 
     // Free the pointer
     void clear();
 
     /**
      * Copies a pointer.
      * @param o the pointer to copy
      */
     inline KisSharedPtr<T>(const KisSharedPtr<T>& o)
             : d(o.d) {
         ref();
     }
 
     /**
      * Dereferences the object that this pointer points to. If it was
      * the last reference, the object will be deleted.
      */
     inline ~KisSharedPtr() {
         deref();
     }
 
     inline KisSharedPtr<T>& operator= (const KisSharedPtr& o) {
         attach(o.d);
         return *this;
     }
     inline bool operator== (const T* p) const {
         return (d == p);
     }
     inline bool operator!= (const T* p) const {
         return (d != p);
     }
     inline bool operator== (const KisSharedPtr& o) const {
         return (d == o.d);
     }
     inline bool operator!= (const KisSharedPtr& o) const {
         return (d != o.d);
     }
 
     inline KisSharedPtr<T>& operator= (T* p) {
         attach(p);
         return *this;
     }
 
     inline operator const T*() const {
         return d;
     }
 
     template< class T2> inline operator KisSharedPtr<T2>() const {
         return KisSharedPtr<T2>(d);
     }
 
     /**
     * @return the contained pointer. If you delete the contained
     * pointer, you will make KisSharedPtr very unhappy. It is
     * perfectly save to put the contained pointer in another
     * KisSharedPtr, though.
     */
     inline T* data() {
         return d;
     }
 
     /**
     * @return the pointer
     */
     inline const T* data() const {
         return d;
     }
 
     /**
     * @return a const pointer to the shared object.
     */
     inline const T* constData() const {
         return d;
     }
 
     inline const T& operator*() const {
         Q_ASSERT(d);
         return *d;
     }
     inline T& operator*() {
         Q_ASSERT(d);
         return *d;
     }
 
     inline const T* operator->() const {
         Q_ASSERT(d);
         return d;
     }
     inline T* operator->() {
         Q_ASSERT(d);
         return d;
     }
 
     /**
     * @return true if the pointer is null
     */
     inline bool isNull() const {
         return (d == 0);
     }
 
     inline static void ref(const KisSharedPtr<T>* sp, T* t)
     {
 #ifndef HAVE_MEMORY_LEAK_TRACKER
         Q_UNUSED(sp);
 #else
         KisMemoryLeakTracker::instance()->reference(t, sp);
 #endif
         if (t) {
             t->ref();
         }
     }
 
     inline static bool deref(const KisSharedPtr<T>* sp, T* t)
     {
 #ifndef HAVE_MEMORY_LEAK_TRACKER
         Q_UNUSED(sp);
 #else
         KisMemoryLeakTracker::instance()->dereference(t, sp);
 #endif
         if (t && !t->deref()) {
             delete t;
             return false;
         }
         return true;
     }
 
 private:    
     inline void ref() const
     {
         ref(this, d);
     }
 
     inline void deref() const
     {
         bool v = deref(this, d);
 #ifndef NDEBUG
         if (!v) {
             d = 0;
         }
 #else
     Q_UNUSED(v);
 #endif
     }
 
 private:
     mutable T* d;
 };
 
 /**
  * A weak shared ptr is an ordinary shared ptr, with two differences:
  * it doesn't delete the contained pointer if the refcount drops to
  * zero and it doesn't prevent the contained pointer from being
  * deleted if the last strong shared pointer goes out of scope.
  */
 template<class T>
 class KisWeakSharedPtr
 {
     friend class KisSharedPtr<T>;
 public:
     /**
      * Creates a null pointer.
      */
     inline KisWeakSharedPtr()
         : d(0), weakReference(0) { }
 
     /**
      * Creates a new pointer.
      * @param p the pointer
      */
     inline KisWeakSharedPtr(T* p) {
         load(p);
     }
 
     inline KisWeakSharedPtr<T>(const KisSharedPtr<T>& o) {
         load(o.d);
     }
 
     /**
      * Copies a pointer.
      * @param o the pointer to copy
      */
     inline KisWeakSharedPtr<T>(const KisWeakSharedPtr<T>& o) {
         if (o.isConsistent()) {
             load(o.d);
         }
         else {
             d = 0;
             weakReference = 0;
         }
     }
 
     inline ~KisWeakSharedPtr() {
         detach();
     }
 
     inline KisWeakSharedPtr<T>& operator= (const KisWeakSharedPtr& o) {
         attach(o);
         return *this;
     }
 
     inline bool operator== (const T* p) const {
         return (d == p);
     }
     inline bool operator!= (const T* p) const {
         return (d != p);
     }
     inline bool operator== (const KisWeakSharedPtr& o) const {
         return (d == o.d);
     }
     inline bool operator!= (const KisWeakSharedPtr& o) const {
         return (d != o.d);
     }
 
     inline KisWeakSharedPtr<T>& operator= (T* p) {
         attach(p);
         return *this;
     }
 
     template< class T2> inline operator KisWeakSharedPtr<T2>() const {
         return KisWeakSharedPtr<T2>(d);
     }
 
     /**
      * Note that if you use this function, the pointer might be destroyed
      * if KisSharedPtr pointing to this pointer are deleted, resulting in
      * a segmentation fault. Use with care.
      * @return a const pointer to the shared object.
      */
     inline T* data() {
         if (!isConsistent()) {
             warnKrita << kisBacktrace();
             Q_ASSERT_X(0, "KisWeakSharedPtr", "Weak pointer is not valid!");
         }
 
         return d;
     }
 
     /**
      * @see data()
      */
     inline const T* data() const {
         if (!isConsistent()) {
             warnKrita << kisBacktrace();
             Q_ASSERT_X(0, "KisWeakSharedPtr", "Weak pointer is not valid!");
         }
 
         return d;
     }
 
     /**
      * @see data()
      */
     inline const T* constData() const {
         if (!isConsistent()) {
             warnKrita << kisBacktrace();
             Q_ASSERT_X(0, "KisWeakSharedPtr", "Weak pointer is not valid!");
         }
 
         return d;
     }
 
     /**
      * @see data()
      */
     inline operator const T*() const {
         /**
          * This operator is used in boolean expressions where we check
          * for pointer consistency, so return 0 instead of asserting.
          */
 
         return isConsistent() ? d : 0;
     }
 
     inline const T& operator*() const {
         if (!isValid()) {
             warnKrita << kisBacktrace();
             Q_ASSERT_X(0, "KisWeakSharedPtr", "Weak pointer is not valid!");
         }
 
         return *d;
     }
 
     inline T& operator*() {
         if (!isValid()) {
             warnKrita << kisBacktrace();
             Q_ASSERT_X(0, "KisWeakSharedPtr", "Weak pointer is not valid!");
         }
 
         return *d;
     }
 
     inline const T* operator->() const {
         if (!isValid()) {
             warnKrita << kisBacktrace();
             Q_ASSERT_X(0, "KisWeakSharedPtr", "Weak pointer is not valid!");
         }
 
         return d;
     }
 
     inline T* operator->() {
         if (!isValid()) {
             warnKrita << kisBacktrace();
             Q_ASSERT_X(0, "KisWeakSharedPtr", "Weak pointer is not valid!");
         }
 
         return d;
     }
 
     /**
     * @return true if the pointer is null
     */
     inline bool isNull() const {
         return (d == 0);
     }
 
     /**
      * @return true if the weak pointer points to a valid pointer
      *         and false if the data has been deleted or is null
      */
     inline bool isValid() const {
         Q_ASSERT(!d || weakReference);
 
         return d && weakReference && isOdd((int)*weakReference);
     }
 
     /**
      * @brief toStrongRef returns a KisSharedPtr which may be dereferenced.
      *
      * Weak pointers should only be used to track ownership but never be used as pointers.
      * This has historically not been the case, but in new API this function should be used
      * instead of directly using a weak pointer as pointer.
      * @return a KisSharedPtr, which may be null
      */
     inline KisSharedPtr<T> toStrongRef() const {
         return KisSharedPtr<T>(*this);
     }
 
 private:
     static const qint32 WEAK_REF = 2;
     static inline bool isOdd(const qint32 &x) {
         return x & 0x01;
     }
 
     inline bool isConsistent() const {
         Q_ASSERT(!d || weakReference);
 
         return !d || (weakReference && isOdd((int)*weakReference));
     }
 
     void load(T* newValue) {
         d = newValue;
 
         if (d) {
             weakReference = d->sharedWeakReference();
             weakReference->fetchAndAddOrdered(WEAK_REF);
         }
         else {
             weakReference = 0;
         }
     }
 
     // see note in kis_shared.cc
     inline void attach(T* newValue) {
         detach();
         load(newValue);
     }
 
     inline void attach(const KisWeakSharedPtr& o) {
         detach();
         if (o.isConsistent()) {
             load(o.d);
         }
         else {
             d = 0;
             weakReference = 0;
         }
     }
 
     // see note in kis_shared.cc
     void detach() {
         d = 0;
 
         if (weakReference &&
             weakReference->fetchAndAddOrdered(-WEAK_REF) <= WEAK_REF) {
 
             // sanity check:
             Q_ASSERT((int)*weakReference == 0);
 
             delete weakReference;
             weakReference = 0;
         }
     }
 
     mutable T* d;
     QAtomicInt *weakReference;
 };
 
 
 template <class T>
 Q_INLINE_TEMPLATE  KisSharedPtr<T>::KisSharedPtr(const KisWeakSharedPtr<T>& o)
         : d(o.d)
 {
     if (o.isValid()) {
         ref();
 
         /**
          * Thread safety:
          * Is the object we have just referenced still valid?
          */
         Q_ASSERT(o.isConsistent());
     }
     else {
         d = 0;
     }
 }
 
 
 template <class T>
 Q_INLINE_TEMPLATE void KisSharedPtr<T>::attach(T* p)
 {
     if (d != p) {
         ref(this, p);
         T* old = d;
         d = p;
         deref(this, old);
     }
 }
 
 template <class T>
 Q_INLINE_TEMPLATE void KisSharedPtr<T>::clear()
 {
     attach((T*)0);
 }
 
 #endif