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

---
 kdevdesigner/designer/CMakeLists.txt             | 2 +-
 kdevdesigner/designer/customwidgeteditorimpl.cpp | 2 +-
 kdevdesigner/designer/filechooser.cpp            | 2 +-
 kdevdesigner/designer/formfile.cpp               | 2 +-
 kdevdesigner/designer/kdevdesigner_part.cpp      | 2 +-
 kdevdesigner/designer/mainwindowactions.cpp      | 2 +-
 kdevdesigner/designer/pixmapchooser.cpp          | 2 +-
 kdevdesigner/designer/projectsettingsimpl.cpp    | 2 +-
 kdevdesigner/designer/resource.cpp               | 2 +-
 kdevdesigner/designer/sourcefile.cpp             | 2 +-
 kdevdesigner/src/kdevdesigner.cpp                | 4 ++--
 11 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kdevdesigner')

diff --git a/kdevdesigner/designer/CMakeLists.txt b/kdevdesigner/designer/CMakeLists.txt
index 298fb20d..c0370f26 100644
--- a/kdevdesigner/designer/CMakeLists.txt
+++ b/kdevdesigner/designer/CMakeLists.txt
@@ -102,6 +102,6 @@ tde_add_kpart( libkdevdesignerpart AUTOMOC
   SOURCES ${SRCS}
   LINK
     kdevqui-static shared-static kinterfacedesigner-shared
-    kio-shared tdeparts-shared qassistantclient
+    tdeio-shared tdeparts-shared qassistantclient
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp
index 5759de20..f923f604 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.cpp
+++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp
@@ -33,7 +33,7 @@
 #include "widgetfactory.h"
 #include "widgetdatabase.h"
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 
 #include <tqlistbox.h>
diff --git a/kdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp
index 9c2bb751..0f4c426e 100644
--- a/kdevdesigner/designer/filechooser.cpp
+++ b/kdevdesigner/designer/filechooser.cpp
@@ -30,7 +30,7 @@
 #include <tqfiledialog.h>
 #include <tqlayout.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 FileChooser::FileChooser( TQWidget *parent, const char *name )
     : TQWidget( parent, name ), md( File )
diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp
index 4c60eaab..c893b42f 100644
--- a/kdevdesigner/designer/formfile.cpp
+++ b/kdevdesigner/designer/formfile.cpp
@@ -43,7 +43,7 @@
 #include "designerappiface.h"
 #include <tqapplication.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include "kdevdesigner_part.h"
 
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index 798b8b6c..2e84b2ad 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -24,7 +24,7 @@
 #include <kaction.h>
 #include <kactionclasses.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index 0aa0275e..17583ecf 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -27,7 +27,7 @@
 #include "mainwindow.h"
 
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <klineedit.h>
 
diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp
index a050f4da..92d68ac1 100644
--- a/kdevdesigner/designer/pixmapchooser.cpp
+++ b/kdevdesigner/designer/pixmapchooser.cpp
@@ -28,7 +28,7 @@
 
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimagefilepreview.h>
 #include <klineedit.h>
 
diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp
index 5cea9192..ca6c34ea 100644
--- a/kdevdesigner/designer/projectsettingsimpl.cpp
+++ b/kdevdesigner/designer/projectsettingsimpl.cpp
@@ -34,7 +34,7 @@
 #include "sourcefile.h"
 #include "workspace.h"
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <klineedit.h>
 
diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp
index 4f1e9a37..02b50684 100644
--- a/kdevdesigner/designer/resource.cpp
+++ b/kdevdesigner/designer/resource.cpp
@@ -82,7 +82,7 @@
 #include <tqucom_p.h>
 
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 
 #include "kdevdesigner_part.h"
diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp
index b0061f24..9713fed9 100644
--- a/kdevdesigner/designer/sourcefile.cpp
+++ b/kdevdesigner/designer/sourcefile.cpp
@@ -37,7 +37,7 @@
 #include "workspace.h"
 #include <stdlib.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 
 SourceFile::SourceFile( const TQString &fn, bool temp, Project *p )
diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp
index 6d1d5270..e184fe01 100644
--- a/kdevdesigner/src/kdevdesigner.cpp
+++ b/kdevdesigner/src/kdevdesigner.cpp
@@ -22,8 +22,8 @@
 
 #include <kxmlguiclient.h>
 #include <kkeydialog.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kdebug.h>
 
-- 
cgit v1.2.1