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

---
 src/difftextwindow.cpp            | 2 +-
 src/directorymergewindow.cpp      | 2 +-
 src/fileaccess.cpp                | 2 +-
 src/fileaccess.h                  | 4 ++--
 src/kdiff3.cpp                    | 4 ++--
 src/kdiff3_part.cpp               | 2 +-
 src/kdiff3_shell.cpp              | 4 ++--
 src/kreplacements/kconfig.h       | 2 --
 src/kreplacements/kfiledialog.h   | 2 --
 src/kreplacements/tdeconfig.h     | 2 ++
 src/kreplacements/tdefiledialog.h | 2 ++
 src/optiondialog.cpp              | 2 +-
 src/smalldialogs.cpp              | 2 +-
 13 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 src/kreplacements/kconfig.h
 delete mode 100644 src/kreplacements/kfiledialog.h
 create mode 100644 src/kreplacements/tdeconfig.h
 create mode 100644 src/kreplacements/tdefiledialog.h

(limited to 'src')

diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp
index e8124fa..727579d 100644
--- a/src/difftextwindow.cpp
+++ b/src/difftextwindow.cpp
@@ -35,7 +35,7 @@
 #include <cstdlib>
 #include <tqdragobject.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 class DiffTextWindowData
 {
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
index b4f6b20..c56f69b 100644
--- a/src/directorymergewindow.cpp
+++ b/src/directorymergewindow.cpp
@@ -35,7 +35,7 @@
 #include <tqtextedit.h>
 #include <tqprogressdialog.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <iostream>
diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp
index eaf1732..44f3037 100644
--- a/src/fileaccess.cpp
+++ b/src/fileaccess.cpp
@@ -11,7 +11,7 @@
 #include "fileaccess.h"
 #include <iostream>
 #include <cstdlib>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kmessagebox.h>
 #include "optiondialog.h"
 #include <tqlayout.h>
diff --git a/src/fileaccess.h b/src/fileaccess.h
index 1103f46..9338a85 100644
--- a/src/fileaccess.h
+++ b/src/fileaccess.h
@@ -14,8 +14,8 @@
 #include <tqdialog.h>
 #include <tqfileinfo.h>
 #include <kprogress.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kurldrag.h>
 #include <list>
 #include <tqstring.h>
diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
index 377257b..8d0839a 100644
--- a/src/kdiff3.cpp
+++ b/src/kdiff3.cpp
@@ -37,11 +37,11 @@
 // include files for KDE
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kcmdlineargs.h>
 #include <kprinter.h>
diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp
index 78bd226..6e7ce45 100644
--- a/src/kdiff3_part.cpp
+++ b/src/kdiff3_part.cpp
@@ -22,7 +22,7 @@
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp
index a8a2a84..287a9b3 100644
--- a/src/kdiff3_shell.cpp
+++ b/src/kdiff3_shell.cpp
@@ -21,8 +21,8 @@
 #include "kdiff3.h"
 
 #include <kkeydialog.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <kedittoolbar.h>
diff --git a/src/kreplacements/kconfig.h b/src/kreplacements/kconfig.h
deleted file mode 100644
index 53443ee..0000000
--- a/src/kreplacements/kconfig.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
diff --git a/src/kreplacements/kfiledialog.h b/src/kreplacements/kfiledialog.h
deleted file mode 100644
index 53443ee..0000000
--- a/src/kreplacements/kfiledialog.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
diff --git a/src/kreplacements/tdeconfig.h b/src/kreplacements/tdeconfig.h
new file mode 100644
index 0000000..53443ee
--- /dev/null
+++ b/src/kreplacements/tdeconfig.h
@@ -0,0 +1,2 @@
+#include "kreplacements.h"      
+ 
diff --git a/src/kreplacements/tdefiledialog.h b/src/kreplacements/tdefiledialog.h
new file mode 100644
index 0000000..53443ee
--- /dev/null
+++ b/src/kreplacements/tdefiledialog.h
@@ -0,0 +1,2 @@
+#include "kreplacements.h"      
+ 
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
index a67c665..be84a9b 100644
--- a/src/optiondialog.cpp
+++ b/src/optiondialog.cpp
@@ -38,7 +38,7 @@
 #include <kfontdialog.h> // For KFontChooser
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kmainwindow.h> //For ktoolbar.h
 
diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp
index b19b7c2..f0d715b 100644
--- a/src/smalldialogs.cpp
+++ b/src/smalldialogs.cpp
@@ -34,7 +34,7 @@
 #include <tqcursor.h>
 
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 
 // OpenDialog **************************************************************
-- 
cgit v1.2.3