From ff94d46e423398804d2ae63faeb114c2cf604fc4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:05:39 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 umbrello/umbrello/CMakeLists.txt                              | 2 +-
 umbrello/umbrello/autolayout/autolayoutdlg.h                  | 2 +-
 umbrello/umbrello/codegenerationpolicy.cpp                    | 2 +-
 umbrello/umbrello/codegenerators/cppcodegenerationform.cpp    | 2 +-
 umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp  | 2 +-
 umbrello/umbrello/codegenerators/cppcodegenerator.cpp         | 2 +-
 umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp | 2 +-
 umbrello/umbrello/codegenerators/javacodegenerator.cpp        | 2 +-
 umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp | 2 +-
 umbrello/umbrello/codegenerators/rubycodegenerator.cpp        | 2 +-
 umbrello/umbrello/configurable.cpp                            | 2 +-
 umbrello/umbrello/dialogs/codegenerationoptionspage.cpp       | 2 +-
 umbrello/umbrello/dialogs/exportallviewsdialog.cpp            | 2 +-
 umbrello/umbrello/dialogs/settingsdlg.cpp                     | 2 +-
 umbrello/umbrello/docgenerators/docbookgenerator.cpp          | 2 +-
 umbrello/umbrello/docgenerators/main.cpp                      | 2 +-
 umbrello/umbrello/docgenerators/xhtmlgenerator.cpp            | 2 +-
 umbrello/umbrello/main.cpp                                    | 2 +-
 umbrello/umbrello/plugin.cpp                                  | 2 +-
 umbrello/umbrello/uml.cpp                                     | 4 ++--
 umbrello/umbrello/umldoc.cpp                                  | 4 ++--
 umbrello/umbrello/umllistview.cpp                             | 2 +-
 umbrello/umbrello/umlview.cpp                                 | 4 ++--
 umbrello/umbrello/umlviewimageexporter.cpp                    | 4 ++--
 umbrello/umbrello/umlviewimageexporterall.cpp                 | 2 +-
 umbrello/umbrello/umlviewimageexportermodel.cpp               | 2 +-
 26 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'umbrello')

