summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-08-12 18:42:36 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-08-16 17:26:58 +0900
commit688e664d9b60e6621372d1a445ccf00f57600750 (patch)
tree503558ba8fe4b2cdf32f79a07cc144ed3e055277
parent2a618adc8eec3febd4f805963a3b89e0ab1af44e (diff)
downloadamarok-688e664d9b60e6621372d1a445ccf00f57600750.tar.gz
amarok-688e664d9b60e6621372d1a445ccf00f57600750.zip
Drop TQT_BASE_OBJECT* defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit a045be0c3e0b69973020070e52867bd84306218e)
-rw-r--r--amarok/src/collectionbrowser.cpp4
-rw-r--r--amarok/src/contextbrowser.cpp4
-rw-r--r--amarok/src/coverfetcher.cpp4
-rw-r--r--amarok/src/mediadevice/daap/daapclient.cpp2
-rw-r--r--amarok/src/mediadevice/daap/daapreader/reader.cpp4
-rw-r--r--amarok/src/playerwindow.cpp2
-rw-r--r--amarok/src/playlist.cpp14
-rw-r--r--amarok/src/playlistloader.cpp2
-rw-r--r--amarok/src/playlistwindow.cpp4
-rw-r--r--amarok/src/statusbar/statusBarBase.cpp6
10 files changed, 23 insertions, 23 deletions
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index 3ca7023c..de90858e 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -336,7 +336,7 @@ CollectionBrowser::eventFilter( TQObject *o, TQEvent *e )
#define e TQT_TQKEYEVENT(e)
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_searchEdit) ) //the search lineedit
+ if( o == m_searchEdit ) //the search lineedit
{
switch( e->key() )
{
@@ -3619,7 +3619,7 @@ CollectionView::viewportResizeEvent( TQResizeEvent* e)
bool
CollectionView::eventFilter( TQObject* o, TQEvent* e )
{
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(header())
+ if( o == header()
&& e->type() == TQEvent::MouseButtonPress
&& TQT_TQMOUSEEVENT( e )->button() == Qt::RightButton
&& m_viewMode == modeFlatView )
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index fedd216e..cef8a4cf 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -3828,7 +3828,7 @@ ContextBrowser::eventFilter( TQObject *o, TQEvent *e )
case 6/*TQEvent::KeyPress*/:
#define e TQT_TQKEYEVENT(e)
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_addLabelEdit) ) //the add label lineedit
+ if( o == m_addLabelEdit ) //the add label lineedit
{
switch( e->key() )
{
@@ -3846,7 +3846,7 @@ ContextBrowser::eventFilter( TQObject *o, TQEvent *e )
}
}
- if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lyricsSearchText))
+ if (o == m_lyricsSearchText)
{
switch ( e->key() )
{
diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp
index 1bdaed54..a5618d1c 100644
--- a/amarok/src/coverfetcher.cpp
+++ b/amarok/src/coverfetcher.cpp
@@ -616,9 +616,9 @@ CoverFetcher::getUserQuery( TQString explanation )
virtual void accept()
{
- if( tqstrcmp( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(), "NewSearch" ) == 0 )
+ if( tqstrcmp( sender()->name(), "NewSearch" ) == 0 )
done( 1000 );
- else if( tqstrcmp( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(), "NextCover" ) == 0 )
+ else if( tqstrcmp( sender()->name(), "NextCover" ) == 0 )
done( 1001 );
else
KDialog::accept();
diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp
index 1f5e9360..53e9a941 100644
--- a/amarok/src/mediadevice/daap/daapclient.cpp
+++ b/amarok/src/mediadevice/daap/daapclient.cpp
@@ -532,7 +532,7 @@ DaapClient::passwordPrompt()
KPasswordEdit* m_input;
};
- Daap::Reader* callback = dynamic_cast<Daap::Reader*>( const_cast<TQT_BASE_OBJECT_NAME*>( sender() ) );
+ Daap::Reader* callback = dynamic_cast<Daap::Reader*>( const_cast<TQObject*>( sender() ) );
if (!callback) {
debug() << "No callback!" << endl;
return;
diff --git a/amarok/src/mediadevice/daap/daapreader/reader.cpp b/amarok/src/mediadevice/daap/daapreader/reader.cpp
index 2fb911c8..98e188c8 100644
--- a/amarok/src/mediadevice/daap/daapreader/reader.cpp
+++ b/amarok/src/mediadevice/daap/daapreader/reader.cpp
@@ -170,7 +170,7 @@ Reader::logoutRequest()
void
Reader::logoutRequest( int, bool )
{
- const_cast<TQT_BASE_OBJECT_NAME*>(sender())->deleteLater();
+ const_cast<TQObject*>(sender())->deleteLater();
deleteLater();
}
@@ -418,7 +418,7 @@ Reader::addElement( TQStringVariantMap &parentMap, char* tag, TQVariant element
void
Reader::fetchingError( const TQString& error )
{
- const_cast<TQT_BASE_OBJECT_NAME*>( sender() )->deleteLater();
+ const_cast<TQObject*>(sender())->deleteLater();
emit httpError( error );
}
#include "reader.moc"
diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp
index 1c278d70..28c23355 100644
--- a/amarok/src/playerwindow.cpp
+++ b/amarok/src/playerwindow.cpp
@@ -688,7 +688,7 @@ PlayerWidget::eventFilter( TQObject *o, TQEvent *e )
{
//NOTE we only monitor for parent() - which is the PlaylistWindow
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pAnalyzer) )
+ if( o == m_pAnalyzer )
{
//delete analyzer, create same one back in Player Window
if( e->type() == TQEvent::Close )
diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp
index 3bd33d32..e4bd4c0b 100644
--- a/amarok/src/playlist.cpp
+++ b/amarok/src/playlist.cpp
@@ -2729,7 +2729,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e )
#define me TQT_TQMOUSEEVENT(e)
#define ke TQT_TQKEYEVENT(e)
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(header()) && e->type() == TQEvent::MouseButtonPress && me->button() == Qt::RightButton )
+ if( o == header() && e->type() == TQEvent::MouseButtonPress && me->button() == Qt::RightButton )
{
enum { HIDE = 1000, SELECT, CUSTOM, SMARTRESIZING };
@@ -2795,7 +2795,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e )
}
// not in slotMouseButtonPressed because we need to disable normal usage.
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) && e->type() == TQEvent::MouseButtonPress && me->state() == TQt::ControlButton && me->button() == Qt::RightButton )
+ if( o == viewport() && e->type() == TQEvent::MouseButtonPress && me->state() == TQt::ControlButton && me->button() == Qt::RightButton )
{
PlaylistItem *item = static_cast<PlaylistItem*>( itemAt( me->pos() ) );
@@ -2810,7 +2810,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e )
}
// trigger in-place tag editing
- else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) && e->type() == TQEvent::MouseButtonPress && me->button() == Qt::LeftButton )
+ else if( o == viewport() && e->type() == TQEvent::MouseButtonPress && me->button() == Qt::LeftButton )
{
m_clicktimer->stop();
m_itemToRename = 0;
@@ -2833,7 +2833,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e )
}
}
- else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) && e->type() == TQEvent::MouseButtonRelease && me->button() == Qt::LeftButton )
+ else if( o == viewport() && e->type() == TQEvent::MouseButtonRelease && me->button() == Qt::LeftButton )
{
int col = header()->sectionAt( viewportToContents( me->pos() ).x() );
if( col != PlaylistItem::Rating )
@@ -2859,7 +2859,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e )
}
// Toggle play/pause if user middle-clicks on current track
- else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) && e->type() == TQEvent::MouseButtonPress && me->button() == Qt::MidButton )
+ else if( o == viewport() && e->type() == TQEvent::MouseButtonPress && me->button() == Qt::MidButton )
{
PlaylistItem *item = static_cast<PlaylistItem*>( itemAt( me->pos() ) );
@@ -2870,7 +2870,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e )
}
}
- else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(renameLineEdit()) && e->type() == 6 /*TQEvent::KeyPress*/ && m_renameItem )
+ else if( o == renameLineEdit() && e->type() == 6 /*TQEvent::KeyPress*/ && m_renameItem )
{
const int visibleCols = numVisibleColumns();
int physicalColumn = visibleCols - 1;
@@ -2961,7 +2961,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e )
}
}
- else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(renameLineEdit()) && ( e->type() == TQEvent::Hide || e->type() == TQEvent::Close ) )
+ else if( o == renameLineEdit() && ( e->type() == TQEvent::Hide || e->type() == TQEvent::Close ) )
{
m_renameItem = 0;
}
diff --git a/amarok/src/playlistloader.cpp b/amarok/src/playlistloader.cpp
index 0eebba0b..104662de 100644
--- a/amarok/src/playlistloader.cpp
+++ b/amarok/src/playlistloader.cpp
@@ -515,7 +515,7 @@ void UrlLoader::slotPlaylistInfo( const TQString &, const TQString &version, con
"and this version can no longer read it.\n"
"You will have to create a new one.\n"
"Sorry :(" ) );
- static_cast<MyXmlLoader*>( const_cast<TQT_BASE_OBJECT_NAME*>( sender() ) )->abort(); //HACK?
+ static_cast<MyXmlLoader*>( const_cast<TQObject*>( sender() ) )->abort(); //HACK?
return;
}
else
diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp
index c7f6c794..eecabde5 100644
--- a/amarok/src/playlistwindow.cpp
+++ b/amarok/src/playlistwindow.cpp
@@ -682,7 +682,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e )
}
}
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) ) //the search lineedit
+ if( o == m_lineEdit ) //the search lineedit
{
TQListViewItem *item;
switch( e->key() )
@@ -753,7 +753,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e )
//following are for Playlist::instance() only
//we don't handle these in the playlist because often we manipulate the lineEdit too
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(pl) )
+ if( o == pl )
{
if( pl->currentItem() && ( e->key() == Key_Up && pl->currentItem()->itemAbove() == 0 && !(e->state() & TQt::ShiftButton) ) )
{
diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp
index 4056a547..7974dfc6 100644
--- a/amarok/src/statusbar/statusBarBase.cpp
+++ b/amarok/src/statusbar/statusBarBase.cpp
@@ -417,7 +417,7 @@ StatusBar::newProgressOperation( TDEIO::Job *job )
void
StatusBar::endProgressOperation()
{
- TQObject *owner = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); //HACK deconsting it
+ TQObject *owner = TQT_TQOBJECT(const_cast<TQObject*>( sender() )); //HACK deconsting it
TDEIO::Job *job = dynamic_cast<TDEIO::Job*>( owner );
//FIXME doesn't seem to work for TDEIO::DeleteJob, it has it's own error handler and returns no error too
@@ -509,7 +509,7 @@ StatusBar::hideMainProgressBar()
void
StatusBar::setProgress( int steps )
{
- setProgress( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())), steps );
+ setProgress( sender(), steps );
}
void
@@ -551,7 +551,7 @@ StatusBar::setProgressStatus( const TQObject *owner, const TQString &text )
void StatusBar::incrementProgress()
{
- incrementProgress( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()) ));
+ incrementProgress( sender() );
}
void