diff options
| -rwxr-xr-x | src/amarokscript/soundKonverter.rb | 8 | ||||
| -rw-r--r-- | src/cdopener.cpp | 68 | ||||
| -rw-r--r-- | src/combobutton.cpp | 8 | ||||
| -rw-r--r-- | src/configbackendspage.cpp | 42 | ||||
| -rw-r--r-- | src/configdialog.cpp | 64 | ||||
| -rw-r--r-- | src/configenvironmentpage.cpp | 24 | ||||
| -rw-r--r-- | src/configgeneralpage.cpp | 56 | ||||
| -rw-r--r-- | src/configpluginspage.cpp | 54 | ||||
| -rw-r--r-- | src/convert.cpp | 76 | ||||
| -rw-r--r-- | src/cuesheeteditor.cpp | 20 | ||||
| -rw-r--r-- | src/dirdialog.cpp | 24 | ||||
| -rw-r--r-- | src/filelist.cpp | 52 | ||||
| -rw-r--r-- | src/logviewer.cpp | 16 | ||||
| -rw-r--r-- | src/options.cpp | 100 | ||||
| -rw-r--r-- | src/optionsdetailed.cpp | 92 | ||||
| -rw-r--r-- | src/optionseditor.cpp | 96 | ||||
| -rw-r--r-- | src/optionsrequester.cpp | 8 | ||||
| -rw-r--r-- | src/optionssimple.cpp | 44 | ||||
| -rw-r--r-- | src/outputdirectory.cpp | 32 | ||||
| -rw-r--r-- | src/replaygainfilelist.cpp | 40 | ||||
| -rw-r--r-- | src/replaygainscanner.cpp | 52 | ||||
| -rw-r--r-- | src/soundkonverter.cpp | 182 |
22 files changed, 579 insertions, 579 deletions
diff --git a/src/amarokscript/soundKonverter.rb b/src/amarokscript/soundKonverter.rb index 92c3d06..7af6d87 100755 --- a/src/amarokscript/soundKonverter.rb +++ b/src/amarokscript/soundKonverter.rb @@ -105,8 +105,8 @@ def initialize(parent = nil, name = nil) okPushButton.setText( "OK" ) okPushButton.setDefault( true ) - connect( okPushButton, SIGNAL( 'clicked()' ), - self, SLOT( 'accept()' ) + connect( okPushButton, TQ_SIGNAL( 'clicked()' ), + self, TQ_SLOT( 'accept()' ) ) cancelPushButton = TQt::PushButton.new( self, "cancel" ) @@ -114,8 +114,8 @@ def initialize(parent = nil, name = nil) cancelPushButton.setText( "Cancel" ) cancelPushButton.setAccel( TQt::KeySequence.new(Key_Escape) ) - connect( cancelPushButton, SIGNAL( 'clicked()' ), - self, SLOT( 'reject()' ) + connect( cancelPushButton, TQ_SIGNAL( 'clicked()' ), + self, TQ_SLOT( 'reject()' ) ) file = TQt::File.new( File.dirname( File.expand_path( __FILE__ ) ) + "/config" ) diff --git a/src/cdopener.cpp b/src/cdopener.cpp index c13c6a0..b13b089 100644 --- a/src/cdopener.cpp +++ b/src/cdopener.cpp @@ -56,8 +56,8 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin cArtist->setMinimumWidth( 200 ); cArtist->insertItem( i18n("Various Artists") ); cArtist->setCurrentText( "" ); - connect( cArtist, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(artistChanged(const TQString&)) + connect( cArtist, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(artistChanged(const TQString&)) ); // add a horizontal box layout for the composer TQHBoxLayout* artistBox = new TQHBoxLayout( -1, "artistBox" ); @@ -71,8 +71,8 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin cComposer->insertItem( i18n("Various Composer") ); cComposer->setCurrentText( "" ); //cComposer->setSizePolicy( TQSizePolicy::Maximum ); - connect( cComposer, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(composerChanged(const TQString&)) + connect( cComposer, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(composerChanged(const TQString&)) ); //artistBox->addStretch(); artistBox->addSpacing( 130 ); @@ -119,11 +119,11 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin trackList->setSelectionMode( TQListView::Extended ); trackList->setAllColumnsShowFocus( true ); trackList->setResizeMode( TQListView::LastColumn ); - connect( trackList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(trackChanged()) + connect( trackList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(trackChanged()) ); - connect( trackList, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(addClicked()) + connect( trackList, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(addClicked()) ); gridLayout->setRowStretch( 1, 1 ); @@ -139,15 +139,15 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin pTrackUp = new KPushButton( " ", tagGroupBox, "pTrackUp" ); pTrackUp->setPixmap( iconLoader->loadIcon("go-up",TDEIcon::Toolbar) ); pTrackUp->setAutoRepeat( true ); - connect( pTrackUp, TQT_SIGNAL(clicked()), - this, TQT_SLOT(trackUpPressed()) + connect( pTrackUp, TQ_SIGNAL(clicked()), + this, TQ_SLOT(trackUpPressed()) ); tagGridLayout->addWidget( pTrackUp, 0, 0 ); pTrackDown = new KPushButton( " ", tagGroupBox, "pTrackDown" ); pTrackDown->setPixmap( iconLoader->loadIcon("go-down",TDEIcon::Toolbar) ); pTrackDown->setAutoRepeat( true ); - connect( pTrackDown, TQT_SIGNAL(clicked()), - this, TQT_SLOT(trackDownPressed()) + connect( pTrackDown, TQ_SIGNAL(clicked()), + this, TQ_SLOT(trackDownPressed()) ); tagGridLayout->addWidget( pTrackDown, 1, 0 ); @@ -160,16 +160,16 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin tagGridLayout->addWidget( lTrackTitleLabel, 0, 1 ); lTrackTitle = new KLineEdit( tagGroupBox, "lTrackTitle" ); trackTitleBox->addWidget( lTrackTitle ); - connect( lTrackTitle, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(trackTitleChanged(const TQString&)) + connect( lTrackTitle, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(trackTitleChanged(const TQString&)) ); pTrackTitleEdit = new KPushButton( " ", tagGroupBox, "pTrackTitleEdit" ); pTrackTitleEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) ); pTrackTitleEdit->setFixedSize( lTrackTitle->sizeHint().height(), lTrackTitle->sizeHint().height() ); pTrackTitleEdit->hide(); trackTitleBox->addWidget( pTrackTitleEdit ); - connect( pTrackTitleEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editTrackTitleClicked()) + connect( pTrackTitleEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editTrackTitleClicked()) ); // add a horizontal box layout for the composer TQHBoxLayout* trackArtistBox = new TQHBoxLayout( -1, "trackArtistBox" ); @@ -179,31 +179,31 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin tagGridLayout->addWidget( lTrackArtistLabel, 1, 1 ); lTrackArtist = new KLineEdit( tagGroupBox, "lTrackArtist" ); trackArtistBox->addWidget( lTrackArtist ); - connect( lTrackArtist, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(trackArtistChanged(const TQString&)) + connect( lTrackArtist, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(trackArtistChanged(const TQString&)) ); pTrackArtistEdit = new KPushButton( " ", tagGroupBox, "pTrackArtistEdit" ); pTrackArtistEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) ); pTrackArtistEdit->setFixedSize( lTrackArtist->sizeHint().height(), lTrackArtist->sizeHint().height() ); pTrackArtistEdit->hide(); trackArtistBox->addWidget( pTrackArtistEdit ); - connect( pTrackArtistEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editTrackArtistClicked()) + connect( pTrackArtistEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editTrackArtistClicked()) ); TQLabel* lTrackComposerLabel = new TQLabel( i18n("Composer:"), tagGroupBox, "lTrackComposerLabel" ); trackArtistBox->addWidget( lTrackComposerLabel ); lTrackComposer = new KLineEdit( tagGroupBox, "lTrackComposer" ); trackArtistBox->addWidget( lTrackComposer ); - connect( lTrackComposer, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(trackComposerChanged(const TQString&)) + connect( lTrackComposer, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(trackComposerChanged(const TQString&)) ); pTrackComposerEdit = new KPushButton( " ", tagGroupBox, "pTrackComposerEdit" ); pTrackComposerEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) ); pTrackComposerEdit->setFixedSize( lTrackComposer->sizeHint().height(), lTrackComposer->sizeHint().height() ); pTrackComposerEdit->hide(); trackArtistBox->addWidget( pTrackComposerEdit ); - connect( pTrackComposerEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editTrackComposerClicked()) + connect( pTrackComposerEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editTrackComposerClicked()) ); // add a horizontal box layout for the comment TQHBoxLayout* trackCommentBox = new TQHBoxLayout( -1, "trackCommentBox" ); @@ -214,16 +214,16 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin tTrackComment = new KTextEdit( tagGroupBox, "tTrackComment" ); trackCommentBox->addWidget( tTrackComment ); tTrackComment->setFixedHeight( 65 ); - connect( tTrackComment, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(trackCommentChanged()) + connect( tTrackComment, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(trackCommentChanged()) ); pTrackCommentEdit = new KPushButton( " ", tagGroupBox, "pTrackCommentEdit" ); pTrackCommentEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) ); pTrackCommentEdit->setFixedSize( lTrackTitle->sizeHint().height(), lTrackTitle->sizeHint().height() ); pTrackCommentEdit->hide(); trackCommentBox->addWidget( pTrackCommentEdit ); - connect( pTrackCommentEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editTrackCommentClicked()) + connect( pTrackCommentEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editTrackCommentClicked()) ); // draw a horizontal line @@ -241,8 +241,8 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin // add the control elements pSaveCue = new KPushButton( iconLoader->loadIcon("document-save",TDEIcon::Small), i18n("Save cuesheet ..."), this, "pSaveCue" ); controlBox->addWidget( pSaveCue ); - connect( pSaveCue, TQT_SIGNAL(clicked()), - this, TQT_SLOT(saveCuesheetClicked()) + connect( pSaveCue, TQ_SIGNAL(clicked()), + this, TQ_SLOT(saveCuesheetClicked()) ); controlBox->addStretch(); @@ -253,13 +253,13 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin if( plugin != 0 && plugin->rip.full_disc.enabled ) cAdd->insertItem( iconLoader->loadIcon("media-optical-cdaudio-unmounted",TDEIcon::Small),i18n("Add full CD as one file") ); //cAdd->setSizeMode( ComboButton::Min ); controlBox->addWidget( cAdd ); - connect( cAdd, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(addClicked(int)) + connect( cAdd, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(addClicked(int)) ); pCancel = new KPushButton( iconLoader->loadIcon("cancel",TDEIcon::Small), i18n("Cancel"), this, "pCancel" ); controlBox->addWidget( pCancel ); - connect( pCancel, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject()) + connect( pCancel, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject()) ); // delete the icon loader object diff --git a/src/combobutton.cpp b/src/combobutton.cpp index 851bc55..31cb23c 100644 --- a/src/combobutton.cpp +++ b/src/combobutton.cpp @@ -18,15 +18,15 @@ ComboButton::ComboButton( TQWidget *parent, const char *name ) m_box = new KComboBox(this); grid->addWidget(m_box,0,0); - connect( m_box, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(boxActivated(int)) + connect( m_box, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(boxActivated(int)) ); m_button = new KPushButton( TQString(), this, "pushbutton" ); grid->addWidget( m_button, 0, 0 ); - connect( m_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(buttonClicked()) + connect( m_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(buttonClicked()) ); m_sizeMode = Max; diff --git a/src/configbackendspage.cpp b/src/configbackendspage.cpp index 06f3603..1c7ec4a 100644 --- a/src/configbackendspage.cpp +++ b/src/configbackendspage.cpp @@ -56,8 +56,8 @@ ConfigBackendsPage::ConfigBackendsPage( Config* _config, TQMap<TQString, TQStrin ripperGroup->layout()->setMargin( 6 ); TQLabel* lRipper = new TQLabel( i18n("CD Ripper")+":", ripperGroup, "lRipper" ); cRipper = new KComboBox( ripperGroup, "cRipper" ); - connect( cRipper, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(cfgChanged()) + connect( cRipper, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(cfgChanged()) ); delete stdDirs; @@ -204,19 +204,19 @@ void ConfigBackendsPage::rebuild() for( TQValueList<FormatOptions>::Iterator it = formatOptions.begin(); it != formatOptions.end(); ++it ) { delete (*it).lEncoder; - disconnect( (*it).cEncoder, TQT_SIGNAL(activated(int)), 0, 0 ); + disconnect( (*it).cEncoder, TQ_SIGNAL(activated(int)), 0, 0 ); delete (*it).cEncoder; delete (*it).lStrength; - disconnect( (*it).sStrength,TQT_SIGNAL(valueChanged(int)), 0, 0 ); + disconnect( (*it).sStrength,TQ_SIGNAL(valueChanged(int)), 0, 0 ); delete (*it).sStrength; delete (*it).lStrengthDisplay; delete (*it).lDecoder; - disconnect( (*it).cDecoder, TQT_SIGNAL(activated(int)), 0, 0 ); + disconnect( (*it).cDecoder, TQ_SIGNAL(activated(int)), 0, 0 ); delete (*it).cDecoder; delete (*it).lReplayGain; - disconnect( (*it).cReplayGain, TQT_SIGNAL(activated(int)), 0, 0 ); + disconnect( (*it).cReplayGain, TQ_SIGNAL(activated(int)), 0, 0 ); delete (*it).cReplayGain; - disconnect( (*it).cInternalReplayGain, TQT_SIGNAL(toggled(bool)), 0, 0 ); + disconnect( (*it).cInternalReplayGain, TQ_SIGNAL(toggled(bool)), 0, 0 ); delete (*it).cInternalReplayGain; delete (*it).grid; delete (*it).group; @@ -262,11 +262,11 @@ void ConfigBackendsPage::rebuild() options.grid->addWidget( options.lEncoder, 0, 0 ); options.cEncoder = new KComboBox( options.group, options.format.utf8().data() ); options.cEncoder->show(); - connect( options.cEncoder, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(cfgChanged()) + connect( options.cEncoder, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(cfgChanged()) ); - connect( options.cEncoder, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(encoderChanged()) + connect( options.cEncoder, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(encoderChanged()) ); options.grid->addWidget( options.cEncoder, 0, 1 ); @@ -279,11 +279,11 @@ void ConfigBackendsPage::rebuild() options.sStrength->show(); TQToolTip::add( options.sStrength, i18n("Set the compression strength:\n\nLeft = fast conversion\nRight = good resultant file") ); options.grid->addWidget( options.sStrength, 0, 3 ); - connect( options.sStrength, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(cfgChanged()) + connect( options.sStrength, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(cfgChanged()) ); - connect( options.sStrength, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(strengthChanged()) + connect( options.sStrength, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(strengthChanged()) ); options.lDecoder = new TQLabel( i18n("Decoder")+":", options.group, options.format.utf8().data() ); @@ -292,8 +292,8 @@ void ConfigBackendsPage::rebuild() options.cDecoder = new KComboBox( options.group, options.format.utf8().data() ); options.cDecoder->show(); options.grid->addWidget( options.cDecoder, 1, 1 ); - connect( options.cDecoder, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(cfgChanged()) + connect( options.cDecoder, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(cfgChanged()) ); options.lStrengthDisplay = new TQLabel( "", options.group, options.format.utf8().data() ); options.lStrengthDisplay->setAlignment( TQt::AlignRight | TQt::AlignVCenter ); @@ -306,14 +306,14 @@ void ConfigBackendsPage::rebuild() options.cReplayGain = new KComboBox( options.group, options.format.utf8().data() ); options.cReplayGain->show(); options.grid->addWidget( options.cReplayGain, 2, 1 ); - connect( options.cReplayGain, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(cfgChanged()) + connect( options.cReplayGain, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(cfgChanged()) ); options.cInternalReplayGain = new TQCheckBox( i18n("Use internal Replay Gain"), options.group, options.format.utf8().data() ); TQToolTip::add( options.cInternalReplayGain, i18n("Use the internal Replay Gain calculator of the encoder") ); options.grid->addWidget( options.cInternalReplayGain, 2, 3 ); - connect( options.cInternalReplayGain, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(cfgChanged()) + connect( options.cInternalReplayGain, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(cfgChanged()) ); options.grid->setColStretch( 0, 0 ); diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 09e3424..22efb6e 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -43,65 +43,65 @@ ConfigDialog::ConfigDialog( Config* _config, TQWidget *parent, const char *name, binaries = config->binaries; - connect( this, TQT_SIGNAL(applyClicked()), - this,TQT_SLOT(applyClickedSlot()) + connect( this, TQ_SIGNAL(applyClicked()), + this,TQ_SLOT(applyClickedSlot()) ); - connect( this, TQT_SIGNAL(okClicked()), - this,TQT_SLOT(okClickedSlot()) + connect( this, TQ_SIGNAL(okClicked()), + this,TQ_SLOT(okClickedSlot()) ); - connect( this, TQT_SIGNAL(defaultClicked()), - this,TQT_SLOT(defaultClickedSlot()) + connect( this, TQ_SIGNAL(defaultClicked()), + this,TQ_SLOT(defaultClickedSlot()) ); generalPage = addPage( i18n("General"), "misc" ); configGeneralPage = new ConfigGeneralPage( config, generalPage, "configGeneralPage" ); - connect( configGeneralPage, TQT_SIGNAL(configChanged()), - this, TQT_SLOT(configChanged()) + connect( configGeneralPage, TQ_SIGNAL(configChanged()), + this, TQ_SLOT(configChanged()) ); - connect( this, TQT_SIGNAL(saveGeneral()), - configGeneralPage, TQT_SLOT(saveSettings()) + connect( this, TQ_SIGNAL(saveGeneral()), + configGeneralPage, TQ_SLOT(saveSettings()) ); - connect( this, TQT_SIGNAL(resetGeneral()), - configGeneralPage, TQT_SLOT(resetDefaults()) + connect( this, TQ_SIGNAL(resetGeneral()), + configGeneralPage, TQ_SLOT(resetDefaults()) ); pluginsPage = addPage( i18n("Plugins"), "connect_creating" ); configPluginsPage = new ConfigPluginsPage( config, pluginsPage, "configPluginsPage" ); - connect( configPluginsPage, TQT_SIGNAL(configChanged()), - this, TQT_SLOT(configChanged()) + connect( configPluginsPage, TQ_SIGNAL(configChanged()), + this, TQ_SLOT(configChanged()) ); - connect( this, TQT_SIGNAL(savePlugins()), - configPluginsPage, TQT_SLOT(saveSettings()) + connect( this, TQ_SIGNAL(savePlugins()), + configPluginsPage, TQ_SLOT(saveSettings()) ); - connect( this, TQT_SIGNAL(resetPlugins()), - configPluginsPage, TQT_SLOT(resetDefaults()) + connect( this, TQ_SIGNAL(resetPlugins()), + configPluginsPage, TQ_SLOT(resetDefaults()) ); environmentPage = addPage( i18n("Environment"), "filefind" ); configEnvironmentPage = new ConfigEnvironmentPage( config, &binaries, environmentPage, "configEnvironmentPage" ); - connect( configEnvironmentPage, TQT_SIGNAL(configChanged()), - this, TQT_SLOT(configChanged()) + connect( configEnvironmentPage, TQ_SIGNAL(configChanged()), + this, TQ_SLOT(configChanged()) ); - connect( this, TQT_SIGNAL(saveEnvironment()), - configEnvironmentPage, TQT_SLOT(saveSettings()) + connect( this, TQ_SIGNAL(saveEnvironment()), + configEnvironmentPage, TQ_SLOT(saveSettings()) ); - connect( this, TQT_SIGNAL(resetEnvironment()), - configEnvironmentPage, TQT_SLOT(resetDefaults()) + connect( this, TQ_SIGNAL(resetEnvironment()), + configEnvironmentPage, TQ_SLOT(resetDefaults()) ); backendsPage = addPage( i18n("Backends"), "preferences-system" ); configBackendsPage = new ConfigBackendsPage( config, &binaries, backendsPage, "configBackendsPage" ); - connect( configBackendsPage, TQT_SIGNAL(configChanged()), - this, TQT_SLOT(configChanged()) + connect( configBackendsPage, TQ_SIGNAL(configChanged()), + this, TQ_SLOT(configChanged()) ); - connect( this, TQT_SIGNAL(saveBackends()), - configBackendsPage, TQT_SLOT(saveSettings()) + connect( this, TQ_SIGNAL(saveBackends()), + configBackendsPage, TQ_SLOT(saveSettings()) ); - connect( this, TQT_SIGNAL(resetBackends()), - configBackendsPage, TQT_SLOT(resetDefaults()) + connect( this, TQ_SIGNAL(resetBackends()), + configBackendsPage, TQ_SLOT(resetDefaults()) ); - connect( configEnvironmentPage, TQT_SIGNAL(rebuildBackendsPage()), - configBackendsPage, TQT_SLOT(rebuild()) + connect( configEnvironmentPage, TQ_SIGNAL(rebuildBackendsPage()), + configBackendsPage, TQ_SLOT(rebuild()) ); setConfigChanged( false ); diff --git a/src/configenvironmentpage.cpp b/src/configenvironmentpage.cpp index 11774e6..1e19a85 100644 --- a/src/configenvironmentpage.cpp +++ b/src/configenvironmentpage.cpp @@ -39,8 +39,8 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap<TQString, T lDirectories = new TDEListBox( parent, "lDirectories" ); lDirectories->insertStringList( config->data.environment.directories ); directoriesBox->addWidget( lDirectories ); - connect( lDirectories, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(directoriesSelectionChanged(int)) + connect( lDirectories, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(directoriesSelectionChanged(int)) ); TQVBoxLayout* directoriesMiddleBox = new TQVBoxLayout( directoriesBox ); @@ -49,8 +49,8 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap<TQString, T pDirUp->setEnabled( false ); TQToolTip::add( pDirUp, i18n("Move selected directory one position up.\nThis effects which backend will be chosen, if there are several versions.") ); directoriesMiddleBox->addWidget( pDirUp ); - connect( pDirUp, TQT_SIGNAL(clicked()), - this, TQT_SLOT(dirUp()) + connect( pDirUp, TQ_SIGNAL(clicked()), + this, TQ_SLOT(dirUp()) ); directoriesMiddleBox->addStretch(); @@ -59,22 +59,22 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap<TQString, T pDirDown->setEnabled( false ); TQToolTip::add( pDirDown, i18n("Move selected directory one position down.\nThis effects which backend will be chosen, if there are several versions.") ); directoriesMiddleBox->addWidget( pDirDown ); - connect( pDirDown, TQT_SIGNAL(clicked()), - this, TQT_SLOT(dirDown()) + connect( pDirDown, TQ_SIGNAL(clicked()), + this, TQ_SLOT(dirDown()) ); TQVBoxLayout* directoriesRightBox = new TQVBoxLayout( directoriesBox ); pAddDirectory = new KPushButton( iconLoader->loadIcon("add",TDEIcon::Small), i18n("Add ..."), parent, "pAddDirectory" ); directoriesRightBox->addWidget( pAddDirectory ); - connect( pAddDirectory, TQT_SIGNAL(clicked()), - this, TQT_SLOT(addDirectory()) + connect( pAddDirectory, TQ_SIGNAL(clicked()), + this, TQ_SLOT(addDirectory()) ); pRemoveDirectory = new KPushButton( iconLoader->loadIcon("remove",TDEIcon::Small), i18n("Remove"), parent, "pRemoveDirectory" ); directoriesRightBox->addWidget( pRemoveDirectory ); pRemoveDirectory->setEnabled( false ); - connect( pRemoveDirectory, TQT_SIGNAL(clicked()), - this, TQT_SLOT(removeDirectory()) + connect( pRemoveDirectory, TQ_SIGNAL(clicked()), + this, TQ_SLOT(removeDirectory()) ); directoriesRightBox->addStretch(); @@ -89,7 +89,7 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap<TQString, T lFoundPrograms = new TDEListBox( parent, "lFoundPrograms" ); lFoundPrograms->setSelectionMode( TQListBox::NoSelection ); foundProgramsBox->addWidget( lFoundPrograms ); - //connect(lPrograms,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(programsSelectionChanged(int))); + //connect(lPrograms,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(programsSelectionChanged(int))); programsBox->setStretchFactor( foundProgramsBox, 3 ); TQVBoxLayout* notFoundProgramsBox = new TQVBoxLayout( programsBox ); @@ -98,7 +98,7 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap<TQString, T lNotFoundPrograms = new TDEListBox( parent, "lNotFoundPrograms" ); lNotFoundPrograms->setSelectionMode( TQListBox::NoSelection ); notFoundProgramsBox->addWidget( lNotFoundPrograms ); - //connect(lPrograms,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(programsSelectionChanged(int))); + //connect(lPrograms,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(programsSelectionChanged(int))); programsBox->setStretchFactor( notFoundProgramsBox, 2 ); for( TQMap<TQString, TQString>::Iterator it = config->binaries.begin(); it != config->binaries.end(); ++it ) { diff --git a/src/configgeneralpage.cpp b/src/configgeneralpage.cpp index f83e507..0d4093f 100644 --- a/src/configgeneralpage.cpp +++ b/src/configgeneralpage.cpp @@ -39,8 +39,8 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const c cStartTab->insertItem( i18n("Detailed") ); cStartTab->setCurrentItem( config->data.general.startTab ); startTabBox->addWidget( cStartTab ); - connect( cStartTab, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(cfgChanged()) + connect( cStartTab, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(cfgChanged()) ); box->addSpacing( 5 ); @@ -63,18 +63,18 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const c cDefaultProfile->insertStringList( sDefaultProfile ); cDefaultProfile->setCurrentItem( profileIndex(config->data.general.defaultProfile) ); defaultProfileBox->addWidget( cDefaultProfile ); - connect( cDefaultProfile, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(profileChanged()) + connect( cDefaultProfile, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(profileChanged()) ); - connect( cDefaultProfile, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(cfgChanged()) + connect( cDefaultProfile, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(cfgChanged()) ); TQLabel* lDefaultFormat = new TQLabel( i18n("Default format")+":", parent, "lDefaultFormat" ); defaultProfileBox->addWidget( lDefaultFormat ); cDefaultFormat = new KComboBox( parent, "cDefaultFormat" ); defaultProfileBox->addWidget( cDefaultFormat ); - connect( cDefaultFormat, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(cfgChanged()) + connect( cDefaultFormat, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(cfgChanged()) ); profileChanged(); @@ -87,20 +87,20 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const c lDir->setText( config->data.general.defaultOutputDirectory ); TQToolTip::add( lDir, i18n("<p>The following strings are space holders, that will be replaced by the information in the meta data:</p><p>%a - Artist<br>%b - Album<br>%c - Comment<br>%d - Disc number<br>%g - Genre<br>%n - Track number<br>%p - Composer<br>%t - Title<br>%y - Year<br>%f - Original file name<p>") ); defaultDirBox->addWidget( lDir ); - connect( lDir, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(cfgChanged()) + connect( lDir, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(cfgChanged()) );*/ /*pDirInfo = new KPushButton( iconLoader->loadIcon("messagebox_info",TDEIcon::Small), "", parent, "pDirInfo" ); TQToolTip::add( pDirInfo, i18n("Information about the wildcards.") ); defaultDirBox->addWidget( pDirInfo ); - connect( pDirInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(dirInfo()) + connect( pDirInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(dirInfo()) );*/ // pDirSelect = new KPushButton( iconLoader->loadIcon("folder",TDEIcon::Small), "", parent, "pDirSelect" ); // TQToolTip::add( pDirSelect, i18n("Choose an output directory") ); // defaultDirBox->addWidget( pDirSelect ); -// connect( pDirSelect, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(selectDir()) +// connect( pDirSelect, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(selectDir()) // ); TQHBoxLayout* priorityBox = new TQHBoxLayout( box, 6 ); @@ -112,8 +112,8 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const c cPriority->insertStringList( sPriority ); cPriority->setCurrentItem( config->data.general.priority / 10 ); // NOTE that just works for 'normal' and 'low' priorityBox->addWidget( cPriority ); - connect( cPriority, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(cfgChanged()) + connect( cPriority, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(cfgChanged()) ); box->addSpacing( 5 ); @@ -123,8 +123,8 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const c TQToolTip::add( cUseVFATNames, i18n("Replaces some special characters like \'?\' by \'_\'.") ); cUseVFATNames->setChecked( config->data.general.useVFATNames ); useVFATNamesBox->addWidget( cUseVFATNames ); - connect( cUseVFATNames, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(cfgChanged()) + connect( cUseVFATNames, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(cfgChanged()) ); box->addSpacing( 5 ); @@ -139,8 +139,8 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const c cConflictHandling->insertStringList( sConflictHandling ); cConflictHandling->setCurrentItem( config->data.general.conflictHandling ); conflictHandlingBox->addWidget( cConflictHandling ); - connect( cConflictHandling, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(cfgChanged()) + connect( cConflictHandling, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(cfgChanged()) ); box->addSpacing( 5 ); @@ -150,8 +150,8 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const c numFilesBox->addWidget( lNumFiles ); iNumFiles = new KIntSpinBox( 1, 100, 1, config->data.general.numFiles, 10, parent, "iNumFiles" ); numFilesBox->addWidget( iNumFiles ); - connect( iNumFiles, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(cfgChanged()) + connect( iNumFiles, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(cfgChanged()) ); box->addSpacing( 5 ); @@ -162,8 +162,8 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const c iUpdateDelay = new KIntSpinBox( 100, 5000, 100, config->data.general.updateDelay, 10, parent, "iUpdateDelay" ); TQToolTip::add( iUpdateDelay, i18n("Update the progress bar in this interval (time in milliseconds)") ); updateDelayBox->addWidget( iUpdateDelay ); - connect( iUpdateDelay, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(cfgChanged()) + connect( iUpdateDelay, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(cfgChanged()) ); box->addSpacing( 5 ); @@ -173,8 +173,8 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const c TQToolTip::add( cAskForNewOptions, i18n("If you open a file with soundKonverter and soundKonverter is already running,\nyou can either be asked to define new converting options\nor the current settings from the soundKonverter main window are used.") ); cAskForNewOptions->setChecked( config->data.general.askForNewOptions ); askForNewOptionsBox->addWidget( cAskForNewOptions ); - connect( cAskForNewOptions, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(cfgChanged()) + connect( cAskForNewOptions, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(cfgChanged()) ); box->addSpacing( 5 ); @@ -184,8 +184,8 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const c TQToolTip::add( cExecuteUserScript, i18n("Executes a script after every finished conversion. Have a look at $TDEDIR/soundkonverter/userscript.sh") ); cExecuteUserScript->setChecked( config->data.general.executeUserScript ); executeUserScriptBox->addWidget( cExecuteUserScript ); - connect( cExecuteUserScript, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(cfgChanged()) + connect( cExecuteUserScript, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(cfgChanged()) ); box->addStretch(); diff --git a/src/configpluginspage.cpp b/src/configpluginspage.cpp index 0b8cb47..3fe80ff 100644 --- a/src/configpluginspage.cpp +++ b/src/configpluginspage.cpp @@ -41,29 +41,29 @@ ConfigPluginsPage::ConfigPluginsPage( Config* _config, TQWidget* parent, const c TQHBoxLayout* pluginsBox = new TQHBoxLayout( box ); lPlugins = new TDEListBox( parent, "lPlugins" ); pluginsBox->addWidget(lPlugins); - connect( lPlugins, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(pluginsSelectionChanged(int)) + connect( lPlugins, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(pluginsSelectionChanged(int)) ); refreshPlugins(); TQVBoxLayout* pluginsRightBox = new TQVBoxLayout( pluginsBox ); pAddPlugin = new KPushButton( iconLoader->loadIcon("add",TDEIcon::Small), i18n("Add ..."), parent, "pAddPlugin" ); pluginsRightBox->addWidget( pAddPlugin ); - connect( pAddPlugin, TQT_SIGNAL(clicked()), - this, TQT_SLOT(getPlugin()) + connect( pAddPlugin, TQ_SIGNAL(clicked()), + this, TQ_SLOT(getPlugin()) ); pRemovePlugin = new KPushButton( iconLoader->loadIcon("remove",TDEIcon::Small), i18n("Remove"), parent, "pRemovePlugin" ); pRemovePlugin->setEnabled( false ); pluginsRightBox->addWidget( pRemovePlugin ); - connect( pRemovePlugin, TQT_SIGNAL(clicked()), - this, TQT_SLOT(removePlugin()) + connect( pRemovePlugin, TQ_SIGNAL(clicked()), + this, TQ_SLOT(removePlugin()) ); pluginsRightBox->addStretch(); pAboutPlugin = new KPushButton( iconLoader->loadIcon("messagebox_info",TDEIcon::Small), i18n("About"), parent, "pAboutPlugin" ); pAboutPlugin->setEnabled( false ); pluginsRightBox->addWidget( pAboutPlugin ); - connect( pAboutPlugin, TQT_SIGNAL(clicked()), - this, TQT_SLOT(aboutPlugin()) + connect( pAboutPlugin, TQ_SIGNAL(clicked()), + this, TQ_SLOT(aboutPlugin()) ); /* NOTE kaligames.de is down box->addSpacing( 5 ); @@ -73,41 +73,41 @@ ConfigPluginsPage::ConfigPluginsPage( Config* _config, TQWidget* parent, const c TQHBoxLayout* onlinePluginsBox = new TQHBoxLayout( box ); lOnlinePlugins = new TDEListBox( parent, "lOnlinePlugins" ); onlinePluginsBox->addWidget( lOnlinePlugins ); - connect( lOnlinePlugins, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(onlinePluginsSelectionChanged(int)) + connect( lOnlinePlugins, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(onlinePluginsSelectionChanged(int)) ); TQVBoxLayout* onlinePluginsRightBox = new TQVBoxLayout( onlinePluginsBox ); pRefreshOnlinePlugins = new KPushButton( iconLoader->loadIcon("reload",TDEIcon::Small), i18n("Refresh"), parent, "pRefreshOnlinePlugins" ); TQToolTip::add( pRefreshOnlinePlugins, i18n("Download the latest list of available plugins.") ); onlinePluginsRightBox->addWidget( pRefreshOnlinePlugins ); - connect( pRefreshOnlinePlugins, TQT_SIGNAL(clicked()), - this, TQT_SLOT(refreshOnlinePlugins()) + connect( pRefreshOnlinePlugins, TQ_SIGNAL(clicked()), + this, TQ_SLOT(refreshOnlinePlugins()) ); // TODO upgrade button // pUpgradeOnlinePlugins = new KPushButton( iconLoader->loadIcon("document-save",TDEIcon::Small), i18n("Upgrade"), parent, "pUpgradeOnlinePlugins" ); // pUpgradeOnlinePlugins->setEnabled( false ); // TQToolTip::add( pUpgradeOnlinePlugins, i18n("Download all plugins and install them into the soundKonverter directory.") ); // onlinePluginsRightBox->addWidget( pUpgradeOnlinePlugins ); -// connect(pInstallAllOnlinePlugins,TQT_SIGNAL(clicked()),this,TQT_SLOT(upgradeOnlinePlugins())); +// connect(pInstallAllOnlinePlugins,TQ_SIGNAL(clicked()),this,TQ_SLOT(upgradeOnlinePlugins())); onlinePluginsRightBox->addStretch(); pInstallOnlinePlugin = new KPushButton( iconLoader->loadIcon("document-save",TDEIcon::Small), i18n("Install"), parent, "pInstallOnlinePlugin" ); pInstallOnlinePlugin->setEnabled( false ); TQToolTip::add( pInstallOnlinePlugin, i18n("Download the selected plugin and install it into the soundKonverter directory.") ); onlinePluginsRightBox->addWidget( pInstallOnlinePlugin ); - connect( pInstallOnlinePlugin, TQT_SIGNAL(clicked()), - this, TQT_SLOT(getOnlinePlugin()) + connect( pInstallOnlinePlugin, TQ_SIGNAL(clicked()), + this, TQ_SLOT(getOnlinePlugin()) ); pAboutOnlinePlugin = new KPushButton( iconLoader->loadIcon("messagebox_info",TDEIcon::Small), i18n("About"), parent, "pAboutOnlinePlugin" ); pAboutOnlinePlugin->setEnabled( false ); onlinePluginsRightBox->addWidget( pAboutOnlinePlugin ); - connect( pAboutOnlinePlugin, TQT_SIGNAL(clicked()), - this, TQT_SLOT(aboutOnlinePlugin()) + connect( pAboutOnlinePlugin, TQ_SIGNAL(clicked()), + this, TQ_SLOT(aboutOnlinePlugin()) ); cCheckOnlinePlugins = new TQCheckBox( i18n("Check for new plugins on every startup"), parent, "cCheckOnlinePlugins" ); cCheckOnlinePlugins->setChecked( config->data.plugins.checkForUpdates ); box->addWidget( cCheckOnlinePlugins ); - connect( cCheckOnlinePlugins, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(cfgChanged()) + connect( cCheckOnlinePlugins, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(cfgChanged()) ); // box->addStretch(); @@ -231,8 +231,8 @@ void ConfigPluginsPage::getPlugin() TQString fileName = filePathName.right( filePathName.length() - filePathName.findRev("/") ); getPluginFilePathName = locateLocal("data","soundkonverter/plugins/") + fileName; getPluginJob = TDEIO::file_copy( url, getPluginFilePathName, -1, true, false, false ); - connect( getPluginJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(getPluginFinished(TDEIO::Job*)) + connect( getPluginJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(getPluginFinished(TDEIO::Job*)) ); } } @@ -430,8 +430,8 @@ void ConfigPluginsPage::refreshOnlinePlugins() refreshOnlinePluginsJob = TDEIO::file_copy( "http://kaligames.de/downloads/soundkonverter/plugins/download.php?version=" + TQString::number(config->data.app.configVersion), locateLocal("data","soundkonverter/pluginlist.txt"), -1, true, false, false ); - connect( refreshOnlinePluginsJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(refreshOnlinePluginsFinished(TDEIO::Job*)) + connect( refreshOnlinePluginsJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(refreshOnlinePluginsFinished(TDEIO::Job*)) ); } @@ -505,8 +505,8 @@ void ConfigPluginsPage::getOnlinePlugin() KURL::encode_string( name ); getOnlinePluginJob = TDEIO::file_copy( "http://kaligames.de/downloads/soundkonverter/plugins/getfile.php?version=" + TQString::number(config->data.app.configVersion) + "&file=" + name, locateLocal("data","soundkonverter/plugins/newplugin.xml"), -1, true, false, false ); - connect( getOnlinePluginJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(getOnlinePluginFinished(TDEIO::Job*)) + connect( getOnlinePluginJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(getOnlinePluginFinished(TDEIO::Job*)) ); } @@ -604,8 +604,8 @@ void ConfigPluginsPage::aboutOnlinePlugin() KURL::encode_string( name ); aboutOnlinePluginJob = TDEIO::file_copy( "http://kaligames.de/downloads/soundkonverter/plugins/info.php?file=" + name + "&lang=" + TQLocale::languageToString(TQLocale::system().language()), locateLocal("data","soundkonverter/plugin_info.txt"), -1, true, false, false ); - connect( aboutOnlinePluginJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(aboutOnlinePluginFinished(TDEIO::Job*)) + connect( aboutOnlinePluginJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(aboutOnlinePluginFinished(TDEIO::Job*)) ); } diff --git a/src/convert.cpp b/src/convert.cpp index f86d31b..40ef75c 100644 --- a/src/convert.cpp +++ b/src/convert.cpp @@ -47,26 +47,26 @@ Convert::Convert( Config* _config, TagEngine* _tagEngine, CDManager* _cdManager, tagEngine = _tagEngine; cdManager = _cdManager; fileList = _fileList; - connect( fileList, TQT_SIGNAL(convertItem(FileListItem*)), - this, TQT_SLOT(add(FileListItem*)) + connect( fileList, TQ_SIGNAL(convertItem(FileListItem*)), + this, TQ_SLOT(add(FileListItem*)) ); - connect( fileList, TQT_SIGNAL(stopItem(FileListItem*)), - this, TQT_SLOT(stop(FileListItem*)) + connect( fileList, TQ_SIGNAL(stopItem(FileListItem*)), + this, TQ_SLOT(stop(FileListItem*)) ); - connect( this, TQT_SIGNAL(finished(FileListItem*,int)), - fileList, TQT_SLOT(itemFinished(FileListItem*,int)) + connect( this, TQ_SIGNAL(finished(FileListItem*,int)), + fileList, TQ_SLOT(itemFinished(FileListItem*,int)) ); - connect( this, TQT_SIGNAL(rippingFinished(const TQString&)), - fileList, TQT_SLOT(rippingFinished(const TQString&)) + connect( this, TQ_SIGNAL(rippingFinished(const TQString&)), + fileList, TQ_SLOT(rippingFinished(const TQString&)) ); logger = _logger; - connect( this, TQT_SIGNAL(finishedProcess(int,int)), - logger, TQT_SLOT(processCompleted(int,int)) + connect( this, TQ_SIGNAL(finishedProcess(int,int)), + logger, TQ_SLOT(processCompleted(int,int)) ); tUpdateProgressIndicator = new TQTimer( this, "tUpdateProgressIndicator" ); - connect( tUpdateProgressIndicator, TQT_SIGNAL(timeout()), - this, TQT_SLOT(updateProgressIndicator()) + connect( tUpdateProgressIndicator, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateProgressIndicator()) ); } @@ -102,11 +102,11 @@ void Convert::get( ConvertItem* item ) } else { item->moveJob = new TDEIO::FileCopyJob( source, destination, -1, false, true, false, false ); - connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), - this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long)) + connect( item->moveJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), + this, TQ_SLOT(moveProgress(TDEIO::Job*,unsigned long)) ); - connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(moveFinished(TDEIO::Job*)) + connect( item->moveJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(moveFinished(TDEIO::Job*)) ); } } @@ -143,11 +143,11 @@ void Convert::getCorrection( ConvertItem* item ) } else { item->moveJob = new TDEIO::FileCopyJob( source, destination, -1, false, true, false, false ); - connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), - this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long)) + connect( item->moveJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), + this, TQ_SLOT(moveProgress(TDEIO::Job*,unsigned long)) ); - connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(moveFinished(TDEIO::Job*)) + connect( item->moveJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(moveFinished(TDEIO::Job*)) ); } } @@ -193,11 +193,11 @@ void Convert::rip( ConvertItem* item ) item->fileListItem->ripping = true; item->moveJob = new TDEIO::FileCopyJob( source, dest, -1, false, true, false, false ); - connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), - this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long)) + connect( item->moveJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), + this, TQ_SLOT(moveProgress(TDEIO::Job*,unsigned long)) ); - connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(moveFinished(TDEIO::Job*)) + connect( item->moveJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(moveFinished(TDEIO::Job*)) ); } else { @@ -637,11 +637,11 @@ void Convert::put( ConvertItem* item ) } else { item->moveJob = new TDEIO::FileCopyJob( source, destination, -1, false, false, false, false ); - connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), - this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long)) + connect( item->moveJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), + this, TQ_SLOT(moveProgress(TDEIO::Job*,unsigned long)) ); - connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(moveFinished(TDEIO::Job*)) + connect( item->moveJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(moveFinished(TDEIO::Job*)) ); } } @@ -676,11 +676,11 @@ void Convert::putCorrection( ConvertItem* item ) } else { item->moveJob = new TDEIO::FileCopyJob( source, destination, -1, false, false, false, false ); - connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), - this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long)) + connect( item->moveJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), + this, TQ_SLOT(moveProgress(TDEIO::Job*,unsigned long)) ); - connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(moveFinished(TDEIO::Job*)) + connect( item->moveJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(moveFinished(TDEIO::Job*)) ); } } @@ -1319,14 +1319,14 @@ void Convert::add( FileListItem* item ) // connect convertProcess of our new item with the slots of Convert (*newItem)->convertProcess = new TDEProcess(); - connect( (*newItem)->convertProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(processOutput(TDEProcess*,char*,int)) + connect( (*newItem)->convertProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(processOutput(TDEProcess*,char*,int)) ); - connect( (*newItem)->convertProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(processOutput(TDEProcess*,char*,int)) + connect( (*newItem)->convertProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(processOutput(TDEProcess*,char*,int)) ); - connect( (*newItem)->convertProcess, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(processExit(TDEProcess*)) + connect( (*newItem)->convertProcess, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(processExit(TDEProcess*)) ); // NOTE the tempInFile is also created if the file is a audio cd track diff --git a/src/cuesheeteditor.cpp b/src/cuesheeteditor.cpp index 8d83106..0cd1f14 100644 --- a/src/cuesheeteditor.cpp +++ b/src/cuesheeteditor.cpp @@ -69,26 +69,26 @@ CuesheetEditor::CuesheetEditor( TQWidget *parent, const char *name, bool modal, pHelp = new KPushButton( iconLoader->loadIcon("help",TDEIcon::Small), "", this, "pHelp" ); buttonBox->addWidget( pHelp ); - connect( pHelp, TQT_SIGNAL(clicked()), - this, TQT_SLOT(help()) + connect( pHelp, TQ_SIGNAL(clicked()), + this, TQ_SLOT(help()) ); pGenerate = new KPushButton( iconLoader->loadIcon("document-new",TDEIcon::Small), i18n("Generate"), this, "pGenerate" ); buttonBox->addWidget( pGenerate ); - connect( pGenerate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(generate()) + connect( pGenerate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(generate()) ); pConvert = new KPushButton( iconLoader->loadIcon("system-run",TDEIcon::Small), i18n("Format"), this, "pConvert" ); buttonBox->addWidget( pConvert ); - connect( pConvert, TQT_SIGNAL(clicked()), - this, TQT_SLOT(convert()) + connect( pConvert, TQ_SIGNAL(clicked()), + this, TQ_SLOT(convert()) ); pShift = new KPushButton( iconLoader->loadIcon("reload",TDEIcon::Small), i18n("Shift Title/Performer"), this, "pShift" ); buttonBox->addWidget( pShift ); - connect( pShift, TQT_SIGNAL(clicked()), - this, TQT_SLOT(shift()) + connect( pShift, TQ_SIGNAL(clicked()), + this, TQ_SLOT(shift()) ); buttonBox->addStretch(); @@ -96,8 +96,8 @@ CuesheetEditor::CuesheetEditor( TQWidget *parent, const char *name, bool modal, pOk = new KPushButton(iconLoader->loadIcon("system-log-out",TDEIcon::Small), i18n("Close"), this, "pOk" ); pOk->setFocus(); buttonBox->addWidget( pOk ); - connect( pOk, TQT_SIGNAL(clicked()), - this, TQT_SLOT(accept()) + connect( pOk, TQ_SIGNAL(clicked()), + this, TQ_SLOT(accept()) ); // delete the icon loader object diff --git a/src/dirdialog.cpp b/src/dirdialog.cpp index cf5d0dd..7cbbcef 100644 --- a/src/dirdialog.cpp +++ b/src/dirdialog.cpp @@ -43,8 +43,8 @@ DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *n pDirectory = new KPushButton( iconLoader->loadIcon("folder_open",TDEIcon::Small), "", this, "pDirectory" ); directoryBox->addWidget( pDirectory ); - connect( pDirectory, TQT_SIGNAL(clicked()), - this, TQT_SLOT(selectDirectoryClicked()) + connect( pDirectory, TQ_SIGNAL(clicked()), + this, TQ_SLOT(selectDirectoryClicked()) ); TQHBoxLayout* fileTypesBox = new TQHBoxLayout(); @@ -62,22 +62,22 @@ DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *n pSelectAll = new KPushButton( iconLoader->loadIcon("font-x-generic",TDEIcon::Small), i18n("Select all"), this, "pSelectAll" ); fileTypesButtonsBox->addWidget( pSelectAll ); - connect( pSelectAll, TQT_SIGNAL(clicked()), - this, TQT_SLOT(selectAllClicked()) + connect( pSelectAll, TQ_SIGNAL(clicked()), + this, TQ_SLOT(selectAllClicked()) ); pSelectNone = new KPushButton( iconLoader->loadIcon("application-x-zerosize",TDEIcon::Small), i18n("Select none"), this, "pSelectNone" ); fileTypesButtonsBox->addWidget( pSelectNone ); - connect( pSelectNone, TQT_SIGNAL(clicked()), - this, TQT_SLOT(selectNoneClicked()) + connect( pSelectNone, TQ_SIGNAL(clicked()), + this, TQ_SLOT(selectNoneClicked()) ); cRecursive = new TQCheckBox( i18n("Recursive"), this, "cRecursive" ); cRecursive->setChecked( true ); recursive = true; fileTypesButtonsBox->addWidget( cRecursive ); - connect( cRecursive, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(recursiveToggled(bool)) + connect( cRecursive, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(recursiveToggled(bool)) ); fileTypesButtonsBox->addStretch(); @@ -87,8 +87,8 @@ DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *n pOk = new KPushButton( iconLoader->loadIcon("folder_open",TDEIcon::Small), i18n("Open"), this, "pOk" ); buttonBox->addWidget( pOk ); - connect( pOk, TQT_SIGNAL(clicked()), - this, TQT_SLOT(okClicked()) + connect( pOk, TQ_SIGNAL(clicked()), + this, TQ_SLOT(okClicked()) ); buttonBox->addStretch(); @@ -96,8 +96,8 @@ DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *n pCancel = new KPushButton( iconLoader->loadIcon("cancel",TDEIcon::Small),i18n("Cancel"), this, "pCancel" ); pOk->setFocus(); buttonBox->addWidget( pCancel ); - connect( pCancel, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject()) + connect( pCancel, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject()) ); // delete the icon loader object diff --git a/src/filelist.cpp b/src/filelist.cpp index 100ba4a..bbd6516 100644 --- a/src/filelist.cpp +++ b/src/filelist.cpp @@ -160,25 +160,25 @@ FileList::FileList( CDManager* _cdManager, TagEngine* _tagEngine, Config* _confi grid->setColStretch( 1, 2 ); contextMenu = new TDEPopupMenu( this ); - connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(showContextMenu( TQListViewItem*, const TQPoint&, int )) + connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(showContextMenu( TQListViewItem*, const TQPoint&, int )) ); // we haven't got access to the action collection of soundKonverter, so let's create a new one actionCollection = new TDEActionCollection( this ); - edit = new TDEAction( i18n("Edit options ..."), "view_text", 0, this, TQT_SLOT(showOptionsEditorDialog()), actionCollection, "edit_options" ); - start = new TDEAction( i18n("Start conversion"), "system-run", 0, this, TQT_SLOT(convertSelectedItems()), actionCollection, "start_conversion" ); - stop = new TDEAction( i18n("Stop conversion"), "process-stop", 0, this, TQT_SLOT(stopSelectedItems()), actionCollection, "stop_conversion" ); - remove = new TDEAction( i18n("Remove"), "edittrash", Key_Delete, this, TQT_SLOT(removeSelectedItems()), actionCollection, "remove" ); + edit = new TDEAction( i18n("Edit options ..."), "view_text", 0, this, TQ_SLOT(showOptionsEditorDialog()), actionCollection, "edit_options" ); + start = new TDEAction( i18n("Start conversion"), "system-run", 0, this, TQ_SLOT(convertSelectedItems()), actionCollection, "start_conversion" ); + stop = new TDEAction( i18n("Stop conversion"), "process-stop", 0, this, TQ_SLOT(stopSelectedItems()), actionCollection, "stop_conversion" ); + remove = new TDEAction( i18n("Remove"), "edittrash", Key_Delete, this, TQ_SLOT(removeSelectedItems()), actionCollection, "remove" ); paste = new TDEAction( i18n("Paste"), "edit-paste", 0, this, 0, actionCollection, "paste" ); // TODO paste - connect( this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(itemsSelected()) + connect( this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(itemsSelected()) ); -// connect( this, TQT_SIGNAL(clicked(TQListViewItem*,const TQPoint&,int)), -// this, TQT_SLOT(clickedSomewhere(TQListViewItem*,const TQPoint&,int)) +// connect( this, TQ_SIGNAL(clicked(TQListViewItem*,const TQPoint&,int)), +// this, TQ_SLOT(clickedSomewhere(TQListViewItem*,const TQPoint&,int)) // ); bubble = new TQSimpleRichText( i18n( "<div align=center>" @@ -188,11 +188,11 @@ FileList::FileList( CDManager* _cdManager, TagEngine* _tagEngine, Config* _confi // "<br/><a href=\"documenation:about_compression\">Learn more about audio compression ...</a>" "</div>" ), TQApplication::font() ); - connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), - TQT_SLOT(columnResizeEvent( int, int, int )) + connect( header(), TQ_SIGNAL(sizeChange( int, int, int )), + TQ_SLOT(columnResizeEvent( int, int, int )) ); - connect( this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), - TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ) + connect( this, TQ_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), + TQ_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ) ); // if( TQFile::exists(locateLocal("data","soundkonverter/filelist.autosave.xml")) ) load( true ); @@ -764,23 +764,23 @@ void FileList::showOptionsEditorDialog() return; } // } - connect( this, TQT_SIGNAL(editItems(TQValueList<FileListItem*>)), - optionsEditor, TQT_SLOT(itemsSelected(TQValueList<FileListItem*>)) + connect( this, TQ_SIGNAL(editItems(TQValueList<FileListItem*>)), + optionsEditor, TQ_SLOT(itemsSelected(TQValueList<FileListItem*>)) ); - connect( this, TQT_SIGNAL(setPreviousItemEnabled(bool)), - optionsEditor, TQT_SLOT(setPreviousEnabled(bool)) + connect( this, TQ_SIGNAL(setPreviousItemEnabled(bool)), + optionsEditor, TQ_SLOT(setPreviousEnabled(bool)) ); - connect( this, TQT_SIGNAL(setNextItemEnabled(bool)), - optionsEditor, TQT_SLOT(setNextEnabled(bool)) + connect( this, TQ_SIGNAL(setNextItemEnabled(bool)), + optionsEditor, TQ_SLOT(setNextEnabled(bool)) ); - connect( optionsEditor, TQT_SIGNAL(user2Clicked()), - this, TQT_SLOT(selectPreviousItem()) + connect( optionsEditor, TQ_SIGNAL(user2Clicked()), + this, TQ_SLOT(selectPreviousItem()) ); - connect( optionsEditor, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(selectNextItem()) + connect( optionsEditor, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(selectNextItem()) ); - /*connect( this, TQT_SIGNAL(moveEditor(int,int)), - optionsEditor, TQT_SLOT(moveWindow(int,int)) + /*connect( this, TQ_SIGNAL(moveEditor(int,int)), + optionsEditor, TQ_SLOT(moveWindow(int,int)) );*/ } itemsSelected(); diff --git a/src/logviewer.cpp b/src/logviewer.cpp index 70d72d6..21f9881 100644 --- a/src/logviewer.cpp +++ b/src/logviewer.cpp @@ -70,11 +70,11 @@ LogViewer::LogViewer( Logger* _logger, TQWidget *parent, const char *name, bool : KDialog( parent, name, modal, f ) { logger = _logger; - connect( logger, TQT_SIGNAL(removedProcess(int)), - this, TQT_SLOT(processRemoved(int)) + connect( logger, TQ_SIGNAL(removedProcess(int)), + this, TQ_SLOT(processRemoved(int)) ); - connect( logger, TQT_SIGNAL(updateProcess(int)), - this, TQT_SLOT(updateProcess(int)) + connect( logger, TQ_SIGNAL(updateProcess(int)), + this, TQ_SLOT(updateProcess(int)) ); // create an icon loader object for loading icons @@ -101,8 +101,8 @@ LogViewer::LogViewer( Logger* _logger, TQWidget *parent, const char *name, bool pReload = new KPushButton(iconLoader->loadIcon("reload",TDEIcon::Small), i18n("Reload"), this, "pReload" ); buttonBox->addWidget( pReload ); - connect( pReload, TQT_SIGNAL(clicked()), - this, TQT_SLOT(refillLogs()) + connect( pReload, TQ_SIGNAL(clicked()), + this, TQ_SLOT(refillLogs()) ); buttonBox->addStretch(); @@ -110,8 +110,8 @@ LogViewer::LogViewer( Logger* _logger, TQWidget *parent, const char *name, bool pOk = new KPushButton(iconLoader->loadIcon("system-log-out",TDEIcon::Small), i18n("Close"), this, "pOk" ); pOk->setFocus(); buttonBox->addWidget( pOk ); - connect( pOk, TQT_SIGNAL(clicked()), - this, TQT_SLOT(accept()) + connect( pOk, TQ_SIGNAL(clicked()), + this, TQ_SLOT(accept()) ); // delete the icon loader object diff --git a/src/options.cpp b/src/options.cpp index d9aede2..133fc21 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -22,8 +22,8 @@ Options::Options( Config* _config, const TQString &text, TQWidget *parent, const : TQWidget( parent, name ) { config = _config; - connect( config, TQT_SIGNAL(configChanged()), - this, TQT_SLOT(configChanged()) + connect( config, TQ_SIGNAL(configChanged()), + this, TQ_SLOT(configChanged()) ); TQGridLayout *gridLayout = new TQGridLayout( this, 1, 1 ); @@ -34,72 +34,72 @@ Options::Options( Config* _config, const TQString &text, TQWidget *parent, const optionsSimple = new OptionsSimple( config, optionsDetailed, text, this, "optionsSimple" ); tab->addTab( optionsSimple, i18n("Simple") ); - connect( optionsSimple, TQT_SIGNAL(optionsChanged()), - this, TQT_SLOT(somethingChanged()) + connect( optionsSimple, TQ_SIGNAL(optionsChanged()), + this, TQ_SLOT(somethingChanged()) ); tab->addTab( optionsDetailed, i18n("Detailed") ); - connect( optionsDetailed, TQT_SIGNAL(optionsChanged()), - this, TQT_SLOT(somethingChanged()) + connect( optionsDetailed, TQ_SIGNAL(optionsChanged()), + this, TQ_SLOT(somethingChanged()) ); -// connect( optionsSimple, TQT_SIGNAL(setFormat(const TQString&)), -// optionsDetailed, TQT_SLOT(setFormat(const TQString&)) +// connect( optionsSimple, TQ_SIGNAL(setFormat(const TQString&)), +// optionsDetailed, TQ_SLOT(setFormat(const TQString&)) // ); -// connect( optionsSimple, TQT_SIGNAL(setQualityMode(const TQString&)), -// optionsDetailed, TQT_SLOT(setQualityMode(const TQString&)) +// connect( optionsSimple, TQ_SIGNAL(setQualityMode(const TQString&)), +// optionsDetailed, TQ_SLOT(setQualityMode(const TQString&)) // ); -// connect( optionsSimple, TQT_SIGNAL(setQuality(int)), -// optionsDetailed, TQT_SLOT(setQuality(int)) +// connect( optionsSimple, TQ_SIGNAL(setQuality(int)), +// optionsDetailed, TQ_SLOT(setQuality(int)) // ); -// connect( optionsSimple, TQT_SIGNAL(setBitrateMode(const TQString&)), -// optionsDetailed, TQT_SLOT(setBitrateMode(const TQString&)) +// connect( optionsSimple, TQ_SIGNAL(setBitrateMode(const TQString&)), +// optionsDetailed, TQ_SLOT(setBitrateMode(const TQString&)) // ); -// connect( optionsSimple, TQT_SIGNAL(setBitrateRangeEnabled(bool)), -// optionsDetailed, TQT_SLOT(setBitrateRangeEnabled(bool)) +// connect( optionsSimple, TQ_SIGNAL(setBitrateRangeEnabled(bool)), +// optionsDetailed, TQ_SLOT(setBitrateRangeEnabled(bool)) // ); -// connect( optionsSimple, TQT_SIGNAL(setMinBitrate(int)), -// optionsDetailed, TQT_SLOT(setMinBitrate(int)) +// connect( optionsSimple, TQ_SIGNAL(setMinBitrate(int)), +// optionsDetailed, TQ_SLOT(setMinBitrate(int)) // ); -// connect( optionsSimple, TQT_SIGNAL(setMaxBitrate(int)), -// optionsDetailed, TQT_SLOT(setMaxBitrate(int)) +// connect( optionsSimple, TQ_SIGNAL(setMaxBitrate(int)), +// optionsDetailed, TQ_SLOT(setMaxBitrate(int)) // ); -// connect( optionsSimple, TQT_SIGNAL(setSamplingrateEnabled(bool)), -// optionsDetailed, TQT_SLOT(setSamplingrateEnabled(bool)) +// connect( optionsSimple, TQ_SIGNAL(setSamplingrateEnabled(bool)), +// optionsDetailed, TQ_SLOT(setSamplingrateEnabled(bool)) // ); -// connect( optionsSimple, TQT_SIGNAL(setSamplingrate(int)), -// optionsDetailed, TQT_SLOT(setSamplingrate(int)) +// connect( optionsSimple, TQ_SIGNAL(setSamplingrate(int)), +// optionsDetailed, TQ_SLOT(setSamplingrate(int)) // ); -// connect( optionsSimple, TQT_SIGNAL(setSamplingrate(const TQString&)), -// optionsDetailed, TQT_SLOT(setSamplingrate(const TQString&)) +// connect( optionsSimple, TQ_SIGNAL(setSamplingrate(const TQString&)), +// optionsDetailed, TQ_SLOT(setSamplingrate(const TQString&)) // ); -// connect( optionsSimple, TQT_SIGNAL(setChannelsEnabled(bool)), -// optionsDetailed, TQT_SLOT(setChannelsEnabled(bool)) +// connect( optionsSimple, TQ_SIGNAL(setChannelsEnabled(bool)), +// optionsDetailed, TQ_SLOT(setChannelsEnabled(bool)) // ); -// connect( optionsSimple, TQT_SIGNAL(setChannels(const TQString&)), -// optionsDetailed, TQT_SLOT(setChannels(const TQString&)) +// connect( optionsSimple, TQ_SIGNAL(setChannels(const TQString&)), +// optionsDetailed, TQ_SLOT(setChannels(const TQString&)) // ); -// connect( optionsSimple, TQT_SIGNAL(setReplayGainEnabled(bool)), -// optionsDetailed, TQT_SLOT(setReplayGainEnabled(bool)) +// connect( optionsSimple, TQ_SIGNAL(setReplayGainEnabled(bool)), +// optionsDetailed, TQ_SLOT(setReplayGainEnabled(bool)) // ); -// connect( optionsSimple, TQT_SIGNAL(setOutputDirectoryMode(OutputDirectory::Mode)), -// optionsDetailed, TQT_SLOT(setOutputDirectoryMode(OutputDirectory::Mode)) +// connect( optionsSimple, TQ_SIGNAL(setOutputDirectoryMode(OutputDirectory::Mode)), +// optionsDetailed, TQ_SLOT(setOutputDirectoryMode(OutputDirectory::Mode)) // ); -// connect( optionsSimple, TQT_SIGNAL(setOutputDirectoryPath(const TQString&)), -// optionsDetailed, TQT_SLOT(setOutputDirectoryPath(const TQString&)) +// connect( optionsSimple, TQ_SIGNAL(setOutputDirectoryPath(const TQString&)), +// optionsDetailed, TQ_SLOT(setOutputDirectoryPath(const TQString&)) // ); -// connect( optionsSimple, TQT_SIGNAL(setOptions(const ConversionOptions&)), -// optionsDetailed, TQT_SLOT(setCurrentOptions(const ConversionOptions&)) +// connect( optionsSimple, TQ_SIGNAL(setOptions(const ConversionOptions&)), +// optionsDetailed, TQ_SLOT(setCurrentOptions(const ConversionOptions&)) // ); -// connect( optionsSimple, TQT_SIGNAL(setUserOptions(const TQString&)), -// optionsDetailed, TQT_SLOT(setUserOptions(const TQString&)) +// connect( optionsSimple, TQ_SIGNAL(setUserOptions(const TQString&)), +// optionsDetailed, TQ_SLOT(setUserOptions(const TQString&)) // ); if( config->data.general.startTab == 0 ) tab->setCurrentPage( config->data.general.lastTab ); else tab->setCurrentPage( config->data.general.startTab - 1 ); gridLayout->addWidget( tab, 0, 0 ); - connect( tab, TQT_SIGNAL( currentChanged(TQWidget*) ), - this, TQT_SLOT( tabChanged(TQWidget*) ) + connect( tab, TQ_SIGNAL( currentChanged(TQWidget*) ), + this, TQ_SLOT( tabChanged(TQWidget*) ) ); // draw the toggle button @@ -118,8 +118,8 @@ Options::Options( Config* _config, const TQString &text, TQWidget *parent, const // pPluginsNotify->hide(); // pPluginsNotify->setPaletteBackgroundColor( TQColor(255,220,247) ); // optionsBox->addWidget( pPluginsNotify ); -// connect( pPluginsNotify, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(showConfigDialogPlugins()) +// connect( pPluginsNotify, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(showConfigDialogPlugins()) // ); pBackendsNotify = new KPushButton( "", this, "pBackendsNotify"); @@ -129,24 +129,24 @@ Options::Options( Config* _config, const TQString &text, TQWidget *parent, const config->backendsChanged = false; pBackendsNotify->setPaletteBackgroundColor( TQColor(255,220,247) ); optionsBox->addWidget( pBackendsNotify ); - connect( pBackendsNotify, TQT_SIGNAL(clicked()), - this, TQT_SLOT(showConfigDialogBackends()) + connect( pBackendsNotify, TQ_SIGNAL(clicked()), + this, TQ_SLOT(showConfigDialogBackends()) ); pAdvancedOptionsToggle = new KPushButton( i18n("Advanced Options"), this, "pAdvancedOptionsToggle"); pAdvancedOptionsToggle->setToggleButton( true ); pAdvancedOptionsToggle->hide(); optionsBox->addWidget( pAdvancedOptionsToggle ); - connect( pAdvancedOptionsToggle, TQT_SIGNAL(clicked()), - optionsDetailed, TQT_SLOT(toggleAdvancedOptions()) + connect( pAdvancedOptionsToggle, TQ_SIGNAL(clicked()), + optionsDetailed, TQ_SLOT(toggleAdvancedOptions()) ); /* NOTE kaligames.de is down if( config->data.plugins.checkForUpdates ) { config->onlinePluginsChanged = false; getPluginListJob = TDEIO::file_copy("http://kaligames.de/downloads/soundkonverter/plugins/download.php?version=" + TQString::number(config->data.app.configVersion), locateLocal("data","soundkonverter/pluginlist_new.txt"), -1, true, false, false ); - connect( getPluginListJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(getPluginListFinished(TDEIO::Job*)) + connect( getPluginListJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(getPluginListFinished(TDEIO::Job*)) ); } */ diff --git a/src/optionsdetailed.cpp b/src/optionsdetailed.cpp index 4e70e15..2dddc2e 100644 --- a/src/optionsdetailed.cpp +++ b/src/optionsdetailed.cpp @@ -46,48 +46,48 @@ OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char normalTopBox->addWidget( lConvert, 0, TQt::AlignVCenter ); cFormat = new KComboBox( normalOptions, "cFormat" ); normalTopBox->addWidget( cFormat, 0, TQt::AlignVCenter ); - connect( cFormat, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(formatChanged()) + connect( cFormat, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(formatChanged()) ); - connect( cFormat, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(somethingChanged()) + connect( cFormat, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(somethingChanged()) ); cQualityMode = new KComboBox( normalOptions, "cQualityMode" ); cQualityMode->setFixedSize( cQualityMode->sizeHint() ); normalTopBox->addWidget( cQualityMode, 0, TQt::AlignVCenter ); - connect( cQualityMode, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(qualityModeChanged()) + connect( cQualityMode, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(qualityModeChanged()) ); - connect( cQualityMode, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(somethingChanged()) + connect( cQualityMode, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(somethingChanged()) ); iQuality = new KIntSpinBox( normalOptions, "iQuality" ); normalTopBox->addWidget( iQuality, 0, TQt::AlignVCenter ); - connect( iQuality, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(qualityChanged()) + connect( iQuality, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(qualityChanged()) ); - connect( iQuality, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(somethingChanged()) + connect( iQuality, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(somethingChanged()) ); cBitrateMode = new KComboBox( normalOptions, "cBitrateMode" ); TQToolTip::add( cBitrateMode, i18n("vbr - variable bitrate\nabr - average bitrate\ncbr - constant bitrate") ); normalTopBox->addWidget( cBitrateMode, 0, TQt::AlignVCenter ); - connect( cBitrateMode, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(bitrateModeChanged()) + connect( cBitrateMode, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(bitrateModeChanged()) ); - connect( cBitrateMode, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(somethingChanged()) + connect( cBitrateMode, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(somethingChanged()) ); normalTopBox->addSpacing( 18 ); cBitrateRangeSwitch = new TQCheckBox( i18n("Bitrate range")+":", normalOptions, "cBitrateRangeSwitch" ); TQToolTip::add( cBitrateRangeSwitch, i18n("Use it only if, you know what you are doing, you could reduce the quality.") ); normalTopBox->addWidget( cBitrateRangeSwitch, 0, TQt::AlignVCenter ); - connect( cBitrateRangeSwitch, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(bitrateRangeToggled()) + connect( cBitrateRangeSwitch, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(bitrateRangeToggled()) ); - connect( cBitrateRangeSwitch, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(somethingChanged()) + connect( cBitrateRangeSwitch, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(somethingChanged()) ); iMinBitrate = new KIntSpinBox( normalOptions, "iMinBitrate" ); iMinBitrate->setMinValue( 32 ); @@ -95,8 +95,8 @@ OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char iMinBitrate->setLineStep( 8 ); iMinBitrate->setValue( 64 ); normalTopBox->addWidget( iMinBitrate, 0, TQt::AlignVCenter ); - connect( iMinBitrate, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(somethingChanged()) + connect( iMinBitrate, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(somethingChanged()) ); lBitrateRangeTo = new TQLabel( "-", normalOptions, "lBitrateRangeTo" ); normalTopBox->addWidget( lBitrateRangeTo, 0, TQt::AlignVCenter ); @@ -106,8 +106,8 @@ OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char iMaxBitrate->setLineStep( 8 ); iMaxBitrate->setValue( 192 ); normalTopBox->addWidget( iMaxBitrate, 0, TQt::AlignVCenter ); - connect( iMaxBitrate, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(somethingChanged()) + connect( iMaxBitrate, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(somethingChanged()) ); lBitrateRangeUnit = new TQLabel( "kbps", normalOptions, "lBitrateRangeUnit" ); normalTopBox->addWidget( lBitrateRangeUnit, 0, TQt::AlignVCenter ); @@ -118,11 +118,11 @@ OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char cSamplingrateSwitch = new TQCheckBox( i18n("Resample")+":", normalOptions, "cSamplingrateSwitch" ); normalMiddleBox->addWidget( cSamplingrateSwitch, 0, TQt::AlignVCenter ); - connect( cSamplingrateSwitch, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(samplingrateToggled()) + connect( cSamplingrateSwitch, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(samplingrateToggled()) ); - connect( cSamplingrateSwitch, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(somethingChanged()) + connect( cSamplingrateSwitch, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(somethingChanged()) ); cSamplingrate = new KComboBox( normalOptions, "cSamplingrate" ); cSamplingrate->setEditable(true); @@ -137,8 +137,8 @@ OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char cSamplingrate->insertItem("8000"); cSamplingrate->setCurrentText("44100"); normalMiddleBox->addWidget( cSamplingrate, 0, TQt::AlignVCenter ); - connect( cSamplingrate, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(somethingChanged()) + connect( cSamplingrate, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(somethingChanged()) ); lSamplingrateUnit = new TQLabel( "Hz", normalOptions, "lSamplingrateUnit" ); normalMiddleBox->addWidget( lSamplingrateUnit, 0, TQt::AlignVCenter ); @@ -146,11 +146,11 @@ OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char cChannelsSwitch = new TQCheckBox( i18n("Channels")+":", normalOptions, "cChannelsSwitch" ); normalMiddleBox->addWidget( cChannelsSwitch, 0, TQt::AlignVCenter ); - connect( cChannelsSwitch, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(channelsToggled()) + connect( cChannelsSwitch, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(channelsToggled()) ); - connect( cChannelsSwitch, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(somethingChanged()) + connect( cChannelsSwitch, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(somethingChanged()) ); cChannels = new KComboBox( normalOptions, "cChannels" ); /* sChannels.append( i18n("Mono") ); @@ -160,8 +160,8 @@ OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char sChannels.append( i18n("Dual Channels") ); cChannels->insertStringList( sChannels );*/ normalMiddleBox->addWidget( cChannels, 0, TQt::AlignVCenter ); - connect( cChannels, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(somethingChanged()) + connect( cChannels, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(somethingChanged()) ); normalMiddleBox->addSpacing( 18 ); @@ -170,8 +170,8 @@ OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char TQToolTip::add( cReplayGain, i18n("Add a Replay Gain tag to the converted file.") ); TQWhatsThis::add( cReplayGain, i18n("Replay Gain is a volume correction technique. A volume difference is calculated and stored in a tag. This way audio players can automatically adjust the volume and the original music data is not modified (like at normalization).") ); normalMiddleBox->addWidget( cReplayGain, 0, TQt::AlignVCenter ); - connect( cReplayGain, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(somethingChanged()) + connect( cReplayGain, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(somethingChanged()) ); normalMiddleBox->addStretch(); @@ -180,19 +180,19 @@ OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char outputDirectory = new OutputDirectory( config, normalOptions, "outputDirectory" ); normalBottomBox->addWidget( outputDirectory, 0, TQt::AlignVCenter ); - connect( outputDirectory, TQT_SIGNAL(modeChanged(OutputDirectory::Mode)), - this, TQT_SLOT(somethingChanged()) + connect( outputDirectory, TQ_SIGNAL(modeChanged(OutputDirectory::Mode)), + this, TQ_SLOT(somethingChanged()) ); - connect( outputDirectory, TQT_SIGNAL(directoryChanged(const TQString&)), - this, TQT_SLOT(somethingChanged()) + connect( outputDirectory, TQ_SIGNAL(directoryChanged(const TQString&)), + this, TQ_SLOT(somethingChanged()) ); normalBottomBox->addSpacing( 18 ); pProfileSave = new TDEToolBarButton( "document-save", 1003, normalOptions, "pProfileSave" ); TQToolTip::add( pProfileSave, i18n("Save current options as a profile") ); normalBottomBox->addWidget( pProfileSave, 0, TQt::AlignVCenter ); - connect( pProfileSave, TQT_SIGNAL(clicked()), - this, TQT_SLOT(saveProfile()) + connect( pProfileSave, TQ_SIGNAL(clicked()), + this, TQ_SLOT(saveProfile()) ); // advanced options @@ -209,8 +209,8 @@ OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char advancedTopBox->addWidget( lUserOptionsLabel, 0, TQt::AlignVCenter ); lUserOptions = new KLineEdit( advancedOptions, "lUserOptions" ); advancedTopBox->addWidget( lUserOptions, 0, TQt::AlignVCenter ); - connect( lUserOptions, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(somethingChanged()) + connect( lUserOptions, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(somethingChanged()) ); TQHBoxLayout *advancedMiddleBox = new TQHBoxLayout(); diff --git a/src/optionseditor.cpp b/src/optionseditor.cpp index fa54706..d07aac0 100644 --- a/src/optionseditor.cpp +++ b/src/optionseditor.cpp @@ -59,8 +59,8 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* // generate the options input area options = new Options( config, i18n("Choose your prefered output options and click on \"Close\"!"), conversionOptions, "options" ); conversionOptionsGridLayout->addWidget( options, 0, 0 ); - connect( options, TQT_SIGNAL(optionsChanged()), - this, TQT_SLOT(optionsChanged()) + connect( options, TQ_SIGNAL(optionsChanged()), + this, TQ_SLOT(optionsChanged()) ); conversionOptionsGridLayout->setRowStretch( 1, 1 ); @@ -72,8 +72,8 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* pEditOptions->setFixedWidth( pEditOptions->sizeHint().width() ); conversionOptionsGridLayout->addWidget( pEditOptions, 3, 0, TQt::AlignHCenter ); pEditOptions->hide(); - connect( pEditOptions, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editOptionsClicked()) + connect( pEditOptions, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editOptionsClicked()) ); //// tags page //// @@ -90,31 +90,31 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* tagsGridLayout->addWidget( lTitleLabel, 0, 0 ); lTitle = new KLineEdit( tags, "lTitle" ); titleBox->addWidget( lTitle ); - connect( lTitle, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(titleChanged(const TQString&)) + connect( lTitle, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(titleChanged(const TQString&)) ); pTitleEdit = new KPushButton( " ", tags, "pTitleEdit" ); pTitleEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) ); pTitleEdit->setFixedSize( lTitle->sizeHint().height(), lTitle->sizeHint().height() ); pTitleEdit->hide(); titleBox->addWidget( pTitleEdit ); - connect( pTitleEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editTitleClicked()) + connect( pTitleEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editTitleClicked()) ); lNumberLabel = new TQLabel( i18n("Track No.:"), tags, "lNumberLabel" ); titleBox->addWidget( lNumberLabel ); iNumber = new KIntSpinBox( 0, 999, 1, 1, 10, tags, "iNumber" ); titleBox->addWidget( iNumber ); - connect( iNumber, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(numberChanged(int)) + connect( iNumber, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(numberChanged(int)) ); pNumberEdit = new KPushButton( " ", tags, "pNumberEdit" ); pNumberEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) ); pNumberEdit->setFixedSize( iNumber->sizeHint().height(), iNumber->sizeHint().height() ); pNumberEdit->hide(); titleBox->addWidget( pNumberEdit ); - connect( pNumberEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editNumberClicked()) + connect( pNumberEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editNumberClicked()) ); // add a horizontal box layout for the artist and the composer @@ -125,31 +125,31 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* tagsGridLayout->addWidget( lArtistLabel, 1, 0 ); lArtist = new KLineEdit( tags, "lArtist" ); artistBox->addWidget( lArtist ); - connect( lArtist, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(artistChanged(const TQString&)) + connect( lArtist, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(artistChanged(const TQString&)) ); pArtistEdit = new KPushButton( " ", tags, "pArtistEdit" ); pArtistEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) ); pArtistEdit->setFixedSize( lArtist->sizeHint().height(), lArtist->sizeHint().height() ); pArtistEdit->hide(); artistBox->addWidget( pArtistEdit ); - connect( pArtistEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editArtistClicked()) + connect( pArtistEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editArtistClicked()) ); lComposerLabel = new TQLabel( i18n("Composer:"), tags, "lComposerLabel" ); artistBox->addWidget( lComposerLabel ); lComposer = new KLineEdit( tags, "lComposer" ); artistBox->addWidget( lComposer ); - connect( lComposer, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(composerChanged(const TQString&)) + connect( lComposer, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(composerChanged(const TQString&)) ); pComposerEdit = new KPushButton( " ", tags, "pComposerEdit" ); pComposerEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) ); pComposerEdit->setFixedSize( lComposer->sizeHint().height(), lComposer->sizeHint().height() ); pComposerEdit->hide(); artistBox->addWidget( pComposerEdit ); - connect( pComposerEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editComposerClicked()) + connect( pComposerEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editComposerClicked()) ); // add a horizontal box layout for the album @@ -160,16 +160,16 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* tagsGridLayout->addWidget( lAlbumLabel, 2, 0 ); lAlbum = new KLineEdit( tags, "lAlbum" ); albumBox->addWidget( lAlbum ); - connect( lAlbum, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(albumChanged(const TQString&)) + connect( lAlbum, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(albumChanged(const TQString&)) ); pAlbumEdit = new KPushButton( " ", tags, "pAlbumEdit" ); pAlbumEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) ); pAlbumEdit->setFixedSize( lAlbum->sizeHint().height(), lAlbum->sizeHint().height() ); pAlbumEdit->hide(); albumBox->addWidget( pAlbumEdit ); - connect( pAlbumEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editAlbumClicked()) + connect( pAlbumEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editAlbumClicked()) ); // add a horizontal box layout for the disc number, year and genre @@ -180,32 +180,32 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* tagsGridLayout->addWidget( lDiscLabel, 3, 0 ); iDisc = new KIntSpinBox( 0, 99, 1, 1, 10, tags, "iDisc" ); albumdataBox->addWidget( iDisc ); - connect( iDisc, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(discChanged(int)) + connect( iDisc, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(discChanged(int)) ); pDiscEdit = new KPushButton( " ", tags, "pDiscEdit" ); pDiscEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) ); pDiscEdit->setFixedSize( iDisc->sizeHint().height(), iDisc->sizeHint().height() ); pDiscEdit->hide(); albumdataBox->addWidget( pDiscEdit ); - connect( pDiscEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editDiscClicked()) + connect( pDiscEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editDiscClicked()) ); albumdataBox->addStretch(); lYearLabel = new TQLabel( i18n("Year:"), tags, "lYearLabel" ); albumdataBox->addWidget( lYearLabel ); iYear = new KIntSpinBox( 0, 99999, 1, TQDate::currentDate().year(), 10, tags, "iYear" ); albumdataBox->addWidget( iYear ); - connect( iYear, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(yearChanged(int)) + connect( iYear, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(yearChanged(int)) ); pYearEdit = new KPushButton( " ", tags, "pYearEdit" ); pYearEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) ); pYearEdit->setFixedSize( iYear->sizeHint().height(), iYear->sizeHint().height() ); pYearEdit->hide(); albumdataBox->addWidget( pYearEdit ); - connect( pYearEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editYearClicked()) + connect( pYearEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editYearClicked()) ); albumdataBox->addStretch(); lGenreLabel = new TQLabel( i18n("Genre:"), tags, "lGenreLabel" ); @@ -217,16 +217,16 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* cGenreCompletion->insertItems( tagEngine->genreList ); cGenreCompletion->setIgnoreCase( tags ); albumdataBox->addWidget( cGenre ); - connect( cGenre, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(genreChanged(const TQString&)) + connect( cGenre, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(genreChanged(const TQString&)) ); pGenreEdit = new KPushButton( " ", tags, "pGenreEdit" ); pGenreEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) ); pGenreEdit->setFixedSize( cGenre->sizeHint().height(), cGenre->sizeHint().height() ); pGenreEdit->hide(); albumdataBox->addWidget( pGenreEdit ); - connect( pGenreEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editGenreClicked()) + connect( pGenreEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editGenreClicked()) ); // add a horizontal box layout for the comment @@ -237,16 +237,16 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* tagsGridLayout->addWidget( lCommentLabel, 4, 0 ); tComment = new KTextEdit( tags, "tComment" ); commentBox->addWidget( tComment ); - connect( tComment, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(commentChanged()) + connect( tComment, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(commentChanged()) ); pCommentEdit = new KPushButton( " ", tags, "pCommentEdit" ); pCommentEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) ); pCommentEdit->setFixedSize( lTitle->sizeHint().height(), lTitle->sizeHint().height() ); pCommentEdit->hide(); commentBox->addWidget( pCommentEdit ); - connect( pCommentEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editCommentClicked()) + connect( pCommentEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editCommentClicked()) ); tagsGridLayout->setRowStretch( 4, 1 ); @@ -258,8 +258,8 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* pEditTags->setFixedWidth( pEditTags->sizeHint().width() ); tagsGridLayout->addWidget( pEditTags, 6, 1, TQt::AlignHCenter ); pEditTags->hide(); - connect( pEditTags, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editTagsClicked()) + connect( pEditTags, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editTagsClicked()) ); // delete the icon loader object @@ -349,10 +349,10 @@ void OptionsEditor::itemsSelected( TQValueList<FileListItem*> items ) setCaption( KURL::decode_string(items.first()->fileName).replace("%2f","/").replace("%%","%") ); // HACK ...but seems to work... // FIXME directory does get set properly - disconnect( options, TQT_SIGNAL(optionsChanged()), 0, 0 ); + disconnect( options, TQ_SIGNAL(optionsChanged()), 0, 0 ); options->setCurrentOptions( items.first()->options ); - connect( options, TQT_SIGNAL(optionsChanged()), - this, TQT_SLOT(optionsChanged()) + connect( options, TQ_SIGNAL(optionsChanged()), + this, TQ_SLOT(optionsChanged()) ); if( items.first()->tags == 0 && !items.first()->local ) { setTagInputEnabled( false ); @@ -466,10 +466,10 @@ void OptionsEditor::itemsSelected( TQValueList<FileListItem*> items ) if( options->isEnabled() ) { // HACK ...but seems to work... // FIXME directory does get set properly - disconnect( options, TQT_SIGNAL(optionsChanged()), 0, 0 ); + disconnect( options, TQ_SIGNAL(optionsChanged()), 0, 0 ); options->setCurrentOptions( items.first()->options ); - connect( options, TQT_SIGNAL(optionsChanged()), - this, TQT_SLOT(optionsChanged()) + connect( options, TQ_SIGNAL(optionsChanged()), + this, TQ_SLOT(optionsChanged()) ); } if( lTitle->isEnabled() ) { diff --git a/src/optionsrequester.cpp b/src/optionsrequester.cpp index 61e7b2e..db3d3aa 100644 --- a/src/optionsrequester.cpp +++ b/src/optionsrequester.cpp @@ -59,11 +59,11 @@ OptionsRequester::OptionsRequester( Config* config, TQStringList list, TQWidget pOk = new KPushButton( iconLoader->loadIcon("apply",TDEIcon::Small), i18n("Ok"), this, "pOk" ); buttonBox->addWidget( pOk ); - connect( pCancel, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject()) + connect( pCancel, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject()) ); - connect( pOk, TQT_SIGNAL(clicked()), - this, TQT_SLOT(okClicked()) + connect( pOk, TQ_SIGNAL(clicked()), + this, TQ_SLOT(okClicked()) ); // delete the icon loader object diff --git a/src/optionssimple.cpp b/src/optionssimple.cpp index 13abfb4..a16b742 100644 --- a/src/optionssimple.cpp +++ b/src/optionssimple.cpp @@ -51,11 +51,11 @@ OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed sProfile += i18n("User defined"); cProfile->insertStringList( sProfile ); topBox->addWidget( cProfile, 0, TQt::AlignVCenter ); - connect( cProfile, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(profileChanged()) + connect( cProfile, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(profileChanged()) ); - connect( cProfile, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(somethingChanged()) + connect( cProfile, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(somethingChanged()) ); topBox->addSpacing( 3 ); //pProfileRemove = new TDEToolBarButton( "edit-delete", 1002, this, "pProfileRemove" ); @@ -63,15 +63,15 @@ OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed pProfileRemove->hide(); TQToolTip::add( pProfileRemove, i18n("Remove the selected profile") ); topBox->addWidget( pProfileRemove, 0, TQt::AlignVCenter ); - connect( pProfileRemove, TQT_SIGNAL(clicked()), - this, TQT_SLOT(profileRemove()) + connect( pProfileRemove, TQ_SIGNAL(clicked()), + this, TQ_SLOT(profileRemove()) ); //pProfileInfo = new TDEToolBarButton( "messagebox_info", 1110, this, "pProfileInfo" ); pProfileInfo = new KPushButton( iconLoader->loadIcon("messagebox_info",TDEIcon::Small), i18n("Info"), this, "pProfileInfo" ); TQToolTip::add( pProfileInfo, i18n("Information about the selected profile") ); topBox->addWidget( pProfileInfo, 0, TQt::AlignVCenter ); - connect( pProfileInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(profileInfo()) + connect( pProfileInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(profileInfo()) ); topBox->addSpacing( 18 ); @@ -79,19 +79,19 @@ OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed topBox->addWidget( lFormat, 0, TQt::AlignVCenter ); cFormat = new KComboBox( this, "cFormat" ); topBox->addWidget( cFormat, 0, TQt::AlignVCenter ); - connect( cFormat, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(formatChanged()) + connect( cFormat, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(formatChanged()) ); - connect( cFormat, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(somethingChanged()) + connect( cFormat, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(somethingChanged()) ); topBox->addSpacing( 3 ); //pFormatInfo = new TDEToolBarButton( "messagebox_info", 1111, this, "pFormatInfo" ); pFormatInfo = new KPushButton( iconLoader->loadIcon("messagebox_info",TDEIcon::Small), i18n("Info"), this, "pFormatInfo" ); TQToolTip::add( pFormatInfo, i18n("Information about the selected file format") ); topBox->addWidget( pFormatInfo, 0, TQt::AlignVCenter ); - connect( pFormatInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(formatInfo()) + connect( pFormatInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(formatInfo()) ); topBox->addStretch( ); @@ -100,17 +100,17 @@ OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed outputDirectory = new OutputDirectory( config, this, "outputDirectory" ); middleBox->addWidget( outputDirectory, 0, TQt::AlignVCenter ); - connect( outputDirectory, TQT_SIGNAL(modeChanged(OutputDirectory::Mode)), - this, TQT_SLOT(outputDirectoryModeChanged(OutputDirectory::Mode)) + connect( outputDirectory, TQ_SIGNAL(modeChanged(OutputDirectory::Mode)), + this, TQ_SLOT(outputDirectoryModeChanged(OutputDirectory::Mode)) ); - connect( outputDirectory, TQT_SIGNAL(directoryChanged(const TQString&)), - this, TQT_SLOT(outputDirectoryPathChanged(const TQString&)) + connect( outputDirectory, TQ_SIGNAL(directoryChanged(const TQString&)), + this, TQ_SLOT(outputDirectoryPathChanged(const TQString&)) ); - connect( outputDirectory, TQT_SIGNAL(modeChanged(OutputDirectory::Mode)), - this, TQT_SLOT(somethingChanged()) + connect( outputDirectory, TQ_SIGNAL(modeChanged(OutputDirectory::Mode)), + this, TQ_SLOT(somethingChanged()) ); - connect( outputDirectory, TQT_SIGNAL(directoryChanged(const TQString&)), - this, TQT_SLOT(somethingChanged()) + connect( outputDirectory, TQ_SIGNAL(directoryChanged(const TQString&)), + this, TQ_SLOT(somethingChanged()) ); TQHBoxLayout *bottomBox = new TQHBoxLayout( ); diff --git a/src/outputdirectory.cpp b/src/outputdirectory.cpp index 7504ee0..4a09790 100644 --- a/src/outputdirectory.cpp +++ b/src/outputdirectory.cpp @@ -49,47 +49,47 @@ OutputDirectory::OutputDirectory( Config* _config, TQWidget* parent, const char* cMode->insertItem( i18n("Copy directory structure") ); //TQToolTip::add( cMode, i18n("Output all converted files into...") ); box->addWidget( cMode ); - connect( cMode, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(modeChangedSlot(int)) + connect( cMode, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(modeChangedSlot(int)) ); modeJustChanged = false; /*pModeInfo = new TDEToolBarButton( "messagebox_info", 1010, this, "pModeInfo" ); TQToolTip::add( pModeInfo, i18n("Information about the output mode") ); box->addWidget( pModeInfo ); - connect( pModeInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(modeInfo()) + connect( pModeInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(modeInfo()) );*/ pClear = new TDEToolBarButton( "locationbar_erase", 1001, this, "pClear" ); TQToolTip::add( pClear, i18n("Clear the directory input field") ); box->addWidget( pClear ); lDir = new KLineEdit( this, "lDir" ); box->addWidget( lDir ); - connect( lDir, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(directoryChangedSlot(const TQString&)) + connect( lDir, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(directoryChangedSlot(const TQString&)) ); - connect( pClear, TQT_SIGNAL(clicked()), - lDir, TQT_SLOT(setFocus()) + connect( pClear, TQ_SIGNAL(clicked()), + lDir, TQ_SLOT(setFocus()) ); - connect( pClear, TQT_SIGNAL(clicked()), - lDir, TQT_SLOT(clear()) + connect( pClear, TQ_SIGNAL(clicked()), + lDir, TQ_SLOT(clear()) ); /*pDirInfo = new TDEToolBarButton( "messagebox_info", 1011, this, "pDirInfo" ); TQToolTip::add( pDirInfo, i18n("Information about the wildcards") ); box->addWidget( pDirInfo ); - connect( pDirInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(dirInfo()) + connect( pDirInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(dirInfo()) );*/ pDirSelect = new TDEToolBarButton( "folder", 1012, this, "pDirSelect" ); TQToolTip::add( pDirSelect, i18n("Choose an output directory") ); box->addWidget( pDirSelect ); - connect( pDirSelect, TQT_SIGNAL(clicked()), - this, TQT_SLOT(selectDir()) + connect( pDirSelect, TQ_SIGNAL(clicked()), + this, TQ_SLOT(selectDir()) ); pDirGoto = new TDEToolBarButton( "konqueror", 1013, this, "pDirGoto" ); TQToolTip::add( pDirGoto, i18n("Open Konqueror with the output directory") ); box->addWidget( pDirGoto ); - connect( pDirGoto, TQT_SIGNAL(clicked()), - this, TQT_SLOT(gotoDir()) + connect( pDirGoto, TQ_SIGNAL(clicked()), + this, TQ_SLOT(gotoDir()) ); // delete the icon loader object diff --git a/src/replaygainfilelist.cpp b/src/replaygainfilelist.cpp index 3353e15..98f072d 100644 --- a/src/replaygainfilelist.cpp +++ b/src/replaygainfilelist.cpp @@ -203,20 +203,20 @@ ReplayGainFileList::ReplayGainFileList( TagEngine* _tagEngine, Config* _config, grid->setColStretch( 1, 2 ); contextMenu = new TDEPopupMenu( this ); - connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(showContextMenu(TQListViewItem*,const TQPoint&,int)) + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(showContextMenu(TQListViewItem*,const TQPoint&,int)) ); // we haven't got access to the action collection of soundKonverter, so let's create a new one actionCollection = new TDEActionCollection( this ); - calc_gain = new TDEAction( i18n("Calculate Replay Gain tags"), "apply", 0, this, TQT_SLOT(calcSelectedItemsGain()), actionCollection, "calc_album" ); - remove_gain = new TDEAction( i18n("Remove Replay Gain tags"), "cancel", 0, this, TQT_SLOT(removeSelectedItemsGain()), actionCollection, "remove_gain" ); - remove = new TDEAction( i18n("Remove"), "edittrash", Key_Delete, this, TQT_SLOT(removeSelectedItems()), actionCollection, "remove" ); + calc_gain = new TDEAction( i18n("Calculate Replay Gain tags"), "apply", 0, this, TQ_SLOT(calcSelectedItemsGain()), actionCollection, "calc_album" ); + remove_gain = new TDEAction( i18n("Remove Replay Gain tags"), "cancel", 0, this, TQ_SLOT(removeSelectedItemsGain()), actionCollection, "remove_gain" ); + remove = new TDEAction( i18n("Remove"), "edittrash", Key_Delete, this, TQ_SLOT(removeSelectedItems()), actionCollection, "remove" ); paste = new TDEAction( i18n("Paste"), "edit-paste", 0, this, 0, actionCollection, "paste" ); - newalbum = new TDEAction( i18n("New album"), "document-new", 0, this, TQT_SLOT(createNewAlbum()), actionCollection, "newalbum" ); - open_albums = new TDEAction( i18n("Open all albums"), "view_tree", 0, this, TQT_SLOT(openAlbums()), actionCollection, "open_albums" ); - close_albums = new TDEAction( i18n("Cloase all albums"), "view_text", 0, this, TQT_SLOT(closeAlbums()), actionCollection, "close_albums" ); + newalbum = new TDEAction( i18n("New album"), "document-new", 0, this, TQ_SLOT(createNewAlbum()), actionCollection, "newalbum" ); + open_albums = new TDEAction( i18n("Open all albums"), "view_tree", 0, this, TQ_SLOT(openAlbums()), actionCollection, "open_albums" ); + close_albums = new TDEAction( i18n("Cloase all albums"), "view_text", 0, this, TQ_SLOT(closeAlbums()), actionCollection, "close_albums" ); replayGain = new ReplayGain( config, logger ); @@ -229,27 +229,27 @@ ReplayGainFileList::ReplayGainFileList( TagEngine* _tagEngine, Config* _config, // "<br><a href=\"documenation:replaygaintool\">Learn more about Replay Gain ...</a><br/>" "</div>" ), TQApplication::font() ); - connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), - TQT_SLOT(columnResizeEvent( int, int, int )) + connect( header(), TQ_SIGNAL(sizeChange( int, int, int )), + TQ_SLOT(columnResizeEvent( int, int, int )) ); - connect( this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), - TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ) + connect( this, TQ_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), + TQ_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ) ); process = new TDEProcess(); - connect( process, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(processOutput(TDEProcess*,char*,int)) + connect( process, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(processOutput(TDEProcess*,char*,int)) ); - connect( process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(processOutput(TDEProcess*,char*,int)) + connect( process, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(processOutput(TDEProcess*,char*,int)) ); - connect( process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(processExit(TDEProcess*)) + connect( process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(processExit(TDEProcess*)) ); tUpdateProgress = new TQTimer( this, "tUpdateProgress" ); - connect( tUpdateProgress, TQT_SIGNAL(timeout()), - this, TQT_SLOT(update()) + connect( tUpdateProgress, TQ_SIGNAL(timeout()), + this, TQ_SLOT(update()) ); } diff --git a/src/replaygainscanner.cpp b/src/replaygainscanner.cpp index f3171a4..b2d07d1 100644 --- a/src/replaygainscanner.cpp +++ b/src/replaygainscanner.cpp @@ -43,8 +43,8 @@ ReplayGainScanner::ReplayGainScanner( TagEngine* _tagEngine, Config* _config, Lo cAdd->insertItem( iconLoader->loadIcon("folder",TDEIcon::Small),i18n("Add Folder ...") ); cAdd->insertItem( iconLoader->loadIcon("audio-x-generic",TDEIcon::Small),i18n("Add Files ...") ); filterBox->addWidget( cAdd ); - connect( cAdd, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(addClicked(int)) + connect( cAdd, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(addClicked(int)) ); filterBox->addStretch(); @@ -65,29 +65,29 @@ ReplayGainScanner::ReplayGainScanner( TagEngine* _tagEngine, Config* _config, Lo lList = new ReplayGainFileList( tagEngine, config, logger, this, "lList" ); grid->addWidget( lList, 1, 0 ); - connect( this, TQT_SIGNAL(addFile(const TQString&)), - lList, TQT_SLOT(addFile(const TQString&)) + connect( this, TQ_SIGNAL(addFile(const TQString&)), + lList, TQ_SLOT(addFile(const TQString&)) ); - connect( this, TQT_SIGNAL(addDir(const TQString&,const TQStringList&,bool)), - lList, TQT_SLOT(addDir(const TQString&,const TQStringList&,bool)) + connect( this, TQ_SIGNAL(addDir(const TQString&,const TQStringList&,bool)), + lList, TQ_SLOT(addDir(const TQString&,const TQStringList&,bool)) ); - connect( this, TQT_SIGNAL(calcAllReplayGain(bool)), - lList, TQT_SLOT(calcAllReplayGain(bool)) + connect( this, TQ_SIGNAL(calcAllReplayGain(bool)), + lList, TQ_SLOT(calcAllReplayGain(bool)) ); - connect( this, TQT_SIGNAL(removeAllReplayGain()), - lList, TQT_SLOT(removeAllReplayGain()) + connect( this, TQ_SIGNAL(removeAllReplayGain()), + lList, TQ_SLOT(removeAllReplayGain()) ); - connect( this, TQT_SIGNAL(cancelProcess()), - lList, TQT_SLOT(cancelProcess()) + connect( this, TQ_SIGNAL(cancelProcess()), + lList, TQ_SLOT(cancelProcess()) ); - connect( lList, TQT_SIGNAL(processStarted()), - this, TQT_SLOT(processStarted()) + connect( lList, TQ_SIGNAL(processStarted()), + this, TQ_SLOT(processStarted()) ); - connect( lList, TQT_SIGNAL(processStopped()), - this, TQT_SLOT(processStopped()) + connect( lList, TQ_SIGNAL(processStopped()), + this, TQ_SLOT(processStopped()) ); - connect( lList, TQT_SIGNAL(updateProgress(int,int)), - this, TQT_SLOT(updateProgress(int,int)) + connect( lList, TQ_SIGNAL(updateProgress(int,int)), + this, TQ_SLOT(updateProgress(int,int)) ); TQHBoxLayout* progressBox = new TQHBoxLayout(); @@ -102,22 +102,22 @@ ReplayGainScanner::ReplayGainScanner( TagEngine* _tagEngine, Config* _config, Lo pTagVisible = new KPushButton( iconLoader->loadIcon("apply",TDEIcon::Small), i18n("Tag untagged"), this, "pTagVisible" ); TQToolTip::add( pTagVisible, i18n("Calculate Replay Gain tag for all files in the file list without Replay Gain tag.") ); buttonBox->addWidget( pTagVisible ); - connect( pTagVisible, TQT_SIGNAL(clicked()), - this, TQT_SLOT(calcReplayGainClicked()) + connect( pTagVisible, TQ_SIGNAL(clicked()), + this, TQ_SLOT(calcReplayGainClicked()) ); pRemoveTag = new KPushButton( iconLoader->loadIcon("cancel",TDEIcon::Small), i18n("Untag tagged"), this, "pRemoveTag" ); TQToolTip::add( pRemoveTag, i18n("Remove the Replay Gain tag from all files in the file list.") ); buttonBox->addWidget( pRemoveTag ); - connect( pRemoveTag, TQT_SIGNAL(clicked()), - this, TQT_SLOT(removeReplayGainClicked()) + connect( pRemoveTag, TQ_SIGNAL(clicked()), + this, TQ_SLOT(removeReplayGainClicked()) ); pCancel = new KPushButton( iconLoader->loadIcon("cancel",TDEIcon::Small),i18n("Cancel"), this, "pCancel" ); pCancel->hide(); buttonBox->addWidget( pCancel ); - connect( pCancel, TQT_SIGNAL(clicked()), - this, TQT_SLOT(cancelClicked()) + connect( pCancel, TQ_SIGNAL(clicked()), + this, TQ_SLOT(cancelClicked()) ); buttonBox->addStretch(); @@ -125,8 +125,8 @@ ReplayGainScanner::ReplayGainScanner( TagEngine* _tagEngine, Config* _config, Lo pOk = new KPushButton( iconLoader->loadIcon("system-log-out",TDEIcon::Small), i18n("Close"), this, "pOk" ); pOk->setFocus(); buttonBox->addWidget( pOk ); - connect( pOk, TQT_SIGNAL(clicked()), - this, TQT_SLOT(accept()) + connect( pOk, TQ_SIGNAL(clicked()), + this, TQ_SLOT(accept()) ); // delete the icon loader object diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp index 3cc6576..14f19a3 100644 --- a/src/soundkonverter.cpp +++ b/src/soundkonverter.cpp @@ -113,17 +113,17 @@ soundKonverter::soundKonverter() 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 TDEAction( i18n("&Start conversion"), "system-run", 0, fileList, TQT_SLOT(startConversion()), actionCollection(), "start" ); + startAction = new TDEAction( i18n("&Start conversion"), "system-run", 0, fileList, TQ_SLOT(startConversion()), actionCollection(), "start" ); startAction->setEnabled( false ); - new TDEAction( i18n("&Replay Gain Tool ..."), "soundkonverter_replaygain", CTRL+Key_R, this, TQT_SLOT(showReplayGainScanner()), actionCollection(), "replaygainscanner" ); - //new TDEAction( i18n("R&epair Tool ..."), "soundkonverter_repair", CTRL+Key_E, this, TQT_SLOT(showRepairTool()), actionCollection(), "repairtool" ); - new TDEAction( i18n("C&uesheet Editor ..."), "kwrite", CTRL+Key_U, this, TQT_SLOT(showCuesheetEditor()), actionCollection(), "cuesheeteditor" ); - new TDEAction( i18n("Show &Log ..."), "view_text", CTRL+Key_L, this, TQT_SLOT(showLogViewer()), actionCollection(), "log" ); -// new TDEAction( i18n("About &Plugins ..."), "connect_creating", CTRL+Key_P, this, TQT_SLOT(showAboutPlugins()), actionCollection(), "about_plugins" ); - - stopAction = new TDEAction( i18n("S&top after current file is complete"), "process-stop", CTRL+Key_O, fileList, TQT_SLOT(stopConversion()), actionCollection(), "stop" ); - continueAction = new TDEAction( i18n("&Continue after current file is complete"), "system-run", CTRL+Key_T, fileList, TQT_SLOT(continueConversion()), actionCollection(), "continue" ); - killAction = new TDEAction( i18n("Stop &immediately"), "system-log-out", CTRL+Key_K, fileList, TQT_SLOT(killConversion()), actionCollection(), "kill" ); + new TDEAction( i18n("&Replay Gain Tool ..."), "soundkonverter_replaygain", CTRL+Key_R, this, TQ_SLOT(showReplayGainScanner()), actionCollection(), "replaygainscanner" ); + //new TDEAction( i18n("R&epair Tool ..."), "soundkonverter_repair", CTRL+Key_E, this, TQ_SLOT(showRepairTool()), actionCollection(), "repairtool" ); + new TDEAction( i18n("C&uesheet Editor ..."), "kwrite", CTRL+Key_U, this, TQ_SLOT(showCuesheetEditor()), actionCollection(), "cuesheeteditor" ); + new TDEAction( i18n("Show &Log ..."), "view_text", CTRL+Key_L, this, TQ_SLOT(showLogViewer()), actionCollection(), "log" ); +// new TDEAction( i18n("About &Plugins ..."), "connect_creating", CTRL+Key_P, this, TQ_SLOT(showAboutPlugins()), actionCollection(), "about_plugins" ); + + stopAction = new TDEAction( i18n("S&top after current file is complete"), "process-stop", CTRL+Key_O, fileList, TQ_SLOT(stopConversion()), actionCollection(), "stop" ); + continueAction = new TDEAction( i18n("&Continue after current file is complete"), "system-run", CTRL+Key_T, fileList, TQ_SLOT(continueConversion()), actionCollection(), "continue" ); + killAction = new TDEAction( i18n("Stop &immediately"), "system-log-out", CTRL+Key_K, fileList, TQ_SLOT(killConversion()), actionCollection(), "kill" ); stopActionMenu = new TDEActionMenu( i18n("Stop"), "process-stop", actionCollection(), "stopMenu" ); stopActionMenu->setDelayed( false ); stopActionMenu->setEnabled( false ); @@ -131,16 +131,16 @@ soundKonverter::soundKonverter() // stopActionMenu->insert( continueAction ); // stopActionMenu->insert( killAction ); -/* veryHighPriorityAction = new TDEToggleAction( i18n("Very hi&gh"), CTRL+Key_1, this, TQT_SLOT(priorityChanged()), actionCollection(), "veryhigh" ); +/* veryHighPriorityAction = new TDEToggleAction( i18n("Very hi&gh"), CTRL+Key_1, this, TQ_SLOT(priorityChanged()), actionCollection(), "veryhigh" ); veryHighPriorityAction->setExclusiveGroup("priorityActionMenu"); - highPriorityAction = new TDEToggleAction( i18n("&High"), CTRL+Key_2, this, TQT_SLOT(priorityChanged()), actionCollection(), "high" ); + highPriorityAction = new TDEToggleAction( i18n("&High"), CTRL+Key_2, this, TQ_SLOT(priorityChanged()), actionCollection(), "high" ); highPriorityAction->setExclusiveGroup("priorityActionMenu"); - normalPriorityAction = new TDEToggleAction( i18n("&Normal"), CTRL+Key_3, this, TQT_SLOT(priorityChanged()), actionCollection(), "nomal" ); + normalPriorityAction = new TDEToggleAction( i18n("&Normal"), CTRL+Key_3, this, TQ_SLOT(priorityChanged()), actionCollection(), "nomal" ); normalPriorityAction->setExclusiveGroup("priorityActionMenu"); normalPriorityAction->setChecked(true); - lowPriorityAction = new TDEToggleAction( i18n("&Low"), CTRL+Key_4, this, TQT_SLOT(priorityChanged()), actionCollection(), "low" ); + lowPriorityAction = new TDEToggleAction( i18n("&Low"), CTRL+Key_4, this, TQ_SLOT(priorityChanged()), actionCollection(), "low" ); lowPriorityAction->setExclusiveGroup("priorityActionMenu"); - veryLowPriorityAction = new TDEToggleAction( i18n("Very lo&w"), CTRL+Key_5, this, TQT_SLOT(priorityChanged()), actionCollection(), "verylow" ); + veryLowPriorityAction = new TDEToggleAction( i18n("Very lo&w"), CTRL+Key_5, this, TQ_SLOT(priorityChanged()), actionCollection(), "verylow" ); veryLowPriorityAction->setExclusiveGroup("priorityActionMenu"); priorityActionMenu = new TDEActionMenu( i18n("En-/Decoder priority"), "ksysguard", actionCollection(), "priorityMenu" ); priorityActionMenu->setDelayed( false ); @@ -151,22 +151,22 @@ soundKonverter::soundKonverter() priorityActionMenu->insert(veryLowPriorityAction);*/ //priorityChanged(); - new TDEAction( i18n("A&dd Files ..."), "audio-x-generic", CTRL+Key_D, this, TQT_SLOT(showFileDialog()), actionCollection(), "add_files" ); - new TDEAction( i18n("Add &Folder ..."), "audio-x-generic", CTRL+Key_F, this, TQT_SLOT(showDirDialog()), actionCollection(), "add_folder" ); - new TDEAction( i18n("Add CD &tracks ..."), "media-optical-cdaudio-unmounted", CTRL+Key_T, this, TQT_SLOT(showCdDialog()), actionCollection(), "add_audiocd" ); - new TDEAction( i18n("Add &URL ..."), "browser", CTRL+Key_U, this, TQT_SLOT(showUrlDialog()), actionCollection(), "add_url" ); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); + new TDEAction( i18n("A&dd Files ..."), "audio-x-generic", CTRL+Key_D, this, TQ_SLOT(showFileDialog()), actionCollection(), "add_files" ); + new TDEAction( i18n("Add &Folder ..."), "audio-x-generic", CTRL+Key_F, this, TQ_SLOT(showDirDialog()), actionCollection(), "add_folder" ); + new TDEAction( i18n("Add CD &tracks ..."), "media-optical-cdaudio-unmounted", CTRL+Key_T, this, TQ_SLOT(showCdDialog()), actionCollection(), "add_audiocd" ); + new TDEAction( i18n("Add &URL ..."), "browser", CTRL+Key_U, this, TQ_SLOT(showUrlDialog()), actionCollection(), "add_url" ); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); - new TDEAction( i18n("L&oad file list"), "document-open", 0, fileList, TQT_SLOT(load()), actionCollection(), "load" ); - new TDEAction( i18n("Sa&ve file list"), "document-save", 0, fileList, TQT_SLOT(save()), actionCollection(), "save" ); + new TDEAction( i18n("L&oad file list"), "document-open", 0, fileList, TQ_SLOT(load()), actionCollection(), "load" ); + new TDEAction( i18n("Sa&ve file list"), "document-save", 0, fileList, TQ_SLOT(save()), actionCollection(), "save" ); - // TODO //KStdAction::paste( this, TQT_SLOT(pasteFiles()), actionCollection() ); + // TODO //KStdAction::paste( this, TQ_SLOT(pasteFiles()), actionCollection() ); - KStdAction::preferences( this, TQT_SLOT(showConfigDialog()), actionCollection() ); + KStdAction::preferences( this, TQ_SLOT(showConfigDialog()), actionCollection() ); - showToolBarAction = KStdAction::showToolbar( this, TQT_SLOT(showToolbar()), actionCollection() ); + showToolBarAction = KStdAction::showToolbar( this, TQ_SLOT(showToolbar()), actionCollection() ); //KStdAction::showStatusbar( 0, 0, actionCollection() ); - KStdAction::configureToolbars( this, TQT_SLOT(editToolbar()), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT(editToolbar()), actionCollection() ); createGUI(); @@ -185,11 +185,11 @@ soundKonverter::soundKonverter() // 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, TQT_SIGNAL(showConfigPluginsPage()), - this, TQT_SLOT(showConfigPluginsPage()) + connect( options, TQ_SIGNAL(showConfigPluginsPage()), + this, TQ_SLOT(showConfigPluginsPage()) ); - connect( options, TQT_SIGNAL(showConfigEnvironmentPage()), - this, TQT_SLOT(showConfigEnvironmentPage()) + connect( options, TQ_SIGNAL(showConfigEnvironmentPage()), + this, TQ_SLOT(showConfigEnvironmentPage()) ); gridLayout->addWidget( options, 0, 0 ); @@ -198,28 +198,28 @@ soundKonverter::soundKonverter() //fileList = new FileList( cdManager, tagEngine, config, options, this, "fileList" ); gridLayout->addWidget( fileList, 1, 0 ); gridLayout->setRowStretch( 1, 1 ); - /*connect( this, TQT_SIGNAL(windowMoved(int,int)), - fileList, TQT_SLOT(moveOptionsEditor(int,int)) + /*connect( this, TQ_SIGNAL(windowMoved(int,int)), + fileList, TQ_SLOT(moveOptionsEditor(int,int)) );*/ - connect( fileList, TQT_SIGNAL(fileCountChanged(int)), - this, TQT_SLOT(fileCountChanged(int)) + connect( fileList, TQ_SIGNAL(fileCountChanged(int)), + this, TQ_SLOT(fileCountChanged(int)) ); - connect( fileList, TQT_SIGNAL(startedConversion()), - this, TQT_SLOT(startedConversion()) + connect( fileList, TQ_SIGNAL(startedConversion()), + this, TQ_SLOT(startedConversion()) ); - connect( fileList, TQT_SIGNAL(stopClicked()), - this, TQT_SLOT(stopClicked()) + connect( fileList, TQ_SIGNAL(stopClicked()), + this, TQ_SLOT(stopClicked()) ); - connect( fileList, TQT_SIGNAL(continueClicked()), - this, TQT_SLOT(continueClicked()) + connect( fileList, TQ_SIGNAL(continueClicked()), + this, TQ_SLOT(continueClicked()) ); - connect( fileList, TQT_SIGNAL(stoppedConversion()), - this, TQT_SLOT(stoppedConversion()) + connect( fileList, TQ_SIGNAL(stoppedConversion()), + this, TQ_SLOT(stoppedConversion()) ); convert = new Convert( config, tagEngine, cdManager, fileList, logger ); -// connect( this, TQT_SIGNAL(setPriority(int)), -// convert, TQT_SLOT(priorityChanged(int)) +// connect( this, TQ_SIGNAL(setPriority(int)), +// convert, TQ_SLOT(priorityChanged(int)) // ); // add a horizontal box layout for the add combobutton to the grid @@ -237,8 +237,8 @@ soundKonverter::soundKonverter() cAdd->insertItem( iconLoader->loadIcon("media-optical-cdaudio-unmounted",TDEIcon::Toolbar), i18n("Add CD tracks ...") ); cAdd->insertItem( iconLoader->loadIcon("browser",TDEIcon::Toolbar), i18n("Add URL ...") ); addBox->addWidget( cAdd ); - connect( cAdd, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(addClicked(int)) + connect( cAdd, TQ_SIGNAL(clicked(int)), + this, TQ_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, TQT_SIGNAL(clicked()), - fileList, TQT_SLOT(startConversion()) + connect( pStart, TQ_SIGNAL(clicked()), + fileList, TQ_SLOT(startConversion()) ); pStop = new KPushButton( iconLoader->loadIcon("process-stop",TDEIcon::Small), i18n("Stop"), widget, "pStop" ); @@ -261,29 +261,29 @@ soundKonverter::soundKonverter() progressIndicator = new ProgressIndicator( systemTray, widget, "progressIndicator" ); addBox->addWidget( progressIndicator ); - connect( fileList, TQT_SIGNAL(increaseTime(float)), - progressIndicator, TQT_SLOT(increaseTime(float)) + connect( fileList, TQ_SIGNAL(increaseTime(float)), + progressIndicator, TQ_SLOT(increaseTime(float)) ); - connect( fileList, TQT_SIGNAL(decreaseTime(float)), - progressIndicator, TQT_SLOT(decreaseTime(float)) + connect( fileList, TQ_SIGNAL(decreaseTime(float)), + progressIndicator, TQ_SLOT(decreaseTime(float)) ); - /*connect( fileList, TQT_SIGNAL(setTime(float)), - progressIndicator, TQT_SLOT(setTime(float)) + /*connect( fileList, TQ_SIGNAL(setTime(float)), + progressIndicator, TQ_SLOT(setTime(float)) );*/ - connect( fileList, TQT_SIGNAL(finished(float)), - progressIndicator, TQT_SLOT(finished(float)) + connect( fileList, TQ_SIGNAL(finished(float)), + progressIndicator, TQ_SLOT(finished(float)) ); - connect( convert, TQT_SIGNAL(countTime(float)), - progressIndicator, TQT_SLOT(countTime(float)) + connect( convert, TQ_SIGNAL(countTime(float)), + progressIndicator, TQ_SLOT(countTime(float)) ); - connect( convert, TQT_SIGNAL(uncountTime(float)), - progressIndicator, TQT_SLOT(uncountTime(float)) + connect( convert, TQ_SIGNAL(uncountTime(float)), + progressIndicator, TQ_SLOT(uncountTime(float)) ); - connect( convert, TQT_SIGNAL(update(float)), - progressIndicator, TQT_SLOT(update(float)) + connect( convert, TQ_SIGNAL(update(float)), + progressIndicator, TQ_SLOT(update(float)) ); - connect( progressIndicator, TQT_SIGNAL(setTitle(const TQString&)), - this, TQT_SLOT(setTitle(const TQString&)) + connect( progressIndicator, TQ_SIGNAL(setTitle(const TQString&)), + this, TQ_SLOT(setTitle(const TQString&)) ); cAdd->increaseHeight( /*progressIndicator->height() - cAdd->height()*/ 10 ); // FIXME detect the height automaticly @@ -340,11 +340,11 @@ void soundKonverter::openArgFiles( const TQStringList &files ) { OptionsRequester* dialog = new OptionsRequester( config, files, this ); - connect( dialog, TQT_SIGNAL(setCurrentOptions(const ConversionOptions&)), - options, TQT_SLOT(setCurrentOptions(const ConversionOptions&)) + connect( dialog, TQ_SIGNAL(setCurrentOptions(const ConversionOptions&)), + options, TQ_SLOT(setCurrentOptions(const ConversionOptions&)) ); - connect( dialog, TQT_SIGNAL(addFiles(TQStringList)), - fileList, TQT_SLOT(addFiles(TQStringList)) + connect( dialog, TQ_SIGNAL(addFiles(TQStringList)), + fileList, TQ_SLOT(addFiles(TQStringList)) ); TQ_CHECK_PTR( dialog ); @@ -364,8 +364,8 @@ void soundKonverter::openArgFiles( const TQStringList &files ) dialog->exec(); - disconnect( dialog, TQT_SIGNAL(setCurrentOptions(const ConversionOptions&)), 0, 0 ); - disconnect( dialog, TQT_SIGNAL(addFiles(TQStringList)), 0, 0 ); + disconnect( dialog, TQ_SIGNAL(setCurrentOptions(const ConversionOptions&)), 0, 0 ); + disconnect( dialog, TQ_SIGNAL(addFiles(TQStringList)), 0, 0 ); delete dialog; } @@ -528,11 +528,11 @@ void soundKonverter::showCdDialog( bool intern ) { OptionsRequester* dialog = new OptionsRequester( config, "", this ); - connect( dialog, TQT_SIGNAL(setCurrentOptions(const ConversionOptions&)), - options, TQT_SLOT(setCurrentOptions(const ConversionOptions&)) + connect( dialog, TQ_SIGNAL(setCurrentOptions(const ConversionOptions&)), + options, TQ_SLOT(setCurrentOptions(const ConversionOptions&)) ); -// connect( dialog, TQT_SIGNAL(addFiles(TQStringList)), -// fileList, TQT_SLOT(addFiles(TQStringList)) +// connect( dialog, TQ_SIGNAL(addFiles(TQStringList)), +// fileList, TQ_SLOT(addFiles(TQStringList)) // ); TQ_CHECK_PTR( dialog ); @@ -552,8 +552,8 @@ void soundKonverter::showCdDialog( bool intern ) dialog->exec(); - disconnect( dialog, TQT_SIGNAL(setCurrentOptions(const ConversionOptions&)), 0, 0 ); -// disconnect( dialog, TQT_SIGNAL(addFiles(TQStringList)), 0, 0 ); + disconnect( dialog, TQ_SIGNAL(setCurrentOptions(const ConversionOptions&)), 0, 0 ); +// disconnect( dialog, TQ_SIGNAL(addFiles(TQStringList)), 0, 0 ); delete dialog; } @@ -594,21 +594,21 @@ void soundKonverter::showCdDialog( bool intern ) if( !dialog->noCD ) { - connect( dialog, TQT_SIGNAL(addTracks(const TQString&,TQValueList<int>)), - fileList, TQT_SLOT(addTracks(const TQString&,TQValueList<int>)) + connect( dialog, TQ_SIGNAL(addTracks(const TQString&,TQValueList<int>)), + fileList, TQ_SLOT(addTracks(const TQString&,TQValueList<int>)) ); - connect( dialog, TQT_SIGNAL(addDisc(const TQString&)), - fileList, TQT_SLOT(addDisc(const TQString&)) + connect( dialog, TQ_SIGNAL(addDisc(const TQString&)), + fileList, TQ_SLOT(addDisc(const TQString&)) ); - /*connect( dialog, TQT_SIGNAL(openCuesheetEditor(const TQString&)), - this, TQT_SLOT(openCuesheetEditor(const TQString&)) + /*connect( dialog, TQ_SIGNAL(openCuesheetEditor(const TQString&)), + this, TQ_SLOT(openCuesheetEditor(const TQString&)) );*/ dialog->exec(); - 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 ); + disconnect( dialog, TQ_SIGNAL(addTracks(const TQString&,TQValueList<int>)), 0, 0 ); + disconnect( dialog, TQ_SIGNAL(addDisc(const TQString&)), 0, 0 ); + //disconnect( dialog, TQ_SIGNAL(openCuesheetEditor(const TQString&)), 0, 0 ); } delete dialog; @@ -639,8 +639,8 @@ void soundKonverter::showReplayGainScanner() // TODO error message return; } -// connect( this, TQT_SIGNAL(addFilesToReplayGainScanner(TQStringList)), -// replayGainScanner, TQT_SLOT(addFiles(TQStringList)) +// connect( this, TQ_SIGNAL(addFilesToReplayGainScanner(TQStringList)), +// replayGainScanner, TQ_SLOT(addFiles(TQStringList)) // ); } replayGainScanner->show(); @@ -684,8 +684,8 @@ void soundKonverter::showLogViewer() // TODO error message return; } -// connect( convert, TQT_SIGNAL(finishedProcess(int,int)), -// logViewer, TQT_SLOT(processCompleted(int,int)) +// connect( convert, TQ_SIGNAL(finishedProcess(int,int)), +// logViewer, TQ_SLOT(processCompleted(int,int)) // ); } logViewer->show(); @@ -747,8 +747,8 @@ void soundKonverter::editToolbar() { saveMainWindowSettings( kapp->config(), "MainWindow" ); KEditToolbar dlg( actionCollection() ); - connect( &dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(newToolbarConfig()) + connect( &dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(newToolbarConfig()) ); dlg.exec(); } |