Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9369 in orxonox.OLD for branches/proxy/src/lib


Ignore:
Timestamp:
Jul 20, 2006, 9:16:39 PM (18 years ago)
Author:
bensch
Message:

orxonox/proxy switched to sigslot library, and it seems to work, but i am not entirely sure…

Location:
branches/proxy/src/lib
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • branches/proxy/src/lib/Makefile.am

    r8367 r9369  
    3131        collision_detection \
    3232        collision_reaction \
     33        gui \
    3334        network \
    3435        parser \
    3536        shell \
    36         script_engine \
    37         gui
     37        script_engine

  • branches/proxy/src/lib/gui/gl/glgui_button.cc

    r8769 r9369  
    7979  {
    8080    GLGuiWidget::clicking(pos);
    81     emit(clicked());
     81    clicked.emit();
    8282  }
    8383  void GLGuiButton::releasing(const Vector2D& pos, bool focused)
    8484  {
    8585    GLGuiWidget::releasing(pos, focused);
    86     emit(released());
     86    released.emit();
    8787  }
    8888
    … …  
    103103    {
    104104      if (event.bPressed)
    105         emit(pushed());
     105        clicked.emit();
    106106      else
    107         emit(released());
     107        released.emit();
    108108      return true;
    109109    }

  • branches/proxy/src/lib/gui/gl/glgui_button.h

    r8717 r9369  
    4242      virtual bool processEvent(const Event& event);
    4343
    44       DeclareSignal0(clicked);
    45       DeclareSignal0(released);
     44      sigslot::signal0<> clicked;
     45      sigslot::signal0<> released;
    4646
    4747

  • branches/proxy/src/lib/gui/gl/glgui_checkbutton.cc

    r8717 r9369  
    5555  {
    5656    this->bActive = bActive;
    57     emit(this->toggled(this->bActive));
     57    this->toggled.emit(this->bActive);
    5858  }
    5959

  • branches/proxy/src/lib/gui/gl/glgui_checkbutton.h

    r8717 r9369  
    3434    virtual void update() {};
    3535
    36     DeclareSignal1(toggled, bool);
     36    sigslot::signal1<bool> toggled;
    3737
    3838  protected:

  • branches/proxy/src/lib/gui/gl/glgui_image.h

    r8448 r9369  
    3434    virtual void draw() const;
    3535
    36     DeclareSignal0(imageChanged);
     36    sigslot::signal0<> imageChanged;
    3737
    3838  protected:

  • branches/proxy/src/lib/gui/gl/glgui_inputline.cc

    r8717 r9369  
    124124    this->resize();
    125125    this->setFrontColor(Color(1,1,1,1), true);
    126     emit(this->textChanged(this->_text.text()));
     126    this->textChanged.emit(this->_text.text());
    127127  }
    128128
    … …  
    146146  void GLGuiInputLine::pushEnter()
    147147  {
    148     emit(this->enterPushed(this->_text.text()));
     148    this->enterPushed.emit(this->_text.text());
    149149    if (this->_clearOnEnter)
    150150      this->clear();

  • branches/proxy/src/lib/gui/gl/glgui_inputline.h

    r8619 r9369  
    4949    virtual bool processEvent(const Event& event);
    5050
    51     DeclareSignal1(textChanged, const std::string&);
    52     DeclareSignal1(enterPushed, const std::string&);
     51    sigslot::signal1<const std::string&> textChanged;
     52    sigslot::signal1<const std::string&> enterPushed;
    5353
    5454  protected:

  • branches/proxy/src/lib/gui/gl/glgui_slider.cc

    r8717 r9369  
    7777    this->_handle.setCenter(this->sliderPosition(), borderTop() + (this->getSizeY2D() - borderTop() - borderBottom()) / 2.0);
    7878
    79     emit(valueChanged(this->_value));
     79    valueChanged.emit(this->_value);
    8080  }
    8181
    … …  
    9090    {
    9191      this->_minValue = minimum;
    92       emit(rangeChanged(this->_minValue, this->_maxValue));
     92      rangeChanged.emit(this->_minValue, this->_maxValue);
    9393    }
    9494    if (this->value() < this->min())
    … …  
    107107    {
    108108      this->_maxValue = maximum;
    109       emit(rangeChanged(this->_minValue, this->_maxValue));
     109      rangeChanged.emit(this->_minValue, this->_maxValue);
    110110    }
    111111    if (this->value() > this->max())
    … …  
    126126      this->_minValue = minimum;
    127127      this->_maxValue = maximum;
    128       emit(rangeChanged(this->_minValue, this->_maxValue));
     128      rangeChanged.emit(this->_minValue, this->_maxValue);
    129129    }
    130130    if (this->value() < this->min())

  • branches/proxy/src/lib/gui/gl/glgui_slider.h

    r8717 r9369  
    5151    virtual void draw() const;
    5252
    53     DeclareSignal1(valueChanged, float);
    54     DeclareSignal2(rangeChanged, float, float);
     53    sigslot::signal1<float> valueChanged;
     54    sigslot::signal2<float, float> rangeChanged;
    5555
    5656  protected:

  • branches/proxy/src/lib/gui/gl/glgui_text.cc

    r8991 r9369  
    113113    this->resize();
    114114    this->setFrontColor(_changedTextColor, true);
    115     emit(this->textChanged(this->_text.text()));
     115    this->textChanged.emit(this->_text.text());
    116116  }
    117117

  • branches/proxy/src/lib/gui/gl/glgui_text.h

    r8991 r9369  
    4040    virtual void draw() const;
    4141
    42     DeclareSignal1(textChanged, const std::string&);
     42    sigslot::signal1<const std::string&> textChanged;
    4343
    4444  protected:

  • branches/proxy/src/lib/gui/gl/glgui_textfield.cc

    r9015 r9369  
    112112    this->resize();
    113113    this->setFrontColor(_changedTextColor, true);
    114     emit(this->textChanged(this->_text.text()));
     114    this->textChanged.emit(this->_text.text());
    115115  }
    116116

  • branches/proxy/src/lib/gui/gl/glgui_textfield.h

    r9015 r9369  
    3838    virtual void draw() const;
    3939
    40     DeclareSignal1(textChanged, const std::string&);
     40    sigslot::signal1<const std::string&> textChanged;
    4141
    4242  protected:

  • branches/proxy/src/lib/gui/gl/glgui_widget.cc

    r9019 r9369  
    288288    this->setWidgetSize(Vector2D(x, y));
    289289  }
    290 
    291 
    292 
    293   void GLGuiWidget::connect(GLGuiWidget* sender, Signal& signal, BaseObject* receiver, Slot executor)
    294   {
    295     sender->connect(signal, receiver, executor);
    296   }
    297 
    298   void GLGuiWidget::connect(Signal& signal, BaseObject* receiver, Slot executor)
    299   {
    300     signal.push_back(SignalConnector(receiver, executor));
    301   }
    302 
    303290
    304291  void GLGuiWidget::show()

  • branches/proxy/src/lib/gui/gl/glgui_widget.h

    r8990 r9369  
    1717
    1818#include "event.h"
    19 #include "signal_connector.h"
     19#include "sigslot/signal.h"
    2020
    2121namespace OrxGui
    … …  
    7070    void release(const Vector2D& pos);
    7171    bool clickable() const { return this->_clickable; };
    72 
    73     static void connect(GLGuiWidget* sender, Signal& signal, BaseObject* receiver, Slot executor);
    74     void connect(Signal& signal, BaseObject* receiver, Slot executor);
    75 
    76     void disconnect(GLGuiWidget* sender, Signal& signal, BaseObject* receiver);
    7772
    7873    OrxGui::State state() const { return this->_state; };

  • branches/proxy/src/lib/gui/gl/signal_connector.h

    r8145 r9369  
    1212{
    1313
    14   //////////////// TO BE IGNORED BY YOU /////
     14//////////////// TO BE IGNORED BY YOU /////
    1515#define DeclareSignalBegin(SignalName) \
    1616  public: \

  • branches/proxy/src/lib/util/sigslot/signal.h

    r9368 r9369  
    12381238    virtual _connection_base0<mt_policy>* duplicate(has_slots<mt_policy>* pnewdest)
    12391239    {
    1240       return new _connection0<dest_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
     1240      return new _connection0<dest_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
    12411241    }
    12421242
    … …  
    12791279    virtual _connection_base1<arg1_type, mt_policy>* duplicate(has_slots<mt_policy>* pnewdest)
    12801280    {
    1281       return new _connection1<dest_type, arg1_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
     1281      return new _connection1<dest_type, arg1_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
    12821282    }
    12831283
    … …  
    13211321    virtual _connection_base2<arg1_type, arg2_type, mt_policy>* duplicate(has_slots<mt_policy>* pnewdest)
    13221322    {
    1323       return new _connection2<dest_type, arg1_type, arg2_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
     1323      return new _connection2<dest_type, arg1_type, arg2_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
    13241324    }
    13251325
    … …  
    13631363    virtual _connection_base3<arg1_type, arg2_type, arg3_type, mt_policy>* duplicate(has_slots<mt_policy>* pnewdest)
    13641364    {
    1365       return new _connection3<dest_type, arg1_type, arg2_type, arg3_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
     1365      return new _connection3<dest_type, arg1_type, arg2_type, arg3_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
    13661366    }
    13671367
    … …  
    14071407    virtual _connection_base4<arg1_type, arg2_type, arg3_type, arg4_type, mt_policy>* duplicate(has_slots<mt_policy>* pnewdest)
    14081408    {
    1409       return new _connection4<dest_type, arg1_type, arg2_type, arg3_type, arg4_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
     1409      return new _connection4<dest_type, arg1_type, arg2_type, arg3_type, arg4_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
    14101410    }
    14111411
    … …  
    14571457    {
    14581458      return new _connection5<dest_type, arg1_type, arg2_type, arg3_type, arg4_type,
    1459              arg5_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
     1459      arg5_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
    14601460    }
    14611461
    … …  
    15071507    {
    15081508      return new _connection6<dest_type, arg1_type, arg2_type, arg3_type, arg4_type,
    1509              arg5_type, arg6_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
     1509      arg5_type, arg6_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
    15101510    }
    15111511
    … …  
    15571557    {
    15581558      return new _connection7<dest_type, arg1_type, arg2_type, arg3_type, arg4_type,
    1559              arg5_type, arg6_type, arg7_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
     1559      arg5_type, arg6_type, arg7_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
    15601560    }
    15611561
    … …  
    16091609    {
    16101610      return new _connection8<dest_type, arg1_type, arg2_type, arg3_type, arg4_type,
    1611              arg5_type, arg6_type, arg7_type, arg8_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
     1611      arg5_type, arg6_type, arg7_type, arg8_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
    16121612    }
    16131613

  • branches/proxy/src/lib/util/sigslot/slot.h

    r9361 r9369  
    240240
    241241  template<class mt_policy = SIGSLOT_DEFAULT_MT_POLICY>
    242   class has_slots : public mt_policy
     242  class has_slots //: public mt_policy
    243243  {
    244244    private:
    … …  
    253253
    254254      has_slots(const has_slots& hs)
    255           : mt_policy(hs)
    256       {
    257         lock_block<mt_policy> lock(this);
     255//          : mt_policy(hs)
     256      {
     257        //lock_block<mt_policy> lock(this);
    258258        const_iterator it = hs.m_senders.begin();
    259259        const_iterator itEnd = hs.m_senders.end();
    … …  
    269269      void signal_connect(_signal_base<mt_policy>* sender)
    270270      {
    271         lock_block<mt_policy> lock(this);
     271        //lock_block<mt_policy> lock(this);
    272272        m_senders.insert(sender);
    273273      }
    … …  
    275275      void signal_disconnect(_signal_base<mt_policy>* sender)
    276276      {
    277         lock_block<mt_policy> lock(this);
     277        //lock_block<mt_policy> lock(this);
    278278        m_senders.erase(sender);
    279279      }
    … …  
    286286      void disconnect_all()
    287287      {
    288         lock_block<mt_policy> lock(this);
     288        //lock_block<mt_policy> lock(this);
    289289        const_iterator it = m_senders.begin();
    290290        const_iterator itEnd = m_senders.end();
Note: See TracChangeset for help on using the changeset viewer.