From eab2995851748c44d333fe168a1c141ccee193ab Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 8 Dec 2023 13:26:11 +0900 Subject: Remove various '#define' strings - part 6 Signed-off-by: Michele Calgaro --- src/modules/dcc/canvas.cpp | 2 +- src/modules/dcc/canvaswidget.cpp | 6 +++--- src/modules/dcc/chat.cpp | 4 ++-- src/modules/dcc/dialogs.cpp | 16 ++++++++-------- src/modules/dcc/voice.cpp | 4 ++-- src/modules/dialog/libkvidialog.cpp | 4 ++-- src/modules/objects/class_button.cpp | 2 +- src/modules/objects/class_buttongroup.cpp | 2 +- src/modules/objects/class_checkbox.cpp | 2 +- src/modules/objects/class_combobox.cpp | 2 +- src/modules/objects/class_dialog.cpp | 4 ++-- src/modules/objects/class_dockwindow.cpp | 2 +- src/modules/objects/class_groupbox.cpp | 2 +- src/modules/objects/class_hbox.cpp | 2 +- src/modules/objects/class_label.cpp | 2 +- src/modules/objects/class_layout.cpp | 2 +- src/modules/objects/class_lcd.cpp | 2 +- src/modules/objects/class_lineedit.cpp | 2 +- src/modules/objects/class_listbox.cpp | 2 +- src/modules/objects/class_listview.cpp | 2 +- src/modules/objects/class_mainwindow.cpp | 2 +- src/modules/objects/class_menubar.cpp | 2 +- src/modules/objects/class_multilineedit.cpp | 2 +- src/modules/objects/class_popupmenu.cpp | 2 +- src/modules/objects/class_progressbar.cpp | 2 +- src/modules/objects/class_radiobutton.cpp | 2 +- src/modules/objects/class_slider.cpp | 2 +- src/modules/objects/class_spinbox.cpp | 2 +- src/modules/objects/class_tabwidget.cpp | 2 +- src/modules/objects/class_tbrowser.cpp | 2 +- src/modules/objects/class_toolbar.cpp | 2 +- src/modules/objects/class_toolbutton.cpp | 2 +- src/modules/objects/class_vbox.cpp | 2 +- src/modules/objects/class_widget.cpp | 2 +- src/modules/objects/class_window.cpp | 2 +- src/modules/objects/class_wizard.cpp | 2 +- src/modules/objects/class_workspace.cpp | 2 +- src/modules/objects/class_wrapper.cpp | 2 +- src/modules/objects/libkviobjects.cpp | 2 +- src/modules/options/libkvioptions.cpp | 2 +- src/modules/options/optw_identity.cpp | 2 +- src/modules/options/optw_servers.cpp | 4 ++-- src/modules/setup/setupwizard.cpp | 2 +- 43 files changed, 57 insertions(+), 57 deletions(-) (limited to 'src/modules') diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp index 8e51d943..4acb85ce 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -119,7 +119,7 @@ KviDccCanvas::~KviDccCanvas() // delete m_pSlaveThread; // m_pSlaveThread = 0; // } - KviThreadManager::killPendingEvents(TQT_TQOBJECT(this)); + KviThreadManager::killPendingEvents(this); // delete m_pDescriptor; // delete m_pMarshal; } diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index 51f4dbdb..252f789c 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1240,7 +1240,7 @@ TQWidget * KviVariantTableItem::createEditor() const TQString sz; sz.setNum(m_property.toInt()); e->setText(sz); - e->setValidator(new TQIntValidator(TQT_TQOBJECT(e))); + e->setValidator(new TQIntValidator(e)); return e; } break; @@ -1250,7 +1250,7 @@ TQWidget * KviVariantTableItem::createEditor() const TQString sz; sz.setNum(m_property.toInt()); e->setText(sz); - TQIntValidator * i = new TQIntValidator(TQT_TQOBJECT(e)); + TQIntValidator * i = new TQIntValidator(e); i->setBottom(0); e->setValidator(i); return e; @@ -1493,7 +1493,7 @@ void KviCanvasItemPropertiesWidget::editItem(TQCanvasItem * it) KviCanvasWidget::KviCanvasWidget(TQWidget * par) : TQWidget(par,"canvas_widget") { - m_pCanvas = new TQCanvas(TQT_TQOBJECT(this)); + m_pCanvas = new TQCanvas(this); //#warning "Make this size as parameter of Dcc ?" m_pCanvas->resize(648,480); m_pMenuBar = new TQMenuBar(this); diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index 59ee9c2c..67f5647f 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -132,7 +132,7 @@ KviDccChat::~KviDccChat() delete m_pSlaveThread; m_pSlaveThread = 0; } - KviThreadManager::killPendingEvents(TQT_TQOBJECT(this)); + KviThreadManager::killPendingEvents(this); } void KviDccChat::textViewRightClicked() @@ -537,7 +537,7 @@ void KviDccChat::connected() KviDccChatThread::KviDccChatThread(KviWindow *wnd,kvi_socket_t fd) -: KviDccThread(TQT_TQOBJECT(wnd),fd) +: KviDccThread(wnd,fd) { m_pOutBuffers = new KviPointerList; m_pOutBuffers->setAutoDelete(true); diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp index 6f2426d7..01d4a3b4 100644 --- a/src/modules/dcc/dialogs.cpp +++ b/src/modules/dcc/dialogs.cpp @@ -82,14 +82,14 @@ void KviDccAcceptBox::acceptClicked() { hide(); emit accepted(this,m_pDescriptor); - g_pApp->collectGarbage(TQT_TQOBJECT(this)); + g_pApp->collectGarbage(this); } void KviDccAcceptBox::rejectClicked() { hide(); emit rejected(this,m_pDescriptor); - g_pApp->collectGarbage(TQT_TQOBJECT(this)); + g_pApp->collectGarbage(this); } void KviDccAcceptBox::closeEvent(TQCloseEvent *e) @@ -97,7 +97,7 @@ void KviDccAcceptBox::closeEvent(TQCloseEvent *e) hide(); e->ignore(); emit rejected(this,m_pDescriptor); - g_pApp->collectGarbage(TQT_TQOBJECT(this)); + g_pApp->collectGarbage(this); } void KviDccAcceptBox::showEvent(TQShowEvent *e) @@ -154,7 +154,7 @@ void KviDccRenameBox::closeEvent(TQCloseEvent *e) if(m_pDescriptor) { emit cancelSelected(this,m_pDescriptor); - g_pApp->collectGarbage(TQT_TQOBJECT(this)); + g_pApp->collectGarbage(this); } } @@ -169,14 +169,14 @@ void KviDccRenameBox::renameClicked() { hide(); emit renameSelected(this,m_pDescriptor); - g_pApp->collectGarbage(TQT_TQOBJECT(this)); + g_pApp->collectGarbage(this); } void KviDccRenameBox::overwriteClicked() { hide(); emit overwriteSelected(this,m_pDescriptor); - g_pApp->collectGarbage(TQT_TQOBJECT(this)); + g_pApp->collectGarbage(this); } void KviDccRenameBox::resumeClicked() @@ -184,14 +184,14 @@ void KviDccRenameBox::resumeClicked() hide(); m_pDescriptor->bResume = true; emit overwriteSelected(this,m_pDescriptor); - g_pApp->collectGarbage(TQT_TQOBJECT(this)); + g_pApp->collectGarbage(this); } void KviDccRenameBox::cancelClicked() { hide(); emit cancelSelected(this,m_pDescriptor); - g_pApp->collectGarbage(TQT_TQOBJECT(this)); + g_pApp->collectGarbage(this); } diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index 95963e95..6b5267b6 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -119,7 +119,7 @@ static KviDccVoiceCodec * kvi_dcc_voice_get_codec(const char * codecName) KviDccVoiceThread::KviDccVoiceThread(KviWindow * wnd,kvi_socket_t fd,KviDccVoiceThreadOptions * opt) -: KviDccThread(TQT_TQOBJECT(wnd),fd) +: KviDccThread(wnd,fd) { #ifndef COMPILE_DISABLE_DCC_VOICE m_pOpt = opt; @@ -725,7 +725,7 @@ KviDccVoice::~KviDccVoice() m_pSlaveThread = 0; } - KviThreadManager::killPendingEvents(TQT_TQOBJECT(this)); + KviThreadManager::killPendingEvents(this); delete m_pUpdateTimer; // delete m_pDescriptor; diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index d6ef068c..fdc61a0c 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -526,7 +526,7 @@ void KviKvsCallbackFileDialog::done(int code) // ...so skip out of this call stack and ask KviApp to destroy us just // when the control returns to the main loop. // If the module is unloaded then , KviApp will notice it and will NOT delete the dialog - g_pApp->collectGarbage(TQT_TQOBJECT(this)); + g_pApp->collectGarbage(this); // calling dialog.unload here WILL lead to a sigsegv (this is SURE // with a lot of qt versions that have the ugly file dialog "accept before this reference" bug) @@ -657,7 +657,7 @@ void KviKvsCallbackImageDialog::done(int code) // ...so skip out of this call stack and ask KviApp to destroy us just // when the control returns to the main loop. // If the module is unloaded then , KviApp will notice it and will NOT delete the dialog - g_pApp->collectGarbage(TQT_TQOBJECT(this)); + g_pApp->collectGarbage(this); // calling dialog.unload here WILL lead to a sigsegv (this is SURE // with a lot of qt versions that have the ugly file dialog "accept before this reference" bug) diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index d5d13717..2af3b0c6 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -57,7 +57,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_button) bool KviKvsObject_button::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new TQPushButton(parentScriptWidget(),name())),true); + setObject(new TQPushButton(parentScriptWidget(),name()),true); connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); return true; } diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp index 38de0fd4..2a6a9ea1 100644 --- a/src/modules/objects/class_buttongroup.cpp +++ b/src/modules/objects/class_buttongroup.cpp @@ -72,7 +72,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_buttongroup) // CHECK ME bool KviKvsObject_buttongroup::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new TQButtonGroup(name(),parentScriptWidget())), true); + setObject(new TQButtonGroup(name(),parentScriptWidget()), true); return true; diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp index 077c2ffb..4975c30f 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -79,7 +79,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_checkbox) bool KviKvsObject_checkbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { KviStyledCheckBox * cb = new KviStyledCheckBox(parentScriptWidget(), name()); - setObject(TQT_TQOBJECT(cb), true); + setObject(cb, true); connect(cb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggled(bool))); connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); return true; diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index cdf5a06f..197c7c02 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -131,7 +131,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_combobox) bool KviKvsObject_combobox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new TQComboBox(parentScriptWidget(), name())), true); + setObject(new TQComboBox(parentScriptWidget(), name()), true); connect (((TQComboBox *)widget()),TQT_SIGNAL(activated( int )),this,TQT_SLOT(slotActivated( int ))); return true; } diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp index 366cf5f0..71a69262 100644 --- a/src/modules/objects/class_dialog.cpp +++ b/src/modules/objects/class_dialog.cpp @@ -68,11 +68,11 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_dialog) bool KviKvsObject_dialog::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - TQWidget * w = TQT_TQWIDGET(g_pApp->activeModalWidget()); + TQWidget * w = g_pApp->activeModalWidget(); if(!w)w = g_pFrame; TQDialog * d = new TQDialog(parentScriptWidget() ? parentScriptWidget() : w,name()); //d->setModal(true); - setObject(TQT_TQOBJECT(d)); + setObject(d); return true; } bool KviKvsObject_dialog::functionSetModal(KviKvsObjectFunctionCall *c) diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp index 44723aa1..6ecdf51a 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -91,7 +91,7 @@ KVSO_END_DESTRUCTOR(KviKvsObject_dockwindow) bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { - setObject(TQT_TQOBJECT(new TQT_DOCK_WINDOW(g_pFrame,getName())),true); + setObject(new TQT_DOCK_WINDOW(g_pFrame,getName()),true); return true; } diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index 53f168bf..f96b3c07 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_groupbox) bool KviKvsObject_groupbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new KviTalGroupBox(name(),parentScriptWidget())), true); + setObject(new KviTalGroupBox(name(),parentScriptWidget()), true); return true; } diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp index 21167be1..c811c769 100644 --- a/src/modules/objects/class_hbox.cpp +++ b/src/modules/objects/class_hbox.cpp @@ -68,7 +68,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_hbox) bool KviKvsObject_hbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new KviTalHBox(parentScriptWidget())), true); + setObject(new KviTalHBox(parentScriptWidget()), true); return true; } bool KviKvsObject_hbox::functionsetMargin(KviKvsObjectFunctionCall *c) diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index f160565e..c393943f 100644 --- a/src/modules/objects/class_label.cpp +++ b/src/modules/objects/class_label.cpp @@ -223,7 +223,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_label) bool KviKvsObject_label::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new TQLabel(parentScriptWidget(), name())), true); + setObject(new TQLabel(parentScriptWidget(), name()), true); return true; } diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp index 51afea9c..386b30be 100644 --- a/src/modules/objects/class_layout.cpp +++ b/src/modules/objects/class_layout.cpp @@ -112,7 +112,7 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList pContext->warning(__tr2qs("The parent of a layout must be a widget!")); return false; } - setObject(TQT_TQOBJECT(new TQGridLayout(w))); + setObject(new TQGridLayout(w)); return true; } diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp index 3b40b64e..79ddea0e 100644 --- a/src/modules/objects/class_lcd.cpp +++ b/src/modules/objects/class_lcd.cpp @@ -89,7 +89,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lcd) bool KviKvsObject_lcd::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new TQLCDNumber(parentScriptWidget(), name())), true); + setObject(new TQLCDNumber(parentScriptWidget(), name()), true); return true; } diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index e5adebb7..2a39996c 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -217,7 +217,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lineedit) bool KviKvsObject_lineedit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { - setObject(TQT_TQOBJECT(new TQLineEdit(parentScriptWidget(),getName())),true); + setObject(new TQLineEdit(parentScriptWidget(),getName()),true); connect(widget(),TQT_SIGNAL(returnPressed()),this,TQT_SLOT(slotreturnPressed())); connect(widget(),TQT_SIGNAL(lostFocus()),this,TQT_SLOT(slotlostFocus())); connect(widget(),TQT_SIGNAL(textChanged(const TQString & )),this,TQT_SLOT(slottextChanged(const TQString & ))); diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp index 58e269b1..84afcd69 100644 --- a/src/modules/objects/class_listbox.cpp +++ b/src/modules/objects/class_listbox.cpp @@ -156,7 +156,7 @@ bool KviKvsObject_listbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis connect(b,TQT_SIGNAL(onItem(KviTalListBoxItem *)),this,TQT_SLOT(onItem(KviTalListBoxItem *))); - setObject(TQT_TQOBJECT(b),true);; + setObject(b,true);; return true; } diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp index 655972f5..ea15b09f 100644 --- a/src/modules/objects/class_listview.cpp +++ b/src/modules/objects/class_listview.cpp @@ -212,7 +212,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listview) bool KviKvsObject_listview::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new KviKvsMdmListView(parentScriptWidget(),name(),this)),true); + setObject(new KviKvsMdmListView(parentScriptWidget(),name(),this),true); connect(widget(),TQT_SIGNAL(clicked(KviTalListViewItem *)),this,TQT_SLOT(slotClicked(KviTalListViewItem *))); connect(widget(),TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(slotSelectionChanged(KviTalListViewItem *))); connect(widget(),TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotMultipleSelectionChanged())); diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp index 60c39b9a..674575e3 100644 --- a/src/modules/objects/class_mainwindow.cpp +++ b/src/modules/objects/class_mainwindow.cpp @@ -68,7 +68,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mainwindow) bool KviKvsObject_mainwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new KviTalMainWindow(parentScriptWidget(), name())), true); + setObject(new KviTalMainWindow(parentScriptWidget(), name()), true); return true; } diff --git a/src/modules/objects/class_menubar.cpp b/src/modules/objects/class_menubar.cpp index 93945979..0eb79d2e 100644 --- a/src/modules/objects/class_menubar.cpp +++ b/src/modules/objects/class_menubar.cpp @@ -61,7 +61,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_menubar) bool KviKvsObject_menubar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new TQMenuBar(parentScriptWidget(), name()))); + setObject(new TQMenuBar(parentScriptWidget(), name())); return true; } diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index d6bba076..9ee232bc 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -340,7 +340,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mledit) bool KviKvsObject_mledit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { - setObject(TQT_TQOBJECT(new KviTalMultiLineEdit(parentScriptWidget(),getName())),true); + setObject(new KviTalMultiLineEdit(parentScriptWidget(),getName()),true); return true; } diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index cb9c3bba..b600841c 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_popupmenu) bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new KviTalPopupMenu(parentScriptWidget(), name())), true); + setObject(new KviTalPopupMenu(parentScriptWidget(), name()), true); connect(widget(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotactivated(int))); connect(widget(),TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slothighlighted(int))); return true; diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp index 39b5df63..1b19f33d 100644 --- a/src/modules/objects/class_progressbar.cpp +++ b/src/modules/objects/class_progressbar.cpp @@ -90,7 +90,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_progressbar) bool KviKvsObject_progressbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new TQProgressBar(parentScriptWidget(), name())), true); + setObject(new TQProgressBar(parentScriptWidget(), name()), true); return true; } diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index 204909ae..a7114f8a 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -82,7 +82,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_radiobutton) bool KviKvsObject_radiobutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new TQRadioButton(parentScriptWidget(),name())),true); + setObject(new TQRadioButton(parentScriptWidget(),name()),true); connect(widget(),TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggled(bool))); return true; } diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index 462bc14d..08e56170 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -130,7 +130,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_slider) bool KviKvsObject_slider::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new TQSlider(parentScriptWidget(), name())), true); + setObject(new TQSlider(parentScriptWidget(), name()), true); connect(widget(),TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(valueChanged(int))); return true; } diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index 01f69779..09fc4efd 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -132,7 +132,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_spinbox) bool KviKvsObject_spinbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new TQSpinBox(parentScriptWidget(), name())), true); + setObject(new TQSpinBox(parentScriptWidget(), name()), true); connect(widget(),TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(valueChanged(int))); return true; } diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 33d77841..e6c748ff 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -182,7 +182,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_tabwidget) bool KviKvsObject_tabwidget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new TQTabWidget(parentScriptWidget(), name())), true); + setObject(new TQTabWidget(parentScriptWidget(), name()), true); connect(widget(),TQT_SIGNAL(currentChanged(int)),this,TQT_SLOT(slotcurrentChanged(int))); return true; } diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index 7f4de6ca..c6154667 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -83,7 +83,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_textbrowser) bool KviKvsObject_textbrowser::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { TQTextBrowser * tb = new TQTextBrowser(parentScriptWidget(), name()); - setObject(TQT_TQOBJECT(tb), true); + setObject(tb, true); connect(tb,TQT_SIGNAL(anchorClicked(const TQString &,const TQString &)),this,TQT_SLOT(anchorClicked(const TQString &,const TQString &))); return true; } diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index fd497215..385c184d 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -86,7 +86,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis } if(parentObject()->inherits("KviKvsObject_mainwindow")) { - setObject(TQT_TQOBJECT(new KviTalToolBar(name(), ((KviTalMainWindow *)parentScriptWidget()))), true); + setObject(new KviTalToolBar(name(), ((KviTalMainWindow *)parentScriptWidget())), true); } else { diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index 906dd9ed..e4d7ecf8 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(TQT_TQOBJECT(new TQToolButton(parentScriptWidget(), name())), true); + setObject(new TQToolButton(parentScriptWidget(), name()), true); connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); return true; } diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp index 4ec3c547..5851f558 100644 --- a/src/modules/objects/class_vbox.cpp +++ b/src/modules/objects/class_vbox.cpp @@ -67,7 +67,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_vbox) bool KviKvsObject_vbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new KviTalVBox(parentScriptWidget())), true); + setObject(new KviTalVBox(parentScriptWidget()), true); return true; } diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 364e907c..a5da6605 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -592,7 +592,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_widget) bool KviKvsObject_widget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { - setObject(TQT_TQOBJECT(new TQWidget(parentScriptWidget(),getName())),true); + setObject(new TQWidget(parentScriptWidget(),getName()),true); return true; } diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp index 41adaa5f..a03cd147 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -113,7 +113,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_window) bool KviKvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { KviWindow * w = new KviKvsScriptWindowWindow(pContext->window()->frame(),name()); - setObject(TQT_TQOBJECT(w)); + setObject(w); pContext->window()->frame()->addWindow(w,false); w->minimize(); // must be minimized before children are added, otherwise the focus handling goes nuts... diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index 13c9bf8f..87cba0a2 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -124,7 +124,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_wizard) bool KviKvsObject_wizard::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new KviKvsMdmWizard(parentScriptWidget(), name(),this)), true); + setObject(new KviKvsMdmWizard(parentScriptWidget(), name(),this), true); return true; } diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp index 2305d742..98f0a2fb 100644 --- a/src/modules/objects/class_workspace.cpp +++ b/src/modules/objects/class_workspace.cpp @@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_workspace) bool KviKvsObject_workspace::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(TQT_TQOBJECT(new TQWorkspace(parentScriptWidget(), name())), true); + setObject(new TQWorkspace(parentScriptWidget(), name()), true); return true; } diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 261b041f..74dcc8f9 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -174,7 +174,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis pContext->warning(__tr2qs("Failed to find the widget to wrap")); return false; } - setObject(TQT_TQOBJECT(pWidget),false); + setObject(pWidget,false); return true; } diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 1c34f50f..782b486d 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -842,7 +842,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd) idx++; - dumpChildObjects(cmd->window(), TQT_TQOBJECT(it.current()), spacing.ptr(), bFlag,n,idx); + dumpChildObjects(cmd->window(), it.current(), spacing.ptr(), bFlag,n,idx); } diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp index 73568fff..2ba98233 100644 --- a/src/modules/options/libkvioptions.cpp +++ b/src/modules/options/libkvioptions.cpp @@ -213,7 +213,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c) if(c->hasSwitch('m',"modal")) { - w = TQT_TQWIDGET(g_pApp->activeModalWidget()); + w = g_pApp->activeModalWidget(); if(!w)w = g_pFrame; } else { w = g_pFrame; diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 32540453..e2e81b8c 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -325,7 +325,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * pare "(case insensitive), you can provide alternative nicknames to be used in case"\ "the server refuses to accept the default one.","options")); #endif - TQValidator * v = new TQRegExpValidator(TQRegExp("[^-0-9 ][^ ]*"),TQT_TQOBJECT(hb)); + TQValidator * v = new TQRegExpValidator(TQRegExp("[^-0-9 ][^ ]*"),hb); sel->setValidator(v); TQPushButton * pb = new TQPushButton(__tr2qs_ctx("Alternatives...","options"),hb); diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 1e465947..adca6260 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -138,7 +138,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork * l = new TQLabel(__tr2qs_ctx("Nickname:","options"),gbox); m_pNickEditor = new TQLineEdit(gbox); - TQValidator * v = new TQRegExpValidator(TQRegExp("[^-0-9 ][^ ]*","options"),TQT_TQOBJECT(gbox)); + TQValidator * v = new TQRegExpValidator(TQRegExp("[^-0-9 ][^ ]*","options"),gbox); m_pNickEditor->setValidator(v); m_pNickEditor->setText(n->nickName()); #ifdef COMPILE_INFO_TIPS @@ -497,7 +497,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s) l = new TQLabel(__tr2qs_ctx("Nickname:","options"),gbox); m_pNickEditor = new TQLineEdit(gbox); - TQValidator * v = new TQRegExpValidator(TQRegExp("[^-0-9 ][^ ]*"),TQT_TQOBJECT(gbox)); + TQValidator * v = new TQRegExpValidator(TQRegExp("[^-0-9 ][^ ]*"),gbox); m_pNickEditor->setValidator(v); m_pNickEditor->setText(s->nickName()); #ifdef COMPILE_INFO_TIPS diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 8e3d7fe0..597b3c20 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -336,7 +336,7 @@ KviSetupWizard::KviSetupWizard() m_pNickSelector = new KviStringSelector(gbox,__tr2qs("Nickname:"),&(KVI_OPTION_STRING(KviOption_stringNickname1)),true); m_pNickSelector->setMinimumLabelWidth(120); - TQValidator * v = new TQRegExpValidator(TQRegExp("[^-0-9 ][^ ]*"),TQT_TQOBJECT(gbox)); + TQValidator * v = new TQRegExpValidator(TQRegExp("[^-0-9 ][^ ]*"),gbox); m_pNickSelector->setValidator(v); TQString szOptionalCtcpUserInfo = __tr2qs("This field is optional and will appear as part of the CTCP USERINFO reply."); -- cgit v1.2.1