Sun Jan 17 22:04:08 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Fix class-map image loading and use the new static smoke methods.

indClass() and isDerivedFrom() are now static (r1076132 and also in KDE 4.4).

--- old-smoke/src/libsmoke/smoke.cpp 2014-10-30 08:08:40.000000000 +0100

+++ new-smoke/src/libsmoke/smoke.cpp 2014-10-30 08:08:40.000000000 +0100

@@ -130,13 +130,12 @@

/** Finds a class.

* @param c pointer to write the result to

- * @param smoke the smoke module

* @param name the name of the class

*/

CL_SMOKE_EXPORT void

-cl_smoke_find_class(Smoke::ModuleIndex* c, void* smoke, const char* name)

+cl_smoke_find_class(Smoke::ModuleIndex* c, const char* name)

{

- *c = get_smoke(smoke)->findClass(name);

+ *c = Smoke::findClass(name);

}

/** Gets the class ID for a Smoke module.

@@ -182,7 +181,7 @@

Q_ASSERT(!smoke_get_class(smoke, class_index)->external);

Q_ASSERT(!smoke_get_class(smoke_base, base_index)->external);

- return get_smoke(smoke)->isDerivedFrom(get_smoke(smoke), class_index,

+ return Smoke::isDerivedFrom(get_smoke(smoke), class_index,

get_smoke(smoke_base), base_index);

}