[Kde-bindings] KDE/kdebindings/csharp/qyoto

[Richard Dale]

SVN commit 808270 by rdale:

* After the modular smoke changes, the QtWebKit classes were not being
  built
* Rename the 'modules' global variable qyoto_modules to reduce the chances
  of a name clash

CCMAIL: kde-bindings at kde.org


 M  +2 -1      CMakeLists.txt  
 M  +7 -0      ChangeLog  
 M  +1 -1      src/qyoto.cpp  
 M  +1 -1      src/qyoto.h  
 M  +3 -3      src/qyotoshared.cpp  


--- trunk/KDE/kdebindings/csharp/qyoto/CMakeLists.txt #808269:808270
@@ -36,7 +36,8 @@
 	svg/*.cs
 	opengl/*.cs
 	uitools/*.cs
-	qdbus/*.cs)
+	qdbus/*.cs
+	webkit/*.cs)
 
 SET( UICS_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/tools/uics/uics )
 SET( CSRCC_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/tools/csrcc/csrcc )
--- trunk/KDE/kdebindings/csharp/qyoto/ChangeLog #808269:808270
@@ -1,3 +1,10 @@
+2008-05-16  Richard Dale  <richard.j.dale at gmail.com>
+
+	* After the modular smoke changes, the QtWebKit classes were not being
+	  built
+	* Rename the 'modules' global variable qyoto_modules to reduce the chances
+	  of a name clash
+
 2008-05-13  Arno Rehn  <arno at arnorehn.de>
 
 	* Fix memory leak in WriteProperty.
--- trunk/KDE/kdebindings/csharp/qyoto/src/qyoto.cpp #808269:808270
@@ -891,7 +891,7 @@
     }
 
     QyotoModule module = { "Qyoto", resolve_classname_Qt, IsContainedInstanceQt };
-    modules.insert(qt_Smoke, module);
+    qyoto_modules[qt_Smoke] = module;
 
 #if QT_VERSION >= 0x40300
     QInternal::registerCallback(QInternal::EventNotifyCallback, qyoto_event_notify);
--- trunk/KDE/kdebindings/csharp/qyoto/src/qyoto.h #808269:808270
@@ -81,7 +81,7 @@
 typedef void * (*ConstructDict)(const char*, const char*);
 typedef void (*SetPropertyFn)(void *, const char*, void *);
 
-extern Q_DECL_EXPORT QHash<Smoke*, QyotoModule> modules;
+extern Q_DECL_EXPORT QHash<Smoke*, QyotoModule> qyoto_modules;
 
 extern Q_DECL_EXPORT int do_debug; // evil
 
--- trunk/KDE/kdebindings/csharp/qyoto/src/qyotoshared.cpp #808269:808270
@@ -17,7 +17,7 @@
 #endif
 
 // modules
-QHash<Smoke*, QyotoModule> modules;
+QHash<Smoke*, QyotoModule> qyoto_modules;
 
 extern "C" {
 bool application_terminated = false;
@@ -282,14 +282,14 @@
 const char *
 resolve_classname(Smoke* smoke, int classId, void * ptr)
 {
-	return modules.value(smoke).resolve_classname(smoke, classId, ptr);
+	return qyoto_modules.value(smoke).resolve_classname(smoke, classId, ptr);
 }
 
 bool
 IsContainedInstance(smokeqyoto_object *o)
 {
 	QHash<Smoke*, QyotoModule>::const_iterator i;
-	for (i = modules.constBegin(); i != modules.constEnd(); ++i) {
+	for (i = qyoto_modules.constBegin(); i != qyoto_modules.constEnd(); ++i) {
 		if (i.value().IsContainedInstance(o))
 			return true;
 	}