diff options
Diffstat (limited to 'kaudiocreator')
-rw-r--r-- | kaudiocreator/encodefileimp.cpp | 14 | ||||
-rw-r--r-- | kaudiocreator/encodefileimp.h | 6 | ||||
-rw-r--r-- | kaudiocreator/encoder.cpp | 58 | ||||
-rw-r--r-- | kaudiocreator/encoder.h | 18 | ||||
-rw-r--r-- | kaudiocreator/encoder_prefs_addons.h | 8 | ||||
-rw-r--r-- | kaudiocreator/encoderconfig.ui.h | 2 | ||||
-rw-r--r-- | kaudiocreator/encoderconfigimp.cpp | 56 | ||||
-rw-r--r-- | kaudiocreator/encoderconfigimp.h | 10 | ||||
-rw-r--r-- | kaudiocreator/general.ui.h | 10 | ||||
-rw-r--r-- | kaudiocreator/job.cpp | 26 | ||||
-rw-r--r-- | kaudiocreator/job.h | 30 | ||||
-rw-r--r-- | kaudiocreator/jobqueimp.cpp | 46 | ||||
-rw-r--r-- | kaudiocreator/jobqueimp.h | 16 | ||||
-rw-r--r-- | kaudiocreator/kaudiocreator.cpp | 102 | ||||
-rw-r--r-- | kaudiocreator/kaudiocreator.h | 6 | ||||
-rw-r--r-- | kaudiocreator/ripper.cpp | 48 | ||||
-rw-r--r-- | kaudiocreator/ripper.h | 18 | ||||
-rw-r--r-- | kaudiocreator/tracksimp.cpp | 98 | ||||
-rw-r--r-- | kaudiocreator/tracksimp.h | 36 | ||||
-rw-r--r-- | kaudiocreator/wizard.ui.h | 14 |
20 files changed, 311 insertions, 311 deletions
diff --git a/kaudiocreator/encodefileimp.cpp b/kaudiocreator/encodefileimp.cpp index 4836c87c..59f32405 100644 --- a/kaudiocreator/encodefileimp.cpp +++ b/kaudiocreator/encodefileimp.cpp @@ -21,20 +21,20 @@ #include "encodefileimp.h" #include "job.h" -#include <qspinbox.h> -#include <qlineedit.h> +#include <tqspinbox.h> +#include <tqlineedit.h> #include <kurlrequester.h> -#include <qcombobox.h> +#include <tqcombobox.h> #include <kmessagebox.h> -EncodeFileImp::EncodeFileImp(QWidget* parent, +EncodeFileImp::EncodeFileImp(TQWidget* parent, const char* name) : EncodeFile(parent, name), m_genres(KCDDB::Genres()) { genre->insertStringList(m_genres.i18nList()); // Specify to only accept wav files file->setFilter("*.wav|Wav Files"); - connect(file,SIGNAL(textChanged(const QString &)),this,SLOT(enableEncodeButton(const QString &))); - connect(encodeButton,SIGNAL(clicked()),this,SLOT(encode())); + connect(file,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(enableEncodeButton(const TQString &))); + connect(encodeButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(encode())); } /** @@ -74,7 +74,7 @@ void EncodeFileImp::encode(){ i18n("Jobs have started"), i18n("Jobs have started")); } -void EncodeFileImp::enableEncodeButton(const QString &text){ +void EncodeFileImp::enableEncodeButton(const TQString &text){ encodeButton->setEnabled(!text.isEmpty()); } diff --git a/kaudiocreator/encodefileimp.h b/kaudiocreator/encodefileimp.h index b1cb41ce..e0e6eaa7 100644 --- a/kaudiocreator/encodefileimp.h +++ b/kaudiocreator/encodefileimp.h @@ -23,7 +23,7 @@ #include "libkcddb/genres.h" #include "encodefile.h" -#include "qmap.h" +#include "tqmap.h" class Job; @@ -39,13 +39,13 @@ signals: void startJob(Job *newJob); public: - EncodeFileImp(QWidget* parent = 0, const char* name = 0); + EncodeFileImp(TQWidget* parent = 0, const char* name = 0); protected slots: // Encode button void encode(); // Enable encode button when user selects a file - void enableEncodeButton(const QString &text); + void enableEncodeButton(const TQString &text); private: // List of genres and i18n versions diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp index e6b506a6..ced2fcac 100644 --- a/kaudiocreator/encoder.cpp +++ b/kaudiocreator/encoder.cpp @@ -24,20 +24,20 @@ #include "encoder_prefs.h" #include "encoderoutput.h" -#include <qregexp.h> -#include <qdir.h> +#include <tqregexp.h> +#include <tqdir.h> #include <kstandarddirs.h> #include <kmessagebox.h> #include <kurl.h> #include <kdebug.h> #include <knotifyclient.h> -#include <qtextedit.h> +#include <tqtextedit.h> #include <kinputdialog.h> /** * Constructor, load settings. */ -Encoder::Encoder( QObject* parent, const char* name):QObject(parent,name),reportCount(0) { +Encoder::Encoder( TQObject* parent, const char* name):TQObject(parent,name),reportCount(0) { loadSettings(); } @@ -53,11 +53,11 @@ void Encoder::loadSettings() { EncoderPrefs* Encoder::loadEncoder( int encoder ){ EncoderPrefs* prefs; - QString currentEncoderGroup = QString("Encoder_%1").arg(encoder); + TQString currentEncoderGroup = TQString("Encoder_%1").arg(encoder); prefs = EncoderPrefs::prefs(currentEncoderGroup); if ( !EncoderPrefs::hasPrefs(currentEncoderGroup) ) { KMessageBox::sorry(0, i18n("No encoder has been selected.\nPlease select an encoder in the configuration."), i18n("No Encoder Selected")); - prefs->setCommandLine(QString::null); + prefs->setCommandLine(TQString::null); } return prefs; @@ -69,13 +69,13 @@ EncoderPrefs* Encoder::loadEncoder( int encoder ){ Encoder::~Encoder() { pendingJobs.clear(); - QMap<KShellProcess*, Job*>::Iterator pit; + TQMap<KShellProcess*, Job*>::Iterator pit; for( pit = jobs.begin(); pit != jobs.end(); ++pit ) { Job *job = jobs[pit.key()]; KShellProcess *process = pit.key(); threads.remove(process); process->kill(); - QFile::remove(job->newLocation); + TQFile::remove(job->newLocation); delete job; delete process; } @@ -101,7 +101,7 @@ int Encoder::pendingJobCount() { * @param id the id number of the job to stop. */ void Encoder::removeJob(int id ) { - QMap<KShellProcess*, Job*>::Iterator it; + TQMap<KShellProcess*, Job*>::Iterator it; for( it = jobs.begin(); it != jobs.end(); ++it ) { if ( it.data()->id == id ) { KShellProcess *process = it.key(); @@ -159,10 +159,10 @@ void Encoder::tendToNewJobs() { EncoderPrefs* prefs = loadEncoder(job->encoder); - QString desiredFile = Prefs::fileFormat(); - desiredFile.replace( QRegExp("~"), QDir::homeDirPath() ); + TQString desiredFile = Prefs::fileFormat(); + desiredFile.replace( TQRegExp("~"), TQDir::homeDirPath() ); { - QMap <QString,QString> map; + TQMap <TQString,TQString> map; map.insert("extension", prefs->extension()); Job jobx = *job; jobx.fix(Prefs::replaceInput(), Prefs::replaceOutput()); @@ -171,9 +171,9 @@ void Encoder::tendToNewJobs() { desiredFile = jobx.replaceSpecialChars(desiredFile, false, map); } - while ( QFile::exists( desiredFile ) ) { + while ( TQFile::exists( desiredFile ) ) { bool ok; - QString text = KInputDialog::getText( + TQString text = KInputDialog::getText( i18n("File Already Exists"), i18n("Sorry, file already exists. Please pick a new name:"), desiredFile, &ok ); if ( ok && !text.isEmpty() ) @@ -197,8 +197,8 @@ void Encoder::tendToNewJobs() { job->newLocation = desiredFile; reportCount = 0; - QString command = prefs->commandLine(); { - QMap <QString,QString> map; + TQString command = prefs->commandLine(); { + TQMap <TQString,TQString> map; map.insert("extension", prefs->extension()); map.insert("f", job->location); map.insert("o", desiredFile); @@ -211,12 +211,12 @@ void Encoder::tendToNewJobs() { KShellProcess *proc = new KShellProcess(); proc->setPriority(Prefs::niceLevel()); - *proc << QFile::encodeName(command); - connect(proc, SIGNAL(receivedStdout(KProcess *, char *, int )), - this, SLOT(receivedThreadOutput(KProcess *, char *, int ))); - connect(proc, SIGNAL(receivedStderr(KProcess *, char *, int )), - this, SLOT(receivedThreadOutput(KProcess *, char *, int ))); - connect(proc, SIGNAL(processExited(KProcess *)), this, SLOT(jobDone(KProcess *))); + *proc << TQFile::encodeName(command); + connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )), + this, TQT_SLOT(receivedThreadOutput(KProcess *, char *, int ))); + connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int )), + this, TQT_SLOT(receivedThreadOutput(KProcess *, char *, int ))); + connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(jobDone(KProcess *))); jobs.insert(proc, job); threads.append(proc); @@ -243,21 +243,21 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length ) Job *job = jobs[(KShellProcess*)process]; // Keep the output in the event it fails. - job->output += QString(buffer).mid(0,length); + job->output += TQString(buffer).mid(0,length); // Make sure the output string has a % symble in it. - QString output = QString(buffer).mid(0,length); + TQString output = TQString(buffer).mid(0,length); if ( output.find('%') == -1 && reportCount < 5 ) { kdDebug(60002) << "No \'%%\' in output. Report as bug w/encoder options if progressbar doesn't fill." << endl; reportCount++; return; } - //qDebug(QString("Pre cropped: %1").arg(output).latin1()); + //qDebug(TQString("Pre cropped: %1").arg(output).latin1()); output = output.mid(output.find('%')-loadEncoder(job->encoder)->percentLength(),2); - //qDebug(QString("Post cropped: %1").arg(output).latin1()); + //qDebug(TQString("Post cropped: %1").arg(output).latin1()); bool conversionSuccessfull = false; int percent = output.toInt(&conversionSuccessfull); - //qDebug(QString("number: %1").arg(percent).latin1()); + //qDebug(TQString("number: %1").arg(percent).latin1()); if ( percent >= 0 && percent < 100 && conversionSuccessfull ) { emit(updateProgress(job->id, percent)); } @@ -287,7 +287,7 @@ void Encoder::jobDone(KProcess *process ) { KMessageBox::sorry(0, i18n("The selected encoder was not found.\nThe wav file has been removed. Command was: %1").arg(job->errorString), i18n("Encoding Failed")); emit(updateProgress(job->id, -1)); } - else if ( QFile::exists(job->newLocation) ) { + else if ( TQFile::exists(job->newLocation) ) { // fyi segfaults return 136 if ( process->exitStatus() != 0 ) { if ( KMessageBox::questionYesNo(0, i18n("The encoder exited with a error. Please check that the file was created.\nDo you want to see the full encoder output?"), i18n("Encoding Failed"),i18n("Show Output"),i18n("Skip Output")) == KMessageBox::Yes ) @@ -313,7 +313,7 @@ void Encoder::jobDone(KProcess *process ) { } if ( job->removeTempFile ) - QFile::remove( job->location ); + TQFile::remove( job->location ); if( showDebugBox ){ EncoderOutput dlg( 0, "Encoder Output" ); diff --git a/kaudiocreator/encoder.h b/kaudiocreator/encoder.h index 809a5275..24ebcafc 100644 --- a/kaudiocreator/encoder.h +++ b/kaudiocreator/encoder.h @@ -21,26 +21,26 @@ #ifndef ENCODER_H #define ENCODER_H -#include <qobject.h> +#include <tqobject.h> -#include <qptrlist.h> -#include <qmap.h> +#include <tqptrlist.h> +#include <tqmap.h> #include "job.h" #include <kprocess.h> class EncoderPrefs; -class Encoder : public QObject { +class Encoder : public TQObject { Q_OBJECT signals: - void addJob(Job *job, const QString &name); + void addJob(Job *job, const TQString &name); void updateProgress(int id, int progress); void jobsChanged(); public: - Encoder( QObject* parent = 0, const char* name = 0); + Encoder( TQObject* parent = 0, const char* name = 0); ~Encoder(); int activeJobCount(); int pendingJobCount(); @@ -57,9 +57,9 @@ private slots: void tendToNewJobs(); private: - QPtrList<Job> pendingJobs; - QPtrList<KShellProcess> threads; - QMap<KShellProcess*, Job*> jobs; + TQPtrList<Job> pendingJobs; + TQPtrList<KShellProcess> threads; + TQMap<KShellProcess*, Job*> jobs; int reportCount; }; diff --git a/kaudiocreator/encoder_prefs_addons.h b/kaudiocreator/encoder_prefs_addons.h index 067f4d79..9ecb0e07 100644 --- a/kaudiocreator/encoder_prefs_addons.h +++ b/kaudiocreator/encoder_prefs_addons.h @@ -1,8 +1,8 @@ public: - static EncoderPrefs *prefs(const QString &groupName); - static bool hasPrefs(const QString &groupName); - static void deletePrefs(const QString &groupName); + static EncoderPrefs *prefs(const TQString &groupName); + static bool hasPrefs(const TQString &groupName); + static void deletePrefs(const TQString &groupName); private: - static QDict<EncoderPrefs> *m_prefs; + static TQDict<EncoderPrefs> *m_prefs; diff --git a/kaudiocreator/encoderconfig.ui.h b/kaudiocreator/encoderconfig.ui.h index fd95a75a..e24f9535 100644 --- a/kaudiocreator/encoderconfig.ui.h +++ b/kaudiocreator/encoderconfig.ui.h @@ -8,7 +8,7 @@ *****************************************************************************/ #include "wizard.h" -#include <qlineedit.h> +#include <tqlineedit.h> /** * Load up the wizard with the encoder fileFormat string. Save it if OK is hit. diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp index 509cd59d..e49dd6a9 100644 --- a/kaudiocreator/encoderconfigimp.cpp +++ b/kaudiocreator/encoderconfigimp.cpp @@ -22,8 +22,8 @@ #include "encoderedit.h" #include "prefs.h" -#include <qpushbutton.h> -#include <qlineedit.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> #include <kconfigdialog.h> #include <kmessagebox.h> #include <klocale.h> @@ -32,12 +32,12 @@ /** * Constructor. */ -EncoderConfigImp::EncoderConfigImp( QWidget* parent, const char* name) : +EncoderConfigImp::EncoderConfigImp( TQWidget* parent, const char* name) : EncoderConfig (parent, name) { - connect(addEncoder, SIGNAL(clicked()), this, SLOT(addEncoderSlot())); - connect(removeEncoder, SIGNAL(clicked()), this, SLOT(removeEncoderSlot())); - connect(configureEncoder, SIGNAL(clicked()), this, SLOT(configureEncoderSlot())); - connect(kcfg_currentEncoder, SIGNAL(doubleClicked ( QListBoxItem * )),this, SLOT(configureEncoderSlot())); + connect(addEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEncoderSlot())); + connect(removeEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEncoderSlot())); + connect(configureEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureEncoderSlot())); + connect(kcfg_currentEncoder, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),this, TQT_SLOT(configureEncoderSlot())); // If there are no encoders then store the three default ones. if( Prefs::lastKnownEncoder() == 0){ @@ -93,11 +93,11 @@ void EncoderConfigImp::loadEncoderList(){ int lastKnownEncoder = Prefs::lastKnownEncoder(); lastKnownEncoder++; for( int i=0; i<=lastKnownEncoder; i++ ){ - QString currentGroup = QString("Encoder_%1").arg(i); + TQString currentGroup = TQString("Encoder_%1").arg(i); if(EncoderPrefs::hasPrefs(currentGroup)){ lastEncoder = i; EncoderPrefs *encPrefs = EncoderPrefs::prefs(currentGroup); - QString encoderName = encPrefs->encoderName(); + TQString encoderName = encPrefs->encoderName(); kcfg_currentEncoder->insertItem(encoderName); encoderNames.insert(encoderName, currentGroup); if(Prefs::currentEncoder() == i) @@ -121,9 +121,9 @@ void EncoderConfigImp::loadEncoderList(){ void EncoderConfigImp::addEncoderSlot(){ bool foundEmptyGroup = false; uint number = 0; - QString groupName; + TQString groupName; while(!foundEmptyGroup){ - groupName = QString("Encoder_%1").arg(number); + groupName = TQString("Encoder_%1").arg(number); if(!EncoderPrefs::hasPrefs(groupName)) foundEmptyGroup = true; else @@ -138,7 +138,7 @@ void EncoderConfigImp::addEncoderSlot(){ KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help); dialog->setCaption(i18n("Configure Encoder")); dialog->addPage(new EncoderEdit(0, groupName.latin1()), i18n("Encoder Configuration"), "package_settings"); - connect(dialog, SIGNAL(settingsChanged()), this, SLOT(loadEncoderList())); + connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadEncoderList())); dialog->show(); } @@ -165,7 +165,7 @@ void EncoderConfigImp::removeEncoderSlot(){ == KMessageBox::Cancel ) return; - QString groupName = encoderNames[kcfg_currentEncoder->currentText()]; + TQString groupName = encoderNames[kcfg_currentEncoder->currentText()]; kcfg_currentEncoder->removeItem(kcfg_currentEncoder->currentItem()); delete KConfigDialog::exists(groupName.latin1()); @@ -185,7 +185,7 @@ void EncoderConfigImp::configureEncoderSlot() { KMessageBox:: sorry(this, i18n("Please select an encoder."), i18n("No Encoder Selected")); return; } - QString groupName = encoderNames[kcfg_currentEncoder->currentText()]; + TQString groupName = encoderNames[kcfg_currentEncoder->currentText()]; KConfig &config = *KGlobal::config(); if(!config.hasGroup(groupName)) return; @@ -198,16 +198,16 @@ void EncoderConfigImp::configureEncoderSlot() { KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help); dialog->setCaption(i18n("Configure Encoder")); dialog->addPage(new EncoderEdit(0, groupName.latin1()), i18n("Encoder Configuration"), "package_settings"); - connect(dialog, SIGNAL(destroyed(QObject *)), this, SLOT(updateEncoder(QObject *))); - connect(dialog, SIGNAL(settingsChanged()), this, SIGNAL(encoderUpdated())); - connect(dialog, SIGNAL(settingsChanged(const char *)), this, SLOT(updateEncoder(const char *))); + connect(dialog, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(updateEncoder(TQObject *))); + connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SIGNAL(encoderUpdated())); + connect(dialog, TQT_SIGNAL(settingsChanged(const char *)), this, TQT_SLOT(updateEncoder(const char *))); dialog->show(); } /** * If object exists update encoder */ -void EncoderConfigImp::updateEncoder(QObject * obj){ +void EncoderConfigImp::updateEncoder(TQObject * obj){ if(!obj) return; updateEncoder(obj->name()); @@ -224,10 +224,10 @@ void EncoderConfigImp::updateEncoder(QObject * obj){ * If current encoder update also. */ void EncoderConfigImp::updateEncoder(const char *dialogName){ - QString groupName = dialogName; - QString encoderName; + TQString groupName = dialogName; + TQString encoderName; bool found = false; - QMap<QString, QString>::Iterator it; + TQMap<TQString, TQString>::Iterator it; for ( it = encoderNames.begin(); it != encoderNames.end(); ++it ) { if(it.data() == groupName){ found = true; @@ -238,11 +238,11 @@ void EncoderConfigImp::updateEncoder(const char *dialogName){ return; if(!EncoderPrefs::hasPrefs(groupName)) return; - QString newName = EncoderPrefs::prefs(groupName)->encoderName(); + TQString newName = EncoderPrefs::prefs(groupName)->encoderName(); if(newName == encoderName) return; - QListBoxItem *item = kcfg_currentEncoder->findItem(encoderName); + TQListBoxItem *item = kcfg_currentEncoder->findItem(encoderName); if(!item) return; kcfg_currentEncoder->changeItem(newName, kcfg_currentEncoder->index(item)); @@ -251,13 +251,13 @@ void EncoderConfigImp::updateEncoder(const char *dialogName){ encoderNames.erase(encoderName); } -QDict<EncoderPrefs> *EncoderPrefs::m_prefs = 0; +TQDict<EncoderPrefs> *EncoderPrefs::m_prefs = 0; -EncoderPrefs *EncoderPrefs::prefs(const QString &groupName) +EncoderPrefs *EncoderPrefs::prefs(const TQString &groupName) { if (!m_prefs) { - m_prefs = new QDict<EncoderPrefs>(); + m_prefs = new TQDict<EncoderPrefs>(); m_prefs->setAutoDelete(true); } EncoderPrefs *encPrefs = m_prefs->find(groupName); @@ -270,13 +270,13 @@ EncoderPrefs *EncoderPrefs::prefs(const QString &groupName) return encPrefs; } -bool EncoderPrefs::hasPrefs(const QString &groupName) +bool EncoderPrefs::hasPrefs(const TQString &groupName) { KConfig &config = *KGlobal::config(); return config.hasGroup(groupName); } -void EncoderPrefs::deletePrefs(const QString &groupName) +void EncoderPrefs::deletePrefs(const TQString &groupName) { KConfig &config = *KGlobal::config(); config.deleteGroup(groupName); diff --git a/kaudiocreator/encoderconfigimp.h b/kaudiocreator/encoderconfigimp.h index c16dc0c0..a72e138f 100644 --- a/kaudiocreator/encoderconfigimp.h +++ b/kaudiocreator/encoderconfigimp.h @@ -23,8 +23,8 @@ #include "encoderconfig.h" #include "encoder_prefs.h" -#include <qmap.h> -#include <qdict.h> +#include <tqmap.h> +#include <tqdict.h> /** * Class mainly build to manage encoder list. @@ -37,20 +37,20 @@ signals: void encoderUpdated(); public: - EncoderConfigImp( QWidget* parent = 0, const char* name = 0); + EncoderConfigImp( TQWidget* parent = 0, const char* name = 0); private slots: void addEncoderSlot(); void removeEncoderSlot(); void configureEncoderSlot(); - void updateEncoder(QObject * obj); + void updateEncoder(TQObject * obj); void updateEncoder(const char *dialogName); void loadEncoderList(); private: // Name, groupName - QMap<QString, QString> encoderNames; + TQMap<TQString, TQString> encoderNames; }; #endif diff --git a/kaudiocreator/general.ui.h b/kaudiocreator/general.ui.h index c54af842..244219ab 100644 --- a/kaudiocreator/general.ui.h +++ b/kaudiocreator/general.ui.h @@ -7,13 +7,13 @@ ** place of a destructor. *****************************************************************************/ -#include <qregexp.h> -#include <qlineedit.h> -#include <qlabel.h> +#include <tqregexp.h> +#include <tqlineedit.h> +#include <tqlabel.h> void General::updateExample() { - QString text = example->text(); - text.replace( QRegExp(kcfg_replaceInput->text()), kcfg_replaceOutput->text() ); + TQString text = example->text(); + text.replace( TQRegExp(kcfg_replaceInput->text()), kcfg_replaceOutput->text() ); exampleOutput->setText(text); } diff --git a/kaudiocreator/job.cpp b/kaudiocreator/job.cpp index 44a05eee..740aeb5e 100644 --- a/kaudiocreator/job.cpp +++ b/kaudiocreator/job.cpp @@ -18,20 +18,20 @@ #include "job.h" #include <kmacroexpander.h> -#include <qregexp.h> +#include <tqregexp.h> /** * A helper function to replace %X with the stuff in the album. * if quote is true then put "" around the %X */ -QString Job::replaceSpecialChars(const QString &string, bool quote, QMap<QString, QString> _map){ - QMap<QString,QString> map = _map; +TQString Job::replaceSpecialChars(const TQString &string, bool quote, TQMap<TQString, TQString> _map){ + TQMap<TQString,TQString> map = _map; map.insert("title", track_title); map.insert("artist", track_artist); - map.insert("number", QString().sprintf("%02d", track)); + map.insert("number", TQString().sprintf("%02d", track)); map.insert("comment", track_comment); - map.insert("year", QString::number(year)); + map.insert("year", TQString::number(year)); map.insert("genre", genre); map.insert("albumtitle", album); @@ -44,15 +44,15 @@ QString Job::replaceSpecialChars(const QString &string, bool quote, QMap<QString return (KMacroExpander::expandMacros(string, map)); } -void Job::fix(const QString &in, const QString &out){ - track_title.replace( QRegExp(in), out ); - track_artist.replace( QRegExp(in), out ); - track_comment.replace( QRegExp(in), out ); +void Job::fix(const TQString &in, const TQString &out){ + track_title.replace( TQRegExp(in), out ); + track_artist.replace( TQRegExp(in), out ); + track_comment.replace( TQRegExp(in), out ); // year // track - genre.replace( QRegExp(in), out ); - album.replace( QRegExp(in), out ); - comment.replace( QRegExp(in), out ); - group.replace( QRegExp(in), out ); + genre.replace( TQRegExp(in), out ); + album.replace( TQRegExp(in), out ); + comment.replace( TQRegExp(in), out ); + group.replace( TQRegExp(in), out ); } diff --git a/kaudiocreator/job.h b/kaudiocreator/job.h index e7faefdd..bb65eed9 100644 --- a/kaudiocreator/job.h +++ b/kaudiocreator/job.h @@ -21,7 +21,7 @@ #ifndef JOB_H #define JOB_H -#include <qmap.h> +#include <tqmap.h> #include <klocale.h> /** @@ -33,34 +33,34 @@ class Job{ public: inline Job():id(-1),track_title(""),track_artist(""), track(-1),track_comment(""), year(-1), genre(i18n("Other")), group(""), album(""), comment(""), lastSongInAlbum(false), removeTempFile(true), encoder(-1) {}; - QString replaceSpecialChars(const QString &string, bool quote, QMap<QString,QString> map); + TQString replaceSpecialChars(const TQString &string, bool quote, TQMap<TQString,TQString> map); - void fix( const QString &in, const QString &out ); + void fix( const TQString &in, const TQString &out ); // The device to obtain the file such as /dev/cdrom/ (Used when ripping and ejecting) - QString device; + TQString device; int id; - QString track_title; - QString track_artist; + TQString track_title; + TQString track_artist; int track; - QString track_comment; + TQString track_comment; int year; - QString genre; + TQString genre; - QString group; - QString album; - QString comment; + TQString group; + TQString album; + TQString comment; // Currently location of file X - QString location; + TQString location; // New location of a file after current opertation is complete (rip/encode). - QString newLocation; + TQString newLocation; // What was just attempted to do via this job and is spit out in the event // of an error. - QString errorString; + TQString errorString; // If this is the last track to be ripped then value is true. bool lastSongInAlbum; @@ -69,7 +69,7 @@ public: bool removeTempFile; // output from the processing. - QString output; + TQString output; int encoder; }; diff --git a/kaudiocreator/jobqueimp.cpp b/kaudiocreator/jobqueimp.cpp index c39aac4f..81c0431d 100644 --- a/kaudiocreator/jobqueimp.cpp +++ b/kaudiocreator/jobqueimp.cpp @@ -21,21 +21,21 @@ #include "jobqueimp.h" #include "job.h" #include "prefs.h" -#include <qpushbutton.h> -#include <qlabel.h> -#include <qpainter.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqpainter.h> #include <kconfig.h> #include <kglobal.h> #include <kdebug.h> #include <kiconloader.h> #include <kmessagebox.h> #include <kurl.h> -#include <qfile.h> -#include <qregexp.h> -#include <qfileinfo.h> +#include <tqfile.h> +#include <tqregexp.h> +#include <tqfileinfo.h> #include <kstandarddirs.h> #include <knotifyclient.h> -#include <qdir.h> +#include <tqdir.h> #define HEADER_JOB 0 #define HEADER_PROGRESS 1 @@ -49,11 +49,11 @@ * @param parent - parent widget * @param name - widget name */ -JobQueImp::JobQueImp( QWidget* parent, const char* name) : +JobQueImp::JobQueImp( TQWidget* parent, const char* name) : JobQue(parent,name),highestNumber(DEFAULT_HIGHEST_NUMBER), currentId(0){ - connect(removeSelected,SIGNAL(clicked()), this, SLOT( removeSelectedJob())); - connect(removeAll, SIGNAL(clicked()), this, SLOT(removeAllJobs())); - connect(removeDoneJobs, SIGNAL(clicked()), this, SLOT(clearDoneJobs())); + connect(removeSelected,TQT_SIGNAL(clicked()), this, TQT_SLOT( removeSelectedJob())); + connect(removeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeAllJobs())); + connect(removeDoneJobs, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearDoneJobs())); } /** @@ -62,9 +62,9 @@ JobQueImp::JobQueImp( QWidget* parent, const char* name) : * Based upon a highest number that is kept. * @param number the number to fill out. */ -QString JobQueImp::getStringFromNumber(int number){ +TQString JobQueImp::getStringFromNumber(int number){ if(number > highestNumber){ - int diff = QString("%1").arg(number).length() - QString("%1").arg(highestNumber).length(); + int diff = TQString("%1").arg(number).length() - TQString("%1").arg(highestNumber).length(); highestNumber = number; if(diff > 0){ // We have to update all of the cells. @@ -76,8 +76,8 @@ QString JobQueImp::getStringFromNumber(int number){ } } - QString buffer = ""; - uint newLength = QString("%1").arg(highestNumber).length() - QString("%1").arg(number).length(); + TQString buffer = ""; + uint newLength = TQString("%1").arg(highestNumber).length() - TQString("%1").arg(number).length(); for(uint i=0; i < newLength; i++) buffer += "0"; return buffer; @@ -88,11 +88,11 @@ QString JobQueImp::getStringFromNumber(int number){ * @param id the id of the job. * @param name the name of the job. */ -void JobQueImp::addJob(Job*job, const QString &name ){ +void JobQueImp::addJob(Job*job, const TQString &name ){ if(!job) return; job->id = ++currentId; - QueListViewItem *currentItem = new QueListViewItem(todoQue, QString("%1%2").arg(getStringFromNumber(currentId)).arg(currentId), "0", name); + QueListViewItem *currentItem = new QueListViewItem(todoQue, TQString("%1%2").arg(getStringFromNumber(currentId)).arg(currentId), "0", name); currentItem->setPixmap(ICON_LOC, SmallIcon("player_pause", currentItem->height()-2)); queLabel->setText(i18n("Number of jobs in the queue: %1").arg(todoQue->childCount())); } @@ -105,8 +105,8 @@ void JobQueImp::addJob(Job*job, const QString &name ){ void JobQueImp::updateProgress(int id, int progress){ int currentJobCount = numberOfJobsNotFinished(); QueListViewItem * currentItem = (QueListViewItem*)todoQue->firstChild(); - QString buffer = getStringFromNumber(id); - buffer += QString("%1").arg(id); + TQString buffer = getStringFromNumber(id); + buffer += TQString("%1").arg(id); // Find the current item while( currentItem != NULL ){ @@ -272,10 +272,10 @@ int JobQueImp::numberOfJobsNotFinished(){ /** * The repaint function overloaded so that we can have a built in progressbar. */ -void QueListViewItem::paintCell (QPainter * p,const QColorGroup &cg,int column, +void QueListViewItem::paintCell (TQPainter * p,const TQColorGroup &cg,int column, int width,int align){ if(column != HEADER_PROGRESS){ - QListViewItem::paintCell(p,cg,column,width,align); + TQListViewItem::paintCell(p,cg,column,width,align); return; } @@ -295,7 +295,7 @@ void QueListViewItem::paintCell (QPainter * p,const QColorGroup &cg,int column, if(isSelected()) p->setPen(cg.highlightedText()); if(percentDone != -1) - p->drawText(0,0,width-1,height()-1,AlignCenter,QString().setNum((int)percentDone) + "%"); + p->drawText(0,0,width-1,height()-1,AlignCenter,TQString().setNum((int)percentDone) + "%"); else p->drawText(0,0,width-1,height()-1,AlignCenter,i18n("Error")); } @@ -303,7 +303,7 @@ void QueListViewItem::paintCell (QPainter * p,const QColorGroup &cg,int column, /** * Header for built in treelist item so we can have a progress bar in them. */ -QueListViewItem::QueListViewItem(QListView *parent, const QString id, const QString p , const QString name, const QString d, const QString e) : QListViewItem(parent, id, p, name,d,e), percentDone(0), progressing(false) { +QueListViewItem::QueListViewItem(TQListView *parent, const TQString id, const TQString p , const TQString name, const TQString d, const TQString e) : TQListViewItem(parent, id, p, name,d,e), percentDone(0), progressing(false) { } #include "jobqueimp.moc" diff --git a/kaudiocreator/jobqueimp.h b/kaudiocreator/jobqueimp.h index 2287cf37..ef5de4b3 100644 --- a/kaudiocreator/jobqueimp.h +++ b/kaudiocreator/jobqueimp.h @@ -22,8 +22,8 @@ #define JOBQUEIMP_H #include "jobque.h" -#include <qstring.h> -#include <qlistview.h> +#include <tqstring.h> +#include <tqlistview.h> class Job; class QPainter; @@ -33,11 +33,11 @@ class QListView; /** * Helper class to allow for progress bars in list view items. */ -class QueListViewItem : public QListViewItem { +class QueListViewItem : public TQListViewItem { public: - QueListViewItem (QListView * p = NULL, const QString a=0, const QString b=0, const QString c=0, const QString d=0, const QString e=0); - virtual void paintCell (QPainter * p,const QColorGroup &cg,int column, + QueListViewItem (TQListView * p = NULL, const TQString a=0, const TQString b=0, const TQString c=0, const TQString d=0, const TQString e=0); + virtual void paintCell (TQPainter * p,const TQColorGroup &cg,int column, int width,int align); double percentDone; // Has the percentDone gone beyond 0 @@ -54,12 +54,12 @@ signals: void removeJob( int idNumber ); public: - JobQueImp( QWidget* parent = 0, const char* name = 0 ); + JobQueImp( TQWidget* parent = 0, const char* name = 0 ); int numberOfJobsNotFinished(); public slots: void updateProgress( int id, int progress ); - void addJob( Job* job, const QString &name ); + void addJob( Job* job, const TQString &name ); // Toolbar Button void clearDoneJobs(); @@ -70,7 +70,7 @@ private slots: private: bool removeJob( QueListViewItem *item, bool kill=true, bool prompt=true ); - QString getStringFromNumber( int number ); + TQString getStringFromNumber( int number ); int highestNumber; int currentId; diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp index 8cf2953b..6ac77beb 100644 --- a/kaudiocreator/kaudiocreator.cpp +++ b/kaudiocreator/kaudiocreator.cpp @@ -20,7 +20,7 @@ #include "kaudiocreator.h" -#include <qvbox.h> +#include <tqvbox.h> #include <kiconloader.h> #include <kmessagebox.h> @@ -49,89 +49,89 @@ /** * Constructor. Connect all of the object and the job control. */ -KAudioCreator::KAudioCreator( QWidget* parent, const char* name) : +KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) : KMainWindow(parent, name) { janusWidget = new KJanusWidget(this, name, KJanusWidget::Tabbed); setCentralWidget(janusWidget); - QVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), QString::null, SmallIcon("cdaudio_unmount", 32)); + TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString::null, SmallIcon("cdaudio_unmount", 32)); tracks = new TracksImp(frame, "Tracks"); ripper = new Ripper ( frame, "Rip" ); encoder = new Encoder( frame, "Encoder" ); - frame = janusWidget->addVBoxPage( i18n("&Jobs"), QString::null, SmallIcon( "run", 32 ) ); + frame = janusWidget->addVBoxPage( i18n("&Jobs"), TQString::null, SmallIcon( "run", 32 ) ); jobQue = new JobQueImp( frame, "Que" ); resize(500, 440); /*KAction *eject = */new KAction( i18n("&Eject CD"), 0, tracks, - SLOT( eject() ), actionCollection(), "eject" ); + TQT_SLOT( eject() ), actionCollection(), "eject" ); (void)new KAction( i18n("&Configure KAudioCreator..."), 0, this, - SLOT( showSettings() ), actionCollection(), "configure_kaudiocreator" ); + TQT_SLOT( showSettings() ), actionCollection(), "configure_kaudiocreator" ); KAction *selectAll = new KAction( i18n( "Select &All Tracks"), 0, tracks, - SLOT( selectAllTracks() ), actionCollection(), "select_all" ) ; + TQT_SLOT( selectAllTracks() ), actionCollection(), "select_all" ) ; KAction *deselectAll = new KAction( i18n( "Deselect &All Tracks"), 0, tracks, - SLOT( deselectAllTracks() ), actionCollection(), "deselect_all" ); + TQT_SLOT( deselectAllTracks() ), actionCollection(), "deselect_all" ); selectAll->setEnabled( false ); deselectAll->setEnabled( false ); KActionMenu *actActionMenu = new KActionMenu( i18n("Rip &Selection"), "rip", actionCollection(), "rip" ); actActionMenu->setDelayed(true); //needed for checking "all accounts" actActionMenu->setEnabled( false ); - connect( actActionMenu, SIGNAL( activated() ), tracks, SLOT( startSession() ) ); + connect( actActionMenu, TQT_SIGNAL( activated() ), tracks, TQT_SLOT( startSession() ) ); ripMenu = actActionMenu->popupMenu(); - connect( ripMenu, SIGNAL( activated(int) ), this, SLOT( slotRipSelection(int)) ); - connect( ripMenu, SIGNAL( aboutToShow() ), this, SLOT( getRipMenu()) ); + connect( ripMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotRipSelection(int)) ); + connect( ripMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( getRipMenu()) ); KAction *rip = new KAction( i18n( "Rip &Selection" ), 0, tracks, - SLOT( startSession() ), actionCollection(), "rip_selected" ); + TQT_SLOT( startSession() ), actionCollection(), "rip_selected" ); rip->setEnabled( false ); - connect( jobQue, SIGNAL( removeJob(int) ), this, SLOT( updateStatus() ) ); - connect( jobQue, SIGNAL( removeJob(int) ), ripper, SLOT( removeJob(int) ) ); - connect( jobQue, SIGNAL( removeJob(int) ), encoder, SLOT( removeJob(int)) ); + connect( jobQue, TQT_SIGNAL( removeJob(int) ), this, TQT_SLOT( updateStatus() ) ); + connect( jobQue, TQT_SIGNAL( removeJob(int) ), ripper, TQT_SLOT( removeJob(int) ) ); + connect( jobQue, TQT_SIGNAL( removeJob(int) ), encoder, TQT_SLOT( removeJob(int)) ); - connect( ripper, SIGNAL( updateProgress(int, int) ) , jobQue, SLOT( updateProgress(int,int) ) ); - connect( ripper, SIGNAL( addJob(Job*, const QString &) ), jobQue, SLOT( addJob(Job*, const QString &)) ); - connect( ripper, SIGNAL( eject(const QString &) ) , tracks, SLOT( ejectDevice(const QString &)) ); - connect( ripper, SIGNAL( encodeWav(Job *) ) , encoder, SLOT( encodeWav(Job *)) ); - connect( ripper, SIGNAL( jobsChanged() ) , this, SLOT( updateStatus() ) ); + connect( ripper, TQT_SIGNAL( updateProgress(int, int) ) , jobQue, TQT_SLOT( updateProgress(int,int) ) ); + connect( ripper, TQT_SIGNAL( addJob(Job*, const TQString &) ), jobQue, TQT_SLOT( addJob(Job*, const TQString &)) ); + connect( ripper, TQT_SIGNAL( eject(const TQString &) ) , tracks, TQT_SLOT( ejectDevice(const TQString &)) ); + connect( ripper, TQT_SIGNAL( encodeWav(Job *) ) , encoder, TQT_SLOT( encodeWav(Job *)) ); + connect( ripper, TQT_SIGNAL( jobsChanged() ) , this, TQT_SLOT( updateStatus() ) ); - connect( encoder, SIGNAL( updateProgress(int, int) ) , jobQue, SLOT( updateProgress(int,int)) ); - connect( encoder, SIGNAL( addJob(Job*, const QString&)), jobQue, SLOT( addJob(Job*, const QString &)) ); - connect( encoder, SIGNAL( jobsChanged() ) , this, SLOT( updateStatus() ) ); + connect( encoder, TQT_SIGNAL( updateProgress(int, int) ) , jobQue, TQT_SLOT( updateProgress(int,int)) ); + connect( encoder, TQT_SIGNAL( addJob(Job*, const TQString&)), jobQue, TQT_SLOT( addJob(Job*, const TQString &)) ); + connect( encoder, TQT_SIGNAL( jobsChanged() ) , this, TQT_SLOT( updateStatus() ) ); - connect( tracks, SIGNAL( hasCD(bool) ) , this, SLOT( hasCD(bool) ) ); - connect( tracks, SIGNAL( ripTrack(Job *) ), ripper, SLOT( ripTrack(Job *)) ); - connect( tracks, SIGNAL( hasTracks(bool) ), rip, SLOT( setEnabled(bool)) ); - connect( tracks, SIGNAL( hasTracks(bool) ), actActionMenu, SLOT( setEnabled(bool)) ); - connect( tracks, SIGNAL( hasTracks(bool) ), deselectAll, SLOT( setEnabled(bool)) ); - connect( tracks, SIGNAL( hasTracks(bool) ), selectAll, SLOT( setEnabled(bool)) ); + connect( tracks, TQT_SIGNAL( hasCD(bool) ) , this, TQT_SLOT( hasCD(bool) ) ); + connect( tracks, TQT_SIGNAL( ripTrack(Job *) ), ripper, TQT_SLOT( ripTrack(Job *)) ); + connect( tracks, TQT_SIGNAL( hasTracks(bool) ), rip, TQT_SLOT( setEnabled(bool)) ); + connect( tracks, TQT_SIGNAL( hasTracks(bool) ), actActionMenu, TQT_SLOT( setEnabled(bool)) ); + connect( tracks, TQT_SIGNAL( hasTracks(bool) ), deselectAll, TQT_SLOT( setEnabled(bool)) ); + connect( tracks, TQT_SIGNAL( hasTracks(bool) ), selectAll, TQT_SLOT( setEnabled(bool)) ); (void)new KAction(i18n("Remove &Completed Jobs"), 0, jobQue, - SLOT(clearDoneJobs()), actionCollection(), "clear_done_jobs" ); + TQT_SLOT(clearDoneJobs()), actionCollection(), "clear_done_jobs" ); KAction *edit = new KAction(i18n("&Edit Album..."), 0, tracks, - SLOT(editInformation()), actionCollection(), "edit_cd"); - connect(tracks, SIGNAL(hasCD(bool)), edit, SLOT(setEnabled(bool))); + TQT_SLOT(editInformation()), actionCollection(), "edit_cd"); + connect(tracks, TQT_SIGNAL(hasCD(bool)), edit, TQT_SLOT(setEnabled(bool))); edit->setEnabled( false ); (void)new KAction(i18n("Encode &File..."), 0, this, - SLOT(encodeFile()), actionCollection(), "encode_file"); + TQT_SLOT(encodeFile()), actionCollection(), "encode_file"); KAction *cddb = new KAction(i18n("&CDDB Lookup"), 0, tracks, - SLOT(performCDDB()), actionCollection(), "cddb_now"); - connect(tracks, SIGNAL(hasCD(bool)), cddb, SLOT(setEnabled(bool))); + TQT_SLOT(performCDDB()), actionCollection(), "cddb_now"); + connect(tracks, TQT_SIGNAL(hasCD(bool)), cddb, TQT_SLOT(setEnabled(bool))); cddb->setEnabled( false ); - KStdAction::configureNotifications(this, SLOT(configureNotifications()), + KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()), actionCollection()); - KStdAction::quit( this, SLOT(close()), actionCollection(), "quit" ); + KStdAction::quit( this, TQT_SLOT(close()), actionCollection(), "quit" ); // Init statusbar statusBar()->insertItem(i18n("No Audio CD detected"), 0 ); @@ -140,7 +140,7 @@ KAudioCreator::KAudioCreator( QWidget* parent, const char* name) : setupGUI(); } -void KAudioCreator::setDevice( const QString &device ) +void KAudioCreator::setDevice( const TQString &device ) { tracks->deviceCombo->setCurrentText( device ); } @@ -153,10 +153,10 @@ void KAudioCreator::getRipMenu(){ ripMenu->clear(); int i=0; - QString currentGroup = QString("Encoder_%1").arg(i); + TQString currentGroup = TQString("Encoder_%1").arg(i); while(EncoderPrefs::hasPrefs(currentGroup)){ ripMenu->insertItem(EncoderPrefs::prefs(currentGroup)->encoderName(), i); - currentGroup = QString("Encoder_%1").arg(++i); + currentGroup = TQString("Encoder_%1").arg(++i); } } @@ -171,9 +171,9 @@ void KAudioCreator::hasCD(bool cd){ } void KAudioCreator::updateStatus() { - QString status = i18n("Idle."); - QString rippingStatus; - QString encodingStatus; + TQString status = i18n("Idle."); + TQString rippingStatus; + TQString encodingStatus; int activeRippingJobs = ripper->activeJobCount(); int pendingRippingJobs = ripper->pendingJobCount(); int activeEncodingJobs = encoder->activeJobCount(); @@ -216,7 +216,7 @@ void KAudioCreator::configureNotifications() { void KAudioCreator::encodeFile(){ EncodeFileImp *file = new EncodeFileImp(this, "EncodeFile"); - connect(file, SIGNAL(startJob(Job*)),encoder, SLOT(encodeWav(Job*))); + connect(file, TQT_SIGNAL(startJob(Job*)),encoder, TQT_SLOT(encodeWav(Job*))); file->show(); } @@ -228,14 +228,14 @@ void KAudioCreator::showSettings(){ return; SettingsDialog *dialog = new SettingsDialog(this, "settings", Prefs::self()); - connect(dialog, SIGNAL(settingsChanged()), ripper, SLOT(loadSettings())); - connect(dialog, SIGNAL(settingsChanged()), encoder, SLOT(loadSettings())); - connect(dialog, SIGNAL(settingsChanged()), tracks, SLOT(loadSettings())); - connect(dialog->encoderConfigImp, SIGNAL(encoderUpdated()), encoder, SLOT(loadSettings())); + connect(dialog, TQT_SIGNAL(settingsChanged()), ripper, TQT_SLOT(loadSettings())); + connect(dialog, TQT_SIGNAL(settingsChanged()), encoder, TQT_SLOT(loadSettings())); + connect(dialog, TQT_SIGNAL(settingsChanged()), tracks, TQT_SLOT(loadSettings())); + connect(dialog->encoderConfigImp, TQT_SIGNAL(encoderUpdated()), encoder, TQT_SLOT(loadSettings())); dialog->show(); } -SettingsDialog::SettingsDialog(QWidget *parent, const char *name,KConfigSkeleton *config) +SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config) : KConfigDialog(parent, name, config), cddb(0), cddbChanged(false) { @@ -248,12 +248,12 @@ SettingsDialog::SettingsDialog(QWidget *parent, const char *name,KConfigSkeleton KService::Ptr libkcddb = KService::serviceByDesktopName("libkcddb"); if (libkcddb && libkcddb->isValid()) { - cddb = KCModuleLoader::loadModule(QString("libkcddb"), KCModuleLoader::Inline); + cddb = KCModuleLoader::loadModule(TQString("libkcddb"), KCModuleLoader::Inline); if (cddb) { cddb->load(); addPage(cddb, i18n("CDDB"), "cdaudio_mount", i18n("CDDB Configuration"), false); - connect(cddb, SIGNAL(changed(bool)), this, SLOT(slotCddbChanged(bool))); + connect(cddb, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(slotCddbChanged(bool))); } } RipConfig *rip = new RipConfig(0, "Ripper"); diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h index 71eafe89..d2e0c57d 100644 --- a/kaudiocreator/kaudiocreator.h +++ b/kaudiocreator/kaudiocreator.h @@ -38,8 +38,8 @@ class KAudioCreator : public KMainWindow { Q_OBJECT public: - KAudioCreator( QWidget* parent = 0, const char* name = 0); - void setDevice( const QString &device ); + KAudioCreator( TQWidget* parent = 0, const char* name = 0); + void setDevice( const TQString &device ); protected: virtual bool queryClose(); @@ -69,7 +69,7 @@ class SettingsDialog: public KConfigDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent, const char *name,KConfigSkeleton *config); + SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config); protected slots: void updateSettings(); diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp index 38f1a4fe..cb9c012b 100644 --- a/kaudiocreator/ripper.cpp +++ b/kaudiocreator/ripper.cpp @@ -21,8 +21,8 @@ #include "ripper.h" #include "prefs.h" -#include <qfile.h> -#include <qtimer.h> +#include <tqfile.h> +#include <tqtimer.h> #include <ktempfile.h> #include <kmessagebox.h> #include <knotifyclient.h> @@ -32,7 +32,7 @@ /** * Constructor, load settings. */ -Ripper::Ripper( QObject* parent, const char* name) : QObject(parent,name) { +Ripper::Ripper( TQObject* parent, const char* name) : TQObject(parent,name) { loadSettings(); } @@ -49,7 +49,7 @@ void Ripper::loadSettings(){ */ Ripper::~Ripper(){ pendingJobs.clear(); - QMap<KIO::Job*, Job*>::Iterator it; + TQMap<KIO::Job*, Job*>::Iterator it; for( it = jobs.begin(); it != jobs.end(); ++it ){ KIO::Job* ioJob = it.key(); Job *job = it.data(); @@ -57,11 +57,11 @@ Ripper::~Ripper(){ if(ioJob){ KIO::FileCopyJob *copyJob = static_cast<KIO::FileCopyJob*> (ioJob); - disconnect(copyJob, SIGNAL(result(KIO::Job*)), this, SLOT(copyJobResult(KIO::Job*))); - disconnect(copyJob, SIGNAL(percent ( KIO::Job *, unsigned long)), this, SLOT(updateProgress ( KIO::Job *, unsigned long))); - QString fileDestination = (copyJob->destURL()).path(); + disconnect(copyJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(copyJobResult(KIO::Job*))); + disconnect(copyJob, TQT_SIGNAL(percent ( KIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( KIO::Job *, unsigned long))); + TQString fileDestination = (copyJob->destURL()).path(); copyJob->kill(); - QFile file( fileDestination ); + TQFile file( fileDestination ); file.remove(); } } @@ -89,20 +89,20 @@ int Ripper::pendingJobCount() { * @param id the id number of the job to remove. */ void Ripper::removeJob(int id){ - QMap<KIO::Job*, Job*>::Iterator it; + TQMap<KIO::Job*, Job*>::Iterator it; for( it = jobs.begin(); it != jobs.end(); ++it ){ if(it.data()->id == id){ KIO::FileCopyJob *copyJob = dynamic_cast<KIO::FileCopyJob*> (it.key()); if(copyJob){ - QString fileDestination = (copyJob->destURL()).path(); + TQString fileDestination = (copyJob->destURL()).path(); copyJob->kill(); // This here is such a hack, shouldn't kill() do this, or why isn't there a stop()? // TODO add to copyJob a stop() function. - QFile file( fileDestination ); + TQFile file( fileDestination ); if(file.exists()) file.remove(); else { - QFile f( fileDestination+".part" ); + TQFile f( fileDestination+".part" ); f.remove(); } } @@ -120,7 +120,7 @@ void Ripper::removeJob(int id){ pendingJobs.remove(job); delete job; } - //qDebug(QString("Done removing Job:%1").arg(id).latin1()); + //qDebug(TQString("Done removing Job:%1").arg(id).latin1()); tendToNewJobs(); } @@ -158,8 +158,8 @@ void Ripper::tendToNewJobs(){ return; pendingJobs.remove(job); - QMap<QString, QString> map; - QString defaultTempDir; + TQMap<TQString, TQString> map; + TQString defaultTempDir; if(Prefs::enableTempDir()) defaultTempDir = Prefs::tempDir(); else @@ -169,23 +169,23 @@ void Ripper::tendToNewJobs(){ KTempFile tmp( defaultTempDir, ".wav" ); tmp.setAutoDelete(true); - QString wavFile; - QString args = job->device; + TQString wavFile; + TQString args = job->device; if(!args.isEmpty()) - args = QString("?device=%1").arg(args); + args = TQString("?device=%1").arg(args); args = args+"&fileNameTemplate=Track %{number}"; if(job->track < 10) - wavFile = QString("audiocd:/Wav/Track 0%1.wav%2").arg(job->track).arg(args); + wavFile = TQString("audiocd:/Wav/Track 0%1.wav%2").arg(job->track).arg(args); else - wavFile = QString("audiocd:/Wav/Track %1.wav%2").arg(job->track).arg(args); + wavFile = TQString("audiocd:/Wav/Track %1.wav%2").arg(job->track).arg(args); KURL source(wavFile); KURL dest(tmp.name()); KIO::FileCopyJob *copyJob = new KIO::FileCopyJob(source, dest, 0644, false, true, false, false); jobs.insert(copyJob, job); - connect(copyJob, SIGNAL(result(KIO::Job*)), this, SLOT(copyJobResult(KIO::Job*))); - connect(copyJob, SIGNAL(percent ( KIO::Job *, unsigned long)), this, SLOT(updateProgress ( KIO::Job *, unsigned long))); + connect(copyJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(copyJobResult(KIO::Job*))); + connect(copyJob, TQT_SIGNAL(percent ( KIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( KIO::Job *, unsigned long))); emit jobsChanged(); } @@ -216,7 +216,7 @@ void Ripper::copyJobResult(KIO::Job *copyjob){ } else{ copyJob->showErrorDialog(0); - QFile file( (copyJob->destURL()).path()); + TQFile file( (copyJob->destURL()).path()); file.remove(); emit updateProgress(newJob->id, -1); delete newJob; @@ -234,7 +234,7 @@ void Ripper::copyJobResult(KIO::Job *copyjob){ } if( !job ){ deviceToEject = newJob->device; - QTimer::singleShot( Prefs::autoEjectDelay()*1000 + 500, this, SLOT(ejectNow())); + TQTimer::singleShot( Prefs::autoEjectDelay()*1000 + 500, this, TQT_SLOT(ejectNow())); } } KNotifyClient::event("cd ripped"); diff --git a/kaudiocreator/ripper.h b/kaudiocreator/ripper.h index 87d25259..1b92493e 100644 --- a/kaudiocreator/ripper.h +++ b/kaudiocreator/ripper.h @@ -23,24 +23,24 @@ #include "job.h" #include <kio/jobclasses.h> -#include <qmap.h> -#include <qptrlist.h> +#include <tqmap.h> +#include <tqptrlist.h> class Job; -class Ripper : public QObject { +class Ripper : public TQObject { Q_OBJECT signals: - void addJob( Job *job, const QString &name ); + void addJob( Job *job, const TQString &name ); void updateProgress( int id, int progress ); void encodeWav( Job *job ); - void eject( const QString &device ); + void eject( const TQString &device ); void jobsChanged(); public: - Ripper( QObject* parent = 0, const char* name = 0 ); + Ripper( TQObject* parent = 0, const char* name = 0 ); ~Ripper(); int activeJobCount(); int pendingJobCount(); @@ -57,11 +57,11 @@ private slots: void ejectNow(); private: - QString deviceToEject; + TQString deviceToEject; // Jobs that we are currently doing. - QMap<KIO::Job*, Job*> jobs; + TQMap<KIO::Job*, Job*> jobs; // Jobs that we want to do , but haven't done yet - QPtrList<Job> pendingJobs; + TQPtrList<Job> pendingJobs; }; #endif // RIPPER_H diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp index 000fdfb9..9a864e9d 100644 --- a/kaudiocreator/tracksimp.cpp +++ b/kaudiocreator/tracksimp.cpp @@ -32,13 +32,13 @@ #include <kmessagebox.h> #include <kurl.h> -#include <qfileinfo.h> -#include <qlabel.h> -#include <qptrlist.h> -#include <qpushbutton.h> -#include <qregexp.h> -#include <qspinbox.h> -#include <qtimer.h> +#include <tqfileinfo.h> +#include <tqlabel.h> +#include <tqptrlist.h> +#include <tqpushbutton.h> +#include <tqregexp.h> +#include <tqspinbox.h> +#include <tqtimer.h> #include "job.h" #include "kcompactdisc.h" @@ -49,28 +49,28 @@ /** * Constructor, connect up slots and signals. */ -TracksImp::TracksImp( QWidget* parent, const char* name) : +TracksImp::TracksImp( TQWidget* parent, const char* name) : Tracks(parent,name), cddbInfo() { cd = new KCompactDisc; - connect(cd,SIGNAL(discChanged(unsigned)),this,SLOT(newDisc(unsigned))); + connect(cd,TQT_SIGNAL(discChanged(unsigned)),this,TQT_SLOT(newDisc(unsigned))); - connect(trackListing, SIGNAL(clicked( QListViewItem * )), this, SLOT(selectTrack(QListViewItem*))); - connect(trackListing, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(editInformation())); - connect(trackListing, SIGNAL(returnPressed(QListViewItem *)), this, SLOT(editInformation())); - connect(selectAllTracksButton, SIGNAL(clicked()), this, SLOT(selectAllTracks())); - connect(deselectAllTracksButton, SIGNAL(clicked()), this, SLOT(deselectAllTracks())); + connect(trackListing, TQT_SIGNAL(clicked( TQListViewItem * )), this, TQT_SLOT(selectTrack(TQListViewItem*))); + connect(trackListing, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(editInformation())); + connect(trackListing, TQT_SIGNAL(returnPressed(TQListViewItem *)), this, TQT_SLOT(editInformation())); + connect(selectAllTracksButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAllTracks())); + connect(deselectAllTracksButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deselectAllTracks())); - connect(deviceCombo, SIGNAL(textChanged(const QString &)), this, SLOT(changeDevice(const QString &))); + connect(deviceCombo, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changeDevice(const TQString &))); selectAllTracksButton->setEnabled( false ); deselectAllTracksButton->setEnabled( false ); cddb = new KCDDB::Client(); cddb->setBlockingMode(false); - connect(cddb, SIGNAL(finished(CDDB::Result)), this, SLOT(lookupCDDBDone(CDDB::Result))); + connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), this, TQT_SLOT(lookupCDDBDone(CDDB::Result))); trackListing->setSorting(-1, false); loadSettings(); } @@ -79,11 +79,11 @@ TracksImp::TracksImp( QWidget* parent, const char* name) : * store the current device from the combo. */ TracksImp::~TracksImp() { - QStringList list; + TQStringList list; if( deviceCombo->count() != 0) list.append(deviceCombo->currentText()); for ( int i=0; i<deviceCombo->count();i++ ) { - QString text = deviceCombo->text(i); + TQString text = deviceCombo->text(i); if( list.find(text) == list.end()) list.append(text); if( list.count() == 5) @@ -98,18 +98,18 @@ TracksImp::~TracksImp() { * Load the class settings. */ void TracksImp::loadSettings() { - QStringList list; + TQStringList list; // Add the saved list, no dups - QStringList prefsList = Prefs::device(); - QStringList::Iterator it; + TQStringList prefsList = Prefs::device(); + TQStringList::Iterator it; for ( it = prefsList.begin(); it != prefsList.end(); ++it ) { if( list.find( *it ) == list.end()) list.append(*it); } // Get current list, no dups for ( int i=0; i<deviceCombo->count();i++ ) { - QString text = deviceCombo->text(i); + TQString text = deviceCombo->text(i); if( list.find(text) == list.end()) list.append(text); } @@ -145,7 +145,7 @@ void TracksImp::newDisc(unsigned discId) cddbInfo.clear(); - cddbInfo.id = QString::number(discId, 16).rightJustify(8,'0'); + cddbInfo.id = TQString::number(discId, 16).rightJustify(8,'0'); cddbInfo.length = cd->discLength(); cddbInfo.artist = cd->discArtist(); @@ -179,15 +179,15 @@ bool TracksImp::hasCD(){ * The device text has changed. * @param file - the new text to check. */ -void TracksImp::changeDevice(const QString &file ) { - QString newDevice = KCompactDisc::urlToDevice(file); +void TracksImp::changeDevice(const TQString &file ) { + TQString newDevice = KCompactDisc::urlToDevice(file); if( newDevice == cd->device() ) { //qDebug("Device names match, returning"); return; } - QFileInfo fileInfo(newDevice); + TQFileInfo fileInfo(newDevice); if( !fileInfo.exists() || fileInfo.isDir()) { //qDebug("Device file !exist or isDir or !file"); return; @@ -195,7 +195,7 @@ void TracksImp::changeDevice(const QString &file ) { if (!cd->setDevice(newDevice, 50, false)) { - QString errstring = + TQString errstring = i18n("CDROM read or access error (or no audio disk in drive).\n"\ "Please make sure you have access permissions to:\n%1") .arg(file); @@ -242,24 +242,24 @@ void TracksImp::lookupCDDBDone(CDDB::Result result ) { // TODO Why doesn't libcddb not return MultipleRecordFound? //if( result == KCDDB::CDDB::MultipleRecordFound ) { if( Prefs::promptIfIncompleteInfo() && cddb->lookupResponse().count() > 1 ) { - QString searchedCDId = cddbInfo.id; + TQString searchedCDId = cddbInfo.id; CDInfoList cddb_info = cddb->lookupResponse(); CDInfoList::iterator it; - QStringList list; + TQStringList list; for ( it = cddb_info.begin(); it != cddb_info.end(); ++it ) { - list.append( QString("%1, %2, %3").arg((*it).artist).arg((*it).title) + list.append( TQString("%1, %2, %3").arg((*it).artist).arg((*it).title) .arg((*it).genre)); } bool ok(false); - QString res = KInputDialog::getItem( + TQString res = KInputDialog::getItem( i18n("Select CDDB entry"), i18n("Select a CDDB entry:"), list, 0, false, &ok, this ); if ( ok ) { // The user selected and item and pressed OK uint c = 0; - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { if( *it == res) break; c++; } @@ -308,7 +308,7 @@ void TracksImp::editInformation( ) CDInfoDialogBase *base = new CDInfoDialogBase(dialog, "Album info editor dialog"); // Workaround the fact that CDInfoDialogBase doesn't take // a const TrackOffsetList - QValueList<unsigned> discSig = cd->discSignature(); + TQValueList<unsigned> discSig = cd->discSignature(); base->setInfo(cddbInfo, discSig); dialog->setMainWidget(base); @@ -322,14 +322,14 @@ void TracksImp::editInformation( ) delete dialog; } -QString TracksImp::formatTime(unsigned ms) +TQString TracksImp::formatTime(unsigned ms) { - QTime time; + TQTime time; time = time.addMSecs((int)ms); // Use ".zzz" for milliseconds... - QString temp2; + TQString temp2; if (time.hour() > 0) temp2 = time.toString("hh:mm:ss"); else @@ -352,7 +352,7 @@ void TracksImp::ripWholeAlbum() { */ void TracksImp::startSession( int encoder ) { - QPtrList<TracksItem> selected = selectedTracks(); + TQPtrList<TracksItem> selected = selectedTracks(); if( selected.isEmpty() ) { @@ -365,7 +365,7 @@ void TracksImp::startSession( int encoder ) selected = selectedTracks(); } - QStringList list; + TQStringList list; if( cddbInfo.genre == "Unknown" ) list += "Genre"; if( cddbInfo.year == 0 ) @@ -425,7 +425,7 @@ void TracksImp::startSession( int encoder ) * Selects and unselects the tracks. * @param currentItem the track to swich the selection choice. */ -void TracksImp::selectTrack( QListViewItem *item ) +void TracksImp::selectTrack( TQListViewItem *item ) { if( !item ) return; @@ -435,9 +435,9 @@ void TracksImp::selectTrack( QListViewItem *item ) #undef item } -QPtrList<TracksItem> TracksImp::selectedTracks() +TQPtrList<TracksItem> TracksImp::selectedTracks() { - QPtrList<TracksItem> selected; + TQPtrList<TracksItem> selected; TracksItem *item = static_cast<TracksItem*>(trackListing->firstChild()); while( item ) @@ -480,7 +480,7 @@ void TracksImp::deselectAllTracks() */ void TracksImp::newAlbum() { - QString albumText = cddbInfo.title; + TQString albumText = cddbInfo.title; if( !cddbInfo.artist.isEmpty() ) albumText = cddbInfo.artist + i18n( " - " ) + albumText; @@ -506,8 +506,8 @@ void TracksImp::newAlbum() TracksItem *last = 0; for( unsigned i = 0; i < t.count(); i++ ) { - QString trackArtist; - QString title; + TQString trackArtist; + TQString title; if( isSampler ) { @@ -523,7 +523,7 @@ void TracksImp::newAlbum() } // There is a new track for this title. Add it to the list of tracks. - QString trackLength = formatTime(cd->trackLength(i+1)); + TQString trackLength = formatTime(cd->trackLength(i+1)); last = new TracksItem( trackListing, last, title, trackArtist, i+1, trackLength, t[i].extt ); } @@ -540,11 +540,11 @@ void TracksImp::newAlbum() /** * If the user presses the F2 key, trigger renaming of the title. - * @param event the QKeyEvent passed to this event handler. + * @param event the TQKeyEvent passed to this event handler. */ -void TracksImp::keyPressEvent(QKeyEvent *event) +void TracksImp::keyPressEvent(TQKeyEvent *event) { - QListViewItem *item = trackListing->selectedItem(); + TQListViewItem *item = trackListing->selectedItem(); if( !item ) return; if( event->key() == Qt::Key_F2 ) @@ -568,7 +568,7 @@ void TracksImp::eject() { * Eject a device * @param deviceToEject the device to eject. */ -void TracksImp::ejectDevice(const QString &deviceToEject) { +void TracksImp::ejectDevice(const TQString &deviceToEject) { changeDevice(deviceToEject); cd->eject(); diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h index 48e34f4f..89ea2e36 100644 --- a/kaudiocreator/tracksimp.h +++ b/kaudiocreator/tracksimp.h @@ -44,8 +44,8 @@ class KCompactDisc; class TracksItem : public KListViewItem { public: - TracksItem( KListView *parent, KListViewItem *after, QString t, QString a, int tr, QString l, QString c ) - : KListViewItem( parent, after, QString::null/*rip*/, QString::number(tr), l, t ) + TracksItem( KListView *parent, KListViewItem *after, TQString t, TQString a, int tr, TQString l, TQString c ) + : KListViewItem( parent, after, TQString::null/*rip*/, TQString::number(tr), l, t ) { m_title = t; m_artist = a; @@ -55,14 +55,14 @@ public: m_checked = false; } - QString title() const { return m_title; } - QString artist() const { return m_artist; } + TQString title() const { return m_title; } + TQString artist() const { return m_artist; } int track() const { return m_track; } - QString length() const { return m_length; } + TQString length() const { return m_length; } bool checked() const { return m_checked; } - QString comment() const { return m_comment; } + TQString comment() const { return m_comment; } #include <kdebug.h> - void setTitle( const QString &t ) { m_title = t; kdDebug() << "title: " << m_title << endl; } + void setTitle( const TQString &t ) { m_title = t; kdDebug() << "title: " << m_title << endl; } void setChecked( const bool &b ) { m_checked = b; b ? setPixmap( HEADER_RIP, SmallIcon( "apply", height()-2 ) ) : @@ -70,11 +70,11 @@ public: } private: - QString m_title; - QString m_artist; + TQString m_title; + TQString m_artist; int m_track; - QString m_length; - QString m_comment; + TQString m_length; + TQString m_comment; bool m_checked; // marked for ripping }; @@ -93,7 +93,7 @@ signals: void hasTracks(bool); public: - TracksImp( QWidget* parent = 0, const char* name = 0); + TracksImp( TQWidget* parent = 0, const char* name = 0); ~TracksImp(); bool hasCD(); @@ -105,26 +105,26 @@ public slots: void startSession( int encoder = -1 ); void editInformation(); void performCDDB(); - void ejectDevice(const QString &deviceToEject); + void ejectDevice(const TQString &deviceToEject); void eject(); void selectAllTracks(); void deselectAllTracks(); private slots: - void changeDevice(const QString &file); - void keyPressEvent(QKeyEvent *event); + void changeDevice(const TQString &file); + void keyPressEvent(TQKeyEvent *event); void lookupCDDBDone(CDDB::Result result); void newDisc(unsigned discId); - void selectTrack(QListViewItem *); + void selectTrack(TQListViewItem *); private: void lookupDevice(); void lookupCDDB(); void newAlbum(); void ripWholeAlbum(); - QPtrList<TracksItem> selectedTracks(); + TQPtrList<TracksItem> selectedTracks(); - QString formatTime(unsigned ms); + TQString formatTime(unsigned ms); KCDDB::Client *cddb; KCompactDisc *cd; diff --git a/kaudiocreator/wizard.ui.h b/kaudiocreator/wizard.ui.h index 539316fe..57a21a42 100644 --- a/kaudiocreator/wizard.ui.h +++ b/kaudiocreator/wizard.ui.h @@ -26,9 +26,9 @@ ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ -#include <qstring.h> -#include <qregexp.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqregexp.h> +#include <tqmap.h> #include <klocale.h> #include "job.h" @@ -87,10 +87,10 @@ void fileWizard::commentPressed() fileFormat->insert("%{albumcomment}"); } -void fileWizard::fileFormatTextChanged(const QString& text) +void fileWizard::fileFormatTextChanged(const TQString& text) { - QString string = text; - string.replace(QRegExp("~"), "/home/foo"); + TQString string = text; + string.replace(TQRegExp("~"), "/home/foo"); Job job; job.genre = "Rock"; job.group = "J Rocker"; @@ -102,7 +102,7 @@ void fileWizard::fileFormatTextChanged(const QString& text) job.track_title = "Time"; job.track_artist = "John Rocker"; job.track_comment = "This Song Rocks!"; - QMap<QString,QString> map; + TQMap<TQString,TQString> map; map.insert("extension", "mp3"); string = job.replaceSpecialChars(string, false, map); exampleLabel->setText(i18n("Example: %1").arg(string)); |