TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove various '#define' strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/19/head
Michele Calgaro 12 months ago
parent 236b93c726
commit eab2995851
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
47 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File

2
src/kvilib/system/kvi_locale.cpp
Unescape View File

@ -971,7 +971,7 @@ namespace KviLocale
if(findCatalogue(szBuffer,"kvirc",localeDir)) if(findCatalogue(szBuffer,"kvirc",localeDir))
{ {
g_pMainCatalogue->load(szBuffer); g_pMainCatalogue->load(szBuffer);
g_pTranslator = new KviTranslator(TQT_TQOBJECT(app),"kvirc_translator"); g_pTranslator = new KviTranslator(app,"kvirc_translator");
app->installTranslator(g_pTranslator); app->installTranslator(g_pTranslator);
} else { } else {
KviStr szTmp = g_szLang; KviStr szTmp = g_szLang;

6
src/kvirc/ui/kvi_customtoolbar.cpp
Unescape View File

@ -201,14 +201,14 @@ void KviCustomToolBar::childEvent(TQChildEvent *e)
if(e->type() == TQEvent::ChildInserted) if(e->type() == TQEvent::ChildInserted)
{ {
if(e->child()->isWidgetType()) if(e->child()->isWidgetType())
filterChild(TQT_TQOBJECT(e->child())); filterChild(e->child());
goto done; goto done;
} }
if(e->type() == TQEvent::ChildRemoved) if(e->type() == TQEvent::ChildRemoved)
{ {
if(e->child()->isWidgetType()) if(e->child()->isWidgetType())
unfilterChild(TQT_TQOBJECT(e->child())); unfilterChild(e->child());
goto done; goto done;
} }
} }
@ -487,7 +487,7 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e)
//d->setPixmap(TQPixmap::grabWidget(m_pMovedChild),TQPoint(m_pMovedChild->width() / 2,m_pMovedChild->height() / 2)); //d->setPixmap(TQPixmap::grabWidget(m_pMovedChild),TQPoint(m_pMovedChild->width() / 2,m_pMovedChild->height() / 2));
// throw it somewhere else for now // throw it somewhere else for now
if(m_pFilteredChildren) if(m_pFilteredChildren)
unfilterChild(TQT_TQOBJECT(m_pMovedChild)); unfilterChild(m_pMovedChild);
m_pMovedChild->hide(); m_pMovedChild->hide();
m_pMovedChild->reparent(g_pFrame,TQPoint(-1000,-1000),false); m_pMovedChild->reparent(g_pFrame,TQPoint(-1000,-1000),false);
TQEvent ev(TQEvent::LayoutHint); TQEvent ev(TQEvent::LayoutHint);

2
src/kvirc/ui/kvi_maskeditor.cpp
Unescape View File

@ -89,7 +89,7 @@ KviMaskInputDialog::KviMaskInputDialog(const TQString &szMask,KviMaskEditor* pEd
m_pChancelButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); m_pChancelButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
TQRegExp rx( "*!*@*", false,true ); TQRegExp rx( "*!*@*", false,true );
TQValidator* validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) ); TQValidator* validator = new TQRegExpValidator( rx, this );
m_pEdit->setValidator( validator ); m_pEdit->setValidator( validator );
} }

4
src/kvirc/ui/kvi_window.cpp
Unescape View File

