Changeset 7855 in orxonox.OLD for trunk/src/lib/gui/gl_gui/glgui_widget.cc

Timestamp:

May 25, 2006, 3:42:18 PM (19 years ago)

Author:

bensch

Message:

qtgui: cleanup as patrick sugested

File:

• trunk/src/lib/gui/gl_gui/glgui_widget.cc (modified) (4 diffs)

trunk/src/lib/gui/gl_gui/glgui_widget.cc

@@ -58 +58 @@
     this->frontModel = 0;
 
-    this->widgetSignals.resize(GLGuiSignalCount, NULL);
+    this->widgetSignals.resize(SignalCount, SignalConnector());
   }
 
@@ -64 +64 @@
   bool GLGuiWidget::focusOverWidget(float x, float y)
   {
-    if (this->getAbsCoor2D().x < x && this->getAbsCoor2D().x+ this->getSizeX2D() > x &&
-        this->getAbsCoor2D().y < y && this->getAbsCoor2D().y+ this->getSizeX2D() > y)
+    if (this->getAbsCoor2D().x < x && this->getAbsCoor2D().x + this->getSizeX2D() > x &&
+        this->getAbsCoor2D().y < y && this->getAbsCoor2D().y + this->getSizeY2D() > y)
       return true;
     else
@@ -76 +76 @@
    * @param signal the name of the Signal
    */
-  void GLGuiWidget::connectSignal(GLGuiSignalType signalType, BaseObject*, const Executor* signal)
+  void GLGuiWidget::connectSignal(SignalType signalType, BaseObject* object, const Executor* signal)
   {
-    if (signalType >= GLGuiSignalCount)
+    if (signalType >= this->widgetSignals.size())
       return;
 
-    if (this->widgetSignals[signalType] != NULL)
-      PRINTF(2)("Already connected a Signal to '%s::%s' type %s... overwriting\n", this->getClassName(), this->getName(), "TEST");
+//    if (this->widgetSignals[signalType] != NULL)
+//      PRINTF(2)("Already connected a Signal to '%s::%s' type %s... overwriting\n", this->getClassName(), this->getName(), "TEST");
 
-    //this->widgetSignals[signalType] = ;
+    this->widgetSignals[signalType] = SignalConnector(object, signal);
   }
 
@@ -91 +91 @@
    * @param signalType the type of Signal to remove.
    */
-  void GLGuiWidget::disconnectSignal(GLGuiSignalType signalType)
+  void GLGuiWidget::disconnectSignal(SignalType signalType)
   {
-    if (signalType > GLGuiSignalCount)
+    if (signalType >= this->widgetSignals.size())
       return;
 
-    this->widgetSignals[signalType] = NULL;
+    this->widgetSignals[signalType] = SignalConnector();
   }