Changeset 7608 in orxonox.OLD for branches/qt_gui/src/lib/lang

Timestamp:

May 12, 2006, 10:43:53 AM (18 years ago)

Author:

bensch

Message:

merged the old qt-gui back with
svn merge -r7438:HEAD ​https://svn.orxonox.net/orxonox/branches/qt_gui_old .
minor conflict in BuildLibs.am

Location:

branches/qt_gui/src/lib/lang

Files:

• base_object.cc (modified) (2 diffs)
• base_object.h (modified) (1 diff)

branches/qt_gui/src/lib/lang/base_object.cc

@@ -20 +20 @@
 
 #include "util/loading/load_param.h"
-#include "compiler.h"
 #include "class_list.h"
 
@@ -32 +31 @@
  * @param root the element to load from
  */
-BaseObject::BaseObject()
+BaseObject::BaseObject(const std::string& objectName)
 {
   this->classID = CL_BASE_OBJECT;
   this->className = "BaseObject";
 
-  this->objectName = "";
+  this->objectName = objectName;
   this->classList = NULL;
   this->xmlElem = NULL;

branches/qt_gui/src/lib/lang/base_object.h

@@ -27 +27 @@
 
  public:
-  BaseObject ();
+   BaseObject (const std::string& objectName = "");
   virtual ~BaseObject ();