diff --git a/k9Mplayer/k9mplayer.cpp b/k9Mplayer/k9mplayer.cpp index ef665f8..ac7eabd 100644 --- a/k9Mplayer/k9mplayer.cpp +++ b/k9Mplayer/k9mplayer.cpp @@ -23,7 +23,7 @@ K9Mplayer::K9Mplayer(TQObject *parent,const char *name,const TQStringList args) m_initVol=TRUE; m_title=0; - m_process=new KProcess(TQT_TQOBJECT(this)); + m_process=new TDEProcess(TQT_TQOBJECT(this)); m_ratio=4.0/3.0; slider->setRange(0, 100); @@ -31,9 +31,9 @@ K9Mplayer::K9Mplayer(TQObject *parent,const char *name,const TQStringList args) bPlay->setPixmap(SmallIcon("player_play")); bStop->setPixmap(SmallIcon("player_stop")); bSwitchAudio->setPixmap(SmallIcon("cycle")); - connect(m_process,TQT_SIGNAL(receivedStdout( KProcess*, char*, int )),this,TQT_SLOT(receivedStdout( KProcess*, char*, int ))); + connect(m_process,TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )),this,TQT_SLOT(receivedStdout( TDEProcess*, char*, int ))); m_timer=new TQTimer(this); - connect(m_process,TQT_SIGNAL(wroteStdin( KProcess* )),this,TQT_SLOT(wroteStdin( KProcess* ))); + connect(m_process,TQT_SIGNAL(wroteStdin( TDEProcess* )),this,TQT_SLOT(wroteStdin( TDEProcess* ))); connect(m_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(timeout())); m_container=new TQWidget(Label); } @@ -55,7 +55,7 @@ void K9Mplayer::resizeEvent ( TQResizeEvent * _resizeEvent) { } -void K9Mplayer::wroteStdin( KProcess *_process) { +void K9Mplayer::wroteStdin( TDEProcess *_process) { m_canwrite = TRUE; } @@ -93,7 +93,7 @@ void K9Mplayer::setTitle( const TQString & _numTitle,const TQString &_numChapter *m_process << "-chapter" << _numChapter; *m_process << TQString("dvd://%1").arg(_numTitle); - if (!m_process->start( KProcess::NotifyOnExit,KProcess::All)) { + if (!m_process->start( TDEProcess::NotifyOnExit,TDEProcess::All)) { KMessageBox::error (tqApp->mainWidget(),i18n("Unable to run %1").arg("mplayer") , i18n("Preview")); } m_canwrite=TRUE; @@ -107,7 +107,7 @@ void K9Mplayer::setTitle( const TQString & _numTitle,const TQString &_numChapter /*$SPECIALIZATION$*/ -void K9Mplayer::receivedStdout (KProcess *proc, char *buffer, int buflen) { +void K9Mplayer::receivedStdout (TDEProcess *proc, char *buffer, int buflen) { TQString buf = TQString::fromLatin1(buffer, buflen); sscanf(buf.latin1(),"ANS_PERCENT_POSITION=%d",&m_position); if (!m_seeking && m_position>0) { diff --git a/k9Mplayer/k9mplayer.h b/k9Mplayer/k9mplayer.h index 20775ce..9f7a4e8 100644 --- a/k9Mplayer/k9mplayer.h +++ b/k9Mplayer/k9mplayer.h @@ -8,7 +8,7 @@ class k9DVD; class k9DVDTitle; -class KProcess; +class TDEProcess; class TQTimer; class TQResizeEvent; @@ -17,7 +17,7 @@ class K9Mplayer : public MPlayer Q_OBJECT private: - KProcess *m_process; + TDEProcess *m_process; bool m_seeking,m_initVol; int m_title; k9DVDTitle *m_dvdTitle; @@ -38,8 +38,8 @@ public: private slots: void slotLengthChanged(); void slotNewPosition(int _pos,const TQTime & _time); - void receivedStdout (KProcess *proc, char *buffer, int buflen); - void wroteStdin(KProcess *_process); + void receivedStdout (TDEProcess *proc, char *buffer, int buflen); + void wroteStdin(TDEProcess *_process); void timeout(); public slots: /*$PUBLIC_SLOTS$*/ diff --git a/k9author/k9newdvd.cpp b/k9author/k9newdvd.cpp index 013e02e..363ff7f 100644 --- a/k9author/k9newdvd.cpp +++ b/k9author/k9newdvd.cpp @@ -51,7 +51,7 @@ void k9NewDVD::execute() { m_cancel=false; m_error=""; m_config=new k9Config(); - // connect(m_process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),this, TQT_SLOT(getStderr(KProcess *, char *, int) )); + // connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getStderr(TDEProcess *, char *, int) )); connect(&m_aviDecode,TQT_SIGNAL(drawFrame(TQImage*)),this,TQT_SLOT(drawImage(TQImage*))); k9Tools::clearOutput(m_workDir+"dvd"); @@ -120,7 +120,7 @@ void k9NewDVD::createXML() { m_processList->clear(); k9Process *process=m_processList->addProcess(i18n("authoring")); - connect(process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),this, TQT_SLOT(getStderr(KProcess *, char *, int) )); + connect(process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getStderr(TDEProcess *, char *, int) )); *process << "dvdauthor" << "-x" << dvdAuthor; m_processList->execute(); m_cancel=m_processList->getCancel(); @@ -250,7 +250,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile * TQTime t(0,0); t.start(); m_timers[process]=t; - connect(process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),this, TQT_SLOT(getStdout(KProcess *, char *, int) )); + connect(process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(getStdout(TDEProcess *, char *, int) )); //m_progress->setTitle(i18n("Encoding file")); //m_process->clearArguments(); *process << "mencoder" << "-oac" << "lavc" << "-ovc" << "lavc" << "-of" << "mpeg" <<"-afm" <<"libmad"; @@ -272,7 +272,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile * // m_aviDecode.close(); } -void k9NewDVD::getStderr(KProcess *_process, char *_buffer, int _length) { +void k9NewDVD::getStderr(TDEProcess *_process, char *_buffer, int _length) { TQCString tmp(_buffer,_length); m_stdout=tmp; int pos; @@ -308,7 +308,7 @@ void k9NewDVD::getStderr(KProcess *_process, char *_buffer, int _length) { } -void k9NewDVD::getStdout(KProcess *_process, char *_buffer, int _length) { +void k9NewDVD::getStdout(TDEProcess *_process, char *_buffer, int _length) { k9Process *process=(k9Process*) _process; if (m_timers[process].elapsed() >500) { TQCString tmp(_buffer,_length); diff --git a/k9author/k9newdvd.h b/k9author/k9newdvd.h index e5aac10..cbc3261 100644 --- a/k9author/k9newdvd.h +++ b/k9author/k9newdvd.h @@ -86,8 +86,8 @@ private: void createMencoderCmd ( TQString &_cmd,TQString &_chapters, k9AviFile *_aviFile ); k9Config *m_config; protected slots: - void getStdout ( KProcess *, char *, int ); - void getStderr ( KProcess *, char *, int ); + void getStdout ( TDEProcess *, char *, int ); + void getStderr ( TDEProcess *, char *, int ); void drawImage ( TQImage * _image ); signals: void sigAddTitle(); diff --git a/k9devices/k9cddrive.cpp b/k9devices/k9cddrive.cpp index 954bd36..d4ffd6b 100644 --- a/k9devices/k9cddrive.cpp +++ b/k9devices/k9cddrive.cpp @@ -128,7 +128,7 @@ void k9CdDrives::scanDrives() { } void k9CdDrives::eject(const TQString & device) { - KProcess *process =new KProcess(); + TDEProcess *process =new TDEProcess(); if (k9Tools::checkProgram("kdeeject")) *process <<"kdeeject" << device; else diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp index 3860b79..3975895 100644 --- a/libk9copy/k9burndvd.cpp +++ b/libk9copy/k9burndvd.cpp @@ -38,7 +38,7 @@ k9BurnDVD::k9BurnDVD() iso=false; m_filename=""; progress=new k9Progress(NULL,"progress",NULL); - TQString s= KGlobal::dirs()->findResource( "data", "k9copy/anim.mng"); + TQString s= TDEGlobal::dirs()->findResource( "data", "k9copy/anim.mng"); progress->setMovie(s); m_cdrkit=k9Tools::checkProgram("genisoimage") && k9Tools::checkProgram("wodim"); } @@ -90,7 +90,7 @@ void k9BurnDVD::burn() { } void k9BurnDVD::burnWithK3b() { - KProcess *k3b = new KProcess(); + TDEProcess *k3b = new TDEProcess(); *k3b << "k3b"; *k3b << TQDir::cleanDirPath(workDir +"/dvd/VIDEO_TS"); @@ -100,13 +100,13 @@ void k9BurnDVD::burnWithK3b() { delete k3b; } -void k9BurnDVD::mkisoSizeStderr(KProcess *proc, char *buffer, int buflen) { +void k9BurnDVD::mkisoSizeStderr(TDEProcess *proc, char *buffer, int buflen) { TQString c=TQString::fromLatin1( buffer,buflen);// (proc2->readStderr()); imageSize=c.replace("\n",""); ; } -void k9BurnDVD::mkisoSizeStdout(KProcess *proc, char *buffer, int buflen) { +void k9BurnDVD::mkisoSizeStdout(TDEProcess *proc, char *buffer, int buflen) { TQString c=TQString::fromLatin1(buffer,buflen);// (proc2->readStdout()); imageSize=c.replace("\n",""); ; @@ -125,9 +125,9 @@ const TQString k9BurnDVD::getImageSize() { *proc2 <<"-V "+volId; *proc2 << TQDir::cleanDirPath(workDir +"/dvd"); - connect( proc2, TQT_SIGNAL(receivedStderr(KProcess *, char *, int )),this, TQT_SLOT(mkisoSizeStderr(KProcess *, char *, int)) ); - connect( proc2, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),this, TQT_SLOT(mkisoSizeStdout(KProcess *, char *, int)) ); - if (proc2->start(KProcess::NotifyOnExit,KProcess::All)) { + connect( proc2, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )),this, TQT_SLOT(mkisoSizeStderr(TDEProcess *, char *, int)) ); + connect( proc2, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(mkisoSizeStdout(TDEProcess *, char *, int)) ); + if (proc2->start(TDEProcess::NotifyOnExit,TDEProcess::All)) { // while (proc2->isRunning()) { // tqApp->processEvents(); // } @@ -158,12 +158,12 @@ void k9BurnDVD::getGenisoimageCmd(k9Process *proc,TQString _fileName,bool _print *proc <<"-o"; *proc <<_fileName; } - connect( proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),this, TQT_SLOT(growisoStderr(KProcess *, char *, int)) ); - connect( proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),this, TQT_SLOT(growisoStdout(KProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(growisoStderr(TDEProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(growisoStdout(TDEProcess *, char *, int)) ); } else { *proc << "-print-size" << "-quiet"; - connect( proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int )),this, TQT_SLOT(mkisoSizeStderr(KProcess *, char *, int)) ); - connect( proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),this, TQT_SLOT(mkisoSizeStdout(KProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )),this, TQT_SLOT(mkisoSizeStderr(TDEProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(mkisoSizeStdout(TDEProcess *, char *, int)) ); } *proc <start(KProcess::NotifyOnExit,KProcess::All); + proc2->start(TDEProcess::NotifyOnExit,TDEProcess::All); proc2->sync(); getWodimCmd(proc); proc->setUseShell(true); @@ -296,8 +296,8 @@ void k9BurnDVD::burnWithGrowisofs() { *proc <<"-V "+volId; *proc <readStderr()); char s[255]; int a,b; @@ -370,7 +370,7 @@ void k9BurnDVD::growisoStderr(KProcess *proc, char *buffer, int buflen) { } } } -void k9BurnDVD::growisoStdout(KProcess *proc, char *buffer, int buflen) { +void k9BurnDVD::growisoStdout(TDEProcess *proc, char *buffer, int buflen) { TQString c=TQString::fromLatin1( buffer,buflen);// (proc->readStdout()); int pos; pos=c.find("STAT"); diff --git a/libk9copy/k9burndvd.h b/libk9copy/k9burndvd.h index 94e1e71..8476030 100644 --- a/libk9copy/k9burndvd.h +++ b/libk9copy/k9burndvd.h @@ -75,10 +75,10 @@ private: TQString imageSize; TQString m_speed; private slots: // Private slots - void growisoStderr(KProcess *proc, char *buffer, int buflen); - void growisoStdout(KProcess *proc, char *buffer, int buflen); - void mkisoSizeStderr(KProcess *proc, char *buffer, int buflen); - void mkisoSizeStdout(KProcess *proc, char *buffer, int buflen); + void growisoStderr(TDEProcess *proc, char *buffer, int buflen); + void growisoStdout(TDEProcess *proc, char *buffer, int buflen); + void mkisoSizeStderr(TDEProcess *proc, char *buffer, int buflen); + void mkisoSizeStdout(TDEProcess *proc, char *buffer, int buflen); }; #endif diff --git a/libk9copy/k9dvdauthor.cpp b/libk9copy/k9dvdauthor.cpp index 256cf53..e050392 100755 --- a/libk9copy/k9dvdauthor.cpp +++ b/libk9copy/k9dvdauthor.cpp @@ -444,10 +444,10 @@ void k9DVDAuthor::author() { TQString c("dvdauthor"); proc=progress->getProcess();// new TQProcess(c,0); *proc << c << "-x" << m_xml->name(); //locateLocal("tmp", "k9copy/k9author.xml"); - connect( proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(DVDAuthorStderr(KProcess *, char *, int )) ); - connect( proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )), - this, TQT_SLOT(DVDAuthorStdout(KProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(DVDAuthorStderr(TDEProcess *, char *, int )) ); + connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQT_SLOT(DVDAuthorStdout(TDEProcess *, char *, int)) ); // connect(progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(stopProcess())); m_copied=0; @@ -488,7 +488,7 @@ void k9DVDAuthor::author() { /** No descriptions */ -void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) { +void k9DVDAuthor::DVDAuthorStderr(TDEProcess *proc, char *buffer, int buflen ) { //TQString m_stderr(proc->readStderr()); TQString m_stderr=TQString::fromLatin1(buffer, buflen); @@ -557,7 +557,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) { } -void k9DVDAuthor::DVDAuthorStdout(KProcess *proc, char *buffer, int buflen) { +void k9DVDAuthor::DVDAuthorStdout(TDEProcess *proc, char *buffer, int buflen) { TQString c=TQString::fromLatin1( buffer,buflen); //(proc->readStdout()); int pos; diff --git a/libk9copy/k9dvdauthor.h b/libk9copy/k9dvdauthor.h index ef13dbe..b319ea0 100755 --- a/libk9copy/k9dvdauthor.h +++ b/libk9copy/k9dvdauthor.h @@ -75,8 +75,8 @@ private: // Private attributes void spumux(); private slots: // Private slots /** No descriptions */ - void DVDAuthorStderr(KProcess *proc, char *buffer, int buflen); - void DVDAuthorStdout(KProcess *proc, char *buffer, int buflen); + void DVDAuthorStderr(TDEProcess *proc, char *buffer, int buflen); + void DVDAuthorStdout(TDEProcess *proc, char *buffer, int buflen); /** No descriptions */ void stopProcess(); diff --git a/libk9copy/k9mp4enc.cpp b/libk9copy/k9mp4enc.cpp index 0f4aaca..7f33e97 100644 --- a/libk9copy/k9mp4enc.cpp +++ b/libk9copy/k9mp4enc.cpp @@ -395,13 +395,13 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) tqDebug ( "%s", s.ascii() ); time->start(); m_timer3.start(); - connect ( m_process, TQT_SIGNAL ( receivedStdout ( KProcess *, char *, int ) ),this, TQT_SLOT ( getStdout ( KProcess *, char *, int ) ) ); - connect ( m_process, TQT_SIGNAL ( receivedStderr ( KProcess *, char *, int ) ),this, TQT_SLOT ( getStderr ( KProcess *, char *, int ) ) ); - //connect(m_process, TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(exited(KProcess*))); + connect ( m_process, TQT_SIGNAL ( receivedStdout ( TDEProcess *, char *, int ) ),this, TQT_SLOT ( getStdout ( TDEProcess *, char *, int ) ) ); + connect ( m_process, TQT_SIGNAL ( receivedStderr ( TDEProcess *, char *, int ) ),this, TQT_SLOT ( getStderr ( TDEProcess *, char *, int ) ) ); + //connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(exited(TDEProcess*))); connect ( m_progress,TQT_SIGNAL ( sigCancel() ),this,TQT_SLOT ( slotCancel() ) ); m_canceled=false; m_progress->show(); - m_process->start ( KProcess::OwnGroup, KProcess::All ); + m_process->start ( TDEProcess::OwnGroup, TDEProcess::All ); timer->start ( 500, 0 ); m_process->sync(); //if application is exiting, kill the encoding process @@ -473,7 +473,7 @@ int k9MP4Enc::getBitRate ( k9DVDTitle *_title ) } -void k9MP4Enc::getStdout ( KProcess *, char *buffer, int buflen ) +void k9MP4Enc::getStdout ( TDEProcess *, char *buffer, int buflen ) { TQCString tmp ( buffer,buflen ); m_cpt++; @@ -501,7 +501,7 @@ void k9MP4Enc::getStdout ( KProcess *, char *buffer, int buflen ) } -void k9MP4Enc::getStderr ( KProcess *proc, char *buffer, int buflen ) +void k9MP4Enc::getStderr ( TDEProcess *proc, char *buffer, int buflen ) { //m_stderr=TQString::fromLatin1(buffer,buflen); TQCString cstderr ( buffer,buflen+1 ); diff --git a/libk9copy/k9mp4enc.h b/libk9copy/k9mp4enc.h index 92396ce..9c25e73 100644 --- a/libk9copy/k9mp4enc.h +++ b/libk9copy/k9mp4enc.h @@ -64,8 +64,8 @@ private: int getselectedSubp(k9DVDTitle *_title); private slots: - void getStdout(KProcess *proc, char *buffer, int buflen); - void getStderr(KProcess *proc, char *buffer, int buflen); + void getStdout(TDEProcess *proc, char *buffer, int buflen); + void getStderr(TDEProcess *proc, char *buffer, int buflen); void timerDone(); void slotCancel(); diff --git a/libk9copy/k9process.cpp b/libk9copy/k9process.cpp index 060f6cf..552fed7 100644 --- a/libk9copy/k9process.cpp +++ b/libk9copy/k9process.cpp @@ -15,9 +15,9 @@ #include k9Process::k9Process(TQObject *parent, const char *name) - : KProcess(parent, name),m_waitSync(false) + : TDEProcess(parent, name),m_waitSync(false) { - connect(this,TQT_SIGNAL(processExited( KProcess* )),this,TQT_SLOT(slotProcessExited( KProcess* ))); + connect(this,TQT_SIGNAL(processExited( TDEProcess* )),this,TQT_SLOT(slotProcessExited( TDEProcess* ))); } @@ -32,7 +32,7 @@ void k9Process::sync() { } -void k9Process::slotProcessExited( KProcess * proc) { +void k9Process::slotProcessExited( TDEProcess * proc) { if (m_waitSync) { TQApplication::eventLoop()->exitLoop(); m_waitSync=false; @@ -49,7 +49,7 @@ const TQString & k9Process::debug() { bool k9Process::start (RunMode runmode, Communication comm) { m_elapsed.start(); - return KProcess::start(runmode,comm); + return TDEProcess::start(runmode,comm); } #include "k9process.moc" diff --git a/libk9copy/k9process.h b/libk9copy/k9process.h index f39efa0..6958046 100644 --- a/libk9copy/k9process.h +++ b/libk9copy/k9process.h @@ -17,7 +17,7 @@ /** @author Jean-Michel PETIT */ -class k9Process : public KProcess +class k9Process : public TDEProcess { Q_OBJECT @@ -33,7 +33,7 @@ private: TQString m_debug; TQTime m_elapsed; private slots: - void slotProcessExited(KProcess *proc); + void slotProcessExited(TDEProcess *proc); }; #endif diff --git a/libk9copy/k9processlist.cpp b/libk9copy/k9processlist.cpp index e39cf7b..138271b 100644 --- a/libk9copy/k9processlist.cpp +++ b/libk9copy/k9processlist.cpp @@ -103,7 +103,7 @@ void k9ProcessList::execute() { } if (m_cancel) break; - if (!p->start(KProcess::OwnGroup,KProcess::All)) + if (!p->start(TDEProcess::OwnGroup,TDEProcess::All)) m_error=true; } //waiting for processes @@ -153,11 +153,11 @@ k9Process *k9ProcessList::addProcess(const TQString &label) { TQListViewItem *item = new _k9ProcessListItem(lProcess,label); m_items[process]=item; setProgress(process,0,100); - connect(process,TQT_SIGNAL(processExited( KProcess* )),this,TQT_SLOT(processExited(KProcess*))); + connect(process,TQT_SIGNAL(processExited( TDEProcess* )),this,TQT_SLOT(processExited(TDEProcess*))); return process; } -void k9ProcessList::processExited(KProcess *_process){ +void k9ProcessList::processExited(TDEProcess *_process){ if (!_process->normalExit()) m_cancel=true; else if (_process->exitStatus() !=0 ) diff --git a/libk9copy/k9processlist.h b/libk9copy/k9processlist.h index 44d2a8c..b2fd9be 100644 --- a/libk9copy/k9processlist.h +++ b/libk9copy/k9processlist.h @@ -59,7 +59,7 @@ protected slots: /*$PROTECTED_SLOTS$*/ void timeout(); virtual void bCancelClick(); - virtual void processExited(KProcess *); + virtual void processExited(TDEProcess *); }; #endif diff --git a/libk9copy/k9progress.cpp b/libk9copy/k9progress.cpp index 6a29fd5..57d8db4 100644 --- a/libk9copy/k9progress.cpp +++ b/libk9copy/k9progress.cpp @@ -60,7 +60,7 @@ void k9Progress::setProgress(long _position,long _total) { int k9Progress::execute() { if (! m_process->isRunning()) { - if (!m_process->start(KProcess::NotifyOnExit,KProcess::All )) + if (!m_process->start(TDEProcess::NotifyOnExit,TDEProcess::All )) return -1; } diff --git a/src/k9copy.cpp b/src/k9copy.cpp index 70ce41b..030a1e1 100644 --- a/src/k9copy.cpp +++ b/src/k9copy.cpp @@ -351,7 +351,7 @@ void k9Copy::optionsConfigureKeys() { void k9Copy::optionsConfigureToolbars() { // use the standard toolbar editor - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); KEditToolbar dlg(factory()); connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig())); dlg.exec(); @@ -362,7 +362,7 @@ void k9Copy::newToolbarConfig() { // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) createGUI(0); - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void k9Copy::fileOpen() { diff --git a/src/k9mencodercmdgen.cpp b/src/k9mencodercmdgen.cpp index 299f2a8..2f2924e 100644 --- a/src/k9mencodercmdgen.cpp +++ b/src/k9mencodercmdgen.cpp @@ -136,7 +136,7 @@ void k9MencoderCmdGen::listViewCurrentChanged(TQListViewItem *_item) { } void k9MencoderCmdGen::loadXml() { - TQFile file(KGlobal::dirs()->findResource( "data", "k9copy/mencoder.xml")); + TQFile file(TDEGlobal::dirs()->findResource( "data", "k9copy/mencoder.xml")); if ( !file.open( IO_ReadOnly ) ) return; if ( !m_doc.setContent( &file ) ) { diff --git a/src/k9redirect.cpp b/src/k9redirect.cpp index fda674b..f38c242 100644 --- a/src/k9redirect.cpp +++ b/src/k9redirect.cpp @@ -21,11 +21,11 @@ k9Redirect::~k9Redirect() } void k9Redirect::execute() { - KProcess *p=new KProcess(); + TDEProcess *p=new TDEProcess(); *p << "mencoder"; *p << "-oac" << "lavc" << "-ovc" << "lavc" << "-of" << "mpeg"; *p << "-mpegopts" << "format=dvd" << "-vf" << "scale=720:576,harddup" << "-srate" << "48000" << "-af" << "lavcresample=48000" << "-lavcopts" << "vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=15:acodec=ac3:abitrate=192:aspect=16/9" << "-ofps" << "25" << "-o" << "/tmp/tde-jmp/k9copy/tmp.mpeg" << "-ss" << "00:00:00.000" << "-endpos" << "00:00:57.360" << "-really-quiet" << "/home/jmp/t.avi"; - p->start(KProcess::NotifyOnExit); + p->start(TDEProcess::NotifyOnExit); p->wait(); diff --git a/src/k9settings.cpp b/src/k9settings.cpp index f3507aa..99bd031 100644 --- a/src/k9settings.cpp +++ b/src/k9settings.cpp @@ -24,14 +24,14 @@ k9settings::k9settings(TQWidget *parent,const TQString &caption): KDialogBase ( setInitialSize(TQSize(750,350), false); TQFrame *frDevices; - frDevices=addPage (i18n("Devices"),i18n("Devices not detected by k9copy"),KGlobal::iconLoader()->loadIcon("blockdevice", KIcon::Panel, KIcon::SizeMedium)); + frDevices=addPage (i18n("Devices"),i18n("Devices not detected by k9copy"),TDEGlobal::iconLoader()->loadIcon("blockdevice", KIcon::Panel, KIcon::SizeMedium)); TQGridLayout *grid = new TQGridLayout(frDevices, 0, 0, 10 ); m_configDlg=new kConfigDlg(frDevices); grid->addWidget(m_configDlg,0,0); TQFrame *frDVD; - frDVD=addPage (i18n("DVD"),i18n("DVD Backup"),KGlobal::iconLoader()->loadIcon("dvdcopy", KIcon::Panel, KIcon::SizeMedium)); + frDVD=addPage (i18n("DVD"),i18n("DVD Backup"),TDEGlobal::iconLoader()->loadIcon("dvdcopy", KIcon::Panel, KIcon::SizeMedium)); grid = new TQGridLayout(frDVD, 0, 0, 10 ); m_prefDVD =new k9prefDVD(frDVD); grid->addWidget(m_prefDVD,0,0); @@ -39,13 +39,13 @@ k9settings::k9settings(TQWidget *parent,const TQString &caption): KDialogBase ( //TODO afficher uniquement si mencoder et mplayer installés TQFrame *frMencoder; - frMencoder=addPage (i18n("MEncoder"),i18n("MPEG-4 Codecs"),KGlobal::iconLoader()->loadIcon("mencoder", KIcon::Panel, KIcon::SizeMedium)); + frMencoder=addPage (i18n("MEncoder"),i18n("MPEG-4 Codecs"),TDEGlobal::iconLoader()->loadIcon("mencoder", KIcon::Panel, KIcon::SizeMedium)); m_prefMencoder =new k9prefMencoder(frMencoder); TQFrame *frMPEG4; - frMPEG4=addPage (i18n("MPEG-4"),i18n("MPEG-4 Encoding"),KGlobal::iconLoader()->loadIcon("mp4", KIcon::Panel, KIcon::SizeMedium)); + frMPEG4=addPage (i18n("MPEG-4"),i18n("MPEG-4 Encoding"),TDEGlobal::iconLoader()->loadIcon("mp4", KIcon::Panel, KIcon::SizeMedium)); grid = new TQGridLayout(frMPEG4, 0, 0, 10 ); m_prefMPEG4 =new k9prefMPEG4(frMPEG4); grid->addWidget(m_prefMPEG4,0,0); @@ -54,13 +54,13 @@ k9settings::k9settings(TQWidget *parent,const TQString &caption): KDialogBase ( grid->addWidget(m_prefMencoder,0,0); TQFrame *frPreview; - frPreview=addPage (i18n("Preview"),i18n("Title preview"),KGlobal::iconLoader()->loadIcon("mplayer", KIcon::Panel, KIcon::SizeMedium)); + frPreview=addPage (i18n("Preview"),i18n("Title preview"),TDEGlobal::iconLoader()->loadIcon("mplayer", KIcon::Panel, KIcon::SizeMedium)); grid = new TQGridLayout(frPreview, 0, 0, 10 ); m_prefPreview =new k9prefPreview(frPreview); grid->addWidget(m_prefPreview,0,0); TQFrame *frAuthor; - frAuthor=addPage(i18n("Authoring"),i18n("Authoring"),KGlobal::iconLoader()->loadIcon("author",KIcon::Panel,KIcon::SizeMedium)); + frAuthor=addPage(i18n("Authoring"),i18n("Authoring"),TDEGlobal::iconLoader()->loadIcon("author",KIcon::Panel,KIcon::SizeMedium)); grid = new TQGridLayout(frAuthor, 0, 0, 10 ); m_prefAuthor =new k9prefAuthor(frAuthor); grid->addWidget(m_prefAuthor,0,0);