diff options
Diffstat (limited to 'kaudiocreator')
| -rw-r--r-- | kaudiocreator/cdconfig.ui | 4 | ||||
| -rw-r--r-- | kaudiocreator/encodefileimp.cpp | 4 | ||||
| -rw-r--r-- | kaudiocreator/encoder.cpp | 12 | ||||
| -rw-r--r-- | kaudiocreator/encoder.h | 2 | ||||
| -rw-r--r-- | kaudiocreator/encoderconfig.ui | 4 | ||||
| -rw-r--r-- | kaudiocreator/encoderconfigimp.cpp | 16 | ||||
| -rw-r--r-- | kaudiocreator/general.ui | 4 | ||||
| -rw-r--r-- | kaudiocreator/jobqueimp.cpp | 8 | ||||
| -rw-r--r-- | kaudiocreator/kaudiocreator.cpp | 110 | ||||
| -rw-r--r-- | kaudiocreator/ripper.cpp | 12 | ||||
| -rw-r--r-- | kaudiocreator/tracksimp.cpp | 18 | ||||
| -rw-r--r-- | kaudiocreator/wizard.ui | 4 |
12 files changed, 99 insertions, 99 deletions
diff --git a/kaudiocreator/cdconfig.ui b/kaudiocreator/cdconfig.ui index c0756c83..50133562 100644 --- a/kaudiocreator/cdconfig.ui +++ b/kaudiocreator/cdconfig.ui @@ -54,8 +54,8 @@ </spacer> </vbox> </widget> -<Q_SLOTS> +<slots> <slot access="protected" specifier="non virtual">configureAudioCD()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/encodefileimp.cpp b/kaudiocreator/encodefileimp.cpp index 75f79736..28bc688a 100644 --- a/kaudiocreator/encodefileimp.cpp +++ b/kaudiocreator/encodefileimp.cpp @@ -33,8 +33,8 @@ EncodeFileImp::EncodeFileImp(TQWidget* parent, // Specify to only accept wav files file->setFilter("*.wav|Wav Files"); - connect(file,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(enableEncodeButton(const TQString &))); - connect(encodeButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(encode())); + connect(file,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(enableEncodeButton(const TQString &))); + connect(encodeButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(encode())); } /** diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp index 9cc729a6..2bd14870 100644 --- a/kaudiocreator/encoder.cpp +++ b/kaudiocreator/encoder.cpp @@ -26,7 +26,7 @@ #include <tqregexp.h> #include <tqdir.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kurl.h> #include <kdebug.h> @@ -212,11 +212,11 @@ void Encoder::tendToNewJobs() { proc->setPriority(Prefs::niceLevel()); *proc << TQFile::encodeName(command).data(); - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this, TQT_SLOT(receivedThreadOutput(TDEProcess *, char *, int ))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )), - this, TQT_SLOT(receivedThreadOutput(TDEProcess *, char *, int ))); - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(jobDone(TDEProcess *))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQ_SLOT(receivedThreadOutput(TDEProcess *, char *, int ))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int )), + this, TQ_SLOT(receivedThreadOutput(TDEProcess *, char *, int ))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(jobDone(TDEProcess *))); jobs.insert(proc, job); threads.append(proc); diff --git a/kaudiocreator/encoder.h b/kaudiocreator/encoder.h index fdc7bb53..281be620 100644 --- a/kaudiocreator/encoder.h +++ b/kaudiocreator/encoder.h @@ -26,7 +26,7 @@ #include <tqptrlist.h> #include <tqmap.h> #include "job.h" -#include <kprocess.h> +#include <tdeprocess.h> class EncoderPrefs; diff --git a/kaudiocreator/encoderconfig.ui b/kaudiocreator/encoderconfig.ui index 66a3daaa..338bac68 100644 --- a/kaudiocreator/encoderconfig.ui +++ b/kaudiocreator/encoderconfig.ui @@ -286,8 +286,8 @@ <includes> <include location="local" impldecl="in implementation">encoderconfig.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>encoderWizard()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp index 2865dce3..e2ca1188 100644 --- a/kaudiocreator/encoderconfigimp.cpp +++ b/kaudiocreator/encoderconfigimp.cpp @@ -34,10 +34,10 @@ */ EncoderConfigImp::EncoderConfigImp( TQWidget* parent, const char* name) : EncoderConfig (parent, name) { - connect(addEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEncoderSlot())); - connect(removeEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEncoderSlot())); - connect(configureEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureEncoderSlot())); - connect(kcfg_currentEncoder, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),this, TQT_SLOT(configureEncoderSlot())); + connect(addEncoder, TQ_SIGNAL(clicked()), this, TQ_SLOT(addEncoderSlot())); + connect(removeEncoder, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeEncoderSlot())); + connect(configureEncoder, TQ_SIGNAL(clicked()), this, TQ_SLOT(configureEncoderSlot())); + connect(kcfg_currentEncoder, TQ_SIGNAL(doubleClicked ( TQListBoxItem * )),this, TQ_SLOT(configureEncoderSlot())); // If there are no encoders then store the three default ones. if( Prefs::lastKnownEncoder() == 0){ @@ -138,7 +138,7 @@ void EncoderConfigImp::addEncoderSlot(){ KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help); dialog->setCaption(i18n("Configure Encoder")); dialog->addPage(new EncoderEdit(0, groupName.latin1()), i18n("Encoder Configuration"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadEncoderList())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadEncoderList())); dialog->show(); } @@ -198,9 +198,9 @@ void EncoderConfigImp::configureEncoderSlot() { KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help); dialog->setCaption(i18n("Configure Encoder")); dialog->addPage(new EncoderEdit(0, groupName.latin1()), i18n("Encoder Configuration"), "package_settings"); - connect(dialog, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(updateEncoder(TQObject *))); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SIGNAL(encoderUpdated())); - connect(dialog, TQT_SIGNAL(settingsChanged(const char *)), this, TQT_SLOT(updateEncoder(const char *))); + connect(dialog, TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(updateEncoder(TQObject *))); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SIGNAL(encoderUpdated())); + connect(dialog, TQ_SIGNAL(settingsChanged(const char *)), this, TQ_SLOT(updateEncoder(const char *))); dialog->show(); } diff --git a/kaudiocreator/general.ui b/kaudiocreator/general.ui index 3e29240c..2fd465f3 100644 --- a/kaudiocreator/general.ui +++ b/kaudiocreator/general.ui @@ -278,8 +278,8 @@ <includes> <include location="local" impldecl="in implementation">general.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="non virtual">updateExample()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaudiocreator/jobqueimp.cpp b/kaudiocreator/jobqueimp.cpp index a800aea3..1d238110 100644 --- a/kaudiocreator/jobqueimp.cpp +++ b/kaudiocreator/jobqueimp.cpp @@ -33,7 +33,7 @@ #include <tqfile.h> #include <tqregexp.h> #include <tqfileinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knotifyclient.h> #include <tqdir.h> @@ -51,9 +51,9 @@ */ JobQueImp::JobQueImp( TQWidget* parent, const char* name) : JobQue(parent,name),highestNumber(DEFAULT_HIGHEST_NUMBER), currentId(0){ - connect(removeSelected,TQT_SIGNAL(clicked()), this, TQT_SLOT( removeSelectedJob())); - connect(removeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeAllJobs())); - connect(removeDoneJobs, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearDoneJobs())); + connect(removeSelected,TQ_SIGNAL(clicked()), this, TQ_SLOT( removeSelectedJob())); + connect(removeAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeAllJobs())); + connect(removeDoneJobs, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearDoneJobs())); } /** diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp index 8c752338..115de82f 100644 --- a/kaudiocreator/kaudiocreator.cpp +++ b/kaudiocreator/kaudiocreator.cpp @@ -58,80 +58,80 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) : TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString(), SmallIcon("media-optical-cdaudio-unmounted", 32)); tracks = new TracksImp(frame, "Tracks"); - ripper = new Ripper ( TQT_TQOBJECT(frame), "Rip" ); - encoder = new Encoder( TQT_TQOBJECT(frame), "Encoder" ); + ripper = new Ripper ( frame, "Rip" ); + encoder = new Encoder( frame, "Encoder" ); frame = janusWidget->addVBoxPage( i18n("&Jobs"), TQString(), SmallIcon( "system-run", 32 ) ); jobQue = new JobQueImp( frame, "Que" ); resize(500, 440); - /*TDEAction *eject = */new TDEAction( i18n("&Eject CD"), 0, TQT_TQOBJECT(tracks), - TQT_SLOT( eject() ), actionCollection(), "eject" ); + /*TDEAction *eject = */new TDEAction( i18n("&Eject CD"), 0, tracks, + TQ_SLOT( eject() ), actionCollection(), "eject" ); - (void)new TDEAction( i18n("&Configure KAudioCreator..."), 0, TQT_TQOBJECT(this), - TQT_SLOT( showSettings() ), actionCollection(), "configure_kaudiocreator" ); + (void)new TDEAction( i18n("&Configure KAudioCreator..."), 0, this, + TQ_SLOT( showSettings() ), actionCollection(), "configure_kaudiocreator" ); - TDEAction *selectAll = new TDEAction( i18n( "Select &All Tracks"), 0, TQT_TQOBJECT(tracks), - TQT_SLOT( selectAllTracks() ), actionCollection(), "select_all" ) ; - TDEAction *deselectAll = new TDEAction( i18n( "Deselect &All Tracks"), 0, TQT_TQOBJECT(tracks), - TQT_SLOT( deselectAllTracks() ), actionCollection(), "deselect_all" ); + TDEAction *selectAll = new TDEAction( i18n( "Select &All Tracks"), 0, tracks, + TQ_SLOT( selectAllTracks() ), actionCollection(), "select_all" ) ; + TDEAction *deselectAll = new TDEAction( i18n( "Deselect &All Tracks"), 0, tracks, + TQ_SLOT( deselectAllTracks() ), actionCollection(), "deselect_all" ); selectAll->setEnabled( false ); deselectAll->setEnabled( false ); TDEActionMenu *actActionMenu = new TDEActionMenu( i18n("Rip &Selection"), "rip", actionCollection(), "rip" ); actActionMenu->setDelayed(true); //needed for checking "all accounts" actActionMenu->setEnabled( false ); - connect( actActionMenu, TQT_SIGNAL( activated() ), TQT_TQOBJECT(tracks), TQT_SLOT( startSession() ) ); + connect( actActionMenu, TQ_SIGNAL( activated() ), tracks, TQ_SLOT( startSession() ) ); ripMenu = actActionMenu->popupMenu(); - connect( ripMenu, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( slotRipSelection(int)) ); - connect( ripMenu, TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( getRipMenu()) ); + connect( ripMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotRipSelection(int)) ); + connect( ripMenu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( getRipMenu()) ); - TDEAction *rip = new TDEAction( i18n( "Rip &Selection" ), 0, TQT_TQOBJECT(tracks), - TQT_SLOT( startSession() ), actionCollection(), "rip_selected" ); + TDEAction *rip = new TDEAction( i18n( "Rip &Selection" ), 0, tracks, + TQ_SLOT( startSession() ), actionCollection(), "rip_selected" ); rip->setEnabled( false ); - connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(this), TQT_SLOT( updateStatus() ) ); - connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(ripper), TQT_SLOT( removeJob(int) ) ); - connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(encoder), TQT_SLOT( removeJob(int)) ); - - connect( ripper, TQT_SIGNAL( updateProgress(int, int) ), TQT_TQOBJECT(jobQue), TQT_SLOT( updateProgress(int,int) ) ); - connect( ripper, TQT_SIGNAL( addJob(Job*, const TQString &) ), TQT_TQOBJECT(jobQue), TQT_SLOT( addJob(Job*, const TQString &)) ); - connect( ripper, TQT_SIGNAL( eject(const TQString &) ) , TQT_TQOBJECT(tracks), TQT_SLOT( ejectDevice(const TQString &)) ); - connect( ripper, TQT_SIGNAL( encodeWav(Job *) ) , TQT_TQOBJECT(encoder), TQT_SLOT( encodeWav(Job *)) ); - connect( ripper, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_SLOT( updateStatus() ) ); - - connect( encoder, TQT_SIGNAL( updateProgress(int, int) ) , TQT_TQOBJECT(jobQue), TQT_SLOT( updateProgress(int,int)) ); - connect( encoder, TQT_SIGNAL( addJob(Job*, const TQString&)), TQT_TQOBJECT(jobQue), TQT_SLOT( addJob(Job*, const TQString &)) ); - connect( encoder, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_SLOT( updateStatus() ) ); - - connect( tracks, TQT_SIGNAL( hasCD(bool) ) , TQT_TQOBJECT(this), TQT_SLOT( hasCD(bool) ) ); - connect( tracks, TQT_SIGNAL( ripTrack(Job *) ), TQT_TQOBJECT(ripper), TQT_SLOT( ripTrack(Job *)) ); - connect( tracks, TQT_SIGNAL( hasTracks(bool) ), rip, TQT_SLOT( setEnabled(bool)) ); - connect( tracks, TQT_SIGNAL( hasTracks(bool) ), actActionMenu, TQT_SLOT( setEnabled(bool)) ); - connect( tracks, TQT_SIGNAL( hasTracks(bool) ), deselectAll, TQT_SLOT( setEnabled(bool)) ); - connect( tracks, TQT_SIGNAL( hasTracks(bool) ), selectAll, TQT_SLOT( setEnabled(bool)) ); - - (void)new TDEAction(i18n("Remove &Completed Jobs"), 0, TQT_TQOBJECT(jobQue), - TQT_SLOT(clearDoneJobs()), actionCollection(), "clear_done_jobs" ); - - TDEAction *edit = new TDEAction(i18n("&Edit Album..."), 0, TQT_TQOBJECT(tracks), - TQT_SLOT(editInformation()), actionCollection(), "edit_cd"); - connect(tracks, TQT_SIGNAL(hasCD(bool)), edit, TQT_SLOT(setEnabled(bool))); + connect( jobQue, TQ_SIGNAL( removeJob(int) ), this, TQ_SLOT( updateStatus() ) ); + connect( jobQue, TQ_SIGNAL( removeJob(int) ), ripper, TQ_SLOT( removeJob(int) ) ); + connect( jobQue, TQ_SIGNAL( removeJob(int) ), encoder, TQ_SLOT( removeJob(int)) ); + + connect( ripper, TQ_SIGNAL( updateProgress(int, int) ), jobQue, TQ_SLOT( updateProgress(int,int) ) ); + connect( ripper, TQ_SIGNAL( addJob(Job*, const TQString &) ), jobQue, TQ_SLOT( addJob(Job*, const TQString &)) ); + connect( ripper, TQ_SIGNAL( eject(const TQString &) ) , tracks, TQ_SLOT( ejectDevice(const TQString &)) ); + connect( ripper, TQ_SIGNAL( encodeWav(Job *) ) , encoder, TQ_SLOT( encodeWav(Job *)) ); + connect( ripper, TQ_SIGNAL( jobsChanged() ) , this, TQ_SLOT( updateStatus() ) ); + + connect( encoder, TQ_SIGNAL( updateProgress(int, int) ) , jobQue, TQ_SLOT( updateProgress(int,int)) ); + connect( encoder, TQ_SIGNAL( addJob(Job*, const TQString&)), jobQue, TQ_SLOT( addJob(Job*, const TQString &)) ); + connect( encoder, TQ_SIGNAL( jobsChanged() ) , this, TQ_SLOT( updateStatus() ) ); + + connect( tracks, TQ_SIGNAL( hasCD(bool) ) , this, TQ_SLOT( hasCD(bool) ) ); + connect( tracks, TQ_SIGNAL( ripTrack(Job *) ), ripper, TQ_SLOT( ripTrack(Job *)) ); + connect( tracks, TQ_SIGNAL( hasTracks(bool) ), rip, TQ_SLOT( setEnabled(bool)) ); + connect( tracks, TQ_SIGNAL( hasTracks(bool) ), actActionMenu, TQ_SLOT( setEnabled(bool)) ); + connect( tracks, TQ_SIGNAL( hasTracks(bool) ), deselectAll, TQ_SLOT( setEnabled(bool)) ); + connect( tracks, TQ_SIGNAL( hasTracks(bool) ), selectAll, TQ_SLOT( setEnabled(bool)) ); + + (void)new TDEAction(i18n("Remove &Completed Jobs"), 0, jobQue, + TQ_SLOT(clearDoneJobs()), actionCollection(), "clear_done_jobs" ); + + TDEAction *edit = new TDEAction(i18n("&Edit Album..."), 0, tracks, + TQ_SLOT(editInformation()), actionCollection(), "edit_cd"); + connect(tracks, TQ_SIGNAL(hasCD(bool)), edit, TQ_SLOT(setEnabled(bool))); edit->setEnabled( false ); - (void)new TDEAction(i18n("Encode &File..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(encodeFile()), actionCollection(), "encode_file"); + (void)new TDEAction(i18n("Encode &File..."), 0, this, + TQ_SLOT(encodeFile()), actionCollection(), "encode_file"); - TDEAction *cddb = new TDEAction(i18n("&CDDB Lookup"), 0, TQT_TQOBJECT(tracks), - TQT_SLOT(performCDDB()), actionCollection(), "cddb_now"); - connect(tracks, TQT_SIGNAL(hasCD(bool)), cddb, TQT_SLOT(setEnabled(bool))); + TDEAction *cddb = new TDEAction(i18n("&CDDB Lookup"), 0, tracks, + TQ_SLOT(performCDDB()), actionCollection(), "cddb_now"); + connect(tracks, TQ_SIGNAL(hasCD(bool)), cddb, TQ_SLOT(setEnabled(bool))); cddb->setEnabled( false ); - KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()), + KStdAction::configureNotifications(this, TQ_SLOT(configureNotifications()), actionCollection()); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit" ); + KStdAction::quit( this, TQ_SLOT(close()), actionCollection(), "quit" ); // Init statusbar statusBar()->insertItem(i18n("No Audio CD detected"), 0 ); @@ -216,7 +216,7 @@ void KAudioCreator::configureNotifications() { void KAudioCreator::encodeFile(){ EncodeFileImp *file = new EncodeFileImp(this, "EncodeFile"); - connect(file, TQT_SIGNAL(startJob(Job*)),encoder, TQT_SLOT(encodeWav(Job*))); + connect(file, TQ_SIGNAL(startJob(Job*)),encoder, TQ_SLOT(encodeWav(Job*))); file->show(); } @@ -228,10 +228,10 @@ void KAudioCreator::showSettings(){ return; SettingsDialog *dialog = new SettingsDialog(this, "settings", Prefs::self()); - connect(dialog, TQT_SIGNAL(settingsChanged()), ripper, TQT_SLOT(loadSettings())); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(encoder), TQT_SLOT(loadSettings())); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(tracks), TQT_SLOT(loadSettings())); - connect(dialog->encoderConfigImp, TQT_SIGNAL(encoderUpdated()), TQT_TQOBJECT(encoder), TQT_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), ripper, TQ_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), encoder, TQ_SLOT(loadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), tracks, TQ_SLOT(loadSettings())); + connect(dialog->encoderConfigImp, TQ_SIGNAL(encoderUpdated()), encoder, TQ_SLOT(loadSettings())); dialog->show(); } @@ -253,7 +253,7 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkele { cddb->load(); addPage(cddb, i18n("CDDB"), "media-optical-cdaudio-mounted", i18n("CDDB Configuration"), false); - connect(cddb, TQT_SIGNAL(changed(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotCddbChanged(bool))); + connect(cddb, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(slotCddbChanged(bool))); } } RipConfig *rip = new RipConfig(0, "Ripper"); diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp index 657d21b2..3a7b62de 100644 --- a/kaudiocreator/ripper.cpp +++ b/kaudiocreator/ripper.cpp @@ -26,7 +26,7 @@ #include <tdetempfile.h> #include <tdemessagebox.h> #include <knotifyclient.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/scheduler.h> /** @@ -57,8 +57,8 @@ Ripper::~Ripper(){ if(ioJob){ TDEIO::FileCopyJob *copyJob = static_cast<TDEIO::FileCopyJob*> (ioJob); - disconnect(copyJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(copyJobResult(TDEIO::Job*))); - disconnect(copyJob, TQT_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( TDEIO::Job *, unsigned long))); + disconnect(copyJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(copyJobResult(TDEIO::Job*))); + disconnect(copyJob, TQ_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQ_SLOT(updateProgress ( TDEIO::Job *, unsigned long))); TQString fileDestination = (copyJob->destURL()).path(); copyJob->kill(); TQFile file( fileDestination ); @@ -184,8 +184,8 @@ void Ripper::tendToNewJobs(){ TDEIO::FileCopyJob *copyJob = new TDEIO::FileCopyJob(source, dest, 0644, false, true, false, false); jobs.insert(copyJob, job); - connect(copyJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(copyJobResult(TDEIO::Job*))); - connect(copyJob, TQT_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( TDEIO::Job *, unsigned long))); + connect(copyJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(copyJobResult(TDEIO::Job*))); + connect(copyJob, TQ_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQ_SLOT(updateProgress ( TDEIO::Job *, unsigned long))); emit jobsChanged(); } @@ -234,7 +234,7 @@ void Ripper::copyJobResult(TDEIO::Job *copyjob){ } if( !job ){ deviceToEject = newJob->device; - TQTimer::singleShot( Prefs::autoEjectDelay()*1000 + 500, this, TQT_SLOT(ejectNow())); + TQTimer::singleShot( Prefs::autoEjectDelay()*1000 + 500, this, TQ_SLOT(ejectNow())); } } KNotifyClient::event("cd ripped"); diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp index 0d7ab5cd..89725f00 100644 --- a/kaudiocreator/tracksimp.cpp +++ b/kaudiocreator/tracksimp.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kinputdialog.h> #include <tdelistview.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <kurl.h> @@ -55,22 +55,22 @@ TracksImp::TracksImp( TQWidget* parent, const char* name) : { cd = new TDECompactDisc; - connect(cd,TQT_SIGNAL(discChanged(unsigned)),this,TQT_SLOT(newDisc(unsigned))); + connect(cd,TQ_SIGNAL(discChanged(unsigned)),this,TQ_SLOT(newDisc(unsigned))); - connect(trackListing, TQT_SIGNAL(clicked( TQListViewItem * )), this, TQT_SLOT(selectTrack(TQListViewItem*))); - connect(trackListing, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(editInformation())); - connect(trackListing, TQT_SIGNAL(returnPressed(TQListViewItem *)), this, TQT_SLOT(editInformation())); - connect(selectAllTracksButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAllTracks())); - connect(deselectAllTracksButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deselectAllTracks())); + connect(trackListing, TQ_SIGNAL(clicked( TQListViewItem * )), this, TQ_SLOT(selectTrack(TQListViewItem*))); + connect(trackListing, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(editInformation())); + connect(trackListing, TQ_SIGNAL(returnPressed(TQListViewItem *)), this, TQ_SLOT(editInformation())); + connect(selectAllTracksButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectAllTracks())); + connect(deselectAllTracksButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deselectAllTracks())); - connect(deviceCombo, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changeDevice(const TQString &))); + connect(deviceCombo, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changeDevice(const TQString &))); selectAllTracksButton->setEnabled( false ); deselectAllTracksButton->setEnabled( false ); cddb = new KCDDB::Client(); cddb->setBlockingMode(false); - connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), this, TQT_SLOT(lookupCDDBDone(CDDB::Result))); + connect(cddb, TQ_SIGNAL(finished(CDDB::Result)), this, TQ_SLOT(lookupCDDBDone(CDDB::Result))); trackListing->setSorting(-1, false); loadSettings(); } diff --git a/kaudiocreator/wizard.ui b/kaudiocreator/wizard.ui index 970a5e84..0bda9d41 100644 --- a/kaudiocreator/wizard.ui +++ b/kaudiocreator/wizard.ui @@ -392,7 +392,7 @@ <includes> <include location="local" impldecl="in implementation">wizard.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">homePressed()</slot> <slot>extensionPressed()</slot> <slot access="private">trackTitlePressed()</slot> @@ -405,6 +405,6 @@ <slot>artistPressed()</slot> <slot>commentPressed()</slot> <slot>fileFormatTextChanged( const TQString & text )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> |
