Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/2/head
Timothy Pearson 12 years ago
parent 03b0a8e08f
commit 2ee2d4c4c7

@ -6,10 +6,10 @@
Process::Process() Process::Process()
{ {
_buffer = TQString(); _buffer = TQString();
_process = new KProcess(); _process = new TDEProcess();
connect(_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), connect(_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotProcessOutput(KProcess*, char*, int))); this, TQT_SLOT(slotProcessOutput(TDEProcess*, char*, int)));
} }
@ -32,9 +32,9 @@
void Process::start(bool block) void Process::start(bool block)
{ {
if( block ) if( block )
_process->start(KProcess::Block, KProcess::Stdout); _process->start(TDEProcess::Block, TDEProcess::Stdout);
else else
_process->start(KProcess::DontCare, KProcess::Stdout); _process->start(TDEProcess::DontCare, TDEProcess::Stdout);
} }
TQString Process::getBuffer() TQString Process::getBuffer()
@ -52,7 +52,7 @@
return _process->normalExit(); return _process->normalExit();
} }
void Process::slotProcessOutput(KProcess* process, char* buffer, int len) void Process::slotProcessOutput(TDEProcess* process, char* buffer, int len)
{ {
if (process != _process) return; if (process != _process) return;

@ -26,11 +26,11 @@ public:
void start(bool block=true); void start(bool block=true);
protected: protected:
KProcess* _process; TDEProcess* _process;
TQString _buffer; TQString _buffer;
protected slots: protected slots:
void slotProcessOutput(KProcess* process, char* buffer, int buflen); void slotProcessOutput(TDEProcess* process, char* buffer, int buflen);
}; };

@ -6,10 +6,10 @@
Process::Process() Process::Process()
{ {
_buffer = TQString(); _buffer = TQString();
_process = new KProcess(); _process = new TDEProcess();
connect(_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), connect(_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotProcessOutput(KProcess*, char*, int))); this, TQT_SLOT(slotProcessOutput(TDEProcess*, char*, int)));
} }
@ -32,9 +32,9 @@
void Process::start(bool block) void Process::start(bool block)
{ {
if( block ) if( block )
_process->start(KProcess::Block, KProcess::Stdout); _process->start(TDEProcess::Block, TDEProcess::Stdout);
else else
_process->start(KProcess::DontCare, KProcess::Stdout); _process->start(TDEProcess::DontCare, TDEProcess::Stdout);
} }
TQString Process::getBuffer() TQString Process::getBuffer()
@ -52,7 +52,7 @@
return _process->normalExit(); return _process->normalExit();
} }
void Process::slotProcessOutput(KProcess* process, char* buffer, int len) void Process::slotProcessOutput(TDEProcess* process, char* buffer, int len)
{ {
if (process != _process) return; if (process != _process) return;

@ -26,11 +26,11 @@ public:
void start(bool block=true); void start(bool block=true);
protected: protected:
KProcess* _process; TDEProcess* _process;
TQString _buffer; TQString _buffer;
protected slots: protected slots:
void slotProcessOutput(KProcess* process, char* buffer, int buflen); void slotProcessOutput(TDEProcess* process, char* buffer, int buflen);
}; };

Loading…
Cancel
Save