From 5b8ab149469c8e186ee8b05d90c0103ae722dd85 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:23:24 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 filters/chalk/raw/kis_raw_import.cpp | 16 ++++++++--------
 filters/chalk/raw/kis_raw_import.h   |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'filters/chalk/raw')

diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp
index 4ec8f028..8bc6692d 100644
--- a/filters/chalk/raw/kis_raw_import.cpp
+++ b/filters/chalk/raw/kis_raw_import.cpp
@@ -134,7 +134,7 @@ KoFilter::ConversionStatus KisRawImport::convert(const TQCString& from, const TQ
     m_dialog->setCursor(TQt::ArrowCursor);
     TQApplication::setOverrideCursor(TQt::ArrowCursor);
 
-    KConfig * cfg = KGlobal::config();
+    KConfig * cfg = TDEGlobal::config();
     cfg->setGroup("rawimport");
     
     m_page->radioGray->setChecked(cfg->readBoolEntry("gray", false));
@@ -413,7 +413,7 @@ void KisRawImport::getImageData( TQStringList arguments )
     delete m_data;
 
     kdDebug(41008) << "getImageData " << arguments.join(" ") << "\n";
-    KProcess process (this);
+    TDEProcess process (this);
     m_data = new TQByteArray(0);
 
     for (TQStringList::iterator it = arguments.begin(); it != arguments.end(); ++it) {
@@ -421,14 +421,14 @@ void KisRawImport::getImageData( TQStringList arguments )
     }
 
     process.setUseShell(true);
-    connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(slotReceivedStdout(KProcess *, char *, int)));
-    connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(slotReceivedStderr(KProcess *, char *, int)));
-    connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotProcessDone()));
+    connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedStdout(TDEProcess *, char *, int)));
+    connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedStderr(TDEProcess *, char *, int)));
+    connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessDone()));
 
 
     kdDebug(41008) << "Starting process\n";
 
-    if (!process.start(KProcess::NotifyOnExit, KProcess::AllOutput)) {
+    if (!process.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) {
         KMessageBox::error( 0, i18n("Cannot convert RAW files because the dcraw executable could not be started."));
     }
     while (process.isRunning()) {
@@ -453,7 +453,7 @@ void KisRawImport::slotProcessDone()
     kdDebug(41008) << "process done!\n";
 }
 
-void KisRawImport::slotReceivedStdout(KProcess *, char *buffer, int buflen)
+void KisRawImport::slotReceivedStdout(TDEProcess *, char *buffer, int buflen)
 {
     //kdDebug(41008) << "stdout received " << buflen << " bytes on stdout.\n";
     //kdDebug(41008) << TQString::fromAscii(buffer, buflen) << "\n";
@@ -462,7 +462,7 @@ void KisRawImport::slotReceivedStdout(KProcess *, char *buffer, int buflen)
     memcpy(m_data->data() + oldSize, buffer, buflen);
 }
 
-void KisRawImport::slotReceivedStderr(KProcess *, char *buffer, int buflen)
+void KisRawImport::slotReceivedStderr(TDEProcess *, char *buffer, int buflen)
 {
     TQByteArray b(buflen);
     memcpy(b.data(), buffer, buflen);
diff --git a/filters/chalk/raw/kis_raw_import.h b/filters/chalk/raw/kis_raw_import.h
index db1780b4..e0a1be39 100644
--- a/filters/chalk/raw/kis_raw_import.h
+++ b/filters/chalk/raw/kis_raw_import.h
@@ -22,7 +22,7 @@
 
 #include <KoFilter.h>
 
-class KProcess;
+class TDEProcess;
 class KDialogBase;
 class WdgRawImport;
 class KisProfile;
@@ -45,8 +45,8 @@ private slots:
     void slotUpdatePreview();
     void slotFillCmbProfiles();
     void slotProcessDone();
-    void slotReceivedStdout(KProcess *proc, char *buffer, int buflen);
-    void slotReceivedStderr(KProcess *proc, char *buffer, int buflen);
+    void slotReceivedStdout(TDEProcess *proc, char *buffer, int buflen);
+    void slotReceivedStderr(TDEProcess *proc, char *buffer, int buflen);
     void incrementProgress();
 
 private:
@@ -62,7 +62,7 @@ private:
     KDialogBase * m_dialog;
     WdgRawImport * m_page;
     KisProfile * m_monitorProfile;
-    KProcess * m_process;
+    TDEProcess * m_process;
     TQProgressDialog* m_progress;
     bool m_err; // Set to true when slotReceivedStderr is called
 };
-- 
cgit v1.2.1