diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 06:00:15 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 06:00:15 +0000 |
| commit | b1057f437bf65300831a0ccb45b920787c6b318d (patch) | |
| tree | f8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /kaudiocreator | |
| parent | 4ddfca384ced9ad654213aef9dc2c3973720b980 (diff) | |
| download | tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip | |
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kaudiocreator')
30 files changed, 373 insertions, 365 deletions
diff --git a/kaudiocreator/cdconfig.ui b/kaudiocreator/cdconfig.ui index 3c688699..d437181f 100644 --- a/kaudiocreator/cdconfig.ui +++ b/kaudiocreator/cdconfig.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>CdConfig</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CdConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_performCDDBauto</cstring> </property> @@ -27,7 +27,7 @@ <string>&Perform CDDB lookup automatically</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_autoRip</cstring> </property> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -54,8 +54,8 @@ </spacer> </vbox> </widget> -<slots> +<Q_SLOTS> <slot access="protected" specifier="non virtual">configureAudioCD()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/encodefile.ui b/kaudiocreator/encodefile.ui index 21163f87..b6395f6d 100644 --- a/kaudiocreator/encodefile.ui +++ b/kaudiocreator/encodefile.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>EncodeFile</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -48,7 +48,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -59,7 +59,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>track</cstring> </property> @@ -67,70 +67,70 @@ <number>1</number> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> <property name="text"> <string>Track:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> <property name="text"> <string>Comment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>track_comment</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>Title:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string>Artist:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="2" colspan="1"> + <widget class="TQLineEdit" row="1" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>track_title</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>track_artist</cstring> </property> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -141,43 +141,43 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>artist</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> <property name="text"> <string>Artist:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> <property name="text"> <string>Album:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>album</cstring> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>year</cstring> </property> @@ -185,49 +185,49 @@ <number>99999</number> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> <property name="text"> <string>Year:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel9</cstring> </property> <property name="text"> <string>Genre:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QComboBox" row="4" column="1"> + <widget class="TQComboBox" row="4" column="1"> <property name="name"> <cstring>genre</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> <property name="text"> <string>Comment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>comment</cstring> </property> @@ -244,7 +244,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -265,9 +265,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -283,14 +283,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>encodeButton</cstring> </property> @@ -301,7 +301,7 @@ <string>&Encode File</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>closeButton</cstring> </property> @@ -335,7 +335,7 @@ <tabstop>encodeButton</tabstop> <tabstop>closeButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdialog.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/kaudiocreator/encodefileimp.cpp b/kaudiocreator/encodefileimp.cpp index 59f32405..d4aae9a3 100644 --- a/kaudiocreator/encodefileimp.cpp +++ b/kaudiocreator/encodefileimp.cpp @@ -27,8 +27,8 @@ #include <tqcombobox.h> #include <kmessagebox.h> -EncodeFileImp::EncodeFileImp(TQWidget* parent, - const char* name) : EncodeFile(parent, name), m_genres(KCDDB::Genres()) { +EncodeFileImp::EncodeFileImp(TQWidget* tqparent, + const char* name) : EncodeFile(tqparent, name), m_genres(KCDDB::Genres()) { genre->insertStringList(m_genres.i18nList()); // Specify to only accept wav files file->setFilter("*.wav|Wav Files"); @@ -70,7 +70,7 @@ void EncodeFileImp::encode(){ int counter(1); KMessageBox::information(this, i18n("%1 Job(s) have been started. You can watch their progress in the " \ - "jobs section.").arg(counter), + "jobs section.").tqarg(counter), i18n("Jobs have started"), i18n("Jobs have started")); } diff --git a/kaudiocreator/encodefileimp.h b/kaudiocreator/encodefileimp.h index e0e6eaa7..de556417 100644 --- a/kaudiocreator/encodefileimp.h +++ b/kaudiocreator/encodefileimp.h @@ -33,13 +33,14 @@ class Job; class EncodeFileImp : public EncodeFile { Q_OBJECT + TQ_OBJECT signals: // Start encoding this wav file void startJob(Job *newJob); public: - EncodeFileImp(TQWidget* parent = 0, const char* name = 0); + EncodeFileImp(TQWidget* tqparent = 0, const char* name = 0); protected slots: // Encode button diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp index ced2fcac..a0567fbf 100644 --- a/kaudiocreator/encoder.cpp +++ b/kaudiocreator/encoder.cpp @@ -37,7 +37,7 @@ /** * Constructor, load settings. */ -Encoder::Encoder( TQObject* parent, const char* name):TQObject(parent,name),reportCount(0) { +Encoder::Encoder( TQObject* tqparent, const char* name):TQObject(tqparent,name),reportCount(0) { loadSettings(); } @@ -53,11 +53,11 @@ void Encoder::loadSettings() { EncoderPrefs* Encoder::loadEncoder( int encoder ){ EncoderPrefs* prefs; - TQString currentEncoderGroup = TQString("Encoder_%1").arg(encoder); + TQString currentEncoderGroup = TQString("Encoder_%1").tqarg(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(TQString::null); + prefs->setCommandLine(TQString()); } return prefs; @@ -132,8 +132,8 @@ void Encoder::removeJob(int id ) { * @param job the job to encode. */ void Encoder::encodeWav(Job *job ) { - emit(addJob(job, i18n("Encoding (%1): %2 - %3").arg(loadEncoder(job->encoder)->extension()) - .arg(job->track_artist).arg(job->track_title))); + emit(addJob(job, i18n("Encoding (%1): %2 - %3").tqarg(loadEncoder(job->encoder)->extension()) + .tqarg(job->track_artist).tqarg(job->track_title))); pendingJobs.append(job); tendToNewJobs(); } @@ -160,7 +160,7 @@ void Encoder::tendToNewJobs() { EncoderPrefs* prefs = loadEncoder(job->encoder); TQString desiredFile = Prefs::fileFormat(); - desiredFile.replace( TQRegExp("~"), TQDir::homeDirPath() ); + desiredFile.tqreplace( TQRegExp("~"), TQDir::homeDirPath() ); { TQMap <TQString,TQString> map; map.insert("extension", prefs->extension()); @@ -185,7 +185,7 @@ void Encoder::tendToNewJobs() { } } - int lastSlash = desiredFile.findRev('/',-1); + int lastSlash = desiredFile.tqfindRev('/',-1); if ( lastSlash == -1 || !(KStandardDirs::makeDir( desiredFile.mid(0,lastSlash), 0775)) ) { KMessageBox::sorry(0, i18n("Cannot place file, unable to make directories."), i18n("Encoding Failed")); @@ -211,7 +211,7 @@ void Encoder::tendToNewJobs() { KShellProcess *proc = new KShellProcess(); proc->setPriority(Prefs::niceLevel()); - *proc << TQFile::encodeName(command); + *proc << TQFile::encodeName(command).data(); connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )), this, TQT_SLOT(receivedThreadOutput(KProcess *, char *, int ))); connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int )), @@ -225,7 +225,7 @@ void Encoder::tendToNewJobs() { } /** - * We have received some output from a thread. See if it contains %. + * We have received some output from a thread. See if it tqcontains %. * @param proc the process that has new output. * @param buffer the output from the process * @param buflen the length of the buffer. @@ -235,7 +235,7 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length ) kdDebug(60002) << buffer << endl; // Make sure we have a job to send an update too. - if(jobs.find((KShellProcess*)process) == jobs.end()){ + if(jobs.tqfind((KShellProcess*)process) == jobs.end()){ kdDebug(60002) << "Encoder::receivedThreadOutput Job doesn't exists. Line: " << __LINE__ << endl; return; } @@ -247,17 +247,17 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length ) // Make sure the output string has a % symble in it. TQString output = TQString(buffer).mid(0,length); - if ( output.find('%') == -1 && reportCount < 5 ) { + if ( output.tqfind('%') == -1 && reportCount < 5 ) { kdDebug(60002) << "No \'%%\' in output. Report as bug w/encoder options if progressbar doesn't fill." << endl; reportCount++; return; } - //qDebug(TQString("Pre cropped: %1").arg(output).latin1()); - output = output.mid(output.find('%')-loadEncoder(job->encoder)->percentLength(),2); - //qDebug(TQString("Post cropped: %1").arg(output).latin1()); + //qDebug(TQString("Pre cropped: %1").tqarg(output).latin1()); + output = output.mid(output.tqfind('%')-loadEncoder(job->encoder)->percentLength(),2); + //qDebug(TQString("Post cropped: %1").tqarg(output).latin1()); bool conversionSuccessfull = false; int percent = output.toInt(&conversionSuccessfull); - //qDebug(TQString("number: %1").arg(percent).latin1()); + //qDebug(TQString("number: %1").tqarg(percent).latin1()); if ( percent >= 0 && percent < 100 && conversionSuccessfull ) { emit(updateProgress(job->id, percent)); } @@ -284,7 +284,7 @@ void Encoder::jobDone(KProcess *process ) { bool showDebugBox = false; if ( process->exitStatus() == 127 ) { - 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")); + KMessageBox::sorry(0, i18n("The selected encoder was not found.\nThe wav file has been removed. Command was: %1").tqarg(job->errorString), i18n("Encoding Failed")); emit(updateProgress(job->id, -1)); } else if ( TQFile::exists(job->newLocation) ) { diff --git a/kaudiocreator/encoder.h b/kaudiocreator/encoder.h index 24ebcafc..1209c71d 100644 --- a/kaudiocreator/encoder.h +++ b/kaudiocreator/encoder.h @@ -33,6 +33,7 @@ class EncoderPrefs; class Encoder : public TQObject { Q_OBJECT + TQ_OBJECT signals: void addJob(Job *job, const TQString &name); @@ -40,7 +41,7 @@ signals: void jobsChanged(); public: - Encoder( TQObject* parent = 0, const char* name = 0); + Encoder( TQObject* tqparent = 0, const char* name = 0); ~Encoder(); int activeJobCount(); int pendingJobCount(); diff --git a/kaudiocreator/encoderconfig.ui b/kaudiocreator/encoderconfig.ui index edab93fb..1c7d70f6 100644 --- a/kaudiocreator/encoderconfig.ui +++ b/kaudiocreator/encoderconfig.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EncoderConfig</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EncoderConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,12 +19,12 @@ <property name="margin"> <number>0</number> </property> - <widget class="QListBox" row="0" column="0" rowspan="3" colspan="1"> + <widget class="TQListBox" row="0" column="0" rowspan="3" colspan="1"> <property name="name"> <cstring>kcfg_currentEncoder</cstring> </property> </widget> - <widget class="QPushButton" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>addEncoder</cstring> </property> @@ -32,7 +32,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>removeEncoder</cstring> </property> @@ -40,7 +40,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>configureEncoder</cstring> </property> @@ -62,7 +62,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QGroupBox" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -79,7 +79,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -87,12 +87,12 @@ <string>Location:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>kcfg_fileFormat</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>encoderWizardButton</cstring> </property> @@ -102,7 +102,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -113,7 +113,7 @@ <cstring>kcfg_numberOfCpus</cstring> </property> </widget> - <widget class="QSpinBox" row="6" column="1"> + <widget class="TQSpinBox" row="6" column="1"> <property name="name"> <cstring>kcfg_numberOfCpus</cstring> </property> @@ -131,22 +131,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>currentEncoderText</cstring> </property> @@ -154,7 +154,7 @@ <string>Current encoder:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>currentEncoderName</cstring> </property> @@ -188,14 +188,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> </size> </property> </spacer> - <widget class="QGroupBox" row="9" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="9" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -206,7 +206,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_NiceLevel</cstring> </property> @@ -226,7 +226,7 @@ <enum>NoMarks</enum> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -234,25 +234,25 @@ <string>Highest</string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>Lowest</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel4</cstring> </property> <property name="text"> <string>Normal</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -286,8 +286,8 @@ <includes> <include location="local" impldecl="in implementation">encoderconfig.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>encoderWizard()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/encoderconfig.ui.h b/kaudiocreator/encoderconfig.ui.h index e24f9535..7650b239 100644 --- a/kaudiocreator/encoderconfig.ui.h +++ b/kaudiocreator/encoderconfig.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp index e49dd6a9..4455781c 100644 --- a/kaudiocreator/encoderconfigimp.cpp +++ b/kaudiocreator/encoderconfigimp.cpp @@ -32,8 +32,8 @@ /** * Constructor. */ -EncoderConfigImp::EncoderConfigImp( TQWidget* parent, const char* name) : - EncoderConfig (parent, name) { +EncoderConfigImp::EncoderConfigImp( TQWidget* tqparent, const char* name) : + EncoderConfig (tqparent, name) { 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())); @@ -93,7 +93,7 @@ void EncoderConfigImp::loadEncoderList(){ int lastKnownEncoder = Prefs::lastKnownEncoder(); lastKnownEncoder++; for( int i=0; i<=lastKnownEncoder; i++ ){ - TQString currentGroup = TQString("Encoder_%1").arg(i); + TQString currentGroup = TQString("Encoder_%1").tqarg(i); if(EncoderPrefs::hasPrefs(currentGroup)){ lastEncoder = i; EncoderPrefs *encPrefs = EncoderPrefs::prefs(currentGroup); @@ -123,7 +123,7 @@ void EncoderConfigImp::addEncoderSlot(){ uint number = 0; TQString groupName; while(!foundEmptyGroup){ - groupName = TQString("Encoder_%1").arg(number); + groupName = TQString("Encoder_%1").tqarg(number); if(!EncoderPrefs::hasPrefs(groupName)) foundEmptyGroup = true; else @@ -242,7 +242,7 @@ void EncoderConfigImp::updateEncoder(const char *dialogName){ if(newName == encoderName) return; - TQListBoxItem *item = kcfg_currentEncoder->findItem(encoderName); + TQListBoxItem *item = kcfg_currentEncoder->tqfindItem(encoderName); if(!item) return; kcfg_currentEncoder->changeItem(newName, kcfg_currentEncoder->index(item)); @@ -260,7 +260,7 @@ EncoderPrefs *EncoderPrefs::prefs(const TQString &groupName) m_prefs = new TQDict<EncoderPrefs>(); m_prefs->setAutoDelete(true); } - EncoderPrefs *encPrefs = m_prefs->find(groupName); + EncoderPrefs *encPrefs = m_prefs->tqfind(groupName); if (encPrefs) return encPrefs; diff --git a/kaudiocreator/encoderconfigimp.h b/kaudiocreator/encoderconfigimp.h index a72e138f..86fbf5a4 100644 --- a/kaudiocreator/encoderconfigimp.h +++ b/kaudiocreator/encoderconfigimp.h @@ -32,12 +32,13 @@ class EncoderConfigImp : public EncoderConfig { Q_OBJECT + TQ_OBJECT signals: void encoderUpdated(); public: - EncoderConfigImp( TQWidget* parent = 0, const char* name = 0); + EncoderConfigImp( TQWidget* tqparent = 0, const char* name = 0); private slots: void addEncoderSlot(); diff --git a/kaudiocreator/encoderedit.ui b/kaudiocreator/encoderedit.ui index 6a0fa7f0..e45c977a 100644 --- a/kaudiocreator/encoderedit.ui +++ b/kaudiocreator/encoderedit.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EncoderEdit</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EncoderEdit</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>kcfg_commandLine</cstring> </property> @@ -24,11 +24,11 @@ <string>app.exe %f %o</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>kcfg_encoderName</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>320</width> <height>0</height> @@ -38,7 +38,7 @@ <string>Unknown Encoder</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>kcfg_extension</cstring> </property> @@ -46,7 +46,7 @@ <string>wav</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -54,7 +54,7 @@ <string>Extension:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -62,7 +62,7 @@ <string>Command line:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -94,5 +94,5 @@ <tabstop>kcfg_commandLine</tabstop> <tabstop>kcfg_extension</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/encoderoutput.ui b/kaudiocreator/encoderoutput.ui index 1cc26be4..85da4902 100644 --- a/kaudiocreator/encoderoutput.ui +++ b/kaudiocreator/encoderoutput.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EncoderOutput</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>EncoderOutput</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>output</cstring> </property> @@ -39,7 +39,7 @@ <enum>WidgetWidth</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -63,14 +63,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -99,5 +99,5 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/general.ui b/kaudiocreator/general.ui index f20fea5b..2fa79a2a 100644 --- a/kaudiocreator/general.ui +++ b/kaudiocreator/general.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>General</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>General</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_removeCompletedJobs</cstring> </property> @@ -30,7 +30,7 @@ <string>&Automatically remove jobs when finished</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_promptIfIncompleteInfo</cstring> </property> @@ -38,7 +38,7 @@ <string>Prompt if information is not complete</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -49,7 +49,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -57,7 +57,7 @@ <string>Selection:</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -65,11 +65,11 @@ <string>Regular expression used on all file names. For example using selection " " and replace with "_" would replace all the spaces with underlines. </string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>inputlabel</cstring> </property> @@ -77,7 +77,7 @@ <string>Input:</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>outputLabel</cstring> </property> @@ -85,7 +85,7 @@ <string>Output:</string> </property> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>exampleLabel</cstring> </property> @@ -93,7 +93,7 @@ <string>Example</string> </property> </widget> - <widget class="QLabel" row="6" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="6" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>exampleOutput</cstring> </property> @@ -101,7 +101,7 @@ <string>Cool artist - example audio file.wav</string> </property> </widget> - <widget class="QLineEdit" row="5" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="5" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>example</cstring> </property> @@ -109,17 +109,17 @@ <string>Cool artist - example audio file.wav</string> </property> </widget> - <widget class="QLineEdit" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_replaceInput</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="2"> + <widget class="TQLineEdit" row="2" column="2"> <property name="name"> <cstring>kcfg_replaceOutput</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -143,7 +143,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>kcfg_seperateMultiArtist</cstring> </property> @@ -160,7 +160,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -171,7 +171,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>kcfg_format_titleArtist</cstring> </property> @@ -179,7 +179,7 @@ <string>Title - Artist</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>kcfg_format_artistTitle</cstring> </property> @@ -192,15 +192,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>delimiterLabel</cstring> </property> @@ -208,7 +208,7 @@ <string>Delimiter:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>genArtistLabel</cstring> </property> @@ -216,12 +216,12 @@ <string>Generic artist:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>kcfg_delimiter</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>kcfg_genericArtist</cstring> </property> @@ -240,7 +240,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -278,8 +278,8 @@ <includes> <include location="local" impldecl="in implementation">general.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected" specifier="non virtual">updateExample()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/general.ui.h b/kaudiocreator/general.ui.h index 244219ab..98c00de3 100644 --- a/kaudiocreator/general.ui.h +++ b/kaudiocreator/general.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -14,6 +14,6 @@ void General::updateExample() { TQString text = example->text(); - text.replace( TQRegExp(kcfg_replaceInput->text()), kcfg_replaceOutput->text() ); + text.tqreplace( TQRegExp(kcfg_replaceInput->text()), kcfg_replaceOutput->text() ); exampleOutput->setText(text); } diff --git a/kaudiocreator/infodialog.ui b/kaudiocreator/infodialog.ui index a488e3dc..39109dfd 100644 --- a/kaudiocreator/infodialog.ui +++ b/kaudiocreator/infodialog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>AlbumEditor</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AlbumEditor</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -28,7 +28,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -39,59 +39,59 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="2" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string>Comment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>track_comment</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>trackLabel</cstring> </property> <property name="text"> <string>Title:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="2" colspan="1"> + <widget class="TQLineEdit" row="1" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>track_title</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>Artist:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>track_artist</cstring> </property> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -102,43 +102,43 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>artist</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> <property name="text"> <string>Artist:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> <property name="text"> <string>Album:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>album</cstring> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>year</cstring> </property> @@ -146,49 +146,49 @@ <number>99999</number> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel7</cstring> </property> <property name="text"> <string>Year:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> <property name="text"> <string>Genre:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QComboBox" row="4" column="1"> + <widget class="TQComboBox" row="4" column="1"> <property name="name"> <cstring>genre</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string>Comment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>comment</cstring> </property> @@ -205,22 +205,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>100</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonPrevious</cstring> </property> @@ -228,7 +228,7 @@ <string>&Previous Track</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonNext</cstring> </property> @@ -236,7 +236,7 @@ <string>&Next Track</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -250,7 +250,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -293,5 +293,5 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/job.cpp b/kaudiocreator/job.cpp index 740aeb5e..c4950377 100644 --- a/kaudiocreator/job.cpp +++ b/kaudiocreator/job.cpp @@ -21,7 +21,7 @@ #include <tqregexp.h> /** - * A helper function to replace %X with the stuff in the album. + * A helper function to tqreplace %X with the stuff in the album. * if quote is true then put "" around the %X */ TQString Job::replaceSpecialChars(const TQString &string, bool quote, TQMap<TQString, TQString> _map){ @@ -45,14 +45,14 @@ TQString Job::replaceSpecialChars(const TQString &string, bool quote, TQMap<TQSt } 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 ); + track_title.tqreplace( TQRegExp(in), out ); + track_artist.tqreplace( TQRegExp(in), out ); + track_comment.tqreplace( TQRegExp(in), out ); // year // track - genre.replace( TQRegExp(in), out ); - album.replace( TQRegExp(in), out ); - comment.replace( TQRegExp(in), out ); - group.replace( TQRegExp(in), out ); + genre.tqreplace( TQRegExp(in), out ); + album.tqreplace( TQRegExp(in), out ); + comment.tqreplace( TQRegExp(in), out ); + group.tqreplace( TQRegExp(in), out ); } diff --git a/kaudiocreator/jobque.ui b/kaudiocreator/jobque.ui index 137ed6df..935ef959 100644 --- a/kaudiocreator/jobque.ui +++ b/kaudiocreator/jobque.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>JobQue</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>JobQue</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>removeAll</cstring> </property> @@ -27,7 +27,7 @@ <string>Remove All Jobs</string> </property> </widget> - <widget class="QPushButton" row="2" column="3"> + <widget class="TQPushButton" row="2" column="3"> <property name="name"> <cstring>removeSelected</cstring> </property> @@ -45,14 +45,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QListView" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQListView" row="1" column="0" rowspan="1" colspan="4"> <column> <property name="text"> <string>Job</string> @@ -99,20 +99,20 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>queLabel</cstring> </property> <property name="text"> <string>No jobs are in the queue</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>removeDoneJobs</cstring> </property> @@ -128,5 +128,5 @@ <tabstop>removeAll</tabstop> <tabstop>removeSelected</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/jobqueimp.cpp b/kaudiocreator/jobqueimp.cpp index 81c0431d..fc580a29 100644 --- a/kaudiocreator/jobqueimp.cpp +++ b/kaudiocreator/jobqueimp.cpp @@ -46,11 +46,11 @@ /** * Constructor, set up signals. - * @param parent - parent widget + * @param tqparent - tqparent widget * @param name - widget name */ -JobQueImp::JobQueImp( TQWidget* parent, const char* name) : - JobQue(parent,name),highestNumber(DEFAULT_HIGHEST_NUMBER), currentId(0){ +JobQueImp::JobQueImp( TQWidget* tqparent, const char* name) : + JobQue(tqparent,name),highestNumber(DEFAULT_HIGHEST_NUMBER), currentId(0){ 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())); @@ -64,7 +64,7 @@ JobQueImp::JobQueImp( TQWidget* parent, const char* name) : */ TQString JobQueImp::getStringFromNumber(int number){ if(number > highestNumber){ - int diff = TQString("%1").arg(number).length() - TQString("%1").arg(highestNumber).length(); + int diff = TQString("%1").tqarg(number).length() - TQString("%1").tqarg(highestNumber).length(); highestNumber = number; if(diff > 0){ // We have to update all of the cells. @@ -77,7 +77,7 @@ TQString JobQueImp::getStringFromNumber(int number){ } TQString buffer = ""; - uint newLength = TQString("%1").arg(highestNumber).length() - TQString("%1").arg(number).length(); + uint newLength = TQString("%1").tqarg(highestNumber).length() - TQString("%1").tqarg(number).length(); for(uint i=0; i < newLength; i++) buffer += "0"; return buffer; @@ -92,9 +92,9 @@ void JobQueImp::addJob(Job*job, const TQString &name ){ if(!job) return; job->id = ++currentId; - QueListViewItem *currentItem = new QueListViewItem(todoQue, TQString("%1%2").arg(getStringFromNumber(currentId)).arg(currentId), "0", name); + QueListViewItem *currentItem = new QueListViewItem(todoQue, TQString("%1%2").tqarg(getStringFromNumber(currentId)).tqarg(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())); + queLabel->setText(i18n("Number of jobs in the queue: %1").tqarg(todoQue->childCount())); } /** @@ -106,7 +106,7 @@ void JobQueImp::updateProgress(int id, int progress){ int currentJobCount = numberOfJobsNotFinished(); QueListViewItem * currentItem = (QueListViewItem*)todoQue->firstChild(); TQString buffer = getStringFromNumber(id); - buffer += TQString("%1").arg(id); + buffer += TQString("%1").tqarg(id); // Find the current item while( currentItem != NULL ){ @@ -124,7 +124,7 @@ void JobQueImp::updateProgress(int id, int progress){ return; currentItem->percentDone = progress; - currentItem->repaint(); + currentItem->tqrepaint(); // Update the icon if needed if(progress > 0 && progress < 100 && !currentItem->progressing ){ @@ -158,7 +158,7 @@ bool JobQueImp::removeJob(QueListViewItem *item, bool kill, bool prompt){ if(!item) return false; - if(item->percentDone < 100 && item->percentDone > -1 && (prompt && KMessageBox::questionYesNo(this, i18n("KAudioCreator has not finished %1. Remove anyway?").arg(item->text(HEADER_DESCRIPTION)), i18n("Unfinished Job in Queue"), KStdGuiItem::del(), i18n("Keep")) + if(item->percentDone < 100 && item->percentDone > -1 && (prompt && KMessageBox::questionYesNo(this, i18n("KAudioCreator has not finished %1. Remove anyway?").tqarg(item->text(HEADER_DESCRIPTION)), i18n("Unfinished Job in Queue"), KStdGuiItem::del(), i18n("Keep")) == KMessageBox::No )) return false; @@ -180,7 +180,7 @@ bool JobQueImp::removeJob(QueListViewItem *item, bool kill, bool prompt){ currentId = 0; } else - queLabel->setText(i18n("Number of jobs in the queue: %1").arg(todoQue->childCount())); + queLabel->setText(i18n("Number of jobs in the queue: %1").tqarg(todoQue->childCount())); return true; } @@ -248,7 +248,7 @@ void JobQueImp::clearDoneJobs(){ currentId = 0; } else - queLabel->setText(i18n("Number of jobs in the queue: %1").arg(todoQue->childCount())); + queLabel->setText(i18n("Number of jobs in the queue: %1").tqarg(todoQue->childCount())); } /** @@ -270,7 +270,7 @@ int JobQueImp::numberOfJobsNotFinished(){ } /** - * The repaint function overloaded so that we can have a built in progressbar. + * The tqrepaint function overloaded so that we can have a built in progressbar. */ void QueListViewItem::paintCell (TQPainter * p,const TQColorGroup &cg,int column, int width,int align){ @@ -303,7 +303,7 @@ void QueListViewItem::paintCell (TQPainter * p,const TQColorGroup &cg,int column /** * Header for built in treelist item so we can have a progress bar in them. */ -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) { +QueListViewItem::QueListViewItem(TQListView *tqparent, const TQString id, const TQString p , const TQString name, const TQString d, const TQString e) : TQListViewItem(tqparent, id, p, name,d,e), percentDone(0), progressing(false) { } #include "jobqueimp.moc" diff --git a/kaudiocreator/jobqueimp.h b/kaudiocreator/jobqueimp.h index 133a020a..32735a3a 100644 --- a/kaudiocreator/jobqueimp.h +++ b/kaudiocreator/jobqueimp.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef JOBQUEIMP_H -#define JOBQUEIMP_H +#ifndef JOBTQUEIMP_H +#define JOBTQUEIMP_H #include "jobque.h" #include <tqstring.h> @@ -49,12 +49,13 @@ public: class JobQueImp : public JobQue { Q_OBJECT + TQ_OBJECT signals: void removeJob( int idNumber ); public: - JobQueImp( TQWidget* parent = 0, const char* name = 0 ); + JobQueImp( TQWidget* tqparent = 0, const char* name = 0 ); int numberOfJobsNotFinished(); public slots: diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp index 6ac77beb..946b57dc 100644 --- a/kaudiocreator/kaudiocreator.cpp +++ b/kaudiocreator/kaudiocreator.cpp @@ -49,32 +49,32 @@ /** * Constructor. Connect all of the object and the job control. */ -KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) : - KMainWindow(parent, name) +KAudioCreator::KAudioCreator( TQWidget* tqparent, const char* name) : + KMainWindow(tqparent, name) { janusWidget = new KJanusWidget(this, name, KJanusWidget::Tabbed); setCentralWidget(janusWidget); - TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString::null, SmallIcon("cdaudio_unmount", 32)); + TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString(), SmallIcon("cdaudio_unmount", 32)); tracks = new TracksImp(frame, "Tracks"); - ripper = new Ripper ( frame, "Rip" ); - encoder = new Encoder( frame, "Encoder" ); + ripper = new Ripper ( TQT_TQOBJECT(frame), "Rip" ); + encoder = new Encoder( TQT_TQOBJECT(frame), "Encoder" ); - frame = janusWidget->addVBoxPage( i18n("&Jobs"), TQString::null, SmallIcon( "run", 32 ) ); + frame = janusWidget->addVBoxPage( i18n("&Jobs"), TQString(), SmallIcon( "run", 32 ) ); jobQue = new JobQueImp( frame, "Que" ); resize(500, 440); - /*KAction *eject = */new KAction( i18n("&Eject CD"), 0, tracks, + /*KAction *eject = */new KAction( i18n("&Eject CD"), 0, TQT_TQOBJECT(tracks), TQT_SLOT( eject() ), actionCollection(), "eject" ); - (void)new KAction( i18n("&Configure KAudioCreator..."), 0, this, + (void)new KAction( i18n("&Configure KAudioCreator..."), 0, TQT_TQOBJECT(this), TQT_SLOT( showSettings() ), actionCollection(), "configure_kaudiocreator" ); - KAction *selectAll = new KAction( i18n( "Select &All Tracks"), 0, tracks, + KAction *selectAll = new KAction( i18n( "Select &All Tracks"), 0, TQT_TQOBJECT(tracks), TQT_SLOT( selectAllTracks() ), actionCollection(), "select_all" ) ; - KAction *deselectAll = new KAction( i18n( "Deselect &All Tracks"), 0, tracks, + KAction *deselectAll = new KAction( i18n( "Deselect &All Tracks"), 0, TQT_TQOBJECT(tracks), TQT_SLOT( deselectAllTracks() ), actionCollection(), "deselect_all" ); selectAll->setEnabled( false ); deselectAll->setEnabled( false ); @@ -82,56 +82,56 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) : KActionMenu *actActionMenu = new KActionMenu( i18n("Rip &Selection"), "rip", actionCollection(), "rip" ); actActionMenu->setDelayed(true); //needed for checking "all accounts" actActionMenu->setEnabled( false ); - connect( actActionMenu, TQT_SIGNAL( activated() ), tracks, TQT_SLOT( startSession() ) ); + connect( actActionMenu, TQT_SIGNAL( activated() ), TQT_TQOBJECT(tracks), TQT_SLOT( startSession() ) ); ripMenu = actActionMenu->popupMenu(); - connect( ripMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotRipSelection(int)) ); - connect( ripMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( getRipMenu()) ); + connect( ripMenu, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( slotRipSelection(int)) ); + connect( ripMenu, TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( getRipMenu()) ); - KAction *rip = new KAction( i18n( "Rip &Selection" ), 0, tracks, + KAction *rip = new KAction( i18n( "Rip &Selection" ), 0, TQT_TQOBJECT(tracks), TQT_SLOT( startSession() ), actionCollection(), "rip_selected" ); rip->setEnabled( false ); - 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( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(this), TQT_SLOT( updatetqStatus() ) ); + connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(ripper), TQT_SLOT( removeJob(int) ) ); + connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(encoder), TQT_SLOT( removeJob(int)) ); - 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( ripper, TQT_SIGNAL( updateProgress(int, int) ), TQT_TQOBJECT(jobQue), TQT_SLOT( updateProgress(int,int) ) ); + connect( ripper, TQT_SIGNAL( addJob(Job*, const TQString &) ), TQT_TQOBJECT(jobQue), TQT_SLOT( addJob(Job*, const TQString &)) ); + connect( ripper, TQT_SIGNAL( eject(const TQString &) ) , TQT_TQOBJECT(tracks), TQT_SLOT( ejectDevice(const TQString &)) ); + connect( ripper, TQT_SIGNAL( encodeWav(Job *) ) , TQT_TQOBJECT(encoder), TQT_SLOT( encodeWav(Job *)) ); + connect( ripper, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_SLOT( updatetqStatus() ) ); - 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( encoder, TQT_SIGNAL( updateProgress(int, int) ) , TQT_TQOBJECT(jobQue), TQT_SLOT( updateProgress(int,int)) ); + connect( encoder, TQT_SIGNAL( addJob(Job*, const TQString&)), TQT_TQOBJECT(jobQue), TQT_SLOT( addJob(Job*, const TQString &)) ); + connect( encoder, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_SLOT( updatetqStatus() ) ); - 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( hasCD(bool) ) , TQT_TQOBJECT(this), TQT_SLOT( hasCD(bool) ) ); + connect( tracks, TQT_SIGNAL( ripTrack(Job *) ), TQT_TQOBJECT(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, + (void)new KAction(i18n("Remove &Completed Jobs"), 0, TQT_TQOBJECT(jobQue), TQT_SLOT(clearDoneJobs()), actionCollection(), "clear_done_jobs" ); - KAction *edit = new KAction(i18n("&Edit Album..."), 0, tracks, + KAction *edit = new KAction(i18n("&Edit Album..."), 0, TQT_TQOBJECT(tracks), 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, + (void)new KAction(i18n("Encode &File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(encodeFile()), actionCollection(), "encode_file"); - KAction *cddb = new KAction(i18n("&CDDB Lookup"), 0, tracks, + KAction *cddb = new KAction(i18n("&CDDB Lookup"), 0, TQT_TQOBJECT(tracks), TQT_SLOT(performCDDB()), actionCollection(), "cddb_now"); connect(tracks, TQT_SIGNAL(hasCD(bool)), cddb, TQT_SLOT(setEnabled(bool))); cddb->setEnabled( false ); - KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()), + KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()), actionCollection()); - KStdAction::quit( this, TQT_SLOT(close()), actionCollection(), "quit" ); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit" ); // Init statusbar statusBar()->insertItem(i18n("No Audio CD detected"), 0 ); @@ -153,10 +153,10 @@ void KAudioCreator::getRipMenu(){ ripMenu->clear(); int i=0; - TQString currentGroup = TQString("Encoder_%1").arg(i); + TQString currentGroup = TQString("Encoder_%1").tqarg(i); while(EncoderPrefs::hasPrefs(currentGroup)){ ripMenu->insertItem(EncoderPrefs::prefs(currentGroup)->encoderName(), i); - currentGroup = TQString("Encoder_%1").arg(++i); + currentGroup = TQString("Encoder_%1").tqarg(++i); } } @@ -170,28 +170,28 @@ void KAudioCreator::hasCD(bool cd){ statusBar()->changeItem(i18n("No Audio CD detected"), 0 ); } -void KAudioCreator::updateStatus() { +void KAudioCreator::updatetqStatus() { TQString status = i18n("Idle."); - TQString rippingStatus; - TQString encodingStatus; + TQString rippingtqStatus; + TQString encodingtqStatus; int activeRippingJobs = ripper->activeJobCount(); int pendingRippingJobs = ripper->pendingJobCount(); int activeEncodingJobs = encoder->activeJobCount(); int pendingEncodingJobs = encoder->pendingJobCount(); if ( activeRippingJobs ) { - rippingStatus = i18n("Ripping (%1 active, %2 queued)").arg( activeRippingJobs ).arg( pendingRippingJobs ); - status = rippingStatus; + rippingtqStatus = i18n("Ripping (%1 active, %2 queued)").tqarg( activeRippingJobs ).tqarg( pendingRippingJobs ); + status = rippingtqStatus; } if ( activeEncodingJobs ) { - encodingStatus = i18n("Encoding (%1 active, %2 queued)").arg( activeEncodingJobs ).arg( pendingEncodingJobs ); + encodingtqStatus = i18n("Encoding (%1 active, %2 queued)").tqarg( activeEncodingJobs ).tqarg( pendingEncodingJobs ); if ( activeRippingJobs ) { status.append(" : "); - status.append( encodingStatus ); + status.append( encodingtqStatus ); } else { - status = encodingStatus; + status = encodingtqStatus; } } @@ -229,14 +229,14 @@ void KAudioCreator::showSettings(){ SettingsDialog *dialog = new SettingsDialog(this, "settings", Prefs::self()); 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())); + connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(encoder), TQT_SLOT(loadSettings())); + connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(tracks), TQT_SLOT(loadSettings())); + connect(dialog->encoderConfigImp, TQT_SIGNAL(encoderUpdated()), TQT_TQOBJECT(encoder), TQT_SLOT(loadSettings())); dialog->show(); } -SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config) - : KConfigDialog(parent, name, config), +SettingsDialog::SettingsDialog(TQWidget *tqparent, const char *name,KConfigSkeleton *config) + : KConfigDialog(tqparent, name, config), cddb(0), cddbChanged(false) { addPage(new General(0, "General"), i18n("General"), "package_settings", @@ -253,7 +253,7 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleto { cddb->load(); addPage(cddb, i18n("CDDB"), "cdaudio_mount", i18n("CDDB Configuration"), false); - connect(cddb, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(slotCddbChanged(bool))); + connect(cddb, TQT_SIGNAL(changed(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotCddbChanged(bool))); } } RipConfig *rip = new RipConfig(0, "Ripper"); diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h index d2e0c57d..29951b74 100644 --- a/kaudiocreator/kaudiocreator.h +++ b/kaudiocreator/kaudiocreator.h @@ -36,9 +36,10 @@ class KPopupMenu; class KAudioCreator : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - KAudioCreator( TQWidget* parent = 0, const char* name = 0); + KAudioCreator( TQWidget* tqparent = 0, const char* name = 0); void setDevice( const TQString &device ); protected: @@ -46,7 +47,7 @@ protected: private slots: void showSettings(); - void updateStatus(); + void updatetqStatus(); void hasCD(bool); void configureNotifications(); @@ -67,9 +68,10 @@ private: class SettingsDialog: public KConfigDialog { Q_OBJECT + TQ_OBJECT public: - SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config); + SettingsDialog(TQWidget *tqparent, const char *name,KConfigSkeleton *config); protected slots: void updateSettings(); diff --git a/kaudiocreator/kaudiocreator.kcfg b/kaudiocreator/kaudiocreator.kcfg index 9e8addd0..03e5fa12 100644 --- a/kaudiocreator/kaudiocreator.kcfg +++ b/kaudiocreator/kaudiocreator.kcfg @@ -31,7 +31,7 @@ <entry name="replaceInput" type="String" key="selection"> <label>Regexp to match file names with</label> </entry> - <entry name="replaceOutput" type="String" key="replace"> + <entry name="replaceOutput" type="String" key="tqreplace"> <label>String used to replace the parts that match the selection regexp</label> </entry> <entry name="seperateMultiArtist" type="Bool"> diff --git a/kaudiocreator/ripconfig.ui b/kaudiocreator/ripconfig.ui index 4ce85f1b..eb88ab8e 100644 --- a/kaudiocreator/ripconfig.ui +++ b/kaudiocreator/ripconfig.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>RipConfig</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>RipConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_beepAfterRip</cstring> </property> @@ -27,7 +27,7 @@ <string>&Beep after each rip is done</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -41,7 +41,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel14</cstring> </property> @@ -52,7 +52,7 @@ <cstring>kcfg_maxWavFiles</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_maxWavFiles</cstring> </property> @@ -65,7 +65,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_autoEjectAfterRip</cstring> </property> @@ -73,7 +73,7 @@ <string>&Auto-eject CD after last track is ripped</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -87,7 +87,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel15</cstring> </property> @@ -101,7 +101,7 @@ <cstring>kcfg_autoEjectDelay</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_autoEjectDelay</cstring> </property> @@ -117,7 +117,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>kcfg_enableTempDir</cstring> </property> @@ -151,7 +151,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>280</height> @@ -182,7 +182,7 @@ <tabstop>kcfg_autoEjectAfterRip</tabstop> <tabstop>kcfg_autoEjectDelay</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp index cb9c012b..7a308a9f 100644 --- a/kaudiocreator/ripper.cpp +++ b/kaudiocreator/ripper.cpp @@ -32,7 +32,7 @@ /** * Constructor, load settings. */ -Ripper::Ripper( TQObject* parent, const char* name) : TQObject(parent,name) { +Ripper::Ripper( TQObject* tqparent, const char* name) : TQObject(tqparent,name) { loadSettings(); } @@ -120,7 +120,7 @@ void Ripper::removeJob(int id){ pendingJobs.remove(job); delete job; } - //qDebug(TQString("Done removing Job:%1").arg(id).latin1()); + //qDebug(TQString("Done removing Job:%1").tqarg(id).latin1()); tendToNewJobs(); } @@ -132,7 +132,7 @@ void Ripper::removeJob(int id){ void Ripper::ripTrack(Job *job){ if(!job) return; - emit(addJob(job, i18n("Ripping: %1 - %2").arg(job->track_artist).arg(job->track_title))); + emit(addJob(job, i18n("Ripping: %1 - %2").tqarg(job->track_artist).tqarg(job->track_title))); pendingJobs.append(job); tendToNewJobs(); } @@ -172,12 +172,12 @@ void Ripper::tendToNewJobs(){ TQString wavFile; TQString args = job->device; if(!args.isEmpty()) - args = TQString("?device=%1").arg(args); + args = TQString("?device=%1").tqarg(args); args = args+"&fileNameTemplate=Track %{number}"; if(job->track < 10) - wavFile = TQString("audiocd:/Wav/Track 0%1.wav%2").arg(job->track).arg(args); + wavFile = TQString("audiocd:/Wav/Track 0%1.wav%2").tqarg(job->track).tqarg(args); else - wavFile = TQString("audiocd:/Wav/Track %1.wav%2").arg(job->track).arg(args); + wavFile = TQString("audiocd:/Wav/Track %1.wav%2").tqarg(job->track).tqarg(args); KURL source(wavFile); KURL dest(tmp.name()); @@ -201,7 +201,7 @@ void Ripper::copyJobResult(KIO::Job *copyjob){ KIO::FileCopyJob *copyJob = dynamic_cast<KIO::FileCopyJob*> (copyjob); KNotifyClient::event("track ripped"); - if(jobs.find(copyjob) == jobs.end()) + if(jobs.tqfind(copyjob) == jobs.end()) return; Job *newJob = jobs[copyjob]; jobs.remove(copyjob); diff --git a/kaudiocreator/ripper.h b/kaudiocreator/ripper.h index 1b92493e..9dfed908 100644 --- a/kaudiocreator/ripper.h +++ b/kaudiocreator/ripper.h @@ -31,6 +31,7 @@ class Job; class Ripper : public TQObject { Q_OBJECT + TQ_OBJECT signals: void addJob( Job *job, const TQString &name ); @@ -40,7 +41,7 @@ signals: void jobsChanged(); public: - Ripper( TQObject* parent = 0, const char* name = 0 ); + Ripper( TQObject* tqparent = 0, const char* name = 0 ); ~Ripper(); int activeJobCount(); int pendingJobCount(); diff --git a/kaudiocreator/tracks.ui b/kaudiocreator/tracks.ui index a225f041..05a3b3ab 100644 --- a/kaudiocreator/tracks.ui +++ b/kaudiocreator/tracks.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>Tracks</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Tracks</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>albumName</cstring> </property> @@ -35,7 +35,7 @@ <property name="text"> <string>Unknown Artist - Unknown Album</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -96,7 +96,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -120,14 +120,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>selectAllTracksButton</cstring> </property> @@ -135,7 +135,7 @@ <string>Select &All Tracks</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>deselectAllTracksButton</cstring> </property> @@ -145,15 +145,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>246</width> <height>20</height> @@ -217,7 +217,7 @@ <tabstop>selectAllTracksButton</tabstop> <tabstop>deselectAllTracksButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp index 9a864e9d..02668821 100644 --- a/kaudiocreator/tracksimp.cpp +++ b/kaudiocreator/tracksimp.cpp @@ -49,8 +49,8 @@ /** * Constructor, connect up slots and signals. */ -TracksImp::TracksImp( TQWidget* parent, const char* name) : - Tracks(parent,name), +TracksImp::TracksImp( TQWidget* tqparent, const char* name) : + Tracks(tqparent,name), cddbInfo() { cd = new KCompactDisc; @@ -84,7 +84,7 @@ TracksImp::~TracksImp() { list.append(deviceCombo->currentText()); for ( int i=0; i<deviceCombo->count();i++ ) { TQString text = deviceCombo->text(i); - if( list.find(text) == list.end()) + if( list.tqfind(text) == list.end()) list.append(text); if( list.count() == 5) break; @@ -104,13 +104,13 @@ void TracksImp::loadSettings() { TQStringList prefsList = Prefs::device(); TQStringList::Iterator it; for ( it = prefsList.begin(); it != prefsList.end(); ++it ) { - if( list.find( *it ) == list.end()) + if( list.tqfind( *it ) == list.end()) list.append(*it); } // Get current list, no dups for ( int i=0; i<deviceCombo->count();i++ ) { TQString text = deviceCombo->text(i); - if( list.find(text) == list.end()) + if( list.tqfind(text) == list.end()) list.append(text); } @@ -198,7 +198,7 @@ void TracksImp::changeDevice(const TQString &file ) { 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); + .tqarg(file); KMessageBox::error(this, errstring, i18n("Error")); } } @@ -247,8 +247,8 @@ void TracksImp::lookupCDDBDone(CDDB::Result result ) { CDInfoList::iterator it; TQStringList list; for ( it = cddb_info.begin(); it != cddb_info.end(); ++it ) { - list.append( TQString("%1, %2, %3").arg((*it).artist).arg((*it).title) - .arg((*it).genre)); + list.append( TQString("%1, %2, %3").tqarg((*it).artist).tqarg((*it).title) + .tqarg((*it).genre)); } bool ok(false); @@ -277,7 +277,7 @@ void TracksImp::lookupCDDBDone(CDDB::Result result ) { } // Some sanity provisions to ensure that the number of records matches what - // the CD actually contains. + // the CD actually tqcontains. while (info.trackInfoList.count() < cddbInfo.trackInfoList.count()) { info.trackInfoList.append(KCDDB::TrackInfo()); @@ -378,7 +378,7 @@ void TracksImp::startSession( int encoder ) if( Prefs::promptIfIncompleteInfo() && list.count() > 0 ) { int r = KMessageBox::questionYesNo( this, - i18n( "Part of the album is not set: %1.\n (To change album information click the \"Edit Information\" button.)\n Would you like to rip the selected tracks anyway?").arg(list.join(", ")), i18n("Album Information Incomplete"), i18n("Rip"), KStdGuiItem::cancel() ); + i18n( "Part of the album is not set: %1.\n (To change album information click the \"Edit Information\" button.)\n Would you like to rip the selected tracks anyway?").tqarg(list.join(", ")), i18n("Album Information Incomplete"), i18n("Rip"), KStdGuiItem::cancel() ); if( r == KMessageBox::No ) return; @@ -417,7 +417,7 @@ void TracksImp::startSession( int encoder ) KMessageBox::information(this, i18n("%1 Job(s) have been started. You can watch their progress in the " - "jobs section.").arg( selected.count() ), + "jobs section.").tqarg( selected.count() ), i18n("Jobs have started"), i18n("Jobs have started")); } @@ -496,7 +496,7 @@ void TracksImp::newAlbum() bool isSampler = true; for( unsigned i = 0; i < t.count(); i++ ) { - if (t[i].title.find(" / ") == -1) + if (t[i].title.tqfind(" / ") == -1) { isSampler = false; break; @@ -512,7 +512,7 @@ void TracksImp::newAlbum() if( isSampler ) { // Support for multiple artists stripping. - int delimiter = t[i].title.find(" / "); + int delimiter = t[i].title.tqfind(" / "); Q_ASSERT( delimiter != -1 ); trackArtist = t[i].title.left(delimiter); title = t[i].title.mid(delimiter + 3); @@ -547,7 +547,7 @@ void TracksImp::keyPressEvent(TQKeyEvent *event) TQListViewItem *item = trackListing->selectedItem(); if( !item ) return; - if( event->key() == Qt::Key_F2 ) + if( event->key() == TQt::Key_F2 ) { item->setRenameEnabled( HEADER_TRACK_NAME, true ); item->startRename( HEADER_TRACK_NAME ); diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h index 89ea2e36..bc109f55 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, TQString t, TQString a, int tr, TQString l, TQString c ) - : KListViewItem( parent, after, TQString::null/*rip*/, TQString::number(tr), l, t ) + TracksItem( KListView *tqparent, KListViewItem *after, TQString t, TQString a, int tr, TQString l, TQString c ) + : KListViewItem( tqparent, after, TQString()/*rip*/, TQString::number(tr), l, t ) { m_title = t; m_artist = a; @@ -86,6 +86,7 @@ private: class TracksImp : public Tracks { Q_OBJECT + TQ_OBJECT signals: void ripTrack(Job *job); @@ -93,7 +94,7 @@ signals: void hasTracks(bool); public: - TracksImp( TQWidget* parent = 0, const char* name = 0); + TracksImp( TQWidget* tqparent = 0, const char* name = 0); ~TracksImp(); bool hasCD(); diff --git a/kaudiocreator/wizard.ui b/kaudiocreator/wizard.ui index 7658557b..14090be4 100644 --- a/kaudiocreator/wizard.ui +++ b/kaudiocreator/wizard.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>fileWizard</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>fileWizard</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -33,7 +33,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel8</cstring> </property> @@ -51,7 +51,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> </widget> @@ -65,14 +65,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -86,7 +86,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel9</cstring> </property> @@ -97,7 +97,7 @@ <cstring>playlistFormat</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>fileFormat</cstring> </property> @@ -107,7 +107,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>exampleLabel</cstring> </property> @@ -115,15 +115,15 @@ <string>Example: ~/mp3/Staind/Lost Love/Staind - Lost Love.m3u</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>artistButton</cstring> </property> @@ -131,7 +131,7 @@ <string>&Artist</string> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>homeDirButton</cstring> </property> @@ -139,7 +139,7 @@ <string>&Home Folder</string> </property> </widget> - <widget class="QPushButton" row="1" column="3"> + <widget class="TQPushButton" row="1" column="3"> <property name="name"> <cstring>trackNumberButton</cstring> </property> @@ -147,7 +147,7 @@ <string>&Track Number</string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>extensionButton</cstring> </property> @@ -155,7 +155,7 @@ <string>&Extension</string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>trackTitleButton</cstring> </property> @@ -163,7 +163,7 @@ <string>Track T&itle</string> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>trackCommentButton</cstring> </property> @@ -171,7 +171,7 @@ <string>T&rack Comment</string> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>genreButton</cstring> </property> @@ -179,7 +179,7 @@ <string>&Genre</string> </property> </widget> - <widget class="QPushButton" row="0" column="3"> + <widget class="TQPushButton" row="0" column="3"> <property name="name"> <cstring>yearButton</cstring> </property> @@ -187,7 +187,7 @@ <string>&Year</string> </property> </widget> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>albumButton</cstring> </property> @@ -195,7 +195,7 @@ <string>Al&bum</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>trackArtistButton</cstring> </property> @@ -203,7 +203,7 @@ <string>Trac&k Artist</string> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>commentButton</cstring> </property> @@ -227,7 +227,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -251,14 +251,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -272,7 +272,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -350,9 +350,9 @@ </connection> <connection> <sender>fileFormat</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TTQString&)</signal> <receiver>fileWizard</receiver> - <slot>fileFormatTextChanged(const QString&)</slot> + <slot>fileFormatTextChanged(const TQString&)</slot> </connection> <connection> <sender>trackArtistButton</sender> @@ -392,7 +392,7 @@ <includes> <include location="local" impldecl="in implementation">wizard.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">homePressed()</slot> <slot>extensionPressed()</slot> <slot access="private">trackTitlePressed()</slot> @@ -404,7 +404,7 @@ <slot>albumPressed()</slot> <slot>artistPressed()</slot> <slot>commentPressed()</slot> - <slot>fileFormatTextChanged( const QString & text )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> + <slot>fileFormatTextChanged( const TQString & text )</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/wizard.ui.h b/kaudiocreator/wizard.ui.h index 57a21a42..294d36dc 100644 --- a/kaudiocreator/wizard.ui.h +++ b/kaudiocreator/wizard.ui.h @@ -21,7 +21,7 @@ /**************************************************************************** ** ui.h extension file, included from the uic-generated form implementation. ** -** If you wish to add, delete or rename slots use Qt Designer which will +** If you wish to add, delete or rename slots use TQt Designer which will ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ @@ -90,7 +90,7 @@ void fileWizard::commentPressed() void fileWizard::fileFormatTextChanged(const TQString& text) { TQString string = text; - string.replace(TQRegExp("~"), "/home/foo"); + string.tqreplace(TQRegExp("~"), "/home/foo"); Job job; job.genre = "Rock"; job.group = "J Rocker"; @@ -105,6 +105,6 @@ void fileWizard::fileFormatTextChanged(const TQString& text) TQMap<TQString,TQString> map; map.insert("extension", "mp3"); string = job.replaceSpecialChars(string, false, map); - exampleLabel->setText(i18n("Example: %1").arg(string)); + exampleLabel->setText(i18n("Example: %1").tqarg(string)); } |