diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:42 -0600 |
| commit | 6ee2a113c808e9fe2fa25ae6dc2ca7d6ca366015 (patch) | |
| tree | 22f7e5a7a405a6d3631ab8b7ca21df6161b6f7d8 /k9author | |
| parent | 7ab25fa204dd2b42267fcd509e4a2a91627641e5 (diff) | |
| download | k9copy-6ee2a113c808e9fe2fa25ae6dc2ca7d6ca366015.tar.gz k9copy-6ee2a113c808e9fe2fa25ae6dc2ca7d6ca366015.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'k9author')
| -rw-r--r-- | k9author/k9newdvd.cpp | 10 | ||||
| -rw-r--r-- | k9author/k9newdvd.h | 4 |
2 files changed, 7 insertions, 7 deletions
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(); |