@ -217,7 +217,7 @@ bool KviWindow::hasAttention()
// KVIrc window just below and can see it. // KVIrc window just below and can see it.
// Handle the special case of the dialogs then // Handle the special case of the dialogs then
TQWidget * w = TQT_TQWIDGET(((TQApplication *)g_pApp)->activeWindow()); TQWidget * w = ((TQApplication *)g_pApp)->activeWindow();
if(w->inherits("TQDialog")) if(w->inherits("TQDialog"))
{ {
// but make sure that the frame is visible at all! // but make sure that the frame is visible at all!
@ -1140,7 +1140,7 @@ void KviWindow::childrenTreeChanged(TQWidget * widgetAdded)
void KviWindow::updateBackgrounds(TQObject * obj) void KviWindow::updateBackgrounds(TQObject * obj)
{ {
if(!obj) if(!obj)
obj = TQT_TQOBJECT(this); obj = this;
TQObjectList list = obj->childrenListObject(); TQObjectList list = obj->childrenListObject();
if(!list.isEmpty()) if(!list.isEmpty())
{ {

2
src/modules/dcc/canvas.cpp
Unescape View File

@ -119,7 +119,7 @@ KviDccCanvas::~KviDccCanvas()
// delete m_pSlaveThread; // delete m_pSlaveThread;
// m_pSlaveThread = 0; // m_pSlaveThread = 0;
// } // }
KviThreadManager::killPendingEvents(TQT_TQOBJECT(this)); KviThreadManager::killPendingEvents(this);
// delete m_pDescriptor; // delete m_pDescriptor;
// delete m_pMarshal; // delete m_pMarshal;
} }

6
src/modules/dcc/canvaswidget.cpp
Unescape View File

@ -1240,7 +1240,7 @@ TQWidget * KviVariantTableItem::createEditor() const
TQString sz; TQString sz;
sz.setNum(m_property.toInt()); sz.setNum(m_property.toInt());
e->setText(sz); e->setText(sz);
e->setValidator(new TQIntValidator(TQT_TQOBJECT(e))); e->setValidator(new TQIntValidator(e));
return e; return e;
} }
break; break;
@ -1250,7 +1250,7 @@ TQWidget * KviVariantTableItem::createEditor() const
TQString sz; TQString sz;
sz.setNum(m_property.toInt()); sz.setNum(m_property.toInt());
e->setText(sz); e->setText(sz);
TQIntValidator * i = new TQIntValidator(TQT_TQOBJECT(e)); TQIntValidator * i = new TQIntValidator(e);
i->setBottom(0); i->setBottom(0);
e->setValidator(i); e->setValidator(i);
return e; return e;
@ -1493,7 +1493,7 @@ void KviCanvasItemPropertiesWidget::editItem(TQCanvasItem * it)
KviCanvasWidget::KviCanvasWidget(TQWidget * par) KviCanvasWidget::KviCanvasWidget(TQWidget * par)
: TQWidget(par,"canvas_widget") : TQWidget(par,"canvas_widget")
{ {
m_pCanvas = new TQCanvas(TQT_TQOBJECT(this)); m_pCanvas = new TQCanvas(this);
//#warning "Make this size as parameter of Dcc ?" //#warning "Make this size as parameter of Dcc ?"
m_pCanvas->resize(648,480); m_pCanvas->resize(648,480);
m_pMenuBar = new TQMenuBar(this); m_pMenuBar = new TQMenuBar(this);

4
src/modules/dcc/chat.cpp
Unescape View File

@ -132,7 +132,7 @@ KviDccChat::~KviDccChat()
delete m_pSlaveThread; delete m_pSlaveThread;
m_pSlaveThread = 0; m_pSlaveThread = 0;
} }
KviThreadManager::killPendingEvents(TQT_TQOBJECT(this)); KviThreadManager::killPendingEvents(this);
} }
void KviDccChat::textViewRightClicked() void KviDccChat::textViewRightClicked()
@ -537,7 +537,7 @@ void KviDccChat::connected()
KviDccChatThread::KviDccChatThread(KviWindow *wnd,kvi_socket_t fd) KviDccChatThread::KviDccChatThread(KviWindow *wnd,kvi_socket_t fd)
: KviDccThread(TQT_TQOBJECT(wnd),fd) : KviDccThread(wnd,fd)
{ {
m_pOutBuffers = new KviPointerList<KviDataBuffer>; m_pOutBuffers = new KviPointerList<KviDataBuffer>;
m_pOutBuffers->setAutoDelete(true); m_pOutBuffers->setAutoDelete(true);

16
src/modules/dcc/dialogs.cpp
Unescape View File

@ -82,14 +82,14 @@ void KviDccAcceptBox::acceptClicked()
{ {
hide(); hide();
emit accepted(this,m_pDescriptor); emit accepted(this,m_pDescriptor);
g_pApp->collectGarbage(TQT_TQOBJECT(this)); g_pApp->collectGarbage(this);
} }
void KviDccAcceptBox::rejectClicked() void KviDccAcceptBox::rejectClicked()
{ {
hide(); hide();
emit rejected(this,m_pDescriptor); emit rejected(this,m_pDescriptor);
g_pApp->collectGarbage(TQT_TQOBJECT(this)); g_pApp->collectGarbage(this);
} }
void KviDccAcceptBox::closeEvent(TQCloseEvent *e) void KviDccAcceptBox::closeEvent(TQCloseEvent *e)
@ -97,7 +97,7 @@ void KviDccAcceptBox::closeEvent(TQCloseEvent *e)
hide(); hide();
e->ignore(); e->ignore();
emit rejected(this,m_pDescriptor); emit rejected(this,m_pDescriptor);
g_pApp->collectGarbage(TQT_TQOBJECT(this)); g_pApp->collectGarbage(this);
} }
void KviDccAcceptBox::showEvent(TQShowEvent *e) void KviDccAcceptBox::showEvent(TQShowEvent *e)
@ -154,7 +154,7 @@ void KviDccRenameBox::closeEvent(TQCloseEvent *e)
if(m_pDescriptor) if(m_pDescriptor)
{ {
emit cancelSelected(this,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(); hide();
emit renameSelected(this,m_pDescriptor); emit renameSelected(this,m_pDescriptor);
g_pApp->collectGarbage(TQT_TQOBJECT(this)); g_pApp->collectGarbage(this);
} }
void KviDccRenameBox::overwriteClicked() void KviDccRenameBox::overwriteClicked()
{ {
hide(); hide();
emit overwriteSelected(this,m_pDescriptor); emit overwriteSelected(this,m_pDescriptor);
g_pApp->collectGarbage(TQT_TQOBJECT(this)); g_pApp->collectGarbage(this);
} }
void KviDccRenameBox::resumeClicked() void KviDccRenameBox::resumeClicked()
@ -184,14 +184,14 @@ void KviDccRenameBox::resumeClicked()
hide(); hide();
m_pDescriptor->bResume = true; m_pDescriptor->bResume = true;
emit overwriteSelected(this,m_pDescriptor); emit overwriteSelected(this,m_pDescriptor);
g_pApp->collectGarbage(TQT_TQOBJECT(this)); g_pApp->collectGarbage(this);
} }
void KviDccRenameBox::cancelClicked() void KviDccRenameBox::cancelClicked()
{ {
hide(); hide();
emit cancelSelected(this,m_pDescriptor); emit cancelSelected(this,m_pDescriptor);
g_pApp->collectGarbage(TQT_TQOBJECT(this)); g_pApp->collectGarbage(this);
} }

