From d2627113ba347e79699e280edcd0813265ae780f Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 5 Jul 2011 19:56:36 +0000 Subject: TQt4 port kstreamripper This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kstreamripper@1239914 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/kstreamripper.cpp | 98 +++++++++++++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) (limited to 'src/kstreamripper.cpp') diff --git a/src/kstreamripper.cpp b/src/kstreamripper.cpp index 9641df2..2c309c7 100644 --- a/src/kstreamripper.cpp +++ b/src/kstreamripper.cpp @@ -25,18 +25,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -48,16 +48,16 @@ -KStreamRipper::KStreamRipper( QWidget* parent, const char* name ) - : KStreamRipperBase( parent,name ) +KStreamRipper::KStreamRipper( TQWidget* tqparent, const char* name ) + : KStreamRipperBase( tqparent,name ) #if KDE_IS_VERSION(3,3,90) , m_browser("_shoutcast._tcp",0,true) #endif { - m_destEdit->setText( QDir::homeDirPath() ); + m_destEdit->setText( TQDir::homeDirPath() ); m_streamsListView->addColumn( "Name" ); - m_streamsListView->addColumn( "Status" ); + m_streamsListView->addColumn( "tqStatus" ); m_streamsListView->addColumn( "Size" ); //app config @@ -69,12 +69,12 @@ KStreamRipper::KStreamRipper( QWidget* parent, const char* name ) m_id3Checkbox->setChecked( appConfig->readBoolEntry( "Id3Tag", 1 )); //listview entrys - QStringList nameList,urlList,descList; + TQStringList nameList,urlList,descList; nameList = appConfig->readListEntry( "names" ); urlList = appConfig->readListEntry( "urls" ); descList = appConfig->readListEntry( "descs" ); - QStringList::iterator iter1, iter2, iter3; + TQStringList::iterator iter1, iter2, iter3; iter1 = nameList.begin(); iter2 = urlList.begin(); iter3 = descList.begin(); @@ -90,26 +90,26 @@ KStreamRipper::KStreamRipper( QWidget* parent, const char* name ) //CONNECTS //clicks - connect(m_addStreamButton, SIGNAL(clicked()), this, SLOT(addStreamButtonClicked())); - connect(m_deleteStreamButton, SIGNAL(clicked()), this, SLOT(deleteStreamButtonClicked())); - connect(m_tuneInButton, SIGNAL(clicked()), this, SLOT(tuneInButtonClicked())); - connect(m_ripButton, SIGNAL(clicked()), this, SLOT(ripButtonClicked())); - connect(m_stopRipButton, SIGNAL(clicked()), this, SLOT(stopRipButtonClicked())); - connect(m_browseButton, SIGNAL(clicked()), this, SLOT(browseButtonClicked())); - connect(m_aboutButton, SIGNAL(clicked()), this, SLOT(aboutButtonClicked())); - connect(m_quitButton, SIGNAL(clicked()), this, SLOT(quitButtonClicked())); + connect(m_addStreamButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addStreamButtonClicked())); + connect(m_deleteStreamButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteStreamButtonClicked())); + connect(m_tuneInButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(tuneInButtonClicked())); + connect(m_ripButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(ripButtonClicked())); + connect(m_stopRipButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(stopRipButtonClicked())); + connect(m_browseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(browseButtonClicked())); + connect(m_aboutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(aboutButtonClicked())); + connect(m_quitButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(quitButtonClicked())); //other - connect( m_streamsListView, SIGNAL(selectionChanged()), this, SLOT( selectedNewListItem()) ); - connect( m_DescriptionEdit, SIGNAL(textChanged(const QString&)), this, SLOT( descriptionChanged()) ); - connect( m_UrlEdit, SIGNAL(textChanged(const QString&)), this, SLOT( urlChanged()) ); + connect( m_streamsListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT( selectedNewListItem()) ); + connect( m_DescriptionEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT( descriptionChanged()) ); + connect( m_UrlEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT( urlChanged()) ); // zeroconf #if KDE_IS_VERSION(3,3,90) - connect(&m_browser, SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)), this, - SLOT(serviceAdded(DNSSD::RemoteService::Ptr))); - connect(&m_browser, SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr)), this, - SLOT(serviceRemoved(DNSSD::RemoteService::Ptr))); + connect(&m_browser, TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)), this, + TQT_SLOT(serviceAdded(DNSSD::RemoteService::Ptr))); + connect(&m_browser, TQT_SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr)), this, + TQT_SLOT(serviceRemoved(DNSSD::RemoteService::Ptr))); m_browser.startBrowse(); #endif } @@ -120,7 +120,7 @@ KStreamRipper::~KStreamRipper() } -void KStreamRipper::closeEvent( QCloseEvent *e ) +void KStreamRipper::closeEvent( TQCloseEvent *e ) { KConfig *appConfig = KGlobal::config(); @@ -131,8 +131,8 @@ void KStreamRipper::closeEvent( QCloseEvent *e ) //save the listview entrys - QStringList nameList,urlList,descList; - QListViewItemIterator iter( m_streamsListView ); + TQStringList nameList,urlList,descList; + TQListViewItemIterator iter( m_streamsListView ); while( iter.current() ) { @@ -159,7 +159,7 @@ void KStreamRipper::closeEvent( QCloseEvent *e ) void KStreamRipper::addStreamButtonClicked() { AddNewStreamImpl *test = new AddNewStreamImpl( this ); - connect( test, SIGNAL( finished( AddNewStreamImpl* )), this, SLOT( addStreamFinished( AddNewStreamImpl* )) ); + connect( test, TQT_SIGNAL( finished( AddNewStreamImpl* )), this, TQT_SLOT( addStreamFinished( AddNewStreamImpl* )) ); test->show(); } @@ -175,11 +175,11 @@ void KStreamRipper::tuneInButtonClicked() { if( m_streamsListView->currentItem() ) { - QString command = m_tuneInEdit->text().replace( "", m_UrlEdit->text() ); + TQString command = m_tuneInEdit->text().tqreplace( "", m_UrlEdit->text() ); - QStringList commands = QStringList::split( " ", command ); + TQStringList commands = TQStringList::split( " ", command ); - QProcess *process = new QProcess( this ); + TQProcess *process = new TQProcess( TQT_TQOBJECT(this) ); process->setArguments( commands ); process->start(); @@ -191,7 +191,7 @@ void KStreamRipper::tuneInButtonClicked() void KStreamRipper::serviceAdded(DNSSD::RemoteService::Ptr srv) { ProcessListViewItem * proc = new ProcessListViewItem( m_streamsListView, srv->serviceName(), "", ""); - proc->getProcessController()->setUrl( QString("http://%1:%2%3").arg(srv->hostName()).arg(srv->port()).arg(srv->textData()["path"]) ); + proc->getProcessController()->setUrl( TQString("http://%1:%2%3").tqarg(srv->hostName()).tqarg(srv->port()).tqarg(srv->textData()["path"]) ); proc->getProcessController()->setDescription( i18n("found by Zeroconf") ); proc->getProcessController()->setAutomatic(true); proc->getProcessController()->setService(srv); @@ -199,7 +199,7 @@ void KStreamRipper::serviceAdded(DNSSD::RemoteService::Ptr srv) } void KStreamRipper::serviceRemoved(DNSSD::RemoteService::Ptr srv) { - QListViewItemIterator iter( m_streamsListView ); + TQListViewItemIterator iter( m_streamsListView ); while( iter.current() ) { ProcessListViewItem * ProcItem = (ProcessListViewItem*)iter.current(); @@ -237,7 +237,7 @@ void KStreamRipper::stopRipButtonClicked() void KStreamRipper::browseButtonClicked() { - QString openDest = KFileDialog::getExistingDirectory( QDir::homeDirPath(), + TQString openDest = KFileDialog::getExistingDirectory( TQDir::homeDirPath(), this, "Select Destination..." ); m_destEdit->setText( openDest ); @@ -260,17 +260,17 @@ void KStreamRipper::selectedNewListItem() m_deleteStreamButton->setEnabled( false ); m_tuneInButton->setEnabled( false ); m_ripButton->setEnabled( false ); - m_DescriptionEdit->setText( QString::null ); + m_DescriptionEdit->setText( TQString() ); m_DescriptionEdit->setEnabled(false); m_UrlEdit->setEnabled(false); - m_UrlEdit->setText( QString::null ); + m_UrlEdit->setText( TQString() ); return; } ProcessController * ProcCtl = ((ProcessListViewItem*)m_streamsListView->currentItem())->getProcessController(); // reconfigure what the user is allowed to do based on if this process is ripping - m_ripButton->setEnabled( !ProcCtl->getStatus() ); - m_stopRipButton->setEnabled( ProcCtl->getStatus() ); + m_ripButton->setEnabled( !ProcCtl->gettqStatus() ); + m_stopRipButton->setEnabled( ProcCtl->gettqStatus() ); m_tuneInButton->setEnabled( true ); m_deleteStreamButton->setEnabled( !ProcCtl->getAutomatic() ); @@ -281,8 +281,8 @@ void KStreamRipper::selectedNewListItem() // maybe these are more elegant than the next two functions, assuming the slots are implemented in ProcessController - //connect(m_DescriptionEdit, SIGNAL(textChanged(const QString&)), (ProcessListViewItem*)m_streamsListView->currentItem()->getProcessController(), SIGNAL(descriptionChanged(const QString&)) - //connect(m_UrlEdit, SIGNAL(textChanged(const QString&)), (ProcessListViewItem*)m_streamsListView->currentItem()->getProcessController(), SIGNAL(urlChanged(const QString&)) + //connect(m_DescriptionEdit, TQT_SIGNAL(textChanged(const TQString&)), (ProcessListViewItem*)m_streamsListView->currentItem()->getProcessController(), TQT_SIGNAL(descriptionChanged(const TQString&)) + //connect(m_UrlEdit, TQT_SIGNAL(textChanged(const TQString&)), (ProcessListViewItem*)m_streamsListView->currentItem()->getProcessController(), TQT_SIGNAL(urlChanged(const TQString&)) } void KStreamRipper::descriptionChanged() -- cgit v1.2.1