summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-26 13:08:44 -0600
committerTimothy Pearson <[email protected]>2013-01-26 13:08:44 -0600
commit56c4d26d031cbe55a66c75c4506eccb23ff92b1c (patch)
tree06fd74a705eff4d92007c53058d4054e3b5bc3d2 /src
parentbfd3620cd83f108b5f82d034ffb250748755dfd5 (diff)
downloadkdiff3-56c4d26d031cbe55a66c75c4506eccb23ff92b1c.tar.gz
kdiff3-56c4d26d031cbe55a66c75c4506eccb23ff92b1c.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/kdiff3.h2
-rw-r--r--src/kdiff3_part.h4
-rw-r--r--src/kdiff3_shell.h2
-rw-r--r--src/kreplacements/tdeparts/factory.h (renamed from src/kreplacements/kparts/factory.h)0
-rw-r--r--src/kreplacements/tdeparts/mainwindow.h (renamed from src/kreplacements/kparts/mainwindow.h)0
-rw-r--r--src/kreplacements/tdeparts/part.h (renamed from src/kreplacements/kparts/part.h)0
7 files changed, 5 insertions, 5 deletions
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/tdeparts/factory.h
index 53443ee..53443ee 100644
--- a/src/kreplacements/kparts/factory.h
+++ b/src/kreplacements/tdeparts/factory.h
diff --git a/src/kreplacements/kparts/mainwindow.h b/src/kreplacements/tdeparts/mainwindow.h
index 53443ee..53443ee 100644
--- a/src/kreplacements/kparts/mainwindow.h
+++ b/src/kreplacements/tdeparts/mainwindow.h
diff --git a/src/kreplacements/kparts/part.h b/src/kreplacements/tdeparts/part.h
index 53443ee..53443ee 100644
--- a/src/kreplacements/kparts/part.h
+++ b/src/kreplacements/tdeparts/part.h