4
src/modules/dcc/voice.cpp
Unescape View File

@ -119,7 +119,7 @@ static KviDccVoiceCodec * kvi_dcc_voice_get_codec(const char * codecName)
KviDccVoiceThread::KviDccVoiceThread(KviWindow * wnd,kvi_socket_t fd,KviDccVoiceThreadOptions * opt) KviDccVoiceThread::KviDccVoiceThread(KviWindow * wnd,kvi_socket_t fd,KviDccVoiceThreadOptions * opt)
: KviDccThread(TQT_TQOBJECT(wnd),fd) : KviDccThread(wnd,fd)
{ {
#ifndef COMPILE_DISABLE_DCC_VOICE #ifndef COMPILE_DISABLE_DCC_VOICE
m_pOpt = opt; m_pOpt = opt;
@ -725,7 +725,7 @@ KviDccVoice::~KviDccVoice()
m_pSlaveThread = 0; m_pSlaveThread = 0;
} }
KviThreadManager::killPendingEvents(TQT_TQOBJECT(this)); KviThreadManager::killPendingEvents(this);
delete m_pUpdateTimer; delete m_pUpdateTimer;
// delete m_pDescriptor; // delete m_pDescriptor;

4
src/modules/dialog/libkvidialog.cpp
Unescape View File

@ -526,7 +526,7 @@ void KviKvsCallbackFileDialog::done(int code)
// ...so skip out of this call stack and ask KviApp to destroy us just // ...so skip out of this call stack and ask KviApp to destroy us just
// when the control returns to the main loop. // when the control returns to the main loop.
// If the module is unloaded then , KviApp will notice it and will NOT delete the dialog // 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 // 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) // 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 // ...so skip out of this call stack and ask KviApp to destroy us just
// when the control returns to the main loop. // when the control returns to the main loop.
// If the module is unloaded then , KviApp will notice it and will NOT delete the dialog // 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 // 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) // with a lot of qt versions that have the ugly file dialog "accept before this reference" bug)

