From 56c4d26d031cbe55a66c75c4506eccb23ff92b1c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:08:44 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 src/Makefile.am                         | 2 +-
 src/kdiff3.h                            | 2 +-
 src/kdiff3_part.h                       | 4 ++--
 src/kdiff3_shell.h                      | 2 +-
 src/kreplacements/kparts/factory.h      | 2 --
 src/kreplacements/kparts/mainwindow.h   | 2 --
 src/kreplacements/kparts/part.h         | 2 --
 src/kreplacements/tdeparts/factory.h    | 2 ++
 src/kreplacements/tdeparts/mainwindow.h | 2 ++
 src/kreplacements/tdeparts/part.h       | 2 ++
 10 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 src/kreplacements/kparts/factory.h
 delete mode 100644 src/kreplacements/kparts/mainwindow.h
 delete mode 100644 src/kreplacements/kparts/part.h
 create mode 100644 src/kreplacements/tdeparts/factory.h
 create mode 100644 src/kreplacements/tdeparts/mainwindow.h
 create mode 100644 src/kreplacements/tdeparts/part.h

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index afcd57f..04aeda8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,7 @@ bin_PROGRAMS = kdiff3
 
 # the application source, library search path, and link libraries
 kdiff3_SOURCES = main.cpp kdiff3_shell.cpp
-kdiff3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdiff3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kdiff3_LDADD   = $(LIB_KPARTS)
 
 # this is where the desktop file will go
diff --git a/src/kdiff3.h b/src/kdiff3.h
index 4ce8db2..ed95dee 100644
--- a/src/kdiff3.h
+++ b/src/kdiff3.h
@@ -35,7 +35,7 @@
 #include <kaccel.h>
 #include <kaction.h>
 #include <kurl.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 
 // forward declaration of the KDiff3 classes
diff --git a/src/kdiff3_part.h b/src/kdiff3_part.h
index 3d7e0ff..f529a7b 100644
--- a/src/kdiff3_part.h
+++ b/src/kdiff3_part.h
@@ -20,8 +20,8 @@
 #ifndef _KDIFF3PART_H_
 #define _KDIFF3PART_H_
 
-#include <kparts/part.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
 
 class TQWidget;
 class TQPainter;
diff --git a/src/kdiff3_shell.h b/src/kdiff3_shell.h
index c3523fd..4dcc2aa 100644
--- a/src/kdiff3_shell.h
+++ b/src/kdiff3_shell.h
@@ -25,7 +25,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 class KToggleAction;
 
diff --git a/src/kreplacements/kparts/factory.h b/src/kreplacements/kparts/factory.h
deleted file mode 100644
index 53443ee..0000000
--- a/src/kreplacements/kparts/factory.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
diff --git a/src/kreplacements/kparts/mainwindow.h b/src/kreplacements/kparts/mainwindow.h
deleted file mode 100644
index 53443ee..0000000
--- a/src/kreplacements/kparts/mainwindow.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
diff --git a/src/kreplacements/kparts/part.h b/src/kreplacements/kparts/part.h
deleted file mode 100644
index 53443ee..0000000
--- a/src/kreplacements/kparts/part.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
diff --git a/src/kreplacements/tdeparts/factory.h b/src/kreplacements/tdeparts/factory.h
new file mode 100644
index 0000000..53443ee
--- /dev/null
+++ b/src/kreplacements/tdeparts/factory.h
@@ -0,0 +1,2 @@
+#include "kreplacements.h"      
+ 
diff --git a/src/kreplacements/tdeparts/mainwindow.h b/src/kreplacements/tdeparts/mainwindow.h
new file mode 100644
index 0000000..53443ee
--- /dev/null
+++ b/src/kreplacements/tdeparts/mainwindow.h
@@ -0,0 +1,2 @@
+#include "kreplacements.h"      
+ 
diff --git a/src/kreplacements/tdeparts/part.h b/src/kreplacements/tdeparts/part.h
new file mode 100644
index 0000000..53443ee
--- /dev/null
+++ b/src/kreplacements/tdeparts/part.h
@@ -0,0 +1,2 @@
+#include "kreplacements.h"      
+ 
-- 
cgit v1.2.1