Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit b932f954f8.
pull/1/head
Timothy Pearson 13 years ago
parent b932f954f8
commit 1731c59e84

@ -34,7 +34,7 @@
#include <tqbuttongroup.h> #include <tqbuttongroup.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqprocess.h> #include <tqprocess.h>
#include <textedit.h> #include <tqtextedit.h>
#include <tqframe.h> #include <tqframe.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kmessagebox.h> #include <kmessagebox.h>
@ -191,7 +191,7 @@ void KStreamRipper::tuneInButtonClicked()
void KStreamRipper::serviceAdded(DNSSD::RemoteService::Ptr srv) void KStreamRipper::serviceAdded(DNSSD::RemoteService::Ptr srv)
{ {
ProcessListViewItem * proc = new ProcessListViewItem( m_streamsListView, srv->serviceName(), "", ""); ProcessListViewItem * proc = new ProcessListViewItem( m_streamsListView, srv->serviceName(), "", "");
proc->getProcessController()->setUrl( TQString("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()->setDescription( i18n("found by Zeroconf") );
proc->getProcessController()->setAutomatic(true); proc->getProcessController()->setAutomatic(true);
proc->getProcessController()->setService(srv); proc->getProcessController()->setService(srv);
@ -269,8 +269,8 @@ void KStreamRipper::selectedNewListItem()
ProcessController * ProcCtl = ((ProcessListViewItem*)m_streamsListView->currentItem())->getProcessController(); ProcessController * ProcCtl = ((ProcessListViewItem*)m_streamsListView->currentItem())->getProcessController();
// reconfigure what the user is allowed to do based on if this process is ripping // reconfigure what the user is allowed to do based on if this process is ripping
m_ripButton->setEnabled( !ProcCtl->getStatus() ); m_ripButton->setEnabled( !ProcCtl->gettqStatus() );
m_stopRipButton->setEnabled( ProcCtl->getStatus() ); m_stopRipButton->setEnabled( ProcCtl->gettqStatus() );
m_tuneInButton->setEnabled( true ); m_tuneInButton->setEnabled( true );
m_deleteStreamButton->setEnabled( !ProcCtl->getAutomatic() ); m_deleteStreamButton->setEnabled( !ProcCtl->getAutomatic() );

@ -29,7 +29,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>20</height> <height>20</height>
@ -46,7 +46,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="6" column="1"> <widget class="TQLayoutWidget" row="6" column="1">
<property name="name"> <property name="name">
<cstring>layout10</cstring> <cstring>tqlayout10</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -80,7 +80,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>421</width> <width>421</width>
<height>21</height> <height>21</height>

@ -23,7 +23,7 @@
#include "processlistviewitem.h" #include "processlistviewitem.h"
ProcessController::ProcessController(ProcessListViewItem * parent) ProcessController::ProcessController(ProcessListViewItem * parent)
: TQObject((TQObject *)parent), myParent(parent), myStatus(false), myAutomatic(false), myProcess(new TQProcess(this)) : TQObject((TQObject *)parent), myParent(parent), mytqStatus(false), myAutomatic(false), myProcess(new TQProcess(this))
{ {
connect (myProcess, TQT_SIGNAL( readyReadStdout() ), (ProcessController *) this, TQT_SLOT( readStdout()) ); connect (myProcess, TQT_SIGNAL( readyReadStdout() ), (ProcessController *) this, TQT_SLOT( readStdout()) );
// connect (myProcess, TQT_SIGNAL( destroyed() ), myProcess, TQT_SLOT( kill()) ); // connect (myProcess, TQT_SIGNAL( destroyed() ), myProcess, TQT_SLOT( kill()) );
@ -71,7 +71,7 @@ void ProcessController::readStdout()
void ProcessController::startRip(TQString destination, TQString time) void ProcessController::startRip(TQString destination, TQString time)
{ {
myStatus = true; mytqStatus = true;
myParent->setText( 1, "Ripping" ); myParent->setText( 1, "Ripping" );
myProcess->clearArguments(); myProcess->clearArguments();
@ -92,7 +92,7 @@ void ProcessController::startRip(TQString destination, TQString time)
void ProcessController::stopRip() void ProcessController::stopRip()
{ {
myStatus = false; mytqStatus = false;
myParent->setText( 1, "" ); myParent->setText( 1, "" );
myParent->setText( 2, "" ); myParent->setText( 2, "" );
@ -101,9 +101,9 @@ void ProcessController::stopRip()
} }
bool ProcessController::getStatus() bool ProcessController::gettqStatus()
{ {
return myStatus; return mytqStatus;
} }
TQString ProcessController::getUrl() TQString ProcessController::getUrl()

@ -40,7 +40,7 @@ public:
ProcessController(ProcessListViewItem * parent); ProcessController(ProcessListViewItem * parent);
~ProcessController(); ~ProcessController();
bool getStatus(); bool gettqStatus();
bool getAutomatic(); bool getAutomatic();
void setAutomatic(bool a); void setAutomatic(bool a);
#if KDE_IS_VERSION(3,3,90) #if KDE_IS_VERSION(3,3,90)
@ -59,7 +59,7 @@ protected slots:
private: private:
ProcessListViewItem * myParent; ProcessListViewItem * myParent;
bool myStatus; bool mytqStatus;
bool myAutomatic; bool myAutomatic;
#if KDE_IS_VERSION(3,3,90) #if KDE_IS_VERSION(3,3,90)
DNSSD::RemoteService::Ptr myService; DNSSD::RemoteService::Ptr myService;

Loading…
Cancel
Save