diff options
Diffstat (limited to 'tests/libother')
-rw-r--r-- | tests/libother/extendsnoimplicitconversion.h | 6 | ||||
-rw-r--r-- | tests/libother/number.h | 4 | ||||
-rw-r--r-- | tests/libother/otherderived.h | 10 | ||||
-rw-r--r-- | tests/libother/othermultiplederived.h | 4 | ||||
-rw-r--r-- | tests/libother/otherobjecttype.h | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/tests/libother/extendsnoimplicitconversion.h b/tests/libother/extendsnoimplicitconversion.h index 0a06482ec..a94c63ade 100644 --- a/tests/libother/extendsnoimplicitconversion.h +++ b/tests/libother/extendsnoimplicitconversion.h @@ -38,12 +38,12 @@ #include "libothermacros.h" #include "noimplicitconversion.h" -class LIBOTHER_API ExtendsNoImplicitConversion +class ExtendsNoImplicitConversion { public: explicit ExtendsNoImplicitConversion(int objId) : m_objId(objId) {}; - int objId() const { return m_objId; } - operator NoImplicitConversion() const { return NoImplicitConversion(m_objId); } + inline int objId() const { return m_objId; } + inline operator NoImplicitConversion() const { return NoImplicitConversion(m_objId); } private: int m_objId; }; diff --git a/tests/libother/number.h b/tests/libother/number.h index 32af33258..8fd2671da 100644 --- a/tests/libother/number.h +++ b/tests/libother/number.h @@ -43,10 +43,10 @@ class LIBOTHER_API Number { public: explicit Number(int value) : m_value(value) {}; - int value() const { return m_value; } + inline int value() const { return m_value; } Str toStr() const; - operator Str() const { return toStr(); } + inline operator Str() const { return toStr(); } friend LIBOTHER_API Point operator*(const Point&, const Number&); diff --git a/tests/libother/otherderived.h b/tests/libother/otherderived.h index 4aae12aa9..8e9171ba5 100644 --- a/tests/libother/otherderived.h +++ b/tests/libother/otherderived.h @@ -53,16 +53,16 @@ public: virtual void unpureVirtual(); virtual PrintFormat returnAnEnum() { return Short; } - void useObjectTypeFromOtherModule(ObjectType*) {} - Event useValueTypeFromOtherModule(const Event& e) { return e; } - Complex useValueTypeFromOtherModule(const Complex& c) { return c; } - void useEnumTypeFromOtherModule(OverloadedFuncEnum) {} + inline void useObjectTypeFromOtherModule(ObjectType*) {} + inline Event useValueTypeFromOtherModule(const Event& e) { return e; } + inline Complex useValueTypeFromOtherModule(const Complex& c) { return c; } + inline void useEnumTypeFromOtherModule(OverloadedFuncEnum) {} // factory method static Abstract* createObject(); protected: - const char* getClassName() { return className(); } + inline const char* getClassName() { return className(); } virtual const char* className() { return "OtherDerived"; } }; #endif // OTHERDERIVED_H diff --git a/tests/libother/othermultiplederived.h b/tests/libother/othermultiplederived.h index 36c23ebc6..cefc72561 100644 --- a/tests/libother/othermultiplederived.h +++ b/tests/libother/othermultiplederived.h @@ -40,11 +40,11 @@ class ObjectType; -class LIBOTHER_API OtherMultipleDerived : public MDerived1 +class OtherMultipleDerived : public MDerived1 { public: // this will use CppCopier from other module (bug#142) - VirtualMethods returnUselessClass() { return VirtualMethods(); } + inline VirtualMethods returnUselessClass() { return VirtualMethods(); } }; #endif diff --git a/tests/libother/otherobjecttype.h b/tests/libother/otherobjecttype.h index 24596fa9d..d4c77cb19 100644 --- a/tests/libother/otherobjecttype.h +++ b/tests/libother/otherobjecttype.h @@ -42,7 +42,7 @@ #include "objecttype.h" #include "collector.h" -class LIBOTHER_API OtherObjectType : public ObjectType +class OtherObjectType : public ObjectType { public: |