diff options
| -rw-r--r-- | client/client.pro | 4 | ||||
| -rw-r--r-- | client/widgetbuilder.cc | 12 | ||||
| -rw-r--r-- | client/widgets.h | 2 | ||||
| -rw-r--r-- | client/widgets/button.cc (renamed from client/widgets/pushbutton.cc) | 14 | ||||
| -rw-r--r-- | client/widgets/button.h (renamed from client/widgets/pushbutton.h) | 12 |
5 files changed, 22 insertions, 22 deletions
diff --git a/client/client.pro b/client/client.pro index 49b718a..cc69d96 100644 --- a/client/client.pro +++ b/client/client.pro @@ -35,7 +35,7 @@ HEADERS += \ widgets/lineedit.h \ widgets/multilist.h \ widgets/textedit.h \ - widgets/pushbutton.h \ + widgets/button.h \ widgets/combobox.h \ widgets/listbox.h \ widgets/frame.h \ @@ -58,7 +58,7 @@ SOURCES += \ widgets/lineedit.cc \ widgets/multilist.cc \ widgets/textedit.cc \ - widgets/pushbutton.cc \ + widgets/button.cc \ widgets/combobox.cc \ widgets/listbox.cc \ widgets/frame.cc \ diff --git a/client/widgetbuilder.cc b/client/widgetbuilder.cc index 8d23c0b..d458379 100644 --- a/client/widgetbuilder.cc +++ b/client/widgetbuilder.cc @@ -54,13 +54,13 @@ QVector< Widget* > widgetBuilder(QDomNode xml_node, QWidget *parent, MacroWindow widget = lineedit; } else if(xml_elem.tagName() == "button") { - PushButton *pushbutton = new PushButton(xml_elem, macrowindow); + Button *button = new Button(xml_elem, macrowindow); //macrowindow->connect(pushbutton, SIGNAL(act_continue()), main, SLOT(get_macro())); - macrowindow->connect(pushbutton, SIGNAL(act_commit()), macrowindow, SLOT(commit())); - macrowindow->connect(pushbutton, SIGNAL(act_reset()), macrowindow, SLOT(reset())); - macrowindow->connect(pushbutton, SIGNAL(act_cancel()), macrowindow, SLOT(cancel())); - macrowindow->connect(pushbutton, SIGNAL(act_continue(QString)), macrowindow, SLOT(cont(QString))); - widget = pushbutton; + macrowindow->connect(button, SIGNAL(act_commit()), macrowindow, SLOT(commit())); + macrowindow->connect(button, SIGNAL(act_reset()), macrowindow, SLOT(reset())); + macrowindow->connect(button, SIGNAL(act_cancel()), macrowindow, SLOT(cancel())); + macrowindow->connect(button, SIGNAL(act_continue(QString)), macrowindow, SLOT(cont(QString))); + widget = button; } else if(xml_elem.tagName() == "textedit") { TextEdit *textedit = new TextEdit(xml_elem, macrowindow); diff --git a/client/widgets.h b/client/widgets.h index 97f5962..18a2856 100644 --- a/client/widgets.h +++ b/client/widgets.h @@ -31,7 +31,7 @@ #include "widgets/label.h" #include "widgets/lineedit.h" #include "widgets/textedit.h" -#include "widgets/pushbutton.h" +#include "widgets/button.h" #include "widgets/combobox.h" #include "widgets/listbox.h" #include "widgets/multilist.h" diff --git a/client/widgets/pushbutton.cc b/client/widgets/button.cc index 21d5c1b..f40b0ec 100644 --- a/client/widgets/pushbutton.cc +++ b/client/widgets/button.cc @@ -1,6 +1,6 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /*************************************************************************** - * pushbutton.cc + * button.cc * * Fri Jul 13 12:38:45 CEST 2007 * Copyright 2007 Bent Bisballe Nyeng and Lars Bisballe Jensen @@ -24,10 +24,10 @@ * along with Pracro; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include "pushbutton.h" +#include "button.h" #include <stdio.h> -PushButton::PushButton(QDomNode &node, MacroWindow *macrowindow) +Button::Button(QDomNode &node, MacroWindow *macrowindow) : QPushButton(), Widget(node, macrowindow) { QDomElement elem = node.toElement(); @@ -67,25 +67,25 @@ PushButton::PushButton(QDomNode &node, MacroWindow *macrowindow) } } -void PushButton::commit() +void Button::commit() { emit act_commit(); printf("Emit: commit\n"); } -void PushButton::reset() +void Button::reset() { emit act_reset(); printf("Emit: reset\n"); } -void PushButton::cancel() +void Button::cancel() { emit act_cancel(); printf("Emit: cancel\n"); } -void PushButton::cont() +void Button::cont() { emit act_continue(field); printf("Emit: continue\n"); diff --git a/client/widgets/pushbutton.h b/client/widgets/button.h index acefdf1..effcd79 100644 --- a/client/widgets/pushbutton.h +++ b/client/widgets/button.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /*************************************************************************** - * pushbutton.h + * button.h * * Fri Jul 13 12:38:45 CEST 2007 * Copyright 2007 Bent Bisballe Nyeng and Lars Bisballe Jensen @@ -24,19 +24,19 @@ * along with Pracro; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifndef __PRACRO_PUSHBUTTON_H__ -#define __PRACRO_PUSHBUTTON_H__ +#ifndef __PRACRO_BUTTON_H__ +#define __PRACRO_BUTTON_H__ #include "widget.h" #include <QPushButton> #include <QWidget> #include <QDomNode> -class PushButton : public QPushButton, public Widget +class Button : public QPushButton, public Widget { Q_OBJECT public: - PushButton(QDomNode &node, MacroWindow *macrowindow); + Button(QDomNode &node, MacroWindow *macrowindow); QString field; public slots: @@ -54,4 +54,4 @@ signals: private: }; -#endif/*__PRACRO_PUSHBUTTON_H__*/ +#endif/*__PRACRO_BUTTON_H__*/ |