2
src/modules/objects/class_button.cpp
Unescape View File

@ -57,7 +57,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_button)
bool KviKvsObject_button::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) 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())); connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
return true; return true;
} }

2
src/modules/objects/class_buttongroup.cpp
Unescape View File

@ -72,7 +72,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_buttongroup)
// CHECK ME // CHECK ME
bool KviKvsObject_buttongroup::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) bool KviKvsObject_buttongroup::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{ {
setObject(TQT_TQOBJECT(new TQButtonGroup(name(),parentScriptWidget())), true); setObject(new TQButtonGroup(name(),parentScriptWidget()), true);
return true; return true;

2
src/modules/objects/class_checkbox.cpp
Unescape View File

@ -79,7 +79,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_checkbox)
bool KviKvsObject_checkbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) bool KviKvsObject_checkbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{ {
KviStyledCheckBox * cb = new KviStyledCheckBox(parentScriptWidget(), name()); 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(cb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggled(bool)));
connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
return true; return true;

2
src/modules/objects/class_combobox.cpp
Unescape View File

@ -131,7 +131,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_combobox)
bool KviKvsObject_combobox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) 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 ))); connect (((TQComboBox *)widget()),TQT_SIGNAL(activated( int )),this,TQT_SLOT(slotActivated( int )));
return true; return true;
} }

4
src/modules/objects/class_dialog.cpp
Unescape View File

@ -68,11 +68,11 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_dialog)
bool KviKvsObject_dialog::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) 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; if(!w)w = g_pFrame;
TQDialog * d = new TQDialog(parentScriptWidget() ? parentScriptWidget() : w,name()); TQDialog * d = new TQDialog(parentScriptWidget() ? parentScriptWidget() : w,name());
//d->setModal(true); //d->setModal(true);
setObject(TQT_TQOBJECT(d)); setObject(d);
return true; return true;
} }
bool KviKvsObject_dialog::functionSetModal(KviKvsObjectFunctionCall *c) bool KviKvsObject_dialog::functionSetModal(KviKvsObjectFunctionCall *c)

2
src/modules/objects/class_dockwindow.cpp
Unescape View File

@ -91,7 +91,7 @@ KVSO_END_DESTRUCTOR(KviKvsObject_dockwindow)
bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) 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; return true;
} }

2
src/modules/objects/class_groupbox.cpp
Unescape View File

@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_groupbox)
bool KviKvsObject_groupbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) bool KviKvsObject_groupbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{ {
setObject(TQT_TQOBJECT(new KviTalGroupBox(name(),parentScriptWidget())), true); setObject(new KviTalGroupBox(name(),parentScriptWidget()), true);
return true; return true;
} }

2
src/modules/objects/class_hbox.cpp
Unescape View File

@ -68,7 +68,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_hbox)
bool KviKvsObject_hbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) bool KviKvsObject_hbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{ {
setObject(TQT_TQOBJECT(new KviTalHBox(parentScriptWidget())), true); setObject(new KviTalHBox(parentScriptWidget()), true);
return true; return true;
} }
bool KviKvsObject_hbox::functionsetMargin(KviKvsObjectFunctionCall *c) bool KviKvsObject_hbox::functionsetMargin(KviKvsObjectFunctionCall *c)

2
src/modules/objects/class_label.cpp
Unescape View File

@ -223,7 +223,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_label)
bool KviKvsObject_label::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) bool KviKvsObject_label::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{ {
setObject(TQT_TQOBJECT(new TQLabel(parentScriptWidget(), name())), true); setObject(new TQLabel(parentScriptWidget(), name()), true);
return true; return true;
} }

2
src/modules/objects/class_layout.cpp
Unescape View File

@ -112,7 +112,7 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
pContext->warning(__tr2qs("The parent of a layout must be a widget!")); pContext->warning(__tr2qs("The parent of a layout must be a widget!"));
return false; return false;
} }
setObject(TQT_TQOBJECT(new TQGridLayout(w))); setObject(new TQGridLayout(w));
return true; return true;
} }

