diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-01 23:15:51 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-01 23:15:51 +0000 |
commit | 6b1b516f42036cf9eff691dba3fd6e9eab82a7e1 (patch) | |
tree | 6830f75fd57d0fac7e33c097ee98b210e90c5239 /src/soundkonverter.cpp | |
parent | 6318b8bb3ef964cfa99ba454a2630779cc9ac3ec (diff) | |
download | soundkonverter-6b1b516f42036cf9eff691dba3fd6e9eab82a7e1.tar.gz soundkonverter-6b1b516f42036cf9eff691dba3fd6e9eab82a7e1.zip |
TQt4 port soundkonverter
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/soundkonverter@1239038 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/soundkonverter.cpp')
-rwxr-xr-x | src/soundkonverter.cpp | 238 |
1 files changed, 119 insertions, 119 deletions
diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp index 692f898..2a6ff0f 100755 --- a/src/soundkonverter.cpp +++ b/src/soundkonverter.cpp @@ -36,11 +36,11 @@ #include <kprocess.h> #include <ksystemtray.h> -#include <qlayout.h> -#include <qprogressbar.h> -#include <qfont.h> -#include <qhbox.h> -#include <qeventloop.h> +#include <tqlayout.h> +#include <tqprogressbar.h> +#include <tqfont.h> +#include <tqhbox.h> +#include <tqeventloop.h> // TODO stop all processes on exit / clean tmp up @@ -79,7 +79,7 @@ soundKonverter::soundKonverter() // KMessageBox::information( this, "You are using a pre-release of soundKonverter. This version is designed for testing only.\nThere are a few things not implemented at the moment but it should run without crashes and big problems. So feel free to report such an error if you find one.\nPlease have a look at the README.\n\nYour old configuration file has been moved to soundkonverterrc.back." ); } // if( config->data.app.configVersion < 290 ) { -// QFile plugin_dir( locateLocal("data","soundkonverter/plugins") ); +// TQFile plugin_dir( locateLocal("data","soundkonverter/plugins") ); // if( plugin_dir.exists() ) { // KIO::rename( locateLocal("data","soundkonverter/plugins"), locateLocal("data","soundkonverter/plugins.back"), true ); // int ret = KMessageBox::questionYesNo( this, i18n("soundKonverter has cleaned up it's old installation. It seems to be necessary to restart soundKonverter!\n\nDo you want to restart soundKonverter now?") ); @@ -106,24 +106,24 @@ soundKonverter::soundKonverter() // create an icon loader object for loading icons KIconLoader *iconLoader = new KIconLoader(); - QWidget* widget = new QWidget( this, "widget" ); + TQWidget* widget = new TQWidget( this, "widget" ); setCentralWidget( widget ); // NOTE created here because of some dependences options = new Options( config, i18n("Choose your prefered output options and click on \"Add files ...\"!"), widget, "options" ); fileList = new FileList( cdManager, tagEngine, config, options, logger, widget, "fileList" ); - startAction = new KAction( i18n("&Start conversion"), "run", 0, fileList, SLOT(startConversion()), actionCollection(), "start" ); + startAction = new KAction( i18n("&Start conversion"), "run", 0, TQT_TQOBJECT(fileList), TQT_SLOT(startConversion()), actionCollection(), "start" ); startAction->setEnabled( false ); - new KAction( i18n("&Replay Gain Tool ..."), "soundkonverter_replaygain", CTRL+Key_R, this, SLOT(showReplayGainScanner()), actionCollection(), "replaygainscanner" ); - //new KAction( i18n("R&epair Tool ..."), "soundkonverter_repair", CTRL+Key_E, this, SLOT(showRepairTool()), actionCollection(), "repairtool" ); - new KAction( i18n("C&uesheet Editor ..."), "kwrite", CTRL+Key_U, this, SLOT(showCuesheetEditor()), actionCollection(), "cuesheeteditor" ); - new KAction( i18n("Show &Log ..."), "view_text", CTRL+Key_L, this, SLOT(showLogViewer()), actionCollection(), "log" ); -// new KAction( i18n("About &Plugins ..."), "connect_creating", CTRL+Key_P, this, SLOT(showAboutPlugins()), actionCollection(), "about_plugins" ); - - stopAction = new KAction( i18n("S&top after current file is complete"), "stop", CTRL+Key_O, fileList, SLOT(stopConversion()), actionCollection(), "stop" ); - continueAction = new KAction( i18n("&Continue after current file is complete"), "run", CTRL+Key_T, fileList, SLOT(continueConversion()), actionCollection(), "continue" ); - killAction = new KAction( i18n("Stop &immediately"), "exit", CTRL+Key_K, fileList, SLOT(killConversion()), actionCollection(), "kill" ); + new KAction( i18n("&Replay Gain Tool ..."), "soundkonverter_replaygain", CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(showReplayGainScanner()), actionCollection(), "replaygainscanner" ); + //new KAction( i18n("R&epair Tool ..."), "soundkonverter_repair", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(showRepairTool()), actionCollection(), "repairtool" ); + new KAction( i18n("C&uesheet Editor ..."), "kwrite", CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(showCuesheetEditor()), actionCollection(), "cuesheeteditor" ); + new KAction( i18n("Show &Log ..."), "view_text", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(showLogViewer()), actionCollection(), "log" ); +// new KAction( i18n("About &Plugins ..."), "connect_creating", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SLOT(showAboutPlugins()), actionCollection(), "about_plugins" ); + + stopAction = new KAction( i18n("S&top after current file is complete"), "stop", CTRL+Key_O, TQT_TQOBJECT(fileList), TQT_SLOT(stopConversion()), actionCollection(), "stop" ); + continueAction = new KAction( i18n("&Continue after current file is complete"), "run", CTRL+Key_T, TQT_TQOBJECT(fileList), TQT_SLOT(continueConversion()), actionCollection(), "continue" ); + killAction = new KAction( i18n("Stop &immediately"), "exit", CTRL+Key_K, TQT_TQOBJECT(fileList), TQT_SLOT(killConversion()), actionCollection(), "kill" ); stopActionMenu = new KActionMenu( i18n("Stop"), "stop", actionCollection(), "stopMenu" ); stopActionMenu->setDelayed( false ); stopActionMenu->setEnabled( false ); @@ -131,16 +131,16 @@ soundKonverter::soundKonverter() // stopActionMenu->insert( continueAction ); // stopActionMenu->insert( killAction ); -/* veryHighPriorityAction = new KToggleAction( i18n("Very hi&gh"), CTRL+Key_1, this, SLOT(priorityChanged()), actionCollection(), "veryhigh" ); +/* veryHighPriorityAction = new KToggleAction( i18n("Very hi&gh"), CTRL+Key_1, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "veryhigh" ); veryHighPriorityAction->setExclusiveGroup("priorityActionMenu"); - highPriorityAction = new KToggleAction( i18n("&High"), CTRL+Key_2, this, SLOT(priorityChanged()), actionCollection(), "high" ); + highPriorityAction = new KToggleAction( i18n("&High"), CTRL+Key_2, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "high" ); highPriorityAction->setExclusiveGroup("priorityActionMenu"); - normalPriorityAction = new KToggleAction( i18n("&Normal"), CTRL+Key_3, this, SLOT(priorityChanged()), actionCollection(), "nomal" ); + normalPriorityAction = new KToggleAction( i18n("&Normal"), CTRL+Key_3, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "nomal" ); normalPriorityAction->setExclusiveGroup("priorityActionMenu"); normalPriorityAction->setChecked(true); - lowPriorityAction = new KToggleAction( i18n("&Low"), CTRL+Key_4, this, SLOT(priorityChanged()), actionCollection(), "low" ); + lowPriorityAction = new KToggleAction( i18n("&Low"), CTRL+Key_4, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "low" ); lowPriorityAction->setExclusiveGroup("priorityActionMenu"); - veryLowPriorityAction = new KToggleAction( i18n("Very lo&w"), CTRL+Key_5, this, SLOT(priorityChanged()), actionCollection(), "verylow" ); + veryLowPriorityAction = new KToggleAction( i18n("Very lo&w"), CTRL+Key_5, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "verylow" ); veryLowPriorityAction->setExclusiveGroup("priorityActionMenu"); priorityActionMenu = new KActionMenu( i18n("En-/Decoder priority"), "ksysguard", actionCollection(), "priorityMenu" ); priorityActionMenu->setDelayed( false ); @@ -151,22 +151,22 @@ soundKonverter::soundKonverter() priorityActionMenu->insert(veryLowPriorityAction);*/ //priorityChanged(); - new KAction( i18n("A&dd Files ..."), "sound", CTRL+Key_D, this, SLOT(showFileDialog()), actionCollection(), "add_files" ); - new KAction( i18n("Add &Folder ..."), "folder", CTRL+Key_F, this, SLOT(showDirDialog()), actionCollection(), "add_folder" ); - new KAction( i18n("Add CD &tracks ..."), "cdaudio_unmount", CTRL+Key_T, this, SLOT(showCdDialog()), actionCollection(), "add_audiocd" ); - new KAction( i18n("Add &URL ..."), "browser", CTRL+Key_U, this, SLOT(showUrlDialog()), actionCollection(), "add_url" ); - KStdAction::quit(this, SLOT(close()), actionCollection()); + new KAction( i18n("A&dd Files ..."), "sound", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(showFileDialog()), actionCollection(), "add_files" ); + new KAction( i18n("Add &Folder ..."), "folder", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(showDirDialog()), actionCollection(), "add_folder" ); + new KAction( i18n("Add CD &tracks ..."), "cdaudio_unmount", CTRL+Key_T, TQT_TQOBJECT(this), TQT_SLOT(showCdDialog()), actionCollection(), "add_audiocd" ); + new KAction( i18n("Add &URL ..."), "browser", CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(showUrlDialog()), actionCollection(), "add_url" ); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - new KAction( i18n("L&oad file list"), "fileopen", 0, fileList, SLOT(load()), actionCollection(), "load" ); - new KAction( i18n("Sa&ve file list"), "filesave", 0, fileList, SLOT(save()), actionCollection(), "save" ); + new KAction( i18n("L&oad file list"), "fileopen", 0, TQT_TQOBJECT(fileList), TQT_SLOT(load()), actionCollection(), "load" ); + new KAction( i18n("Sa&ve file list"), "filesave", 0, TQT_TQOBJECT(fileList), TQT_SLOT(save()), actionCollection(), "save" ); - // TODO //KStdAction::paste( this, SLOT(pasteFiles()), actionCollection() ); + // TODO //KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(pasteFiles()), actionCollection() ); - KStdAction::preferences( this, SLOT(showConfigDialog()), actionCollection() ); + KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(showConfigDialog()), actionCollection() ); - showToolBarAction = KStdAction::showToolbar( this, SLOT(showToolbar()), actionCollection() ); + showToolBarAction = KStdAction::showToolbar( TQT_TQOBJECT(this), TQT_SLOT(showToolbar()), actionCollection() ); //KStdAction::showStatusbar( 0, 0, actionCollection() ); - KStdAction::configureToolbars( this, SLOT(editToolbar()), actionCollection() ); + KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(editToolbar()), actionCollection() ); createGUI(); @@ -180,16 +180,16 @@ soundKonverter::soundKonverter() } // the grid for all widgets in the main window - QGridLayout* gridLayout = new QGridLayout( widget, 1, 1, 6, 6, "gridLayout" ); + TQGridLayout* gridLayout = new TQGridLayout( widget, 1, 1, 6, 6, "gridLayout" ); // generate the options input area // NOTE created above because of some dependences //options = new Options( config, i18n("Choose your prefered output options and click on \"Add files ...\"!"), this, "options" ); - connect( options, SIGNAL(showConfigPluginsPage()), - this, SLOT(showConfigPluginsPage()) + connect( options, TQT_SIGNAL(showConfigPluginsPage()), + TQT_TQOBJECT(this), TQT_SLOT(showConfigPluginsPage()) ); - connect( options, SIGNAL(showConfigEnvironmentPage()), - this, SLOT(showConfigEnvironmentPage()) + connect( options, TQT_SIGNAL(showConfigEnvironmentPage()), + TQT_TQOBJECT(this), TQT_SLOT(showConfigEnvironmentPage()) ); gridLayout->addWidget( options, 0, 0 ); @@ -198,38 +198,38 @@ soundKonverter::soundKonverter() //fileList = new FileList( cdManager, tagEngine, config, options, this, "fileList" ); gridLayout->addWidget( fileList, 1, 0 ); gridLayout->setRowStretch( 1, 1 ); - /*connect( this, SIGNAL(windowMoved(int,int)), - fileList, SLOT(moveOptionsEditor(int,int)) + /*connect( TQT_TQOBJECT(this), TQT_SIGNAL(windowMoved(int,int)), + TQT_TQOBJECT(fileList), TQT_SLOT(moveOptionsEditor(int,int)) );*/ - connect( fileList, SIGNAL(fileCountChanged(int)), - this, SLOT(fileCountChanged(int)) + connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(fileCountChanged(int)), + TQT_TQOBJECT(this), TQT_SLOT(fileCountChanged(int)) ); - connect( fileList, SIGNAL(startedConversion()), - this, SLOT(startedConversion()) + connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(startedConversion()), + TQT_TQOBJECT(this), TQT_SLOT(startedConversion()) ); - connect( fileList, SIGNAL(stopClicked()), - this, SLOT(stopClicked()) + connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(stopClicked()), + TQT_TQOBJECT(this), TQT_SLOT(stopClicked()) ); - connect( fileList, SIGNAL(continueClicked()), - this, SLOT(continueClicked()) + connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(continueClicked()), + TQT_TQOBJECT(this), TQT_SLOT(continueClicked()) ); - connect( fileList, SIGNAL(stoppedConversion()), - this, SLOT(stoppedConversion()) + connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(stoppedConversion()), + TQT_TQOBJECT(this), TQT_SLOT(stoppedConversion()) ); convert = new Convert( config, tagEngine, cdManager, fileList, logger ); -// connect( this, SIGNAL(setPriority(int)), -// convert, SLOT(priorityChanged(int)) +// connect( TQT_TQOBJECT(this), TQT_SIGNAL(setPriority(int)), +// convert, TQT_SLOT(priorityChanged(int)) // ); - // add a horizontal box layout for the add combobutton to the grid - QHBoxLayout *addBox = new QHBoxLayout( -1, "addBox" ); + // add a horizontal box tqlayout for the add combobutton to the grid + TQHBoxLayout *addBox = new TQHBoxLayout( -1, "addBox" ); gridLayout->addLayout( addBox, 2, 0 ); // create the combobutton for adding files to the file list cAdd = new ComboButton( widget, "cAdd" ); - QFont font = cAdd->font(); - //font.setWeight( QFont::DemiBold ); + TQFont font = cAdd->font(); + //font.setWeight( TQFont::DemiBold ); font.setPointSize( font.pointSize() + 1 ); cAdd->setFont( font ); cAdd->insertItem( iconLoader->loadIcon("sound",KIcon::Toolbar), i18n("Add files ...") ); @@ -237,8 +237,8 @@ soundKonverter::soundKonverter() cAdd->insertItem( iconLoader->loadIcon("cdaudio_unmount",KIcon::Toolbar), i18n("Add CD tracks ...") ); cAdd->insertItem( iconLoader->loadIcon("browser",KIcon::Toolbar), i18n("Add URL ...") ); addBox->addWidget( cAdd ); - connect( cAdd, SIGNAL(clicked(int)), - this, SLOT(addClicked(int)) + connect( cAdd, TQT_SIGNAL(clicked(int)), + TQT_TQOBJECT(this), TQT_SLOT(addClicked(int)) ); addBox->addSpacing( 18 ); @@ -247,8 +247,8 @@ soundKonverter::soundKonverter() pStart->setFixedHeight( pStart->size().height() ); pStart->setEnabled( false ); addBox->addWidget( pStart ); - connect( pStart, SIGNAL(clicked()), - fileList, SLOT(startConversion()) + connect( pStart, TQT_SIGNAL(clicked()), + TQT_TQOBJECT(fileList), TQT_SLOT(startConversion()) ); pStop = new KPushButton( iconLoader->loadIcon("stop",KIcon::Small), i18n("Stop"), widget, "pStop" ); @@ -261,29 +261,29 @@ soundKonverter::soundKonverter() progressIndicator = new ProgressIndicator( systemTray, widget, "progressIndicator" ); addBox->addWidget( progressIndicator ); - connect( fileList, SIGNAL(increaseTime(float)), - progressIndicator, SLOT(increaseTime(float)) + connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(increaseTime(float)), + progressIndicator, TQT_SLOT(increaseTime(float)) ); - connect( fileList, SIGNAL(decreaseTime(float)), - progressIndicator, SLOT(decreaseTime(float)) + connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(decreaseTime(float)), + progressIndicator, TQT_SLOT(decreaseTime(float)) ); - /*connect( fileList, SIGNAL(setTime(float)), - progressIndicator, SLOT(setTime(float)) + /*connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(setTime(float)), + progressIndicator, TQT_SLOT(setTime(float)) );*/ - connect( fileList, SIGNAL(finished(float)), - progressIndicator, SLOT(finished(float)) + connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(finished(float)), + progressIndicator, TQT_SLOT(finished(float)) ); - connect( convert, SIGNAL(countTime(float)), - progressIndicator, SLOT(countTime(float)) + connect( convert, TQT_SIGNAL(countTime(float)), + progressIndicator, TQT_SLOT(countTime(float)) ); - connect( convert, SIGNAL(uncountTime(float)), - progressIndicator, SLOT(uncountTime(float)) + connect( convert, TQT_SIGNAL(uncountTime(float)), + progressIndicator, TQT_SLOT(uncountTime(float)) ); - connect( convert, SIGNAL(update(float)), - progressIndicator, SLOT(update(float)) + connect( convert, TQT_SIGNAL(update(float)), + progressIndicator, TQT_SLOT(update(float)) ); - connect( progressIndicator, SIGNAL(setTitle(const QString&)), - this, SLOT(setTitle(const QString&)) + connect( progressIndicator, TQT_SIGNAL(setTitle(const TQString&)), + TQT_TQOBJECT(this), TQT_SLOT(setTitle(const TQString&)) ); cAdd->increaseHeight( /*progressIndicator->height() - cAdd->height()*/ 10 ); // FIXME detect the height automaticly @@ -319,32 +319,32 @@ bool soundKonverter::queryClose() convert->cleanUp(); logger->cleanUp(); - QFile::remove( locateLocal("data","soundkonverter/filelist.autosave.xml") ); + TQFile::remove( locateLocal("data","soundkonverter/filelist.autosave.xml") ); return true; } -void soundKonverter::setNotify( const QString& cmd ) +void soundKonverter::setNotify( const TQString& cmd ) { fileList->setNotify( cmd ); } -/*void soundKonverter::moveEvent( QMoveEvent* e ) +/*void soundKonverter::moveEvent( TQMoveEvent* e ) { // emit windowMoved( pos().x(), pos().y() + height() ); }*/ -void soundKonverter::openArgFiles( const QStringList &files ) +void soundKonverter::openArgFiles( const TQStringList &files ) { if( ( instances <= 1 || config->data.general.askForNewOptions ) && ( profile == "" || format == "" || directory == "" ) ) { OptionsRequester* dialog = new OptionsRequester( config, files, this ); - connect( dialog, SIGNAL(setCurrentOptions(const ConversionOptions&)), - options, SLOT(setCurrentOptions(const ConversionOptions&)) + connect( dialog, TQT_SIGNAL(setCurrentOptions(const ConversionOptions&)), + options, TQT_SLOT(setCurrentOptions(const ConversionOptions&)) ); - connect( dialog, SIGNAL(addFiles(QStringList)), - fileList, SLOT(addFiles(QStringList)) + connect( dialog, TQT_SIGNAL(addFiles(TQStringList)), + TQT_TQOBJECT(fileList), TQT_SLOT(addFiles(TQStringList)) ); Q_CHECK_PTR( dialog ); @@ -364,8 +364,8 @@ void soundKonverter::openArgFiles( const QStringList &files ) dialog->exec(); - disconnect( dialog, SIGNAL(setCurrentOptions(const ConversionOptions&)), 0, 0 ); - disconnect( dialog, SIGNAL(addFiles(QStringList)), 0, 0 ); + disconnect( dialog, TQT_SIGNAL(setCurrentOptions(const ConversionOptions&)), 0, 0 ); + disconnect( dialog, TQT_SIGNAL(addFiles(TQStringList)), 0, 0 ); delete dialog; } @@ -393,13 +393,13 @@ void soundKonverter::openArgFiles( const QStringList &files ) if( !visible ) fileList->startConversion(); // NOTE should be save! } -void soundKonverter::openArgReplayGainFiles( const QStringList &files ) +void soundKonverter::openArgReplayGainFiles( const TQStringList &files ) { showReplayGainScanner(); if( replayGainScanner ) replayGainScanner->addFiles( files ); } -// void soundKonverter::openArgRepairFiles( const QStringList &files ) +// void soundKonverter::openArgRepairFiles( const TQStringList &files ) // {} void soundKonverter::startedConversion() @@ -492,9 +492,9 @@ void soundKonverter::addClicked( int index ) void soundKonverter::showFileDialog() { - QStringList urls = KFileDialog::getOpenURLs( ":file_open", config->fileFilter(), this, i18n("Choose files to convert") ).toStringList(); + TQStringList urls = KFileDialog::getOpenURLs( ":file_open", config->fileFilter(), this, i18n("Choose files to convert") ).toStringList(); if( !urls.empty() ) { -/* for( QStringList::Iterator it = urls.begin(); it != urls.end(); ++it ) { +/* for( TQStringList::Iterator it = urls.begin(); it != urls.end(); ++it ) { *it = KURL::decode_string( *it ); }*/ fileList->addFiles( urls ); @@ -503,7 +503,7 @@ void soundKonverter::showFileDialog() void soundKonverter::showDirDialog() { -// QString directory = KFileDialog::getExistingDirectory( ":file_open", this, i18n("Choose a directory") ); +// TQString directory = KFileDialog::getExistingDirectory( ":file_open", this, i18n("Choose a directory") ); // if( !directory.isEmpty() ) // { // fileList->addDir( directory ); @@ -528,11 +528,11 @@ void soundKonverter::showCdDialog( bool intern ) { OptionsRequester* dialog = new OptionsRequester( config, "", this ); - connect( dialog, SIGNAL(setCurrentOptions(const ConversionOptions&)), - options, SLOT(setCurrentOptions(const ConversionOptions&)) + connect( dialog, TQT_SIGNAL(setCurrentOptions(const ConversionOptions&)), + options, TQT_SLOT(setCurrentOptions(const ConversionOptions&)) ); -// connect( dialog, SIGNAL(addFiles(QStringList)), -// fileList, SLOT(addFiles(QStringList)) +// connect( dialog, TQT_SIGNAL(addFiles(TQStringList)), +// TQT_TQOBJECT(fileList), TQT_SLOT(addFiles(TQStringList)) // ); Q_CHECK_PTR( dialog ); @@ -552,8 +552,8 @@ void soundKonverter::showCdDialog( bool intern ) dialog->exec(); - disconnect( dialog, SIGNAL(setCurrentOptions(const ConversionOptions&)), 0, 0 ); -// disconnect( dialog, SIGNAL(addFiles(QStringList)), 0, 0 ); + disconnect( dialog, TQT_SIGNAL(setCurrentOptions(const ConversionOptions&)), 0, 0 ); +// disconnect( dialog, TQT_SIGNAL(addFiles(TQStringList)), 0, 0 ); delete dialog; } @@ -575,9 +575,9 @@ void soundKonverter::showCdDialog( bool intern ) // support for media:/ and system:/ urls if( !device.isEmpty() ) { - device.replace( "system:/media", "/dev" ); - device.replace( "media:", "/dev" ); - device.replace( "devices:", "/dev" ); // NOTE obsolete, since soundkonverter 0.3 won't run on KDE < 3.5 + device.tqreplace( "system:/media", "/dev" ); + device.tqreplace( "media:", "/dev" ); + device.tqreplace( "devices:", "/dev" ); // NOTE obsolete, since soundkonverter 0.3 won't run on KDE < 3.5 } if( device.left(5) != "/dev/" || device == "auto" ) { device = ""; @@ -594,21 +594,21 @@ void soundKonverter::showCdDialog( bool intern ) if( !dialog->noCD ) { - connect( dialog, SIGNAL(addTracks(const QString&,QValueList<int>)), - fileList, SLOT(addTracks(const QString&,QValueList<int>)) + connect( dialog, TQT_SIGNAL(addTracks(const TQString&,TQValueList<int>)), + TQT_TQOBJECT(fileList), TQT_SLOT(addTracks(const TQString&,TQValueList<int>)) ); - connect( dialog, SIGNAL(addDisc(const QString&)), - fileList, SLOT(addDisc(const QString&)) + connect( dialog, TQT_SIGNAL(addDisc(const TQString&)), + TQT_TQOBJECT(fileList), TQT_SLOT(addDisc(const TQString&)) ); - /*connect( dialog, SIGNAL(openCuesheetEditor(const QString&)), - this, SLOT(openCuesheetEditor(const QString&)) + /*connect( dialog, TQT_SIGNAL(openCuesheetEditor(const TQString&)), + TQT_TQOBJECT(this), TQT_SLOT(openCuesheetEditor(const TQString&)) );*/ dialog->exec(); - disconnect( dialog, SIGNAL(addTracks(const QString&,QValueList<int>)), 0, 0 ); - disconnect( dialog, SIGNAL(addDisc(const QString&)), 0, 0 ); - //disconnect( dialog, SIGNAL(openCuesheetEditor(const QString&)), 0, 0 ); + disconnect( dialog, TQT_SIGNAL(addTracks(const TQString&,TQValueList<int>)), 0, 0 ); + disconnect( dialog, TQT_SIGNAL(addDisc(const TQString&)), 0, 0 ); + //disconnect( dialog, TQT_SIGNAL(openCuesheetEditor(const TQString&)), 0, 0 ); } delete dialog; @@ -620,11 +620,11 @@ void soundKonverter::showCdDialog( bool intern ) void soundKonverter::showUrlDialog() { bool ok; - QString url = KInputDialog::getText( i18n("Open URL"), i18n("Enter a URL:"), "", &ok ); + TQString url = KInputDialog::getText( i18n("Open URL"), i18n("Enter a URL:"), "", &ok ); if( ok ) { // if it isn't a local file and no protocol is given, we assume, it's http - if( url.left(1) != "/" && !url.contains(":/") ) + if( url.left(1) != "/" && !url.tqcontains(":/") ) url.prepend( "http://" ); fileList->addFiles( url ); @@ -639,8 +639,8 @@ void soundKonverter::showReplayGainScanner() // TODO error message return; } -// connect( this, SIGNAL(addFilesToReplayGainScanner(QStringList)), -// replayGainScanner, SLOT(addFiles(QStringList)) +// connect( TQT_TQOBJECT(this), TQT_SIGNAL(addFilesToReplayGainScanner(TQStringList)), +// replayGainScanner, TQT_SLOT(addFiles(TQStringList)) // ); } replayGainScanner->show(); @@ -663,7 +663,7 @@ void soundKonverter::showCuesheetEditor() cuesheetEditor->raise(); } -/*void soundKonverter::openCuesheetEditor( const QString& content ) +/*void soundKonverter::openCuesheetEditor( const TQString& content ) { if( cuesheetEditor == 0 ) { cuesheetEditor = new CuesheetEditor( 0, "cuesheetEditor", false ); @@ -684,8 +684,8 @@ void soundKonverter::showLogViewer() // TODO error message return; } -// connect( convert, SIGNAL(finishedProcess(int,int)), -// logViewer, SLOT(processCompleted(int,int)) +// connect( convert, TQT_SIGNAL(finishedProcess(int,int)), +// logViewer, TQT_SLOT(processCompleted(int,int)) // ); } logViewer->show(); @@ -747,8 +747,8 @@ void soundKonverter::editToolbar() { saveMainWindowSettings( kapp->config(), "MainWindow" ); KEditToolbar dlg( actionCollection() ); - connect( &dlg, SIGNAL(newToolbarConfig()), - this, SLOT(newToolbarConfig()) + connect( &dlg, TQT_SIGNAL(newToolbarConfig()), + TQT_TQOBJECT(this), TQT_SLOT(newToolbarConfig()) ); dlg.exec(); } @@ -771,7 +771,7 @@ void soundKonverter::fileCountChanged( int count ) } } -void soundKonverter::setTitle( const QString& title ) +void soundKonverter::setTitle( const TQString& title ) { setCaption( title ); } |