From 00b4f54142276b0e2272ca56e48558551ab7b2b0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:17:19 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kmrml/kmrml/CMakeLists.txt          | 2 +-
 kmrml/kmrml/browser.h               | 2 +-
 kmrml/kmrml/kcontrol/CMakeLists.txt | 2 +-
 kmrml/kmrml/mrml_part.cpp           | 2 +-
 kmrml/kmrml/mrml_part.h             | 4 ++--
 kmrml/kmrml/server/CMakeLists.txt   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kmrml')

diff --git a/kmrml/kmrml/CMakeLists.txt b/kmrml/kmrml/CMakeLists.txt
index 20f6edb5..b570b684 100644
--- a/kmrml/kmrml/CMakeLists.txt
+++ b/kmrml/kmrml/CMakeLists.txt
@@ -49,7 +49,7 @@ tde_add_kpart( libkmrmlpart AUTOMOC
     mrml_part.cpp mrml_view.cpp loader.cpp mrml_elements.cpp
     mrml_creator.cpp browser.cpp algorithmdialog.cpp collectioncombo.cpp
     algorithmcombo.cpp propertysheet.cpp
-  LINK kmrmlstuff-static kparts-shared
+  LINK kmrmlstuff-static tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kmrml/kmrml/browser.h b/kmrml/kmrml/browser.h
index 1bfd3310..d19d1543 100644
--- a/kmrml/kmrml/browser.h
+++ b/kmrml/kmrml/browser.h
@@ -19,7 +19,7 @@
 #ifndef BROWSER_H
 #define BROWSER_H
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 namespace KMrml
 {
diff --git a/kmrml/kmrml/kcontrol/CMakeLists.txt b/kmrml/kmrml/kcontrol/CMakeLists.txt
index 6db11a40..15f85e95 100644
--- a/kmrml/kmrml/kcontrol/CMakeLists.txt
+++ b/kmrml/kmrml/kcontrol/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( kcm_kmrml AUTOMOC
     kcmkmrml.cpp mainpage.cpp indexer.cpp
     serverconfigwidget.ui indexcleaner.cpp
   LINK
-    kmrmlstuff-static kparts-shared kio-shared
+    kmrmlstuff-static tdeparts-shared kio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index 33b5ea30..29e633a7 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -42,7 +42,7 @@
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kprotocolinfo.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <ktempfile.h>
 
 #include <mrml_utils.h>
diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h
index 605d23e7..822ca042 100644
--- a/kmrml/kmrml/mrml_part.h
+++ b/kmrml/kmrml/mrml_part.h
@@ -23,8 +23,8 @@
 #include <tqstringlist.h>
 
 #include <kurl.h>
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
 
 #include <kmrml_config.h>
 
diff --git a/kmrml/kmrml/server/CMakeLists.txt b/kmrml/kmrml/server/CMakeLists.txt
index f51a9b80..337bede6 100644
--- a/kmrml/kmrml/server/CMakeLists.txt
+++ b/kmrml/kmrml/server/CMakeLists.txt
@@ -30,6 +30,6 @@ INSTALL( FILES daemonwatcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 
 tde_add_kpart( kded_daemonwatcher AUTOMOC
   SOURCES watcher.cpp watcher.skel
-  LINK kmrmlstuff-static kparts-shared kio-shared tdeinit_kded-shared
+  LINK kmrmlstuff-static tdeparts-shared kio-shared tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
-- 
cgit v1.2.1