2
src/modules/objects/class_lcd.cpp
Unescape View File

@ -89,7 +89,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lcd)
bool KviKvsObject_lcd::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) bool KviKvsObject_lcd::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{ {
setObject(TQT_TQOBJECT(new TQLCDNumber(parentScriptWidget(), name())), true); setObject(new TQLCDNumber(parentScriptWidget(), name()), true);
return true; return true;
} }

2
src/modules/objects/class_lineedit.cpp
Unescape View File

@ -217,7 +217,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lineedit)
bool KviKvsObject_lineedit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) 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(returnPressed()),this,TQT_SLOT(slotreturnPressed()));
connect(widget(),TQT_SIGNAL(lostFocus()),this,TQT_SLOT(slotlostFocus())); connect(widget(),TQT_SIGNAL(lostFocus()),this,TQT_SLOT(slotlostFocus()));
connect(widget(),TQT_SIGNAL(textChanged(const TQString & )),this,TQT_SLOT(slottextChanged(const TQString & ))); connect(widget(),TQT_SIGNAL(textChanged(const TQString & )),this,TQT_SLOT(slottextChanged(const TQString & )));

2
src/modules/objects/class_listbox.cpp
Unescape View File

@ -156,7 +156,7 @@ bool KviKvsObject_listbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
connect(b,TQT_SIGNAL(onItem(KviTalListBoxItem *)),this,TQT_SLOT(onItem(KviTalListBoxItem *))); connect(b,TQT_SIGNAL(onItem(KviTalListBoxItem *)),this,TQT_SLOT(onItem(KviTalListBoxItem *)));
setObject(TQT_TQOBJECT(b),true);; setObject(b,true);;
return true; return true;
} }

2
src/modules/objects/class_listview.cpp
Unescape View File

@ -212,7 +212,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listview)
bool KviKvsObject_listview::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) 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(clicked(KviTalListViewItem *)),this,TQT_SLOT(slotClicked(KviTalListViewItem *)));
connect(widget(),TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(slotSelectionChanged(KviTalListViewItem *))); connect(widget(),TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(slotSelectionChanged(KviTalListViewItem *)));
connect(widget(),TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotMultipleSelectionChanged())); connect(widget(),TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotMultipleSelectionChanged()));

2
src/modules/objects/class_mainwindow.cpp
Unescape View File

@ -68,7 +68,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mainwindow)
bool KviKvsObject_mainwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) bool KviKvsObject_mainwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{ {
setObject(TQT_TQOBJECT(new KviTalMainWindow(parentScriptWidget(), name())), true); setObject(new KviTalMainWindow(parentScriptWidget(), name()), true);
return true; return true;
} }

2
src/modules/objects/class_menubar.cpp
Unescape View File

@ -61,7 +61,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_menubar)
bool KviKvsObject_menubar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) bool KviKvsObject_menubar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{ {
setObject(TQT_TQOBJECT(new TQMenuBar(parentScriptWidget(), name()))); setObject(new TQMenuBar(parentScriptWidget(), name()));
return true; return true;
} }

2
src/modules/objects/class_multilineedit.cpp
Unescape View File

@ -340,7 +340,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mledit)
bool KviKvsObject_mledit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) bool KviKvsObject_mledit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
{ {
setObject(TQT_TQOBJECT(new KviTalMultiLineEdit(parentScriptWidget(),getName())),true); setObject(new KviTalMultiLineEdit(parentScriptWidget(),getName()),true);
return true; return true;
} }

2
src/modules/objects/class_popupmenu.cpp
Unescape View File

@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_popupmenu)
bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) 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(activated(int)),this,TQT_SLOT(slotactivated(int)));
connect(widget(),TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slothighlighted(int))); connect(widget(),TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slothighlighted(int)));
return true; return true;

2
src/modules/objects/class_progressbar.cpp
Unescape View File

@ -90,7 +90,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_progressbar)
bool KviKvsObject_progressbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) bool KviKvsObject_progressbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{ {
setObject(TQT_TQOBJECT(new TQProgressBar(parentScriptWidget(), name())), true); setObject(new TQProgressBar(parentScriptWidget(), name()), true);
return true; return true;
} }

