summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-08-12 18:48:25 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-08-18 11:25:20 +0900
commit2c7c646af5349a9a68c2f129fda7af338855ba85 (patch)
tree36853a1916641351a322dd78de1aaa787c70601c
parent16b9b38e0267f80b68a78d861d111ca182551d5c (diff)
downloadtdeutils-2c7c646af5349a9a68c2f129fda7af338855ba85.tar.gz
tdeutils-2c7c646af5349a9a68c2f129fda7af338855ba85.zip
Drop TQT_BASE_OBJECT* defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--khexedit/bitswapwidget.cpp6
-rw-r--r--khexedit/lib/khexedit.cpp2
-rw-r--r--khexedit/searchbar.cpp2
-rw-r--r--ksim/monitors/filesystem/filesystemwidget.cpp4
-rw-r--r--ksim/monitors/net/ksimnet.cpp2
-rw-r--r--tdewallet/kwmapeditor.cpp4
6 files changed, 10 insertions, 10 deletions
diff --git a/khexedit/bitswapwidget.cpp b/khexedit/bitswapwidget.cpp
index e281d2b..bbea65a 100644
--- a/khexedit/bitswapwidget.cpp
+++ b/khexedit/bitswapwidget.cpp
@@ -206,7 +206,7 @@ void CByteWidget::stepCell( const TQObject *obj, bool next )
{
for( uint i=0; i<8; i++ )
{
- if( TQT_BASE_OBJECT_CONST(obj) == TQT_BASE_OBJECT_CONST(mDigit[i]) )
+ if( obj == mDigit[i] )
{
if( next == true )
{
@@ -228,7 +228,7 @@ void CByteWidget::valueChanged( const TQObject *obj, uint val, bool after )
{
for( uint i=0; i<8; i++ )
{
- if( TQT_BASE_OBJECT_CONST(obj) == TQT_BASE_OBJECT_CONST(mDigit[i]) )
+ if( obj == mDigit[i] )
{
uint tmp = 7-mDigit[i]->value();
mDigit[tmp]->setValue( mDigit[i]->value(), false );
@@ -282,7 +282,7 @@ void CByteWidget::setBuddy( const TQObject *obj )
{
for( uint i=0; i<8; i++ )
{
- if( TQT_BASE_OBJECT_CONST(obj) == TQT_BASE_OBJECT_CONST(mDigit[i]) )
+ if( obj == mDigit[i] )
{
uint val = mDigit[i]->value();
if( val < 8 )
diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp
index 4873fa3..dd34e1e 100644
--- a/khexedit/lib/khexedit.cpp
+++ b/khexedit/lib/khexedit.cpp
@@ -1178,7 +1178,7 @@ void KHexEdit::showEvent( TQShowEvent *e )
bool KHexEdit::eventFilter( TQObject *O, TQEvent *E )
{
- if( TQT_BASE_OBJECT(O) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(O) == TQT_BASE_OBJECT(viewport()) )
+ if( O == this || O == viewport() )
{
if( E->type() == TQEvent::FocusIn )
{
diff --git a/khexedit/searchbar.cpp b/khexedit/searchbar.cpp
index 02fbb4e..aeb4b77 100644
--- a/khexedit/searchbar.cpp
+++ b/khexedit/searchbar.cpp
@@ -110,7 +110,7 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f )
//
bool CSearchBar::eventFilter( TQObject *o, TQEvent *e )
{
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mInputEdit) && e->type() == TQEvent::KeyPress )
+ if( o == mInputEdit && e->type() == TQEvent::KeyPress )
{
TQKeyEvent *ke = (TQKeyEvent*)e;
if( ke->key() == Key_Return )
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index 2fb77e1..35e79b9 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -141,7 +141,7 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e)
while ((filesystem = it.current()) != 0) {
++it;
- if (TQT_BASE_OBJECT(filesystem->display()) == TQT_BASE_OBJECT(o)) {
+ if (filesystem->display() == o) {
progressBar = filesystem->display();
break;
}
@@ -149,7 +149,7 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e)
++i;
}
- if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(progressBar) && e->type() == TQEvent::MouseButtonPress)
+ if (o == progressBar && e->type() == TQEvent::MouseButtonPress)
{
switch(TQT_TQMOUSEEVENT(e)->button()) {
case Qt::RightButton:
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp
index 065797d..338ac06 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -632,7 +632,7 @@ bool NetView::eventFilter( TQObject * o, TQEvent * e )
Network::List::Iterator it;
for ( it = m_networkList.begin(); it != m_networkList.end(); ++it )
{
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).chart()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).label()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).led()) )
+ if ( o == ( *it ).chart() || o == ( *it ).label() || o == ( *it ).led() )
{
break;
}
diff --git a/tdewallet/kwmapeditor.cpp b/tdewallet/kwmapeditor.cpp
index a6c09b4..32ff65e 100644
--- a/tdewallet/kwmapeditor.cpp
+++ b/tdewallet/kwmapeditor.cpp
@@ -76,9 +76,9 @@ KWMapEditor::~KWMapEditor() {
void KWMapEditor::erase() {
- const TQObject *o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
+ const TQObject *o = sender();
for (int i = 0; i < numRows(); i++) {
- if (TQT_BASE_OBJECT_CONST(cellWidget(i, 0)) == TQT_BASE_OBJECT_CONST(o)) {
+ if (cellWidget(i, 0) == o) {
removeRow(i);
break;
}