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

---
 kommander/editor/assoctexteditorimpl.cpp  | 2 +-
 kommander/editor/filechooser.cpp          | 2 +-
 kommander/editor/formfile.cpp             | 2 +-
 kommander/editor/kommander.xml            | 2 +-
 kommander/editor/main.cpp                 | 2 +-
 kommander/editor/mainwindow.cpp           | 4 ++--
 kommander/editor/mainwindowactions.cpp    | 2 +-
 kommander/editor/messagelog.cpp           | 2 +-
 kommander/factory/kommanderfactory.cpp    | 2 +-
 kommander/pluginmanager/mainwindow.cpp    | 4 ++--
 kommander/pluginmanager/pluginmanager.cpp | 2 +-
 kommander/widget/functionlib.cpp          | 2 +-
 kommander/widget/kommanderfunctions.cpp   | 2 +-
 kommander/widgets/fileselector.cpp        | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'kommander')

diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index 4cbaeb08..9fbfe938 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 /* KDE INCLUDES */
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/kommander/editor/filechooser.cpp b/kommander/editor/filechooser.cpp
index 6dfb84ec..ac0aad5a 100644
--- a/kommander/editor/filechooser.cpp
+++ b/kommander/editor/filechooser.cpp
@@ -1,7 +1,7 @@
 #include "filechooser.h"
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqlayout.h>
 
 FileChooser::FileChooser( TQWidget *parent, const char *name )
diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp
index fbb64d48..97a636ef 100644
--- a/kommander/editor/formfile.cpp
+++ b/kommander/editor/formfile.cpp
@@ -34,7 +34,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
diff --git a/kommander/editor/kommander.xml b/kommander/editor/kommander.xml
index ee10455b..2652e09b 100644
--- a/kommander/editor/kommander.xml
+++ b/kommander/editor/kommander.xml
@@ -558,7 +558,7 @@
       <!-- others -->
       <item> dcop </item>
       <item> kdialog </item>
-      <item> kfile </item>
+      <item> tdefile </item>
       <item> xhost </item>
       <item> xmodmap </item>
       <item> xset </item>
diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index a4c4b27b..75e4ce67 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -17,7 +17,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <ksplashscreen.h>
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 608049ed..fd3f0ecb 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -74,7 +74,7 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmenubar.h>
@@ -86,7 +86,7 @@
 #include <ktoolbar.h>
 #include <kurl.h>
 #include <tdeparts/partmanager.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 extern TQMap<TQWidget*, TQString> *qwf_functions;
 extern TQMap<TQWidget*, TQString> *qwf_forms;
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index 749f5d3b..8a217843 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -60,7 +60,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kkeydialog.h>
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index 16947a77..33a385b3 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -17,7 +17,7 @@
 #include "messagelog.h"
 
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klistbox.h>
 #include <kmessagebox.h>
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp
index 7c717a68..76da35f1 100644
--- a/kommander/factory/kommanderfactory.cpp
+++ b/kommander/factory/kommanderfactory.cpp
@@ -19,7 +19,7 @@
 **********************************************************************/
 /* Modifications by Marc Britton (c) 2002 under GNU GPL, terms as above */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 
 #include "kommanderfactory.h"
diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp
index 8c1eb55b..249aed75 100644
--- a/kommander/pluginmanager/mainwindow.cpp
+++ b/kommander/pluginmanager/mainwindow.cpp
@@ -20,8 +20,8 @@
 
 #include <ktoolbar.h>
 #include <klistbox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kommander/pluginmanager/pluginmanager.cpp b/kommander/pluginmanager/pluginmanager.cpp
index e5de0841..64f1bf22 100644
--- a/kommander/pluginmanager/pluginmanager.cpp
+++ b/kommander/pluginmanager/pluginmanager.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
  
 #include "pluginmanager.h"
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index a43fbfaf..18f9a6b8 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -36,7 +36,7 @@
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <kcolordialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kinputdialog.h>
 #include <klocale.h>
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index b36a7251..dc890657 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -23,7 +23,7 @@
  
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 
diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp
index 897f85c8..54a0e90a 100644
--- a/kommander/widgets/fileselector.cpp
+++ b/kommander/widgets/fileselector.cpp
@@ -16,7 +16,7 @@
 
 
 /* KDE INCLUDES */
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kurlcompletion.h>
-- 
cgit v1.2.1