From 5b6d393e0a2c88cce8f433607c091ae883ef54f9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:27:15 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/fetch/gcstarpluginfetcher.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/fetch/gcstarpluginfetcher.cpp') diff --git a/src/fetch/gcstarpluginfetcher.cpp b/src/fetch/gcstarpluginfetcher.cpp index d28d4fc..7b363ce 100644 --- a/src/fetch/gcstarpluginfetcher.cpp +++ b/src/fetch/gcstarpluginfetcher.cpp @@ -51,7 +51,7 @@ GCstarPluginFetcher::PluginList GCstarPluginFetcher::plugins(int collType_) { KProcIO proc; proc << gcstar << TQString::fromLatin1("--version"); // wait 5 seconds at most, just a sanity thing, never want to block completely - if(proc.start(KProcess::Block) && proc.wait(5)) { + if(proc.start(TDEProcess::Block) && proc.wait(5)) { TQString output; proc.readln(output); if(!output.isEmpty()) { @@ -98,7 +98,7 @@ void GCstarPluginFetcher::readPluginsNew(int collType_, const TQString& gcstar_) << TQString::fromLatin1("--list-plugins") << TQString::fromLatin1("--collection") << gcstarCollection; - if(!proc.start(KProcess::Block)) { + if(!proc.start(TDEProcess::Block)) { myWarning() << "GCstarPluginFetcher::readPluginsNew() - can't start" << endl; return; } @@ -228,19 +228,19 @@ void GCstarPluginFetcher::search(FetchKey key_, const TQString& value_) { return; } - m_process = new KProcess(); - connect(m_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), TQT_SLOT(slotData(KProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), TQT_SLOT(slotError(KProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); + m_process = new TDEProcess(); + connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(slotData(TDEProcess*, char*, int))); + connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(slotError(TDEProcess*, char*, int))); + connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); TQStringList args; args << gcstar << TQString::fromLatin1("-x") << TQString::fromLatin1("--collection") << gcstarCollection << TQString::fromLatin1("--export") << TQString::fromLatin1("Tellico") << TQString::fromLatin1("--website") << m_plugin - << TQString::fromLatin1("--download") << KProcess::quote(value_); + << TQString::fromLatin1("--download") << TDEProcess::quote(value_); myLog() << "GCstarPluginFetcher::search() - " << args.join(TQChar(' ')) << endl; *m_process << args; - if(!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput)) { + if(!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) { myDebug() << "GCstarPluginFetcher::startSearch() - process failed to start" << endl; stop(); } @@ -261,19 +261,19 @@ void GCstarPluginFetcher::stop() { emit signalDone(this); } -void GCstarPluginFetcher::slotData(KProcess*, char* buffer_, int len_) { +void GCstarPluginFetcher::slotData(TDEProcess*, char* buffer_, int len_) { TQDataStream stream(m_data, IO_WriteOnly | IO_Append); stream.writeRawBytes(buffer_, len_); } -void GCstarPluginFetcher::slotError(KProcess*, char* buffer_, int len_) { +void GCstarPluginFetcher::slotError(TDEProcess*, char* buffer_, int len_) { TQString msg = TQString::fromLocal8Bit(buffer_, len_); msg.prepend(source() + TQString::fromLatin1(": ")); myDebug() << "GCstarPluginFetcher::slotError() - " << msg << endl; m_errors << msg; } -void GCstarPluginFetcher::slotProcessExited(KProcess*) { +void GCstarPluginFetcher::slotProcessExited(TDEProcess*) { // myDebug() << "GCstarPluginFetcher::slotProcessExited()" << endl; if(!m_process->normalExit() || m_process->exitStatus()) { myDebug() << "GCstarPluginFetcher::slotProcessExited() - "<< source() << ": process did not exit successfully" << endl; -- cgit v1.2.1