--- a/generator/cppgenerator.h	Fri May 21 14:16:02 2010 +0300
+++ b/generator/cppgenerator.h	Mon May 24 23:43:30 2010 +0300
@@ -82,10 +82,11 @@
             && !(java_class->attributes() & AbstractMetaAttributes::Fake);
     }
 
-    static QString shellClassName(const AbstractMetaClass *java_class) {
-        return java_class->generateShellClass()
-               ? java_class->name() + "_QtDShell"
-               : java_class->qualifiedCppName();
+    static QString shellClassName(const AbstractMetaClass *java_class, bool fullName = true) {
+        if (java_class->generateShellClass())
+            return java_class->name() + "_QtDShell";
+        else
+            return fullName ? java_class->qualifiedCppName() : java_class->typeEntry()->name();
     }
 
  protected: