summaryrefslogtreecommitdiffstats
path: root/kaffeine/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'kaffeine/src/input')
-rw-r--r--kaffeine/src/input/audiobrowser/googlefetcher.cpp2
-rw-r--r--kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp8
-rw-r--r--kaffeine/src/input/audiobrowser/playlist.cpp8
-rw-r--r--kaffeine/src/input/disc/cddb.cpp4
-rw-r--r--kaffeine/src/input/disc/disc.cpp30
-rw-r--r--kaffeine/src/input/disc/paranoia.cpp4
-rw-r--r--kaffeine/src/input/dvb/dvbcam.cpp10
-rw-r--r--kaffeine/src/input/dvb/dvbconfig.cpp80
-rw-r--r--kaffeine/src/input/dvb/dvbpanel.cpp16
-rw-r--r--kaffeine/src/input/dvb/dvbsi.cpp4
-rw-r--r--kaffeine/src/input/dvb/dvbstream.cpp6
-rw-r--r--kaffeine/src/input/dvb/kgradprogress.cpp2
-rw-r--r--kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp2
-rw-r--r--kaffeine/src/input/dvb/scandialog.cpp16
14 files changed, 96 insertions, 96 deletions
diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.cpp b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
index c74317d..0e76b88 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcher.cpp
+++ b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
@@ -108,7 +108,7 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size)
kdDebug() << "Performing Google Search: " << url << endl;
- search.load(url.url()+TQString("&start=%1&sa=N").tqarg(galleryPage*20) );
+ search.load(url.url()+TQString("&start=%1&sa=N").arg(galleryPage*20) );
TQString text = search.toString().string();
diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
index 5bb169e..ccfea35 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
+++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
@@ -87,9 +87,9 @@ GoogleFetcherDialog::~GoogleFetcherDialog()
void GoogleFetcherDialog::setLayout()
{
setCaption(TQString("%1 - %2 (%3)")
- .tqarg(m_artist)
- .tqarg(m_album)
- .tqarg(m_imageList.size()));
+ .arg(m_artist)
+ .arg(m_album)
+ .arg(m_imageList.size()));
m_iconWidget->clear();
for(uint i = 0; i < m_imageList.size(); i++)
@@ -237,7 +237,7 @@ CoverIconViewItem::~CoverIconViewItem()
void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data)
{
int currentSize = m_buffer.size();
- m_buffer.tqresize(currentSize + data.size(), TQGArray::SpeedOptim);
+ m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim);
memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size());
}
diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
index 3735b61..e67603e 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
@@ -1774,14 +1774,14 @@ void PlayList::updateStatus()
TQValueList<MRL>::ConstIterator end(m_queue.end());
for (TQValueList<MRL>::ConstIterator it = m_queue.begin(); it != end; ++it)
total = total.addSecs(TQTime().secsTo((*it).length()));
- status = i18n("Queue: %1 Entries, Playtime: %2").tqarg(m_queue.count()).tqarg(total.toString("h:mm:ss"));
+ status = i18n("Queue: %1 Entries, Playtime: %2").arg(m_queue.count()).arg(total.toString("h:mm:ss"));
}
else
{
- //status = i18n("Entries: %1, Playtime: %2 (Total: %3, %4)").tqarg(TQString::number(m_countVisible)).tqarg(msToTimeString(m_playTimeVisible)).tqarg(TQString::number(m_list->childCount())).tqarg(msToTimeString(m_playTime));
+ //status = i18n("Entries: %1, Playtime: %2 (Total: %3, %4)").arg(TQString::number(m_countVisible)).arg(msToTimeString(m_playTimeVisible)).arg(TQString::number(m_list->childCount())).arg(msToTimeString(m_playTime));
- status = i18n("Entries: %1, Playtime: %2").tqarg(TQString::number(m_countVisible)).tqarg(msToTimeString(m_playTimeVisible));
+ status = i18n("Entries: %1, Playtime: %2").arg(TQString::number(m_countVisible)).arg(msToTimeString(m_playTimeVisible));
}
emit statusBarMessage(status);
}
@@ -1886,7 +1886,7 @@ void PlayList::saveCurrentPlaylist()
void PlayList::removeCurrentPlaylist()
{
- int code = KMessageBox::warningContinueCancel(0, i18n("Remove '%1' from list and from disk?").tqarg(m_playlistSelector->text(m_currentPlaylist)),TQString(),KStdGuiItem::del());
+ int code = KMessageBox::warningContinueCancel(0, i18n("Remove '%1' from list and from disk?").arg(m_playlistSelector->text(m_currentPlaylist)),TQString(),KStdGuiItem::del());
if (code == KMessageBox::Continue)
{
TQString pl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine";
diff --git a/kaffeine/src/input/disc/cddb.cpp b/kaffeine/src/input/disc/cddb.cpp
index 9581651..231e008 100644
--- a/kaffeine/src/input/disc/cddb.cpp
+++ b/kaffeine/src/input/disc/cddb.cpp
@@ -302,7 +302,7 @@ bool CDDB::parse_read_resp(TQTextStream *stream, TQTextStream *write_stream)
for (int i = 0; i < m_tracks; i++)
{
if (m_names[i].isEmpty())
- m_names[i] += i18n("Track %1").tqarg(i);
+ m_names[i] += i18n("Track %1").arg(i);
m_names[i].replace(TQRegExp("/"), "%2f");
kdDebug(7101) << "CDDB: found Track " << i+1 << ": `" << m_names[i]
<< "'" << endl;
@@ -328,7 +328,7 @@ bool CDDB::searchLocal(unsigned int id, TQFile *ret_file)
{
TQDir dir;
TQString filename;
- filename = TQString("%1").tqarg(id, 0, 16).rightJustify(8, '0');
+ filename = TQString("%1").arg(id, 0, 16).rightJustify(8, '0');
TQStringList::ConstIterator it;
for (it = cddb_dirs.begin(); it != cddb_dirs.end(); ++it)
{
diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp
index e392dca..31bba0c 100644
--- a/kaffeine/src/input/disc/disc.cpp
+++ b/kaffeine/src/input/disc/disc.cpp
@@ -370,7 +370,7 @@ void Disc::trackSelected( TQListViewItem *it )
if ( !it )
return;
- MRL mrl( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
+ MRL mrl( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
mrl.setTitle( it->text(1) );
mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() );
@@ -465,7 +465,7 @@ void Disc::startCD( const TQString &device, bool rip )
for ( i=0; i<para->getTracks(); i++ ) {
it = new KListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) );
if ( i==0 ) {
- mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) );
+ mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
mrl.setTitle( cddb->track(i) );
mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() );
@@ -481,7 +481,7 @@ void Disc::startCD( const TQString &device, bool rip )
for ( i=0; i<para->getTracks(); i++ ) {
it = new KListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) );
if ( i==0 ) {
- mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) );
+ mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
mrl.setTitle( cddb->track(i) );
mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() );
@@ -495,7 +495,7 @@ void Disc::startCD( const TQString &device, bool rip )
for ( i=0; i<para->getTracks(); i++ ) {
it = new KListViewItem( list, TQString().sprintf("%02d", i+1), i18n("Track")+TQString().sprintf("%02d", i+1), para->trackTime(i) );
if ( i==0 ) {
- mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) );
+ mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
mrl.setTitle( i18n("Track")+TQString().sprintf("%02d", i+1) );
mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() );
@@ -531,7 +531,7 @@ void Disc::startDVD( const TQString &device )
bool ok=false;
if ( !device.isEmpty() )
- mrl.setURL( TQString("dvd://%1").tqarg(device) );
+ mrl.setURL( TQString("dvd://%1").arg(device) );
else {
DCOPRef mediamanager("kded","mediamanager");
DCOPReply reply = mediamanager.call("fullList()");
@@ -555,12 +555,12 @@ void Disc::startDVD( const TQString &device )
TQString choice = KInputDialog::getItem( i18n("DVD Video"), i18n("Several DVD Video found. Choose one:"),
devList, 0, false, &ok );
if ( ok )
- mrl.setURL( TQString("dvd://%1").tqarg(choice) );
+ mrl.setURL( TQString("dvd://%1").arg(choice) );
else
return;
}
else if ( devList.count()==1 )
- mrl.setURL( TQString("dvd://%1").tqarg(devList[0]) );
+ mrl.setURL( TQString("dvd://%1").arg(devList[0]) );
else {
//KMessageBox::information( 0, i18n("No DVD Video found."), i18n("Warning") );
//return;
@@ -591,7 +591,7 @@ void Disc::startVCD( const TQString &device )
bool ok=false;
if ( !device.isEmpty() )
- mrl.setURL( TQString("vcd://%1").tqarg(device) );
+ mrl.setURL( TQString("vcd://%1").arg(device) );
else {
DCOPRef mediamanager("kded","mediamanager");
DCOPReply reply = mediamanager.call("fullList()");
@@ -609,12 +609,12 @@ void Disc::startVCD( const TQString &device )
TQString choice = KInputDialog::getItem( i18n("VCD-SVCD"), i18n("Several (S)VCD found. Choose one:"),
devList, 0, false, &ok );
if ( ok )
- mrl.setURL( TQString("vcd://%1").tqarg(choice) );
+ mrl.setURL( TQString("vcd://%1").arg(choice) );
else
return;
}
else if ( devList.count()==1 )
- mrl.setURL( TQString("vcd://%1").tqarg(devList[0]) );
+ mrl.setURL( TQString("vcd://%1").arg(devList[0]) );
else {
//KMessageBox::information( 0, i18n("No (S)VCD found."), i18n("Warning") );
//return;
@@ -649,7 +649,7 @@ bool Disc::currentTrack( MRL &mrl )
return false;
while ( it!=0 ) {
if ( it->text(0).toInt()==trackCurrent ) {
- mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
+ mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
mrl.setTitle( it->text(1) );
mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() );
@@ -681,7 +681,7 @@ bool Disc::nextTrack( MRL &mrl )
return false;
while ( it!=0 ) {
if ( it->text(0).toInt()==trackCurrent+1 ) {
- mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
+ mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
mrl.setTitle( it->text(1) );
mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() );
@@ -695,7 +695,7 @@ bool Disc::nextTrack( MRL &mrl )
}
it = list->firstChild();
- mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
+ mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
mrl.setTitle( it->text(1) );
mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() );
@@ -718,7 +718,7 @@ bool Disc::previousTrack( MRL &mrl )
return false;
while ( it!=0 ) {
if ( it->text(0).toInt()==trackCurrent-1 ) {
- mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
+ mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
mrl.setTitle( it->text(1) );
mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() );
@@ -746,7 +746,7 @@ bool Disc::trackNumber( int number, MRL &mrl )
return false;
while ( it!=0 ) {
if ( it->text(0).toInt()==number ) {
- mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
+ mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
mrl.setTitle( it->text(1) );
mrl.setArtist( artistLab->text() );
mrl.setAlbum( albumLab->text() );
diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp
index 03f39fa..36b052a 100644
--- a/kaffeine/src/input/disc/paranoia.cpp
+++ b/kaffeine/src/input/disc/paranoia.cpp
@@ -288,14 +288,14 @@ bool Paranoia::loadEncoder( TQWidget *parent )
KService::Ptr service = KService::serviceByDesktopName( encoderDesktop );
if (!service) {
- KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
+ KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").arg(encoderDesktop) );
return false;
}
if ( service->serviceTypes().contains("KaffeineAudioEncoder") ) {
currentEncoder = KParts::ComponentFactory::createPartInstanceFromService<KaffeineAudioEncoder>(service, 0, service->name().ascii(), 0, 0, 0, &error);
if (error > 0) {
- KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
+ KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").arg(encoderDesktop) );
return false;
}
else
diff --git a/kaffeine/src/input/dvb/dvbcam.cpp b/kaffeine/src/input/dvb/dvbcam.cpp
index b430b38..41e9895 100644
--- a/kaffeine/src/input/dvb/dvbcam.cpp
+++ b/kaffeine/src/input/dvb/dvbcam.cpp
@@ -79,7 +79,7 @@ int DvbCam::probe( int adapter, int ca_device )
int fdCa;
ca_caps_t cap;
ca_slot_info_t info;
- TQString s = TQString("/dev/dvb/adapter%1/ca%2").tqarg( adapter ).tqarg( ca_device );
+ TQString s = TQString("/dev/dvb/adapter%1/ca%2").arg( adapter ).arg( ca_device );
if ( (fdCa = open( s.ascii(), O_RDWR )) < 0) {
fprintf(stderr, "DvbCam::probe(): %s:", s.ascii());
@@ -413,11 +413,11 @@ int DvbCam::aiCallback(void *arg, uint8_t slot_id, uint16_t session_number, uint
(void)session_number;
fprintf(stderr, "CAM Application type: %02x\n", application_type);
- std->dvbcam->setAppType( TQString("0x%1").tqarg(application_type, 0, 16 ) );
+ std->dvbcam->setAppType( TQString("0x%1").arg(application_type, 0, 16 ) );
fprintf(stderr, "CAM Application manufacturer: %04x\n", application_manufacturer);
- std->dvbcam->setAppManu( TQString("0x%1").tqarg(application_manufacturer, 0, 16 ) );
+ std->dvbcam->setAppManu( TQString("0x%1").arg(application_manufacturer, 0, 16 ) );
fprintf(stderr, "CAM Manufacturer code: %04x\n", manufacturer_code);
- std->dvbcam->setManuCode( TQString("0x%1").tqarg(manufacturer_code, 0, 16 ) );
+ std->dvbcam->setManuCode( TQString("0x%1").arg(manufacturer_code, 0, 16 ) );
fprintf(stderr, "CAM Menu string: %.*s\n", menu_string_length, menu_string);
TQString s = (const char*)menu_string;
s.truncate( menu_string_length );
@@ -531,7 +531,7 @@ int DvbCam::mmi_menu_callback(void *arg, uint8_t slot_id, uint16_t session_numbe
fprintf(stderr, "%i. %.*s\n", i+1, items[i].text_length, items[i].text);
s = (const char*)items[i].text;
s.truncate( items[i].text_length );
- std->menuList.append( TQString("%1. %2").tqarg(i+1).tqarg(s) );
+ std->menuList.append( TQString("%1. %2").arg(i+1).arg(s) );
}
diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp
index c920090..5f9e228 100644
--- a/kaffeine/src/input/dvb/dvbconfig.cpp
+++ b/kaffeine/src/input/dvb/dvbconfig.cpp
@@ -187,10 +187,10 @@ bool DVBconfig::haveDvbDevice()
d.setPath( "/dev/dvb/"+list[i]+"/" );
flist = d.entryList( "frontend*", TQDir::System, TQDir::Name );
for ( j=0; j<(int)flist.count(); j++ ) {
- fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( list[i] ).tqarg( flist[j] ).ascii(), O_RDWR);
+ fdFrontend = open( TQString("/dev/dvb/%1/%2").arg( list[i] ).arg( flist[j] ).ascii(), O_RDWR);
if ( fdFrontend>0 ) {
if ( (res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) )
- perror( TQString("/dev/dvb/%1/%2 FE_GET_INFO: ").tqarg( list[i] ).tqarg( flist[j] ).ascii() );
+ perror( TQString("/dev/dvb/%1/%2 FE_GET_INFO: ").arg( list[i] ).arg( flist[j] ).ascii() );
else {
close( fdFrontend );
return true;
@@ -229,7 +229,7 @@ void DVBconfig::startup()
if ( !probeMfe && t!="frontend0" )
continue;
t1 = TQTime::currentTime();
- fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( s ).tqarg( t ).ascii(), O_RDWR);
+ fdFrontend = open( TQString("/dev/dvb/%1/%2").arg( s ).arg( t ).ascii(), O_RDWR);
if ( fdFrontend>0 ) {
if ( !(res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) ) {
if ( (info.type==FE_OFDM)
@@ -247,7 +247,7 @@ void DVBconfig::startup()
close( fdFrontend );
}
else {
- perror( TQString("/dev/dvb/%1/%2 %3/%4").tqarg( s ).tqarg( t ).tqarg( errno ).tqarg( -EBUSY ).ascii() );
+ perror( TQString("/dev/dvb/%1/%2 %3/%4").arg( s ).arg( t ).arg( errno ).arg( -EBUSY ).ascii() );
}
}
}
@@ -450,30 +450,30 @@ void DVBconfig::readConfig()
shiftDir+= "/";
filenameFormat = config->readEntry( "filenameFormat", "%name" );
for ( i=0; i<(int)devList.count(); i++ ) {
- devList.at(i)->source = config->readEntry( TQString("DVB%1").tqarg(i), "" );
- devList.at(i)->tuningTimeout = config->readNumEntry( TQString("DVB%1_TIMEOUT").tqarg(i), 1500 );
- devList.at(i)->camMaxService = config->readNumEntry( TQString("DVB%1_CAM_MAX").tqarg(i), 1 );
- devList.at(i)->priority = config->readNumEntry( TQString("DVB%1_PRIORITY").tqarg(i), 10 );
+ devList.at(i)->source = config->readEntry( TQString("DVB%1").arg(i), "" );
+ devList.at(i)->tuningTimeout = config->readNumEntry( TQString("DVB%1_TIMEOUT").arg(i), 1500 );
+ devList.at(i)->camMaxService = config->readNumEntry( TQString("DVB%1_CAM_MAX").arg(i), 1 );
+ devList.at(i)->priority = config->readNumEntry( TQString("DVB%1_PRIORITY").arg(i), 10 );
if ( devList.at(i)->type!=FE_QPSK )
continue;
- devList.at(i)->numLnb = config->readNumEntry( TQString("DVB%1_NLNB").tqarg(i), 1 );
+ devList.at(i)->numLnb = config->readNumEntry( TQString("DVB%1_NLNB").arg(i), 1 );
for ( j=0; j<devList.at(i)->numLnb; j++ ) {
- devList.at(i)->lnb[j].switchFreq = config->readNumEntry( TQString("DVB%1_LNB%2_switch").tqarg(i).tqarg(j), 11700 );
- devList.at(i)->lnb[j].loFreq = config->readNumEntry( TQString("DVB%1_LNB%2_lo").tqarg(i).tqarg(j), 9750 );
- devList.at(i)->lnb[j].hiFreq = config->readNumEntry( TQString("DVB%1_LNB%2_hi").tqarg(i).tqarg(j), 10600 );
- devList.at(i)->lnb[j].rotorType = config->readNumEntry( TQString("DVB%1_LNB%2_rotor").tqarg(i).tqarg(j), 0 );
- devList.at(i)->lnb[j].source = config->readListEntry( TQString("DVB%1_LNB%2_source").tqarg(i).tqarg(j) );
- devList.at(i)->lnb[j].position = config->readIntListEntry( TQString("DVB%1_LNB%2_position").tqarg(i).tqarg(j) );
- devList.at(i)->lnb[j].speed13v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed13v").tqarg(i).tqarg(j), 2.5 );
- devList.at(i)->lnb[j].speed18v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed18v").tqarg(i).tqarg(j), 1.5 );
+ devList.at(i)->lnb[j].switchFreq = config->readNumEntry( TQString("DVB%1_LNB%2_switch").arg(i).arg(j), 11700 );
+ devList.at(i)->lnb[j].loFreq = config->readNumEntry( TQString("DVB%1_LNB%2_lo").arg(i).arg(j), 9750 );
+ devList.at(i)->lnb[j].hiFreq = config->readNumEntry( TQString("DVB%1_LNB%2_hi").arg(i).arg(j), 10600 );
+ devList.at(i)->lnb[j].rotorType = config->readNumEntry( TQString("DVB%1_LNB%2_rotor").arg(i).arg(j), 0 );
+ devList.at(i)->lnb[j].source = config->readListEntry( TQString("DVB%1_LNB%2_source").arg(i).arg(j) );
+ devList.at(i)->lnb[j].position = config->readIntListEntry( TQString("DVB%1_LNB%2_position").arg(i).arg(j) );
+ devList.at(i)->lnb[j].speed13v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed13v").arg(i).arg(j), 2.5 );
+ devList.at(i)->lnb[j].speed18v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed18v").arg(i).arg(j), 1.5 );
}
- devList.at(i)->secMini = config->readNumEntry( TQString("DVB%1_SEC_MINI").tqarg(i), 0 );
- devList.at(i)->secTwice = config->readNumEntry( TQString("DVB%1_SEC_TWICE").tqarg(i), 0 );
- devList.at(i)->doS2 = config->readNumEntry( TQString("DVB%1_DOS2").tqarg(i), 0 );
+ devList.at(i)->secMini = config->readNumEntry( TQString("DVB%1_SEC_MINI").arg(i), 0 );
+ devList.at(i)->secTwice = config->readNumEntry( TQString("DVB%1_SEC_TWICE").arg(i), 0 );
+ devList.at(i)->doS2 = config->readNumEntry( TQString("DVB%1_DOS2").arg(i), 0 );
}
j = config->readNumEntry( "NumCategories", 0 );
for ( i=0; i<j; i++ )
- categories.append( new Category( config->readEntry( TQString("CategoryName%1").tqarg(i), "" ), config->readEntry( TQString("CategoryIcon%1").tqarg(i), "kaffeine" ) ) );
+ categories.append( new Category( config->readEntry( TQString("CategoryName%1").arg(i), "" ), config->readEntry( TQString("CategoryIcon%1").arg(i), "kaffeine" ) ) );
allIcon = config->readEntry( "AllIcon", "kaffeine" );
tvIcon = config->readEntry( "TvIcon", "kdvbtv" );
radioIcon = config->readEntry( "RadioIcon", "kdvbra" );
@@ -512,31 +512,31 @@ void DVBconfig::saveConfig()
config->writeEntry( "SenderPort", senderPort );
config->writeEntry( "ProbeMFE", probeMfe );
for ( i=0; i<(int)devList.count(); i++ ) {
- config->writeEntry( TQString("DVB%1").tqarg(i), devList.at(i)->source );
- config->writeEntry( TQString("DVB%1_TIMEOUT").tqarg(i), devList.at(i)->tuningTimeout );
- config->writeEntry( TQString("DVB%1_PRIORITY").tqarg(i), devList.at(i)->priority );
- config->writeEntry( TQString("DVB%1_CAM_MAX").tqarg(i), devList.at(i)->camMaxService );
+ config->writeEntry( TQString("DVB%1").arg(i), devList.at(i)->source );
+ config->writeEntry( TQString("DVB%1_TIMEOUT").arg(i), devList.at(i)->tuningTimeout );
+ config->writeEntry( TQString("DVB%1_PRIORITY").arg(i), devList.at(i)->priority );
+ config->writeEntry( TQString("DVB%1_CAM_MAX").arg(i), devList.at(i)->camMaxService );
if ( devList.at(i)->type!=FE_QPSK )
continue;
- config->writeEntry( TQString("DVB%1_NLNB").tqarg(i), devList.at(i)->numLnb );
+ config->writeEntry( TQString("DVB%1_NLNB").arg(i), devList.at(i)->numLnb );
for ( j=0; j<devList.at(i)->numLnb; j++ ) {
- config->writeEntry( TQString("DVB%1_LNB%2_switch").tqarg(i).tqarg(j), devList.at(i)->lnb[j].switchFreq );
- config->writeEntry( TQString("DVB%1_LNB%2_lo").tqarg(i).tqarg(j), devList.at(i)->lnb[j].loFreq );
- config->writeEntry( TQString("DVB%1_LNB%2_hi").tqarg(i).tqarg(j), devList.at(i)->lnb[j].hiFreq );
- config->writeEntry( TQString("DVB%1_LNB%2_rotor").tqarg(i).tqarg(j), devList.at(i)->lnb[j].rotorType );
- config->writeEntry( TQString("DVB%1_LNB%2_source").tqarg(i).tqarg(j), devList.at(i)->lnb[j].source );
- config->writeEntry( TQString("DVB%1_LNB%2_position").tqarg(i).tqarg(j), devList.at(i)->lnb[j].position );
- config->writeEntry( TQString("DVB%1_LNB%2_speed13v").tqarg(i).tqarg(j), devList.at(i)->lnb[j].speed13v );
- config->writeEntry( TQString("DVB%1_LNB%2_speed18v").tqarg(i).tqarg(j), devList.at(i)->lnb[j].speed18v );
+ config->writeEntry( TQString("DVB%1_LNB%2_switch").arg(i).arg(j), devList.at(i)->lnb[j].switchFreq );
+ config->writeEntry( TQString("DVB%1_LNB%2_lo").arg(i).arg(j), devList.at(i)->lnb[j].loFreq );
+ config->writeEntry( TQString("DVB%1_LNB%2_hi").arg(i).arg(j), devList.at(i)->lnb[j].hiFreq );
+ config->writeEntry( TQString("DVB%1_LNB%2_rotor").arg(i).arg(j), devList.at(i)->lnb[j].rotorType );
+ config->writeEntry( TQString("DVB%1_LNB%2_source").arg(i).arg(j), devList.at(i)->lnb[j].source );
+ config->writeEntry( TQString("DVB%1_LNB%2_position").arg(i).arg(j), devList.at(i)->lnb[j].position );
+ config->writeEntry( TQString("DVB%1_LNB%2_speed13v").arg(i).arg(j), devList.at(i)->lnb[j].speed13v );
+ config->writeEntry( TQString("DVB%1_LNB%2_speed18v").arg(i).arg(j), devList.at(i)->lnb[j].speed18v );
}
- config->writeEntry( TQString("DVB%1_SEC_MINI").tqarg(i), devList.at(i)->secMini );
- config->writeEntry( TQString("DVB%1_SEC_TWICE").tqarg(i), devList.at(i)->secTwice );
- config->writeEntry( TQString("DVB%1_DOS2").tqarg(i), devList.at(i)->doS2 );
+ config->writeEntry( TQString("DVB%1_SEC_MINI").arg(i), devList.at(i)->secMini );
+ config->writeEntry( TQString("DVB%1_SEC_TWICE").arg(i), devList.at(i)->secTwice );
+ config->writeEntry( TQString("DVB%1_DOS2").arg(i), devList.at(i)->doS2 );
}
config->writeEntry( "NumCategories", categories.count() );
for ( i=0; i<(int)categories.count(); i++ ) {
- config->writeEntry( TQString("CategoryName%1").tqarg(i), categories.at(i)->name );
- config->writeEntry( TQString("CategoryIcon%1").tqarg(i), categories.at(i)->icon );
+ config->writeEntry( TQString("CategoryName%1").arg(i), categories.at(i)->name );
+ config->writeEntry( TQString("CategoryIcon%1").arg(i), categories.at(i)->icon );
}
config->writeEntry( "AllIcon", allIcon );
config->writeEntry( "TvIcon", tvIcon );
@@ -589,7 +589,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
timeoutSpin.setAutoDelete( true );
for ( i=0; i<(int)dvbConfig->devList.count(); i++ ) {
- page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").tqarg(dvbConfig->devList.at(i)->adapter).tqarg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"),
+ page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").arg(dvbConfig->devList.at(i)->adapter).arg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"),
KGlobal::instance()->iconLoader()->loadIcon( "hwinfo", KIcon::NoGroup, KIcon::SizeMedium ) );
vb = new TQVBoxLayout( page, 6, 6 );
gb = new TQGroupBox( "", page );
diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
index 1b54229..365b7ac 100644
--- a/kaffeine/src/input/dvb/dvbpanel.cpp
+++ b/kaffeine/src/input/dvb/dvbpanel.cpp
@@ -307,7 +307,7 @@ void DvbPanel::diskStatus()
freemb = (double)(((double)(buf.f_bavail)*(double)(buf.f_bsize))/(1024.0*1024.0));
if ( freemb<300 )
- emit showOSD( i18n("Warning: low disc space")+TQString(" (%1").tqarg((int)freemb)+i18n("MB")+")", 5000, 3 );
+ emit showOSD( i18n("Warning: low disc space")+TQString(" (%1").arg((int)freemb)+i18n("MB")+")", 5000, 3 );
}
@@ -649,15 +649,15 @@ void DvbPanel::dumpEvents()
for( i=0; i<events.getNSource(); i++ ) {
if ( !(esrc=events.getNEventSource( i )) )
continue;
- tt << esrc->getSource()+TQString(" : %1 TS with events.\n").tqarg( esrc->getNTsid() );
+ tt << esrc->getSource()+TQString(" : %1 TS with events.\n").arg( esrc->getNTsid() );
for ( m=0; m<esrc->getNTsid(); m++ ) {
if ( !(et=esrc->getNEventTsid( m )) )
continue;
- tt << TQString("TSID %1 : %2 services with events\n").tqarg( et->getTsid() ).tqarg( et->getNSid() );
+ tt << TQString("TSID %1 : %2 services with events\n").arg( et->getTsid() ).arg( et->getNSid() );
for ( n=0; n<et->getNSid(); n++ ) {
if ( !(es=et->getNEventSid( n )) )
continue;
- tt << TQString(" SID %1 : %2 events\n").tqarg( es->getSid() ).tqarg( es->getNDesc() );
+ tt << TQString(" SID %1 : %2 events\n").arg( es->getSid() ).arg( es->getNDesc() );
k+= es->getNDesc();
}
}
@@ -681,10 +681,10 @@ void DvbPanel::dumpEvents()
if ( !(desc=esEvents->at( j )) )
continue;
tt << "Source: "+desc->source+"\n";
- tt << TQString("Network ID: %1\n").tqarg(desc->nid);
- tt << TQString("Transport Stream ID: %1\n").tqarg(desc->tsid);
- tt << TQString("Service ID: %1\n").tqarg(desc->sid);
- tt << TQString("Event ID: %1\n").tqarg(desc->eid);
+ tt << TQString("Network ID: %1\n").arg(desc->nid);
+ tt << TQString("Transport Stream ID: %1\n").arg(desc->tsid);
+ tt << TQString("Service ID: %1\n").arg(desc->sid);
+ tt << TQString("Event ID: %1\n").arg(desc->eid);
tt << "Title: "+desc->title+"\n";
tt << "Subtitle: "+desc->subtitle+"\n";
tt << desc->startDateTime.toString( "dd-MM-yyyy hh:mm:ss" )+"\n";
diff --git a/kaffeine/src/input/dvb/dvbsi.cpp b/kaffeine/src/input/dvb/dvbsi.cpp
index cce9d0c..7fd8669 100644
--- a/kaffeine/src/input/dvb/dvbsi.cpp
+++ b/kaffeine/src/input/dvb/dvbsi.cpp
@@ -620,7 +620,7 @@ bool DVBsi::tablePAT( unsigned char *buf )
desc->tp.tsid = tsid;
desc->sid = sid;
desc->pmtpid = pmt;
- desc->name = TQString("TSID:%1-SID:%2").tqarg(tsid).tqarg(sid);
+ desc->name = TQString("TSID:%1-SID:%2").arg(tsid).arg(sid);
}
}
@@ -854,7 +854,7 @@ bool DVBsi::parseVCT( int pid, int tid, int timeout, int sid )
ChannelDesc *desc = new ChannelDesc();
desc->tp.tsid = channel_tsid;
- desc->name = TQString("%1-%2 %3").tqarg(major_channel_num).tqarg(minor_channel_num).tqarg(short_name);
+ desc->name = TQString("%1-%2 %3").arg(major_channel_num).arg(minor_channel_num).arg(short_name);
desc->sid = program_number;
if (access_controlled == 1)
desc->fta = 1;
diff --git a/kaffeine/src/input/dvb/dvbstream.cpp b/kaffeine/src/input/dvb/dvbstream.cpp
index 4ef290b..be8ae7d 100644
--- a/kaffeine/src/input/dvb/dvbstream.cpp
+++ b/kaffeine/src/input/dvb/dvbstream.cpp
@@ -65,9 +65,9 @@ DvbStream::DvbStream( Device *d, const TQString &charset, EventTable *et )
fdFrontend = fdDvr = 0;
ndmx = 0;
currentTransponder = Transponder();
- frontendName = TQString("/dev/dvb/adapter%1/frontend%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner );
- dvrName = TQString("/dev/dvb/adapter%1/dvr%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner );
- demuxName = TQString("/dev/dvb/adapter%1/demux%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner );
+ frontendName = TQString("/dev/dvb/adapter%1/frontend%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
+ dvrName = TQString("/dev/dvb/adapter%1/dvr%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
+ demuxName = TQString("/dev/dvb/adapter%1/demux%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
out.setAutoDelete( true );
diff --git a/kaffeine/src/input/dvb/kgradprogress.cpp b/kaffeine/src/input/dvb/kgradprogress.cpp
index 7898f84..07030e4 100644
--- a/kaffeine/src/input/dvb/kgradprogress.cpp
+++ b/kaffeine/src/input/dvb/kgradprogress.cpp
@@ -43,7 +43,7 @@ void KGradProgress::setProgress( int progress )
{
current = progress;
draw();
- tqrepaint(false);
+ repaint(false);
}
diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp
index 44619b7..3c49848 100644
--- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp
+++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp
@@ -70,7 +70,7 @@ KaffeineDVBsection::~KaffeineDVBsection()
bool KaffeineDVBsection::setFilter( int pid, int tid, int timeout, bool checkcrc )
{
struct dmx_sct_filter_params sctfilter;
- TQString demuxer = TQString("/dev/dvb/adapter%1/demux%2").tqarg( adapter ).tqarg( tuner );
+ TQString demuxer = TQString("/dev/dvb/adapter%1/demux%2").arg( adapter ).arg( tuner );
if ((fdDemux = open( demuxer.ascii(), O_RDWR | O_NONBLOCK )) < 0) {
perror ("open failed");
diff --git a/kaffeine/src/input/dvb/scandialog.cpp b/kaffeine/src/input/dvb/scandialog.cpp
index 7f760e6..9b68d93 100644
--- a/kaffeine/src/input/dvb/scandialog.cpp
+++ b/kaffeine/src/input/dvb/scandialog.cpp
@@ -71,7 +71,7 @@ ScanDialog::ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQS
tmp = dvb->at(i)->getSources( true );
for ( j=0; j<(int)tmp.count(); j++ ) {
if ( tmp[j].startsWith( "AUTO" ) )
- list.append( TQString("AUTO(%1:%2)").tqarg(dvb->at(i)->getAdapter()).tqarg(dvb->at(i)->getTuner()) );
+ list.append( TQString("AUTO(%1:%2)").arg(dvb->at(i)->getAdapter()).arg(dvb->at(i)->getTuner()) );
else
list.append( tmp[j] );
}
@@ -614,25 +614,25 @@ bool ScanDialog::getTransData()
int i;
for ( i=177; i<227; i+=7 ) {
if ( offset07->isChecked() ) {
- s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+500000 );
+ s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+500000 );
parseTp( s, ds->getType(), "" );
}
if ( offset125p->isChecked() ) {
- s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+500000+125000 );
+ s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+500000+125000 );
parseTp( s, ds->getType(), "" );
}
}
for ( i=474; i<859; i+=8 ) {
if ( offset167m->isChecked() ) {
- s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)-167000 );
+ s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)-167000 );
parseTp( s, ds->getType(), "" );
}
if ( offset0->isChecked() ) {
- s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( i*1000000 );
+ s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( i*1000000 );
parseTp( s, ds->getType(), "" );
}
if ( offset167p->isChecked() ) {
- s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+167000 );
+ s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+167000 );
parseTp( s, ds->getType(), "" );
}
}
@@ -1010,7 +1010,7 @@ void ScanDialog::addFound( ChannelDesc *chan, bool scan )
int i;
DListViewItem *it;
- it = new DListViewItem( foundList, chan, TQString( "%1").tqarg( chan->tp.snr ), chan->name );
+ it = new DListViewItem( foundList, chan, TQString( "%1").arg( chan->tp.snr ), chan->name );
if ( chan->type==1 ) {
if ( scan )
@@ -1030,7 +1030,7 @@ void ScanDialog::addFound( ChannelDesc *chan, bool scan )
}
if ( scan )
- progressLab->setText( TQString( i18n("Found: %1 TV - %2 radio") ).tqarg(ntv).tqarg(nradio) );
+ progressLab->setText( TQString( i18n("Found: %1 TV - %2 radio") ).arg(ntv).arg(nradio) );
if ( chan->provider.isEmpty() )
return;
for ( i=0; i<providerComb->count(); i++ ) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 08:56:09 +0000