diff --git a/umbrello/umbrello/CMakeLists.txt b/umbrello/umbrello/CMakeLists.txt
index f7c299b3..7329dec6 100644
--- a/umbrello/umbrello/CMakeLists.txt
+++ b/umbrello/umbrello/CMakeLists.txt
@@ -81,6 +81,6 @@ tde_add_executable( umbrello AUTOMOC
   LINK
     refactoring-static codeimport-static kdevcppparser-static clipboard-static
     codegenerator-static docgenerators-static dialogs-static
-    tdeprint-shared kio-shared ${XML2_LIBRARIES} ${XSLT_LIBRARIES}
+    tdeprint-shared tdeio-shared ${XML2_LIBRARIES} ${XSLT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index d970c521..6b4eea53 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -15,7 +15,7 @@
 #include "newautolayoutdialog.h"
 #include "../umlview.h"
 #include <tqobject.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "autotqlayout.h"
 
 class AutolayoutDlg : public MyDialog1
diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp
index 725f322f..dbabc9a3 100644
--- a/umbrello/umbrello/codegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerationpolicy.cpp
@@ -27,7 +27,7 @@
 #include <tqdatetime.h>
 
 // kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
index 1051b6c6..609b7eb2 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
@@ -21,7 +21,7 @@
 #include <tqlabel.h>
 #include <tqregexp.h>
 #include <tqlistview.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcombobox.h>
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
index 70983d96..33f013a2 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
@@ -19,7 +19,7 @@
 // qt/kde includes
 #include <tqregexp.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 // app includes
 #include "cppcodegenerationpolicypage.h"
 #include "../uml.h"
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
index b5c12dd6..a86f14f4 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
@@ -20,7 +20,7 @@
 // qt/kde includes
 #include <tqregexp.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // app includes
 #include "cppcodedocumentation.h"
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
index 02cd8adf..ad8810f7 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
@@ -17,7 +17,7 @@
 // own header
 #include "javacodegenerationpolicy.h"
 // qt/kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 // app includes
 #include "javacodegenerationpolicypage.h"
 #include "javacodegenerator.h"
diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.cpp b/umbrello/umbrello/codegenerators/javacodegenerator.cpp
index 0f78a0fb..8e204695 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerator.cpp
@@ -19,7 +19,7 @@
 
 // qt/kde includes
 #include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
index d9c8527d..55446f27 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
@@ -20,7 +20,7 @@
 // own header
 #include "rubycodegenerationpolicy.h"
 // qt/kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 // app includes
 #include "rubycodegenerationpolicypage.h"
 #include "rubycodegenerator.h"
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
index 0cd9176f..6305537d 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
@@ -22,7 +22,7 @@
 
 // qt/kde includes
 #include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/umbrello/umbrello/configurable.cpp b/umbrello/umbrello/configurable.cpp
index c4f9683c..0738904d 100644
--- a/umbrello/umbrello/configurable.cpp
+++ b/umbrello/umbrello/configurable.cpp
@@ -23,7 +23,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // local includes
 #include "pluginloader.h"
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
index a5ce2f57..d8e94856 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
@@ -29,7 +29,7 @@
 
 //kde include
 #include <knuminput.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 
 //qt include
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
index 7560b850..12836f0b 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
@@ -18,7 +18,7 @@
 #include <tqtooltip.h>
 
 // kde include files
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 #include <klocale.h>
 
 // application specific includes
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp
index 172c695f..145b0519 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@@ -20,7 +20,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 // app includes
 #include "codegenerationoptionspage.h"
 #include "codevieweroptionspage.h"
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
index e1e3c297..41c43e60 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqregexp.h>
diff --git a/umbrello/umbrello/docgenerators/main.cpp b/umbrello/umbrello/docgenerators/main.cpp
index 08d8c317..ea8576da 100644
--- a/umbrello/umbrello/docgenerators/main.cpp
+++ b/umbrello/umbrello/docgenerators/main.cpp
@@ -27,7 +27,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <ktip.h>
 #include <kdebug.h>
diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
index 5c147e84..1a9bab5c 100644
--- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqregexp.h>
diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp
index 52d96693..6408c8d6 100644
--- a/umbrello/umbrello/main.cpp
+++ b/umbrello/umbrello/main.cpp
@@ -15,7 +15,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <ktip.h>
 #include <kdebug.h>
diff --git a/umbrello/umbrello/plugin.cpp b/umbrello/umbrello/plugin.cpp
index d3efb4e7..c4d9913a 100644
--- a/umbrello/umbrello/plugin.cpp
+++ b/umbrello/umbrello/plugin.cpp
@@ -21,7 +21,7 @@
 // KDE includes
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // app includes
 #include "pluginloader.h"
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index f6792444..a498b3c6 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -24,10 +24,10 @@
 // kde includes
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kprinter.h>
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index 8bff0db0..d3c79214 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -25,8 +25,8 @@
 #include <kapplication.h>
 #include <tdeversion.h>
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index 0edf4df6..12671fdf 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp
index aef18eca..2cdeefae 100644
--- a/umbrello/umbrello/umlview.cpp
+++ b/umbrello/umbrello/umlview.cpp
@@ -35,11 +35,11 @@
 
 //kde include files
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
 #include <kcursor.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/umbrello/umbrello/umlviewimageexporter.cpp b/umbrello/umbrello/umlviewimageexporter.cpp
index 6436536d..9411fae6 100644
--- a/umbrello/umbrello/umlviewimageexporter.cpp
+++ b/umbrello/umbrello/umlviewimageexporter.cpp
@@ -18,10 +18,10 @@
 
 //kde include files
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 // application specific includes
 #include "umlviewimageexportermodel.h"
diff --git a/umbrello/umbrello/umlviewimageexporterall.cpp b/umbrello/umbrello/umlviewimageexporterall.cpp
index 95801867..cb256ca1 100644
--- a/umbrello/umbrello/umlviewimageexporterall.cpp
+++ b/umbrello/umbrello/umlviewimageexporterall.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kurlrequester.h>
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 #include <kmessagebox.h>
 
 // application specific includes
diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp
index 7bd5a30a..a56aa85c 100644
--- a/umbrello/umbrello/umlviewimageexportermodel.cpp
+++ b/umbrello/umbrello/umlviewimageexportermodel.cpp
@@ -30,7 +30,7 @@
 #include <klocale.h>
 #include <ktempfile.h>
 #include <kapplication.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 // application specific includes
 #include "uml.h"
-- 
cgit v1.2.1