2
src/modules/objects/class_radiobutton.cpp
Unescape View File

@ -82,7 +82,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_radiobutton)
bool KviKvsObject_radiobutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) 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))); connect(widget(),TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggled(bool)));
return true; return true;
} }

2
src/modules/objects/class_slider.cpp
Unescape View File

@ -130,7 +130,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_slider)
bool KviKvsObject_slider::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) 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))); connect(widget(),TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(valueChanged(int)));
return true; return true;
} }

2
src/modules/objects/class_spinbox.cpp
Unescape View File

@ -132,7 +132,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_spinbox)
bool KviKvsObject_spinbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) 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))); connect(widget(),TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(valueChanged(int)));
return true; return true;
} }

2
src/modules/objects/class_tabwidget.cpp
Unescape View File

@ -182,7 +182,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_tabwidget)
bool KviKvsObject_tabwidget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) 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))); connect(widget(),TQT_SIGNAL(currentChanged(int)),this,TQT_SLOT(slotcurrentChanged(int)));
return true; return true;
} }

2
src/modules/objects/class_tbrowser.cpp
Unescape View File

@ -83,7 +83,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_textbrowser)
bool KviKvsObject_textbrowser::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) bool KviKvsObject_textbrowser::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{ {
TQTextBrowser * tb = new TQTextBrowser(parentScriptWidget(), name()); 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 &))); connect(tb,TQT_SIGNAL(anchorClicked(const TQString &,const TQString &)),this,TQT_SLOT(anchorClicked(const TQString &,const TQString &)));
return true; return true;
} }

2
src/modules/objects/class_toolbar.cpp
Unescape View File

@ -86,7 +86,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
} }
if(parentObject()->inherits("KviKvsObject_mainwindow")) if(parentObject()->inherits("KviKvsObject_mainwindow"))
{ {
setObject(TQT_TQOBJECT(new KviTalToolBar(name(), ((KviTalMainWindow *)parentScriptWidget()))), true); setObject(new KviTalToolBar(name(), ((KviTalMainWindow *)parentScriptWidget())), true);
} }
else else
{ {

2
src/modules/objects/class_toolbutton.cpp
Unescape View File

@ -129,7 +129,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_toolbutton)
bool KviKvsObject_toolbutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) 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())); connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
return true; return true;
} }

2
src/modules/objects/class_vbox.cpp
Unescape View File

@ -67,7 +67,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_vbox)
bool KviKvsObject_vbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) bool KviKvsObject_vbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{ {
setObject(TQT_TQOBJECT(new KviTalVBox(parentScriptWidget())), true); setObject(new KviTalVBox(parentScriptWidget()), true);
return true; return true;
} }

2
src/modules/objects/class_widget.cpp
Unescape View File

@ -592,7 +592,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_widget)
bool KviKvsObject_widget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) bool KviKvsObject_widget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
{ {
setObject(TQT_TQOBJECT(new TQWidget(parentScriptWidget(),getName())),true); setObject(new TQWidget(parentScriptWidget(),getName()),true);
return true; return true;
} }

2
src/modules/objects/class_window.cpp
Unescape View File

@ -113,7 +113,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_window)
bool KviKvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) bool KviKvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{ {
KviWindow * w = new KviKvsScriptWindowWindow(pContext->window()->frame(),name()); KviWindow * w = new KviKvsScriptWindowWindow(pContext->window()->frame(),name());
setObject(TQT_TQOBJECT(w)); setObject(w);
pContext->window()->frame()->addWindow(w,false); pContext->window()->frame()->addWindow(w,false);
w->minimize(); // must be minimized before children are added, otherwise the focus handling goes nuts... w->minimize(); // must be minimized before children are added, otherwise the focus handling goes nuts...

2
src/modules/objects/class_wizard.cpp
Unescape View File

@ -124,7 +124,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_wizard)
bool KviKvsObject_wizard::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) 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; return true;
} }

2
src/modules/objects/class_workspace.cpp
Unescape View File

