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

Drop TQT_BASE_OBJECT* defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit a045be0c3e)
r14.1.x
Michele Calgaro 1 year ago
parent 2a618adc8e
commit 688e664d9b
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
10 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

4
amarok/src/collectionbrowser.cpp
Unescape View File

@ -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 )

4
amarok/src/contextbrowser.cpp
Unescape View File

@ -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() )
{

4
amarok/src/coverfetcher.cpp
Unescape View File

@ -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();

2
amarok/src/mediadevice/daap/daapclient.cpp
Unescape View File

@ -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;

4
amarok/src/mediadevice/daap/daapreader/reader.cpp
Unescape View File

@ -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"

2
amarok/src/playerwindow.cpp
Unescape View File

@ -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 )

14
amarok/src/playlist.cpp
Unescape View File

@ -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;
}

2
amarok/src/playlistloader.cpp
Unescape View File

@ -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

4
amarok/src/playlistwindow.cpp
Unescape View File

@ -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) ) )
{

6
amarok/src/statusbar/statusBarBase.cpp
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save