diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:30:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:30:40 -0600 |
| commit | ebc6678331f06606b8dcbca2448c1fccbec05872 (patch) | |
| tree | 6c6d0d3370e7a5089d338e088f19939614ff54b5 | |
| parent | 6af58c78b8f4d5b3ea9aacbceea8e0267d0970d2 (diff) | |
| download | libkdcraw-ebc6678331f06606b8dcbca2448c1fccbec05872.tar.gz libkdcraw-ebc6678331f06606b8dcbca2448c1fccbec05872.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
| -rw-r--r-- | libkdcraw/libkdcraw/dcrawbinary.cpp | 12 | ||||
| -rw-r--r-- | libkdcraw/libkdcraw/dcrawbinary.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libkdcraw/libkdcraw/dcrawbinary.cpp b/libkdcraw/libkdcraw/dcrawbinary.cpp index 08a80e9..8a09042 100644 --- a/libkdcraw/libkdcraw/dcrawbinary.cpp +++ b/libkdcraw/libkdcraw/dcrawbinary.cpp @@ -86,17 +86,17 @@ void DcrawBinary::cleanUp() void DcrawBinary::checkSystem() { - KProcess process; + TDEProcess process; process.clearArguments(); process << path(); - connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char*, int)), - this, TQT_SLOT(slotReadStdoutFromDcraw(KProcess*, char*, int))); + connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)), + this, TQT_SLOT(slotReadStdoutFromDcraw(TDEProcess*, char*, int))); - d->available = process.start(KProcess::Block, KProcess::Stdout); + d->available = process.start(TDEProcess::Block, TDEProcess::Stdout); } -void DcrawBinary::slotReadStdoutFromDcraw(KProcess*, char* buffer, int buflen) +void DcrawBinary::slotReadStdoutFromDcraw(TDEProcess*, char* buffer, int buflen) { // The dcraw output looks like this : Raw photo decoder "dcraw" v8.54... TQString dcrawHeader("Raw photo decoder \"dcraw\" v"); @@ -151,7 +151,7 @@ bool DcrawBinary::versionIsRight() const void DcrawBinary::checkReport() { - TQString appName = KGlobal::instance()->aboutData()->programName(); + TQString appName = TDEGlobal::instance()->aboutData()->programName(); if (!isAvailable()) { diff --git a/libkdcraw/libkdcraw/dcrawbinary.h b/libkdcraw/libkdcraw/dcrawbinary.h index 95b92f1..cdf16e5 100644 --- a/libkdcraw/libkdcraw/dcrawbinary.h +++ b/libkdcraw/libkdcraw/dcrawbinary.h @@ -33,7 +33,7 @@ #include "libkdcraw_export.h" -class KProcess; +class TDEProcess; namespace KDcrawIface { @@ -81,7 +81,7 @@ public: private slots: - void slotReadStdoutFromDcraw(KProcess*, char*, int); + void slotReadStdoutFromDcraw(TDEProcess*, char*, int); private: |