[rkward-cvs] SF.net SVN: rkward: [2160] branches/KDE4_port/rkward/core

[tfry at users.sourceforge.net]

Revision: 2160
          http://rkward.svn.sourceforge.net/rkward/?rev=2160&view=rev
Author:   tfry
Date:     2007-11-02 05:04:06 -0700 (Fri, 02 Nov 2007)

Log Message:
-----------
Inline RObject::getShortName() (and most importantly, don't trace)

Modified Paths:
--------------
    branches/KDE4_port/rkward/core/robject.cpp
    branches/KDE4_port/rkward/core/robject.h

Modified: branches/KDE4_port/rkward/core/robject.cpp
===================================================================
--- branches/KDE4_port/rkward/core/robject.cpp	2007-11-02 12:03:14 UTC (rev 2159)
+++ branches/KDE4_port/rkward/core/robject.cpp	2007-11-02 12:04:06 UTC (rev 2160)
@@ -57,11 +57,6 @@
 	delete [] classnames;
 }
 
-QString RObject::getShortName () const {
-	RK_TRACE (OBJECTS);
-	return name;
-}
-
 QString RObject::getFullName () const {
 	RK_TRACE (OBJECTS);
 	return parent->makeChildName (RObject::name, type & Misplaced);

Modified: branches/KDE4_port/rkward/core/robject.h
===================================================================
--- branches/KDE4_port/rkward/core/robject.h	2007-11-02 12:03:14 UTC (rev 2159)
+++ branches/KDE4_port/rkward/core/robject.h	2007-11-02 12:04:06 UTC (rev 2160)
@@ -77,7 +77,7 @@
 /** @returns false if an object of the given old type cannot represent an object of the given new type (e.g. (new_type & RObjectType::Variable), but (old_type & RObjectType::Container)). */
 	static bool isMatchingType (int old_type, int new_type) { return ((old_type & ROBJECT_TYPE_INTERNAL_MASK) == (new_type & ROBJECT_TYPE_INTERNAL_MASK)); };
 	
-	QString getShortName () const;
+	QString getShortName () const { return name; };
 	virtual QString getFullName () const;
 	virtual QString getBaseName () const;
 	QString getLabel () const;


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