# HG changeset patch
# User Max Samukha <maxter@spambox.com>
# Date 1275503162 -10800
# Node ID a3f5c10414f369eb253094fec5258887477e1a4a
# Parent  9784459f0750755b8e7937cf2ae642eaff494777
oops

diff -r 9784459f0750 -r a3f5c10414f3 d2/qtd/MOC.d
--- a/d2/qtd/MOC.d	Wed Jun 02 19:38:05 2010 +0300
+++ b/d2/qtd/MOC.d	Wed Jun 02 21:26:02 2010 +0300
@@ -566,7 +566,7 @@
 
     /*internal*/ static void setStaticMetaObject(QMetaObject m)
     {
-        _staticMetaObject = m;
+        staticMetaObject_ = m;
     }
 }
 
diff -r 9784459f0750 -r a3f5c10414f3 generator/dgenerator.cpp
--- a/generator/dgenerator.cpp	Wed Jun 02 19:38:05 2010 +0300
+++ b/generator/dgenerator.cpp	Wed Jun 02 21:26:02 2010 +0300
@@ -2753,23 +2753,23 @@
           << "    }" << endl << endl;
     }
 
-    s << "    private static __gshared QMetaObject _staticMetaObject;" << endl
+    s << "    private static __gshared QMetaObject staticMetaObject_;" << endl
       << "    protected static void setStaticMetaObject(QMetaObject m) {" << endl
-      << "        _staticMetaObject = m;" << endl
+      << "        staticMetaObject_ = m;" << endl
       << "    }" << endl << endl
 
       << "    @property QMetaObject metaObject() {" << endl
-      << "        return _staticMetaObject;" << endl
+      << "        return staticMetaObject_;" << endl
       << "    }" << endl << endl
 
       << "    @property static QMetaObject staticMetaObject() {" << endl
-      << "        if (!_staticMetaObject)" << endl
+      << "        if (!staticMetaObject_)" << endl
       << "            QMetaObject.create!(typeof(this))(qtd_" << d_class->name() << "_staticMetaObject());" << endl
-      << "        return _staticMetaObject;" << endl
+      << "        return staticMetaObject_;" << endl
       << "    }" << endl << endl
 
       << "    static " << d_class->name() << " __getObject(void* nativeId) {" << endl
-      << "        return static_cast!(" << d_class->name() << ")(_staticMetaObject.getObject(nativeId));" << endl
+      << "        return static_cast!(" << d_class->name() << ")(staticMetaObject_.getObject(nativeId));" << endl
       << "    }" << endl << endl
 
       << "    /* internal */ static void __createEntity(void* nativeId, void* dId) {" << endl
@@ -2789,8 +2789,8 @@
       do // need this to look for default arguments and generate extra signatures
       {
           AbstractMetaFunction *fn = signal_funcs.at(i);
-    s << "        index = _staticMetaObject.indexOfMethod_Cpp(__signalSignatures[" << staticId << "]);" << endl
-    << "        _staticMetaObject.addMethod(new QMetaSignal(signature!(";
+    s << "        index = staticMetaObject_.indexOfMethod_Cpp(__signalSignatures[" << staticId << "]);" << endl
+    << "        staticMetaObject_.addMethod(new QMetaSignal(signature!(";
           writeMetaMethodArguments(s, fn, j);
     s << ")(\"" << fn->name() << "\"), index));" << endl << endl;
           AbstractMetaArgumentList args = fn->arguments();
@@ -2811,8 +2811,8 @@
       do // need this to look for default arguments and generate extra signatures
       {
           AbstractMetaFunction *fn = slot_funcs.at(i);
-    s << "        index = _staticMetaObject.indexOfMethod_Cpp(__slotSignatures[" << staticId << "]);" << endl
-    << "        _staticMetaObject.addMethod(new QMetaSlot(signature!(";
+    s << "        index = staticMetaObject_.indexOfMethod_Cpp(__slotSignatures[" << staticId << "]);" << endl
+    << "        staticMetaObject_.addMethod(new QMetaSlot(signature!(";
           writeMetaMethodArguments(s, fn, j);
     s << ")(\"" << fn->name() << "\"), index));" << endl << endl;
           AbstractMetaArgumentList args = fn->arguments();