Commit 80477cef authored by Declara Denis's avatar Declara Denis Committed by Christian Schulte zu Berge
Browse files

Small fixes in the codebase

* Remove explicit use of Qt::QueuedConnection. As it turns out, when the
  event is emitted by a thread, different from the GUI thread, it is
  automatically enqueued.
* use #ifdef instead of #if
parent 2107d089
...@@ -70,7 +70,7 @@ namespace campvis { ...@@ -70,7 +70,7 @@ namespace campvis {
_layout->setSpacing(8); _layout->setSpacing(8);
_layout->setMargin(0); _layout->setMargin(0);
setLayout(_layout); setLayout(_layout);
connect(this, SIGNAL(s_propertyVisibilityChanged(const AbstractProperty*)), this, SLOT(onWidgetVisibilityChanged(const AbstractProperty*)), Qt::QueuedConnection); connect(this, SIGNAL(s_propertyVisibilityChanged(const AbstractProperty*)), this, SLOT(onWidgetVisibilityChanged(const AbstractProperty*)));
connect(this, SIGNAL(propertyAdded(AbstractProperty*)), this, SLOT(addProperty(AbstractProperty*))); connect(this, SIGNAL(propertyAdded(AbstractProperty*)), this, SLOT(addProperty(AbstractProperty*)));
connect(this, SIGNAL(propertyRemoved(AbstractProperty*, QWidget*)), this, SLOT(removeProperty(AbstractProperty*, QWidget*))); connect(this, SIGNAL(propertyRemoved(AbstractProperty*, QWidget*)), this, SLOT(removeProperty(AbstractProperty*, QWidget*)));
} }
......
...@@ -479,7 +479,7 @@ void Shader::activate() { ...@@ -479,7 +479,7 @@ void Shader::activate() {
} }
void Shader::activate(GLint id) { void Shader::activate(GLint id) {
#if CGT_DEBUG #ifdef CGT_DEBUG
if (cgt::getGlInt(GL_CURRENT_PROGRAM) != 0) if (cgt::getGlInt(GL_CURRENT_PROGRAM) != 0)
LWARNING("Binding a new Shader while another Shader is active. Do you really want to do this?"); LWARNING("Binding a new Shader while another Shader is active. Do you really want to do this?");
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment