[rkward-cvs] SF.net SVN: rkward:[4077] trunk/rkward/rkward/core/renvironmentobject.cpp

[tfry at users.sourceforge.net]

Revision: 4077
          http://rkward.svn.sourceforge.net/rkward/?rev=4077&view=rev
Author:   tfry
Date:     2011-12-07 17:54:11 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
Fix code completion for :::-operator

Modified Paths:
--------------
    trunk/rkward/rkward/core/renvironmentobject.cpp

Modified: trunk/rkward/rkward/core/renvironmentobject.cpp
===================================================================
--- trunk/rkward/rkward/core/renvironmentobject.cpp	2011-12-07 16:14:13 UTC (rev 4076)
+++ trunk/rkward/rkward/core/renvironmentobject.cpp	2011-12-07 17:54:11 UTC (rev 4077)
@@ -89,9 +89,8 @@
 QString REnvironmentObject::makeChildBaseName (const QString &short_child_name) const {
 	RK_TRACE (OBJECTS);
 
-	if (type & ToplevelEnv) {
-		return (short_child_name);
-	}
+	if (type & ToplevelEnv) return (short_child_name);
+	if (isPackageNamespace ()) return (static_cast<REnvironmentObject*>(parent)->packageName () + ":::" + short_child_name);
 	return (name + '$' + short_child_name);
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.