diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-08-12 18:42:03 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-08-15 21:01:21 +0900 |
commit | 2c078f1888431b5ad02b3258684682fffc7cfa88 (patch) | |
tree | 68c2fbac03297c5e1efe354a39946a028a4ef02e /src/kvirc/ui | |
parent | c49086f688a52b2b466951b228b85af92ae64cc7 (diff) | |
download | kvirc-2c078f18.tar.gz kvirc-2c078f18.zip |
Drop TQT_BASE_OBJECT* defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 3ec2ac7ee5d10c5bbc2d4d1af67c5be874f985a5)
Diffstat (limited to 'src/kvirc/ui')
-rw-r--r-- | src/kvirc/ui/kvi_channel.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_customtoolbar.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_frame.cpp | 4 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_ipeditor.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_mdichild.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_modew.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_taskbar.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/ui/kvi_topicw.cpp | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index ff06df1..d1ec58a 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -1593,7 +1593,7 @@ void KviChannel::checkChannelSync() bool KviChannel::eventFilter(TQObject * o, TQEvent * e) { - if(e->type() == TQEvent::FocusOut && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pTopicWidget) && \ + if(e->type() == TQEvent::FocusOut && o == m_pTopicWidget && m_pTopicWidget->isVisible()) m_pTopicWidget->deactivate(); diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index 2a5794b..83a6da1 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -136,7 +136,7 @@ void KviCustomToolBar::paintEvent(TQPaintEvent * e) void KviCustomToolBar::filteredChildDestroyed() { if(!m_pFilteredChildren)return; - const TQObject * o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + const TQObject * o = TQT_TQOBJECT(sender()); m_pFilteredChildren->remove((void *)o); } diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index 8e651ad..fffb464 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -417,7 +417,7 @@ KviAccel * KviFrame::installAccelerators(TQWidget * wnd) void KviFrame::accelActivated(int id) { - KviAccel * acc = (KviAccel *)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + KviAccel * acc = (KviAccel *)TQT_TQOBJECT(sender()); int keys = (int)(acc->key(id)); KviTaskBarItem *item = 0; @@ -1139,7 +1139,7 @@ void KviFrame::customizeToolBars() void KviFrame::toolbarsPopupSelected(int id) { - const TQObject * o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + const TQObject * o = TQT_TQOBJECT(sender()); if(!o)return; if(!o->inherits("KviTalPopupMenu"))return; const KviTalPopupMenu * p = (const KviTalPopupMenu *)o; diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp index fc94552..ea0d94d 100644 --- a/src/kvirc/ui/kvi_ipeditor.cpp +++ b/src/kvirc/ui/kvi_ipeditor.cpp @@ -259,7 +259,7 @@ bool KviIpEditor::eventFilter(TQObject * o,TQEvent *e) int edIdx = -1; for(int i=0;i<8;i++) { - if(TQT_BASE_OBJECT(m_pEdit[i]) == TQT_BASE_OBJECT(o)) + if(m_pEdit[i] == o) { edIdx = i; break; diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index a043a60..caa8f64 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -491,7 +491,7 @@ void KviMdiChild::setClient(TQWidget *w) resize(w->width()+(KVI_MDICHILD_BORDER << 1),w->height()+KVI_MDICHILD_BORDER+clientYPos); //Reparent if needed - if(TQT_BASE_OBJECT(w->parent())!=TQT_BASE_OBJECT(this)){ + if(w->parent()!=this){ //reparent to this widget , no flags , point , show it TQPoint pnt2(KVI_MDICHILD_BORDER,clientYPos); w->reparent(this,pnt2,true); diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index 9f9aba0..e2af01b 100644 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -119,7 +119,7 @@ void KviModeWidget::labelDoubleClick() bool KviModeWidget::eventFilter( TQObject *obj, TQEvent *ev ) { - if( (TQT_BASE_OBJECT(obj)==TQT_BASE_OBJECT(m_pLineEdit)) && ( ev->type() == TQEvent::KeyPress ) ) + if( (obj==m_pLineEdit) && ( ev->type() == TQEvent::KeyPress ) ) { TQKeyEvent *keyEvent = (TQKeyEvent*)ev; switch(keyEvent->key()) diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index 8031719..2346eaa 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -1312,7 +1312,7 @@ void KviTreeTaskBar::tipRequest(KviDynamicToolTip *,const TQPoint &pnt) bool KviTreeTaskBar::eventFilter(TQObject * o,TQEvent *e) { - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pListView->viewport())) + if(o == m_pListView->viewport()) { if(e->type() == TQEvent::MouseButtonPress) { diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index 84a9ca5..b7b845a 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -639,7 +639,7 @@ bool KviTopicWidget::eventFilter(TQObject *object,TQEvent *e) { if ( !e ) return TRUE; - if(TQT_BASE_OBJECT(object)==TQT_BASE_OBJECT(m_pCompletionBox)) + if(object==m_pCompletionBox) { switch( e->type() ) { case TQEvent::MouseButtonPress: |