summaryrefslogtreecommitdiffstats
path: root/libk9copy
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:19:42 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:19:42 -0600
commit6ee2a113c808e9fe2fa25ae6dc2ca7d6ca366015 (patch)
tree22f7e5a7a405a6d3631ab8b7ca21df6161b6f7d8 /libk9copy
parent7ab25fa204dd2b42267fcd509e4a2a91627641e5 (diff)
downloadk9copy-6ee2a113c808e9fe2fa25ae6dc2ca7d6ca366015.tar.gz
k9copy-6ee2a113c808e9fe2fa25ae6dc2ca7d6ca366015.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libk9copy')
-rw-r--r--libk9copy/k9burndvd.cpp32
-rw-r--r--libk9copy/k9burndvd.h8
-rwxr-xr-xlibk9copy/k9dvdauthor.cpp12
-rwxr-xr-xlibk9copy/k9dvdauthor.h4
-rw-r--r--libk9copy/k9mp4enc.cpp12
-rw-r--r--libk9copy/k9mp4enc.h4
-rw-r--r--libk9copy/k9process.cpp8
-rw-r--r--libk9copy/k9process.h4
-rw-r--r--libk9copy/k9processlist.cpp6
-rw-r--r--libk9copy/k9processlist.h2
-rw-r--r--libk9copy/k9progress.cpp2
11 files changed, 47 insertions, 47 deletions
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 <<TQDir::cleanDirPath(workDir +"/dvd");
@@ -207,7 +207,7 @@ void k9BurnDVD::burnWithGenisoimage() {
if (!iso) {
k9Process *proc2=new k9Process(NULL,NULL);
getGenisoimageCmd(proc2,"",true);
- proc2->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 <<TQDir::cleanDirPath(workDir +"/dvd");
- 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)) );
if (!autoBurn && !iso) {
c=i18n("Insert a recordable DVD");
if ( KMessageBox::warningContinueCancel ( 0,c, i18n("DVD burning"))!=KMessageBox::Continue)
@@ -330,7 +330,7 @@ void k9BurnDVD::burnWithGrowisofs() {
}
/** No descriptions */
-void k9BurnDVD::growisoStderr(KProcess *proc, char *buffer, int buflen) {
+void k9BurnDVD::growisoStderr(TDEProcess *proc, char *buffer, int buflen) {
TQString c=TQString::fromLatin1( buffer,buflen);// (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 <tqeventloop.h>
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 <k9copy@free.fr>
*/
-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;
}