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

---
 src/app/bookmarkdialog.cpp |  2 +-
 src/app/configdialog.cpp   |  6 +++---
 src/app/kipiinterface.cpp  |  2 +-
 src/app/mainwindow.cpp     | 10 +++++-----
 src/app/metaedit.h         |  2 +-
 src/app/treeview.h         |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/app')

diff --git a/src/app/bookmarkdialog.cpp b/src/app/bookmarkdialog.cpp
index 3fe5aa8..d3646e4 100644
--- a/src/app/bookmarkdialog.cpp
+++ b/src/app/bookmarkdialog.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqlabel.h>
 
 // KDE
-#include <kfile.h>
+#include <tdefile.h>
 #include <kicondialog.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
index f482cc7..39e7153 100644
--- a/src/app/configdialog.cpp
+++ b/src/app/configdialog.cpp
@@ -32,13 +32,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kcolorbutton.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 #include <tdeversion.h>
 #include <kdirsize.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kurllabel.h>
 #include <kurlrequester.h>
diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp
index e6484f6..e5feecf 100644
--- a/src/app/kipiinterface.cpp
+++ b/src/app/kipiinterface.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klocale.h>
 #include <kurl.h>
 
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 75a9d42..c159dd2 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -34,17 +34,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kbookmarkmanager.h>
 #include <kbookmarkmenu.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klargefile.h>
 #include <klistview.h>
@@ -1068,9 +1068,9 @@ void MainWindow::createObjectInteractions() {
 		TQT_TQOBJECT(this), TQT_SLOT(openFileViewControllerContextMenu(const TQPoint&, bool)) );
 
 	// Bookmarks
-	TQString file = locate( "data", "kfile/bookmarks.xml" );
+	TQString file = locate( "data", "tdefile/bookmarks.xml" );
 	if (file.isEmpty()) {
-		file = locateLocal( "data", "kfile/bookmarks.xml" );
+		file = locateLocal( "data", "tdefile/bookmarks.xml" );
 	}
 
 	KBookmarkManager* manager=KBookmarkManager::managerForFile(file,false);
diff --git a/src/app/metaedit.h b/src/app/metaedit.h
index 1b08f40..3ef6d50 100644
--- a/src/app/metaedit.h
+++ b/src/app/metaedit.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqvbox.h>
 
 // KDE
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 class TQTextEdit;
 
 namespace Gwenview {
diff --git a/src/app/treeview.h b/src/app/treeview.h
index 99dcf5f..5609d11 100644
--- a/src/app/treeview.h
+++ b/src/app/treeview.h
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define TREEVIEW_H
 
 // KDE
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 
 class KURL;
 class TQShowEvent;
-- 
cgit v1.2.1