@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_workspace)
bool KviKvsObject_workspace::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) bool KviKvsObject_workspace::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{ {
setObject(TQT_TQOBJECT(new TQWorkspace(parentScriptWidget(), name())), true); setObject(new TQWorkspace(parentScriptWidget(), name()), true);
return true; return true;
} }

2
src/modules/objects/class_wrapper.cpp
Unescape View File

@ -174,7 +174,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
pContext->warning(__tr2qs("Failed to find the widget to wrap")); pContext->warning(__tr2qs("Failed to find the widget to wrap"));
return false; return false;
} }
setObject(TQT_TQOBJECT(pWidget),false); setObject(pWidget,false);
return true; return true;
} }

2
src/modules/objects/libkviobjects.cpp
Unescape View File

@ -842,7 +842,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
idx++; idx++;
dumpChildObjects(cmd->window(), TQT_TQOBJECT(it.current()), spacing.ptr(), bFlag,n,idx); dumpChildObjects(cmd->window(), it.current(), spacing.ptr(), bFlag,n,idx);
} }

2
src/modules/options/libkvioptions.cpp
Unescape View File

@ -213,7 +213,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
if(c->hasSwitch('m',"modal")) if(c->hasSwitch('m',"modal"))
{ {
w = TQT_TQWIDGET(g_pApp->activeModalWidget()); w = g_pApp->activeModalWidget();
if(!w)w = g_pFrame; if(!w)w = g_pFrame;
} else { } else {
w = g_pFrame; w = g_pFrame;

2
src/modules/options/optw_identity.cpp
Unescape View File

@ -325,7 +325,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * pare
"(case insensitive), you can provide alternative nicknames to be used in case"\ "(case insensitive), you can provide alternative nicknames to be used in case"\
"the server refuses to accept the default one.</center>","options")); "the server refuses to accept the default one.</center>","options"));
#endif #endif
TQValidator * v = new TQRegExpValidator(TQRegExp("[^-0-9 ][^ ]*"),TQT_TQOBJECT(hb)); TQValidator * v = new TQRegExpValidator(TQRegExp("[^-0-9 ][^ ]*"),hb);
sel->setValidator(v); sel->setValidator(v);
TQPushButton * pb = new TQPushButton(__tr2qs_ctx("Alternatives...","options"),hb); TQPushButton * pb = new TQPushButton(__tr2qs_ctx("Alternatives...","options"),hb);

4
src/modules/options/optw_servers.cpp
Unescape View File

@ -138,7 +138,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork *
l = new TQLabel(__tr2qs_ctx("Nickname:","options"),gbox); l = new TQLabel(__tr2qs_ctx("Nickname:","options"),gbox);
m_pNickEditor = new TQLineEdit(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->setValidator(v);
m_pNickEditor->setText(n->nickName()); m_pNickEditor->setText(n->nickName());
#ifdef COMPILE_INFO_TIPS #ifdef COMPILE_INFO_TIPS
@ -497,7 +497,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
l = new TQLabel(__tr2qs_ctx("Nickname:","options"),gbox); l = new TQLabel(__tr2qs_ctx("Nickname:","options"),gbox);
m_pNickEditor = new TQLineEdit(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->setValidator(v);
m_pNickEditor->setText(s->nickName()); m_pNickEditor->setText(s->nickName());
#ifdef COMPILE_INFO_TIPS #ifdef COMPILE_INFO_TIPS

2
src/modules/setup/setupwizard.cpp
Unescape View File

@ -336,7 +336,7 @@ KviSetupWizard::KviSetupWizard()
m_pNickSelector = new KviStringSelector(gbox,__tr2qs("Nickname:"),&(KVI_OPTION_STRING(KviOption_stringNickname1)),true); m_pNickSelector = new KviStringSelector(gbox,__tr2qs("Nickname:"),&(KVI_OPTION_STRING(KviOption_stringNickname1)),true);
m_pNickSelector->setMinimumLabelWidth(120); 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); m_pNickSelector->setValidator(v);
TQString szOptionalCtcpUserInfo = __tr2qs("This field is optional and will appear as part of the CTCP USERINFO reply."); TQString szOptionalCtcpUserInfo = __tr2qs("This field is optional and will appear as part of the CTCP USERINFO reply.");

Write Preview
Loading…
Cancel
Save