From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: 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 --- kioslave/audiocd/kcmaudiocd/audiocdconfig.ui | 132 +++++++++++++-------------- kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp | 16 ++-- kioslave/audiocd/kcmaudiocd/kcmaudiocd.h | 7 +- 3 files changed, 78 insertions(+), 77 deletions(-) (limited to 'kioslave/audiocd/kcmaudiocd') diff --git a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui index a742a4cc..271c6261 100644 --- a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui +++ b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui @@ -4,7 +4,7 @@ AudiocdConfig - + 0 0 @@ -12,9 +12,9 @@ 563 - + - + @@ -26,7 +26,7 @@ 0 - + tabWidget @@ -38,11 +38,11 @@ 0 - + - + - + tab @@ -63,14 +63,14 @@ Expanding - + 20 210 - + encoderPriority @@ -81,7 +81,7 @@ unnamed - + niceLevel @@ -101,7 +101,7 @@ NoMarks - + textLabel2 @@ -109,31 +109,31 @@ Highest - + textLabel3 Lowest - + AlignVCenter|AlignRight - + textLabel4 Normal - + AlignCenter - + cd_device_string @@ -147,7 +147,7 @@ Specify a location for the drive you want to use. Normally, this is a file inside the /dev folder representing your CD or DVD drive. - + cd_specify_device @@ -158,7 +158,7 @@ Check this to specify a CD device different from the one which is detected automatically - + ec_enable_check @@ -172,7 +172,7 @@ If you uncheck this option, the slave will not try to use error correction which can be useful for reading damaged CDs. However, this feature can be problematic in some cases, so you can switch it off here. - + ec_skip_check @@ -193,7 +193,7 @@ Fixed - + 20 20 @@ -202,7 +202,7 @@ - + tab @@ -213,7 +213,7 @@ unnamed - + fileNameGroupBox @@ -224,7 +224,7 @@ unnamed - + textLabel1_2 @@ -232,15 +232,15 @@ The following macros will be expanded: - + - layout7 + tqlayout7 unnamed - + textLabel13 @@ -248,7 +248,7 @@ Genre - + textLabel7 @@ -256,7 +256,7 @@ Track Number - + textLabel2_3 @@ -264,7 +264,7 @@ %{title} - + textLabel11 @@ -272,7 +272,7 @@ Year - + textLabel3_3 @@ -280,7 +280,7 @@ Track Title - + textLabel9 @@ -288,7 +288,7 @@ Album Artist - + textLabel10 @@ -296,7 +296,7 @@ %{year} - + textLabel6 @@ -304,7 +304,7 @@ %{albumtitle} - + textLabel5 @@ -312,7 +312,7 @@ Album Title - + textLabel12 @@ -320,7 +320,7 @@ %{genre} - + textLabel8 @@ -328,7 +328,7 @@ %{albumartist} - + textLabel4_2 @@ -345,7 +345,7 @@ - + groupBox2 @@ -356,7 +356,7 @@ unnamed - + textLabel2_2 @@ -364,7 +364,7 @@ Selection: - + textLabel1 @@ -372,11 +372,11 @@ Regular expression used on all file names. For example using selection " " and replace with "_" would replace all the spaces with underlines. - + WordBreak|AlignVCenter - + inputlabel @@ -384,7 +384,7 @@ Input: - + outputLabel @@ -392,7 +392,7 @@ Output: - + exampleLabel @@ -400,7 +400,7 @@ Example - + exampleOutput @@ -408,7 +408,7 @@ Cool artist - example audio file.wav - + example @@ -416,17 +416,17 @@ Cool artist - example audio file.wav - + kcfg_replaceInput - + kcfg_replaceOutput - + textLabel3_2 @@ -460,14 +460,14 @@ Expanding - + 21 16 - + fileNameGroupBox_2 @@ -478,7 +478,7 @@ unnamed - + fileNameLabel_2 @@ -486,15 +486,15 @@ The following macros will be expanded: - + - layout9 + tqlayout9 unnamed - + textLabel20 @@ -502,7 +502,7 @@ Year - + textLabel15 @@ -510,7 +510,7 @@ %{albumartist} - + textLabel16 @@ -518,7 +518,7 @@ %{year} - + textLabel21 @@ -526,7 +526,7 @@ Genre - + textLabel19 @@ -534,7 +534,7 @@ Album Artist - + textLabel18 @@ -542,7 +542,7 @@ Album Title - + textLabel17 @@ -550,7 +550,7 @@ %{genre} - + textLabel14 @@ -570,7 +570,7 @@ Expanding - + 20 31 @@ -618,10 +618,10 @@ kcmodule.h - + toggleLowpass() - - + + klineedit.h diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp index 87614806..166aa126 100644 --- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp +++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp @@ -34,8 +34,8 @@ #include "kcmaudiocd.moc" #include -KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name) - : AudiocdConfig(parent, name), configChanged(false) +KAudiocdModule::KAudiocdModule(TQWidget *tqparent, const char *name) + : AudiocdConfig(tqparent, name), configChanged(false) { TQString foo = i18n("Report errors found on the cd."); @@ -51,7 +51,7 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name) KConfigSkeleton *config = NULL; TQWidget *widget = encoder->getConfigureWidget(&config); if(widget && config){ - tabWidget->addTab(widget, i18n("%1 Encoder").arg(encoder->type())); + tabWidget->addTab(widget, i18n("%1 Encoder").tqarg(encoder->type())); KConfigDialogManager *configManager = new KConfigDialogManager(widget, config, TQString(encoder->type()+" EncoderConfigManager").latin1()); encoderSettings.append(configManager); } @@ -123,7 +123,7 @@ void KAudiocdModule::updateExample() TQString deqoutedReplaceInput=removeQoutes(kcfg_replaceInput->text()); TQString deqoutedReplaceOutput=removeQoutes(kcfg_replaceOutput->text()); - text.replace( TQRegExp(deqoutedReplaceInput), deqoutedReplaceOutput ); + text.tqreplace( TQRegExp(deqoutedReplaceInput), deqoutedReplaceOutput ); exampleOutput->setText(text); } @@ -165,7 +165,7 @@ void KAudiocdModule::save() { replaceOutput=TQString("\"")+replaceOutput+TQString("\""); } config->writeEntry("regexp_search", replaceInput); - config->writeEntry("regexp_replace", replaceOutput); + config->writeEntry("regexp_tqreplace", replaceOutput); } KConfigDialogManager *widget; @@ -204,7 +204,7 @@ void KAudiocdModule::load(bool useDefaults) { fileNameLineEdit->setText(config->readEntry("file_name_template", "%{albumartist} - %{number} - %{title}")); albumNameLineEdit->setText(config->readEntry("album_name_template", "%{albumartist} - %{albumtitle}")); kcfg_replaceInput->setText(config->readEntry("regexp_search")); - kcfg_replaceOutput->setText(config->readEntry("regexp_replace")); + kcfg_replaceOutput->setText(config->readEntry("regexp_tqreplace")); example->setText(config->readEntry("example", i18n("Cool artist - example audio file.wav"))); } @@ -259,9 +259,9 @@ TQString KAudiocdModule::quickHelp() const extern "C" { - KCModule *create_audiocd(TQWidget *parent, const char */*name*/) + KCModule *create_audiocd(TQWidget *tqparent, const char */*name*/) { - return new KAudiocdModule(parent, "kcmaudiocd"); + return new KAudiocdModule(tqparent, "kcmaudiocd"); } } diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h index 4d51134d..b69a6784 100644 --- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h +++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h @@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the Qt - library, treating Qt like a library that normally accompanies the + Permission is also granted to link this program with the TQt + library, treating TQt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ @@ -32,10 +32,11 @@ class KConfigDialogManager; class KAudiocdModule : public AudiocdConfig { Q_OBJECT + TQ_OBJECT public: - KAudiocdModule(TQWidget *parent=0, const char *name=0); + KAudiocdModule(TQWidget *tqparent=0, const char *name=0); ~KAudiocdModule(); TQString quickHelp() const; -- cgit v1.2.1