diff options
Diffstat (limited to 'src')
50 files changed, 73 insertions, 110 deletions
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index 5db91762e..296e3569a 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -25,7 +25,8 @@ #include "kvi_iconmanager.h" #include "class_button.h" -#include <QIconSet> +#include <QIcon> +#include <QPushButton> KVSO_BEGIN_REGISTERCLASS(KviKvsObject_button,"button","widget") @@ -55,7 +56,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_button) bool KviKvsObject_button::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(new QPushButton(parentScriptWidget(),name()),true); + SET_OBJECT(QPushButton); connect(widget(),SIGNAL(clicked()),this,SLOT(slotClicked())); return true; } diff --git a/src/modules/objects/class_button.h b/src/modules/objects/class_button.h index 46cb78a20..48233759e 100644 --- a/src/modules/objects/class_button.h +++ b/src/modules/objects/class_button.h @@ -24,7 +24,6 @@ -#include <qpushbutton.h> #include "class_widget.h" #include "object_macros.h" diff --git a/src/modules/objects/class_checkbox.h b/src/modules/objects/class_checkbox.h index bf93ceefe..d6deca095 100644 --- a/src/modules/objects/class_checkbox.h +++ b/src/modules/objects/class_checkbox.h @@ -25,7 +25,6 @@ -#include <qcheckbox.h> #include "class_button.h" #include "object_macros.h" diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index 314666305..38fc015ea 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -29,6 +29,7 @@ #include <QLineEdit> #include <QString> +#include <QComboBox> /* @doc: combobox @@ -131,7 +132,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_combobox) bool KviKvsObject_combobox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(new QComboBox(parentScriptWidget(), name()), true); + SET_OBJECT(QComboBox); connect (((QComboBox *)widget()),SIGNAL(activated( int )),this,SLOT(slotActivated( int ))); return true; } diff --git a/src/modules/objects/class_dialog.h b/src/modules/objects/class_dialog.h index 224e214cd..f74e85b3a 100644 --- a/src/modules/objects/class_dialog.h +++ b/src/modules/objects/class_dialog.h @@ -23,9 +23,6 @@ // #include "class_widget.h" - -class QDialog; - #include "object_macros.h" class KviKvsObject_dialog : public KviKvsObject_widget diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp index abd43a51a..fd996427d 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -27,9 +27,10 @@ #include "kvi_frame.h" #include "kvi_locale.h" #include "kvi_qstring.h" + #include <QDockWidget> #define QT_DOCK_WINDOW QDockWidget -#include <qlayout.h> +#include <QLayout> /* @doc: dockwindow diff --git a/src/modules/objects/class_dockwindow.h b/src/modules/objects/class_dockwindow.h index e94476031..310106096 100644 --- a/src/modules/objects/class_dockwindow.h +++ b/src/modules/objects/class_dockwindow.h @@ -26,7 +26,6 @@ #include "kvi_settings.h" #include "object_macros.h" - #include "class_widget.h" class KviKvsObject_dockwindow : public KviKvsObject_widget diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp index 50e40d038..b7fd22c19 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -28,7 +28,10 @@ #include "kvi_error.h" #include "kvi_fileutils.h" -#include <QStringList> +#include <QStringList> +#include <QFile> +#include <QTextStream> + // needed for $open() diff --git a/src/modules/objects/class_file.h b/src/modules/objects/class_file.h index ac805a959..4d318abcb 100644 --- a/src/modules/objects/class_file.h +++ b/src/modules/objects/class_file.h @@ -24,10 +24,9 @@ -#include <qfile.h> -#include <qtextstream.h> #include "kvi_string.h" +#include <QFile> /* //class KviCommand; diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index 74474cba9..f6974ccd6 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -29,6 +29,7 @@ #include "kvi_locale.h" #include "kvi_iconmanager.h" + // Tables used in $setAlignment , $alignment and in $setOrientation & $orientation const char * const align_tbl[] = { diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp index 60c0c0fbf..9f77e4179 100644 --- a/src/modules/objects/class_hbox.cpp +++ b/src/modules/objects/class_hbox.cpp @@ -23,6 +23,7 @@ #include "kvi_debug.h" #include "kvi_locale.h" #include "class_hbox.h" +#include "kvi_tal_hbox.h" /* @doc: hbox diff --git a/src/modules/objects/class_hbox.h b/src/modules/objects/class_hbox.h index ae067b5fe..531eed2f0 100644 --- a/src/modules/objects/class_hbox.h +++ b/src/modules/objects/class_hbox.h @@ -21,9 +21,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -#include "kvi_string.h" -#include "kvi_tal_hbox.h" #include "object_macros.h" #include "class_widget.h" diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index 236c2603e..a2c72b9dd 100644 --- a/src/modules/objects/class_label.cpp +++ b/src/modules/objects/class_label.cpp @@ -31,6 +31,7 @@ #include <QFont> #include <QPixmap> #include <QMessageBox> +#include <QLabel> @@ -225,9 +226,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_label) bool KviKvsObject_label::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - QLabel *label=new QLabel(parentScriptWidget()); - label->setObjectName(name()); - setObject(label,true); + SET_OBJECT(QLabel) return true; } diff --git a/src/modules/objects/class_label.h b/src/modules/objects/class_label.h index e5589d003..ca98412f3 100644 --- a/src/modules/objects/class_label.h +++ b/src/modules/objects/class_label.h @@ -24,7 +24,6 @@ -#include <qlabel.h> #include "class_widget.h" #include "object_macros.h" diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp index c8f641b6e..19cc525d9 100644 --- a/src/modules/objects/class_layout.cpp +++ b/src/modules/objects/class_layout.cpp @@ -21,11 +21,10 @@ // #define _KVI_DEBUG_CHECK_RANGE_ #include "kvi_debug.h" - #include "kvi_locale.h" - #include "class_layout.h" +#include <QGridLayout> #define QLAYOUT_AUTO_CONSTRAINT QLayout::SetDefaultConstraint #define QLAYOUT_FIXED QLayout::SetFixedSize #define QLAYOUT_FREE_RESIZE QLayout::SetNoConstraint @@ -113,6 +112,7 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList return false; } setObject(new QGridLayout(w)); + setObjectName(name()); return true; } diff --git a/src/modules/objects/class_layout.h b/src/modules/objects/class_layout.h index 832c81cf1..29fc116b9 100644 --- a/src/modules/objects/class_layout.h +++ b/src/modules/objects/class_layout.h @@ -21,9 +21,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -#include "kvi_string.h" -#include <qlayout.h> #include "object_macros.h" class KviKvsObject_layout : public KviKvsObject diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp index 88c9eb32c..c840b8132 100644 --- a/src/modules/objects/class_lcd.cpp +++ b/src/modules/objects/class_lcd.cpp @@ -25,10 +25,11 @@ #include "class_lcd.h" #include "kvi_error.h" #include "kvi_debug.h" - #include "kvi_locale.h" #include "kvi_iconmanager.h" +#include <QLCDNumber> + /* @doc: lcdnumber @keyterms: @@ -89,7 +90,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lcd) bool KviKvsObject_lcd::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(new QLCDNumber(parentScriptWidget(), name()), true); + SET_OBJECT(QLCDNumber) return true; } diff --git a/src/modules/objects/class_lcd.h b/src/modules/objects/class_lcd.h index 09a01b5e0..eb0384dbe 100644 --- a/src/modules/objects/class_lcd.h +++ b/src/modules/objects/class_lcd.h @@ -25,7 +25,6 @@ -#include <qlcdnumber.h> #include "class_widget.h" diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index d00357c49..d87e3f79c 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -23,11 +23,10 @@ #include "kvi_error.h" #include "kvi_debug.h" - #include "kvi_locale.h" - #include "class_lineedit.h" +#include <QLineEdit> static const char * mode_tbl[] = { "Normal", "NoEcho", @@ -218,7 +217,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lineedit) bool KviKvsObject_lineedit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { - setObject(new QLineEdit(parentScriptWidget(),getName()),true); + SET_OBJECT(QLineEdit) connect(widget(),SIGNAL(returnPressed()),this,SLOT(slotreturnPressed())); connect(widget(),SIGNAL(lostFocus()),this,SLOT(slotlostFocus())); connect(widget(),SIGNAL(textChanged(const QString & )),this,SLOT(slottextChanged(const QString & ))); diff --git a/src/modules/objects/class_lineedit.h b/src/modules/objects/class_lineedit.h index 0887b1821..60c95e576 100644 --- a/src/modules/objects/class_lineedit.h +++ b/src/modules/objects/class_lineedit.h @@ -24,7 +24,6 @@ -#include <qlineedit.h> #include "class_widget.h" //#warning "Signals !" diff --git a/src/modules/objects/class_mainwindow.h b/src/modules/objects/class_mainwindow.h index c8cb266a2..259e1a24e 100644 --- a/src/modules/objects/class_mainwindow.h +++ b/src/modules/objects/class_mainwindow.h @@ -23,7 +23,7 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -//#include <qmainwindow.h> + #include "class_widget.h" #include "object_macros.h" diff --git a/src/modules/objects/class_menubar.cpp b/src/modules/objects/class_menubar.cpp index 37797a3eb..b90a215d3 100644 --- a/src/modules/objects/class_menubar.cpp +++ b/src/modules/objects/class_menubar.cpp @@ -60,7 +60,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_menubar) bool KviKvsObject_menubar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(new QMenuBar(parentScriptWidget(), name())); + SET_OBJECT(QMenuBar) return true; } diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index 97d0a2282..bc2e41182 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -25,7 +25,6 @@ #include "class_pixmap.h"
#include "class_widget.h"
#include "kvi_debug.h"
-
#include "kvi_locale.h"
#include "kvi_error.h"
#include "kvi_iconmanager.h"
diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index 3b95e662f..00864d5cb 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -23,9 +23,9 @@ #include "class_pixmap.h" #include "kvi_debug.h" - #include "kvi_locale.h" -#include <qfile.h> + +#include <QFile> /* @doc: pixmap diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index 090952e98..f9b077f32 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -24,11 +24,13 @@ #include "class_popupmenu.h" #include "kvi_error.h" - #include "kvi_debug.h" - #include "kvi_locale.h" #include "kvi_iconmanager.h" +#include "kvi_tal_popupmenu.h" + +#include <QCursor> + /* diff --git a/src/modules/objects/class_popupmenu.h b/src/modules/objects/class_popupmenu.h index 9f5048020..3ba2ca464 100644 --- a/src/modules/objects/class_popupmenu.h +++ b/src/modules/objects/class_popupmenu.h @@ -24,8 +24,6 @@ // -#include "kvi_tal_popupmenu.h" -#include <qcursor.h> #include "class_widget.h" #include "object_macros.h" diff --git a/src/modules/objects/class_progressbar.h b/src/modules/objects/class_progressbar.h index 549487a4a..f717c19ea 100644 --- a/src/modules/objects/class_progressbar.h +++ b/src/modules/objects/class_progressbar.h @@ -24,7 +24,7 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -//#include <qprogressbar.h> + #include "class_widget.h" #include "object_macros.h" diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index e70605fa6..83a1c751b 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -23,10 +23,10 @@ #include "class_radiobutton.h" #include "kvi_error.h" #include "kvi_debug.h" - #include "kvi_locale.h" #include "kvi_iconmanager.h" +#include <QRadioButton> /* @doc: radiobutton @keyterms: diff --git a/src/modules/objects/class_radiobutton.h b/src/modules/objects/class_radiobutton.h index cd6f8579d..aed8a9b06 100644 --- a/src/modules/objects/class_radiobutton.h +++ b/src/modules/objects/class_radiobutton.h @@ -22,10 +22,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -#include <qradiobutton.h> #include "class_widget.h" - - #include "object_macros.h" class KviKvsObject_radiobutton : public KviKvsObject_widget diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index c4a235241..c202082d3 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -22,12 +22,12 @@ // #include "class_slider.h" #include "kvi_error.h" - #include "kvi_debug.h" - #include "kvi_locale.h" #include "kvi_iconmanager.h" +#include <QSlider> + /* @doc: slider @@ -130,7 +130,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_slider) bool KviKvsObject_slider::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(new QSlider(parentScriptWidget(), name()), true); + SET_OBJECT(QSlider) connect(widget(),SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); return true; } diff --git a/src/modules/objects/class_slider.h b/src/modules/objects/class_slider.h index a11147950..0a1cc289e 100644 --- a/src/modules/objects/class_slider.h +++ b/src/modules/objects/class_slider.h @@ -22,10 +22,8 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -#include <qslider.h> -#include "class_widget.h" - +#include "class_widget.h" #include "object_macros.h" class KviKvsObject_slider : public KviKvsObject_widget diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index 406ba9877..eb78f3db9 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -21,14 +21,13 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -#include <qspinbox.h> #include "class_spinbox.h" #include "kvi_error.h" #include "kvi_debug.h" - #include "kvi_locale.h" #include "kvi_iconmanager.h" +#include <QSpinBox> /* @doc: spinbox @keyterms: @@ -132,7 +131,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_spinbox) bool KviKvsObject_spinbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(new QSpinBox(parentScriptWidget(), name()), true); + SET_OBJECT(QSpinBox) connect(widget(),SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); return true; } diff --git a/src/modules/objects/class_spinbox.h b/src/modules/objects/class_spinbox.h index 48e15ed66..e37ec847e 100644 --- a/src/modules/objects/class_spinbox.h +++ b/src/modules/objects/class_spinbox.h @@ -25,9 +25,7 @@ -#include <qspinbox.h> #include "class_widget.h" - #include "object_macros.h" class KviKvsObject_spinbox : public KviKvsObject_widget diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 9213d497a..1fe08acf2 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -23,10 +23,10 @@ #include "class_tabwidget.h" #include "kvi_error.h" #include "kvi_debug.h" - #include "kvi_locale.h" #include "kvi_iconmanager.h" +#include <QTabWidget> /* @doc: tabwidget @keyterms: @@ -182,7 +182,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_tabwidget) bool KviKvsObject_tabwidget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(new QTabWidget(parentScriptWidget(), name()), true); + SET_OBJECT(QTabWidget) connect(widget(),SIGNAL(currentChanged(int)),this,SLOT(slotcurrentChanged(int))); return true; } diff --git a/src/modules/objects/class_tabwidget.h b/src/modules/objects/class_tabwidget.h index baf97a575..43c428911 100644 --- a/src/modules/objects/class_tabwidget.h +++ b/src/modules/objects/class_tabwidget.h @@ -22,9 +22,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -#include <qtabwidget.h> #include "class_widget.h" - #include "object_macros.h" class KviKvsObject_tabwidget : public KviKvsObject_widget diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index 4010edc99..1603f51b3 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -21,14 +21,15 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -#include <qtextbrowser.h> + #include "class_tbrowser.h" #include "kvi_error.h" #include "kvi_debug.h" - #include "kvi_locale.h" #include "kvi_iconmanager.h" +#include <QTextBrowser> +#include <QFile> /* @doc: textbrowser @keyterms: @@ -82,9 +83,8 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_textbrowser) bool KviKvsObject_textbrowser::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - QTextBrowser * tb = new QTextBrowser(parentScriptWidget(), name()); - setObject(tb, true); - connect(tb,SIGNAL(anchorClicked(const QString &,const QString &)),this,SLOT(anchorClicked(const QString &,const QString &))); + SET_OBJECT(QTextBrowser); + connect(obj,SIGNAL(anchorClicked(const QString &,const QString &)),this,SLOT(anchorClicked(const QString &,const QString &))); return true; } diff --git a/src/modules/objects/class_tbrowser.h b/src/modules/objects/class_tbrowser.h index 139d6800e..b48493250 100644 --- a/src/modules/objects/class_tbrowser.h +++ b/src/modules/objects/class_tbrowser.h @@ -23,9 +23,7 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -#include <qtextbrowser.h> #include "class_widget.h" -#include <qfile.h> #include "class_multilineedit.h" #include "object_macros.h" diff --git a/src/modules/objects/class_toolbar.h b/src/modules/objects/class_toolbar.h index 7b18ff78d..c6264cf11 100644 --- a/src/modules/objects/class_toolbar.h +++ b/src/modules/objects/class_toolbar.h @@ -23,9 +23,6 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // - - - #include "class_widget.h" #include "object_macros.h" diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index 0da72ad07..760ea0872 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -129,7 +129,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_toolbutton) bool KviKvsObject_toolbutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(new QToolButton(parentScriptWidget(), name()), true); + SET_OBJECT(QToolButton); connect(widget(),SIGNAL(clicked()),this,SLOT(slotClicked())); return true; } diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp index bb20fc596..77c95030d 100644 --- a/src/modules/objects/class_vbox.cpp +++ b/src/modules/objects/class_vbox.cpp @@ -26,6 +26,7 @@ #include "class_vbox.h" +#include "kvi_tal_vbox.h" /* @doc: vbox @keyterms: @@ -67,7 +68,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_vbox) bool KviKvsObject_vbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(new KviTalVBox(parentScriptWidget()), true); + SET_OBJECT(KviTalVBox); return true; } diff --git a/src/modules/objects/class_vbox.h b/src/modules/objects/class_vbox.h index 11cef7d0e..c9cfe0e90 100644 --- a/src/modules/objects/class_vbox.h +++ b/src/modules/objects/class_vbox.h @@ -22,9 +22,7 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // #include "kvi_string.h" - #include "class_widget.h" -#include "kvi_tal_vbox.h" #include "object_macros.h" class KviKvsObject_vbox : public KviKvsObject_widget diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 5da256437..d511c59ce 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -24,31 +24,25 @@ #include "kvi_malloc.h"
#include "kvi_debug.h"
-
#include "kvi_error.h"
#include "kvi_locale.h"
#include "kvi_iconmanager.h"
#include "kvi_window.h"
-#include "kvi_out.h"
-#include "kvi_mirccntrl.h"
#include "kvi_app.h"
-#include "kvi_string.h"
-#include <qcursor.h>
-#include <qiconset.h>
-#include <qcolor.h>
-#include <qlayout.h>
-#include <qbitmap.h>
-#include <qmetaobject.h>
#include "class_widget.h"
#include "class_pixmap.h"
#include <QKeyEvent>
#include <QDesktopWidget>
-
-#include <qwidget.h>
-#include <qtooltip.h>
-#include <qfont.h>
-#include <qvariant.h>
+#include <QWidget>
+#include <QTooltip>
+#include <QFont>
+#include <QVariant>
+#include <QCursor>
+#include <QColor>
+#include <QLayout>
+#include <QBitmap>
+#include <QMetaobject>
KviKvsWidget::KviKvsWidget(KviKvsObject_widget * object,QWidget * par)
:QWidget(par), m_pObject(object)
@@ -715,11 +709,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_widget) bool KviKvsObject_widget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
{
- //QWidget *pis=new QWidget(parentScriptWidget(),getName()),true);
- //setObject(new QWidget(parentScriptWidget(),getName()),true);
setObject(new KviKvsWidget(this,parentScriptWidget()));
-// setObject(new QWidget(parentScriptWidget()));
-
widget()->setObjectName(getName());
return true;
}
diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h index 33fbf9455..0863989fe 100644 --- a/src/modules/objects/class_widget.h +++ b/src/modules/objects/class_widget.h @@ -23,7 +23,6 @@ //
#include <kvi_tal_tooltip.h>
#include "kvi_string.h"
-#include "qtooltip.h"
#include "object_macros.h"
diff --git a/src/modules/objects/class_window.h b/src/modules/objects/class_window.h index b73bce82e..1324a5626 100644 --- a/src/modules/objects/class_window.h +++ b/src/modules/objects/class_window.h @@ -24,7 +24,6 @@ #include "class_widget.h" #include "kvi_window.h" - #include "object_macros.h" class KviKvsObject_window : public KviKvsObject_widget diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index b441dc2a7..a0c04de6d 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -22,14 +22,14 @@ // #include <kvi_tal_wizard.h> -#include <qpushbutton.h> + #include "class_wizard.h" #include "kvi_error.h" #include "kvi_debug.h" #include "kvi_locale.h" - +#include <QPushButton> /* @doc: wizard @@ -344,6 +344,7 @@ KviKvsMdmWizard::KviKvsMdmWizard(QWidget * par,const char * name,KviKvsObject_wi :KviTalWizard(par) { m_pParentScript=parent; + setObjectName(name); connect (this->backButton(),SIGNAL(clicked()),this,SLOT(slotBackClicked())); connect (this->nextButton(),SIGNAL(clicked()),this,SLOT(slotNextClicked())); } diff --git a/src/modules/objects/class_wizard.h b/src/modules/objects/class_wizard.h index 63c88fd96..3ee8eadd1 100644 --- a/src/modules/objects/class_wizard.h +++ b/src/modules/objects/class_wizard.h @@ -24,8 +24,6 @@ // #include <kvi_tal_wizard.h> #include "class_widget.h" - - #include "object_macros.h" class KviKvsObject_wizard : public KviKvsObject_widget diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp index cb2adace8..746786e5d 100644 --- a/src/modules/objects/class_workspace.cpp +++ b/src/modules/objects/class_workspace.cpp @@ -24,14 +24,15 @@ -#include <qworkspace.h> + #include "class_workspace.h" #include "kvi_error.h" #include "kvi_debug.h" - #include "kvi_locale.h" #include "kvi_iconmanager.h" +#include <QWorkspace> + /* @doc: workspace @keyterms: @@ -184,7 +185,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_workspace) bool KviKvsObject_workspace::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(new QWorkspace(parentScriptWidget(), name()), true); + SET_OBJECT(QWorkspace); return true; } diff --git a/src/modules/objects/class_workspace.h b/src/modules/objects/class_workspace.h index 4cfc13e8b..618879f06 100644 --- a/src/modules/objects/class_workspace.h +++ b/src/modules/objects/class_workspace.h @@ -23,10 +23,6 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // - - - -#include <qworkspace.h> #include "class_widget.h" class KviKvsObject_workspace : public KviKvsObject_widget diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 23debfb7f..d3abfa558 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -117,7 +117,6 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis { if( !pParams ) return false; - debug ("ci sono i parametri"); QWidget *pWidget = 0; int i=0; while(i!=pParams->count()) @@ -136,9 +135,9 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis szClass = s; szName = ""; } - debug ("szClass %s",szClass.latin1()); - debug ("szName %s",szName.latin1()); - debug ("s %s",s.latin1()); + debug ("szClass %s",szClass.utf8().data()); + debug ("szName %s",szName.utf8().data()); + debug ("s %s",s.data()); if(KviQString::equalCI(szClass,"WinId")) { diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h index 608617d4a..020398ebf 100644 --- a/src/modules/objects/object_macros.h +++ b/src/modules/objects/object_macros.h @@ -36,7 +36,11 @@ static void registerSelf(); \ static void unregisterSelf(); - +#define SET_OBJECT(__className) \ + __className *obj=new __className(parentScriptWidget()); \ + obj->setObjectName(name()); \ + setObject(obj,true); + #define KVSO_REGISTER_HANDLER(__className,__szName,__proc) \ g_pKvs##__className##Class->registerFunctionHandler(__szName,(KviKvsObjectFunctionHandlerProc)(KVI_PTR2MEMBER(__className::__proc))); |