summaryrefslogtreecommitdiffstats
path: root/libk3b
diff options
context:
space:
mode:
Diffstat (limited to 'libk3b')
-rw-r--r--libk3b/core/k3bdefaultexternalprograms.cpp44
-rw-r--r--libk3b/projects/audiocd/k3baudionormalizejob.cpp30
2 files changed, 37 insertions, 37 deletions
diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp
index 4b86055..a5ba55a 100644
--- a/libk3b/core/k3bdefaultexternalprograms.cpp
+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
@@ -49,13 +49,13 @@ void K3b::addDefaultPrograms( K3bExternalBinManager* m )
void K3b::addTranscodePrograms( K3bExternalBinManager* m )
{
static const char* transcodeTools[] = { "transcode",
- 0, // K3b 1.0 only uses the transcode binary
- "tcprobe",
- "tccat",
- "tcscan",
- "tcextract",
- "tcdecode",
- 0 };
+ 0, // K3b 1.0 only uses the transcode binary
+ "tcprobe",
+ "tccat",
+ "tcscan",
+ "tcextract",
+ "tcdecode",
+ 0 };
for( int i = 0; transcodeTools[i]; ++i )
m->addProgram( new K3bTranscodeProgram( transcodeTools[i] ) );
@@ -102,16 +102,16 @@ static TQString& debianWeirdnessHack( TQString& path )
f.open( IO_ReadOnly );
TQString s = TQTextStream( &f ).read();
if( s.contains( "cdrecord.mmap" ) && s.contains( "cdrecord.shm" ) ) {
- kdDebug() << "(K3bCdrecordProgram) Found Debian Wrapper script." << endl;
- TQString ext;
- if( K3b::kernelVersion().versionString().left(3) > "2.2" )
- ext = ".mmap";
- else
- ext = ".shm";
+ kdDebug() << "(K3bCdrecordProgram) Found Debian Wrapper script." << endl;
+ TQString ext;
+ if( K3b::kernelVersion().versionString().left(3) > "2.2" )
+ ext = ".mmap";
+ else
+ ext = ".shm";
- kdDebug() << "(K3bCdrecordProgram) Using cdrecord" << ext << endl;
+ kdDebug() << "(K3bCdrecordProgram) Using cdrecord" << ext << endl;
- path += ext;
+ path += ext;
}
}
}
@@ -214,7 +214,7 @@ bool K3bCdrecordProgram::scan( const TQString& p )
if( out.output().contains( "-tao" ) )
bin->addFeature( "tao" );
if( out.output().contains( "cuefile=" ) &&
- ( wodim || bin->version > K3bVersion( 2, 1, -1, "a14") ) ) // cuefile handling was still buggy in a14
+ ( wodim || bin->version > K3bVersion( 2, 1, -1, "a14") ) ) // cuefile handling was still buggy in a14
bin->addFeature( "cuefile" );
// new mode 2 options since cdrecord 2.01a12
@@ -223,15 +223,15 @@ bool K3bCdrecordProgram::scan( const TQString& p )
// two checks)
// and the version check does not handle versions like 2.01-dvd properly
if( out.output().contains( "-xamix" ) ||
- bin->version >= K3bVersion( 2, 1, -1, "a12" ) ||
- wodim )
+ bin->version >= K3bVersion( 2, 1, -1, "a12" ) ||
+ wodim )
bin->addFeature( "xamix" );
// check if we run cdrecord as root
struct stat s;
if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
+ bin->addFeature( "suidroot" );
}
}
else {
@@ -352,7 +352,7 @@ bool K3bMkisofsProgram::scan( const TQString& p )
struct stat s;
if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
+ bin->addFeature( "suidroot" );
}
}
else {
@@ -458,7 +458,7 @@ bool K3bReadcdProgram::scan( const TQString& p )
struct stat s;
if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
+ bin->addFeature( "suidroot" );
}
}
else {
@@ -551,7 +551,7 @@ bool K3bCdrdaoProgram::scan( const TQString& p )
struct stat s;
if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
- bin->addFeature( "suidroot" );
+ bin->addFeature( "suidroot" );
}
}
else {
diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
index 85fd698..beb05fb 100644
--- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp
+++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
@@ -131,18 +131,18 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
if( m_currentAction == ADJUSTING_LEVELS ) {
emit newTask( i18n("Adjusting volume level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) );
kdDebug() << "(K3bAudioNormalizeJob) adjusting level for track "
- << m_currentTrack
- << " "
- << m_files.at(m_currentTrack-1)
- << endl;
+ << m_currentTrack
+ << " "
+ << m_files.at(m_currentTrack-1)
+ << endl;
}
else {
emit newTask( i18n("Computing level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) );
kdDebug() << "(K3bAudioNormalizeJob) computing level for track "
- << m_currentTrack
- << " "
- << m_files.at(m_currentTrack-1)
- << endl;
+ << m_currentTrack
+ << " "
+ << m_files.at(m_currentTrack-1)
+ << endl;
}
m_currentTrack++;
@@ -159,7 +159,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
emit subPercent( p );
else
kdDebug() << "(K3bAudioNormalizeJob) subPercent parsing error at pos "
- << 19 << " in line '" << line.mid( 19, 3 ) << "'" << endl;
+ << 19 << " in line '" << line.mid( 19, 3 ) << "'" << endl;
// batch progress starts at position 50 in version 0.7.6
p = line.mid( 50, 3 ).toInt(&ok);
@@ -169,7 +169,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
emit percent( 50 + (int)((double)p/2.0) );
else
kdDebug() << "(K3bAudioNormalizeJob) percent parsing error at pos "
- << 50 << " in line '" << line.mid( 50, 3 ) << "'" << endl;
+ << 50 << " in line '" << line.mid( 50, 3 ) << "'" << endl;
}
}
@@ -185,13 +185,13 @@ void K3bAudioNormalizeJob::slotProcessExited( TDEProcess* p )
break;
default:
if( !m_canceled ) {
- emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(p->exitStatus()),
- K3bJob::ERROR );
- emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
- emit infoMessage( i18n("Error while normalizing tracks."), ERROR );
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(p->exitStatus()),
+ K3bJob::ERROR );
+ emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
+ emit infoMessage( i18n("Error while normalizing tracks."), ERROR );
}
else
- emit canceled();
+ emit canceled();
jobFinished(false);
break;
}