summaryrefslogtreecommitdiff
path: root/client/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'client/widgets')
-rw-r--r--client/widgets/altcombobox.cc16
-rw-r--r--client/widgets/widget.cc14
2 files changed, 16 insertions, 14 deletions
diff --git a/client/widgets/altcombobox.cc b/client/widgets/altcombobox.cc
index f60fb5c..b5cdab0 100644
--- a/client/widgets/altcombobox.cc
+++ b/client/widgets/altcombobox.cc
@@ -35,6 +35,8 @@
#include "multilist.h"
#include "macrowindow.h"
+#include "debug.h"
+
AltComboBox::AltComboBox(QDomNode &node, MacroWindow *macrowindow)
: Widget(node, macrowindow)
{
@@ -72,14 +74,14 @@ AltComboBox::AltComboBox(QDomNode &node, MacroWindow *macrowindow)
if(item.hasAttribute("value")) {
altvalue = item.attribute("value");
} else {
- printf("ERROR: altitem tag is missing the value attribute, "
- "in altcombobox!\n");
+ ERROR(altcombobos, "altitem tag is missing the value attribute, "
+ "in altcombobox!\n");
}
if(item.hasAttribute("innerwidget")) {
iwname = item.attribute("innerwidget");
} else {
- printf("ERROR: altitem tag is missing the innerwidget attribute, "
+ ERROR(altcombobox, "altitem tag is missing the innerwidget attribute, "
"in altcombobox!\n");
}
@@ -108,7 +110,7 @@ AltComboBox::AltComboBox(QDomNode &node, MacroWindow *macrowindow)
innerwidget = findWidget(iwname, true);
if(innerwidget == NULL) {
- printf("ERROR: Inner Widget %s not found (in altcombobox)!\n",
+ ERROR(altcombobox, "Inner Widget %s not found (in altcombobox)!\n",
iwname.toStdString().c_str());
}
@@ -182,9 +184,9 @@ void AltComboBox::onValueChange(int index)
QComboBox *cmb = (QComboBox*)combobox->qwidget();
- printf("Value changed: %s altvalue: %s\n",
- cmb->itemData(index).toString().toStdString().c_str(),
- altvalue.toStdString().c_str());
+ DEBUG(alcombobox, "Value changed: %s altvalue: %s\n",
+ cmb->itemData(index).toString().toStdString().c_str(),
+ altvalue.toStdString().c_str());
if(cmb->itemData(index).toString() == altvalue) {
// altframe->setEnabled(true);
diff --git a/client/widgets/widget.cc b/client/widgets/widget.cc
index 231359c..563f648 100644
--- a/client/widgets/widget.cc
+++ b/client/widgets/widget.cc
@@ -33,8 +33,7 @@
#include <QLayout>
#include <QObject>
-#define DEBUG(fmt...) printf("Widget (%p)", this); printf(fmt); fflush(stdout)
-//#define DEBUG(ftm...)
+#include "debug.h"
Widget::Widget(QDomNode &node, MacroWindow *macrowindow)
{
@@ -69,14 +68,14 @@ Widget::Widget(QDomNode &node, MacroWindow *macrowindow)
is_valid = true;
- DEBUG("Create Widget '%s' of type '%s'\n",
+ DEBUG(widget, "Create Widget '%s' of type '%s'\n",
name().toStdString().c_str(),
type().toStdString().c_str());
}
Widget::~Widget()
{
- DEBUG("Delete Widget '%s' of type '%s'\n",
+ DEBUG(widget, "Delete Widget '%s' of type '%s'\n",
name().toStdString().c_str(),
type().toStdString().c_str());
@@ -169,7 +168,7 @@ bool Widget::setKeyboardFocus()
Widget *Widget::findWidget(QString n, bool deep)
{
- DEBUG("Find Widget %p\n", this); fflush(stdout);
+ DEBUG(widget, "Find Widget %p\n", this);
if(n == name()) return this;
@@ -189,7 +188,7 @@ Widget *Widget::findWidget(QString n, bool deep)
QVector< Widget* > Widget::widgetList(bool deep)
{
- DEBUG("Widget List %p\n", this); fflush(stdout);
+ DEBUG(widget, "Widget List %p\n", this);
QVector< Widget* > lst;
@@ -214,7 +213,8 @@ void Widget::childWasChanged()
void Widget::addChild(Widget *widget)
{
if(widget == NULL) {
- DEBUG("Trying to add NULL child to '%s'\n", name().toStdString().c_str());
+ WARN(widget, "Trying to add NULL child to '%s'\n",
+ name().toStdString().c_str());
return;
}
children.push_back(widget);