← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qtdeclarative-opensource-src-gles/vivid

« back to all changes in this revision

Viewing changes to src/qml/qml/qqmlprivate.h

  • Committer: Package Import Robot
  • Author(s): Timo Jyrinki
  • Date: 2015-03-11 16:51:45 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20150311165145-7653iqap3mau92gy
Tags: 5.4.1-0ubuntu1
Sync package with qtdeclarative-opensource-src - 5.4.1-1ubuntu3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qml/qml/qqmlprivate.h
122
122
        typedef int yes_type;
123
123
        typedef char no_type;
124
124
 
125
 
        static yes_type check(To *);
126
 
        static no_type check(...);
 
125
        static yes_type checkType(To *);
 
126
        static no_type checkType(...);
127
127
 
128
128
        static inline int cast()
129
129
        {
130
 
            return StaticCastSelectorClass<From, To, sizeof(check(reinterpret_cast<From *>(0)))>::cast();
 
130
            return StaticCastSelectorClass<From, To, sizeof(checkType(reinterpret_cast<From *>(0)))>::cast();
131
131
        }
132
132
    };
133
133
 
145
145
        typedef char no_type;
146
146
 
147
147
        template<typename ReturnType>
148
 
        static yes_type check(ReturnType *(*)(QObject *));
149
 
        static no_type check(...);
 
148
        static yes_type checkType(ReturnType *(*)(QObject *));
 
149
        static no_type checkType(...);
150
150
 
151
 
        static bool const value = sizeof(check(&T::qmlAttachedProperties)) == sizeof(yes_type);
 
151
        static bool const value = sizeof(checkType(&T::qmlAttachedProperties)) == sizeof(yes_type);
152
152
    };
153
153
 
154
154
    template <typename T>