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

---
 xparts/xpart_notepad/shell_xparthost.cpp    | 2 +-
 xparts/xpart_notepad/shell_xparthost.h      | 4 ++--
 xparts/xpart_notepad/xp_notepad_factory.cpp | 2 +-
 xparts/xpart_notepad/xp_notepad_factory.h   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'xparts/xpart_notepad')

diff --git a/xparts/xpart_notepad/shell_xparthost.cpp b/xparts/xpart_notepad/shell_xparthost.cpp
index b65819ad..8bb4ce65 100644
--- a/xparts/xpart_notepad/shell_xparthost.cpp
+++ b/xparts/xpart_notepad/shell_xparthost.cpp
@@ -22,7 +22,7 @@ ShellWindow::ShellWindow()
     connect(m_host, TQT_SIGNAL( actionsInitialized() ), this, TQT_SLOT( mergeGUI() ) );
 
     // Launch our XPart child.
-    m_partProcess = new KProcess;
+    m_partProcess = new TDEProcess;
     *m_partProcess << "./xp_notepad"
                    << kapp->dcopClient()->appId() << m_host->objId();
     m_partProcess->start();
diff --git a/xparts/xpart_notepad/shell_xparthost.h b/xparts/xpart_notepad/shell_xparthost.h
index f65cdf1b..7a0bb1a8 100644
--- a/xparts/xpart_notepad/shell_xparthost.h
+++ b/xparts/xpart_notepad/shell_xparthost.h
@@ -5,7 +5,7 @@
 #include <kparts/mainwindow.h>
 #include <kdebug.h>
 
-class KProcess;
+class TDEProcess;
 
 class ShellWindow : public KParts::MainWindow
 {
@@ -23,7 +23,7 @@ public slots:
 
 private:
     XPartHost_KPart *m_host;
-    KProcess *m_partProcess;
+    TDEProcess *m_partProcess;
 };
 
 #endif
diff --git a/xparts/xpart_notepad/xp_notepad_factory.cpp b/xparts/xpart_notepad/xp_notepad_factory.cpp
index 799c83f8..7d9b4d12 100644
--- a/xparts/xpart_notepad/xp_notepad_factory.cpp
+++ b/xparts/xpart_notepad/xp_notepad_factory.cpp
@@ -47,7 +47,7 @@ XP_NotepadPart::XP_NotepadPart(TQWidget *parentWidget, const char *widgetName,
 	                       TQObject *parent, const char *name)
 	: XPartHost_KPart(parentWidget, widgetName, parent, name)
 {
-    m_partProcess = new KProcess;
+    m_partProcess = new TDEProcess;
     *m_partProcess << "xnotepard"
 		   << kapp->dcopClient()->appId() << objId();
     m_partProcess->start();
diff --git a/xparts/xpart_notepad/xp_notepad_factory.h b/xparts/xpart_notepad/xp_notepad_factory.h
index c499cd0e..cb3090c6 100644
--- a/xparts/xpart_notepad/xp_notepad_factory.h
+++ b/xparts/xpart_notepad/xp_notepad_factory.h
@@ -30,7 +30,7 @@ class TDEInstance;
 class TDEAboutData;
 class KHTMLSettings;
 class KHTMLPart;
-class KProcess;
+class TDEProcess;
 
 class XP_NotepadFactory : public KParts::Factory
 {
@@ -56,7 +56,7 @@ public:
 
     virtual void createActions( const TQCString &xmlActions );
 private:
-    KProcess *m_partProcess;
+    TDEProcess *m_partProcess;
 };
 
 #endif
-- 
cgit v1.2.1