Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7994 in orxonox.OLD


Ignore:
Timestamp:
May 30, 2006, 9:54:28 PM (18 years ago)
Author:
bensch
Message:

gui: doxytags, and returning reference to temporary resolved

Location:
branches/gui/src/lib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/gui/src/lib/gui/gl_gui/signal_connector.cc

    r7992 r7994  
    6262  }
    6363
     64  /**
     65   * @brief assignes a SignalConnector to the current one
     66   * @param signalConnector the SignalConnector to assign to this one
     67   * @return A Reference to this SignalConnector.
     68   */
    6469  SignalConnector& SignalConnector::operator=(const SignalConnector& signalConnector)
    6570  {
    … …  
    6772    this->object = signalConnector.object;
    6873    this->exec = (signalConnector.exec == NULL) ? NULL : signalConnector.exec->clone();
     74  }
     75
     76
     77  /**
     78   * @brief compares two SignalConnectors.
     79   * @param signalConnector the SignalConnector to compare against this one.
     80   * @return true if the Connectors are the same.
     81   */
     82  bool SignalConnector::operator==(const SignalConnector& signalConnector) const
     83  {
     84    return (this->object == signalConnector.object /* && this->exec == signalConnector.exec */ );
    6985  }
    7086

  • branches/gui/src/lib/gui/gl_gui/signal_connector.h

    r7992 r7994  
    158158
    159159    SignalConnector& operator=(const SignalConnector& signalConnector);
    160     bool operator==(const SignalConnector& signalConnector);
     160    bool operator==(const SignalConnector& signalConnector) const;
    161161
    162162    void operator()() const;

  • branches/gui/src/lib/util/executor/executor.h

    r7985 r7994  
    4242
    4343    virtual Executor* clone () const = 0;
     44//    virtual bool operator==(const Executor* executor) const = 0;
    4445
    4546    // SETTING up the EXECUTOR
    … …  
    5152
    5253    // EXECUTE
     54    /** executes a Command. @param objec the Object, @param count how many values, @param values the Values */
    5355    virtual void operator()(BaseObject* object, unsigned int count, const MultiType* values) const = 0;
    54 
    5556    /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes */
    5657    virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const = 0;

  • branches/gui/src/lib/util/executor/executor_functional.cc

    r7985 r7994  
    4040template<> float fromMulti<float>(const MultiType& multi) { return multi.getFloat(); };
    4141template<> char fromMulti<char>(const MultiType& multi) { return multi.getChar(); };
    42 template<> const std::string& fromMulti<const std::string&>(const MultiType& multi) { return multi.getString(); };
     42template<> const std::string& fromMulti<const std::string&>(const MultiType& multi) { return multi.getConstString(); };
    4343
    4444

  • branches/gui/src/lib/util/executor/executor_functional.h

    r7990 r7994  
    122122  };
    123123
     124  /** executes a Command. @param objec the Object, @param count how many values, @param values the Values */
    124125  virtual void operator()(BaseObject* object, unsigned int count, const MultiType* values) const
    125126  {
    … …  
    161162  };
    162163
     164  /** executes a Command. @param objec the Object, @param count how many values, @param values the Values */
    163165  virtual void operator()(BaseObject* object, unsigned int count, const MultiType* values) const
    164166  {
    … …  
    223225  };
    224226
     227  /** executes a Command. @param objec the Object, @param count how many values, @param values the Values */
    225228  virtual void operator()(BaseObject* object, unsigned int count, const MultiType* values) const
    226229  {
    … …  
    276279  };
    277280
     281  /** executes a Command. @param objec the Object, @param count how many values, @param values the Values */
    278282  virtual void operator()(BaseObject* object, unsigned int count, const MultiType* values) const
    279283  {
    … …  
    332336  };
    333337
     338  /** executes a Command. @param objec the Object, @param count how many values, @param values the Values */
    334339  virtual void operator()(BaseObject* object, unsigned int count, const MultiType* values) const
    335340  {
    … …  
    390395  };
    391396
     397  /** executes a Command. @param objec the Object, @param count how many values, @param values the Values */
    392398  virtual void operator()(BaseObject* object, unsigned int count, const MultiType* values) const
    393399  {

  • branches/gui/src/lib/util/multi_type.cc

    r7401 r7994  
    381381}
    382382
     383const std::string& MultiType::getConstString() const
     384{
     385  MultiType::constString = this->getString();
     386  return MultiType::constString;
     387}
     388
     389
    383390/**
    384391 * @returns a formated c-string of the held value
    … …  
    490497
    491498
     499std::string MultiType::constString = "";
    492500const std::string MultiType::typeNames[] =
    493501  {

  • branches/gui/src/lib/util/multi_type.h

    r7401 r7994  
    8787    const char* getCString();
    8888    std::string getString() const;
     89    const std::string& getConstString() const;
    8990
    9091    void reset();
    … …  
    107108    MT_Type                      type;              //!< The Type stored in this MultiType
    108109
     110
     111    static std::string           constString;       //!< A String for returning Constant strings.
     112
    109113    static const std::string     typeNames[];       //!< List of TypeNames for conversion.
    110114};
Note: See TracChangeset for help on using the changeset viewer.