summaryrefslogtreecommitdiffstats
path: root/kxsldbg
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:18:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:18:40 -0600
commit82072ef281de2d5948a42fb69ae800d47e0800be (patch)
treebe82dd63affaf693c5e0857c997fa9589d344cc2 /kxsldbg
parent93ec82602aa008218cc1ee075ff13d65b3a317ea (diff)
downloadtdewebdev-82072ef281de2d5948a42fb69ae800d47e0800be.tar.gz
tdewebdev-82072ef281de2d5948a42fb69ae800d47e0800be.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kxsldbg')
-rw-r--r--kxsldbg/Makefile.am4
-rw-r--r--kxsldbg/kxsldbg.h2
-rw-r--r--kxsldbg/kxsldbgpart/Makefile.am4
-rw-r--r--kxsldbg/kxsldbgpart/kxsldbg_part.cpp10
-rw-r--r--kxsldbg/kxsldbgpart/kxsldbg_part.h6
-rw-r--r--kxsldbg/kxsldbgpart/qxsldbgdoc.cpp4
-rw-r--r--kxsldbg/kxsldbgpart/qxsldbgdoc.h4
7 files changed, 17 insertions, 17 deletions
diff --git a/kxsldbg/Makefile.am b/kxsldbg/Makefile.am
index e83cfe27..a5a2e896 100644
--- a/kxsldbg/Makefile.am
+++ b/kxsldbg/Makefile.am
@@ -23,7 +23,7 @@ xsldbg_DEPENDENCIES = kxsldbgpart/libxsldbg/libxsldbg.la
xsldbg_LDADD = kxsldbgpart/libxsldbg/libxsldbg.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_TDEUI)
#
# the library search path.
-xsldbg_LDFLAGS = $(all_libraries) $(XSLDBG_EXTRA_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+xsldbg_LDFLAGS = $(all_libraries) $(XSLDBG_EXTRA_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# These paths are KDE specific. Use them:
# kde_appsdir Where your application's menu entry (.desktop) should go to.
@@ -52,7 +52,7 @@ INCLUDES= $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(all_includes)
METASOURCES = AUTO
# the application source, library search path, and link libraries
-kxsldbg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kxsldbg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# this is where the shell's XML-GUI resource file goes
shellrcdir = $(kde_datadir)/kxsldbg
diff --git a/kxsldbg/kxsldbg.h b/kxsldbg/kxsldbg.h
index 5eb95600..16cf3592 100644
--- a/kxsldbg/kxsldbg.h
+++ b/kxsldbg/kxsldbg.h
@@ -6,7 +6,7 @@
#endif
#include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
#include <dcopobject.h>
#include <dcopclient.h>
#include "kxsldbgif.h"
diff --git a/kxsldbg/kxsldbgpart/Makefile.am b/kxsldbg/kxsldbgpart/Makefile.am
index 40812810..4c173a39 100644
--- a/kxsldbg/kxsldbgpart/Makefile.am
+++ b/kxsldbg/kxsldbgpart/Makefile.am
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libkxsldbgcommon.la
libkxsldbgcommon_la_SOURCES = xsldbgwalkspeedimpl.cpp xsldbgtemplatesimpl.cpp xsldbgtemplatelistitem.cpp xsldbgsourcesimpl.cpp xsldbgoutputview.cpp xsldbglocalvariablesimpl.cpp xsldbglocallistitem.cpp xsldbglistitem.cpp xsldbginspector.cpp xsldbgglobalvariablesimpl.cpp xsldbggloballistitem.cpp xsldbgentitiesimpl.cpp xsldbgdoc.cpp xsldbgdialogbase.cpp xsldbgdebugger.cpp xsldbgconfigimpl.cpp xsldbgcallstackimpl.cpp xsldbgbreakpointsimpl.cpp xsldbgbreakpointlistitem.cpp qxsldbgdoc.cpp kxsldbg_part.cpp kxsldbg_partif.skel xsldbgwalkspeed.ui xsldbgtemplates.ui xsldbgsources.ui xsldbgmsgdialog.ui xsldbglocalvariables.ui xsldbgglobalvariables.ui xsldbgentities.ui xsldbgconfig.ui xsldbgcallstack.ui xsldbgbreakpoints.ui
libkxsldbgcommon_la_METASOURCES = AUTO
-libkxsldbgcommon_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP -lktexteditor
+libkxsldbgcommon_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -ltdetexteditor
libkxsldbgcommon_la_LIBADD = libxsldbg/libxsldbg.la libqtnotfier/libqtnotfier.la
noinst_HEADERS = kxsldbg_part.h qxsldbgdoc.h xsldbgbreakpointlistitem.h xsldbgbreakpointsimpl.h xsldbgcallstackimpl.h xsldbgconfigimpl.h xsldbgdebugger.h xsldbgdialogbase.h xsldbgdoc.h xsldbgdocmap.h xsldbgentitiesimpl.h xsldbggloballistitem.h xsldbgglobalvariablesimpl.h xsldbginspector.h xsldbglistitem.h xsldbglocallistitem.h xsldbglocalvariablesimpl.h xsldbgmsgdialogimpl.h xsldbgoutputview.h xsldbgsourcesimpl.h xsldbgtemplatelistitem.h xsldbgtemplatesimpl.h xsldbgwalkspeedimpl.h
@@ -15,7 +15,7 @@ SUBDIRS = libqtnotfier libxsldbg
INCLUDES = $(XSLDBG_CFLAGS) -I.. $(all_includes)
-libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries) $(XSLDBG_EXTRA_LIBS)-ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP
+libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries) $(XSLDBG_EXTRA_LIBS)-ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP
libkxsldbgpart_la_LIBADD = libkxsldbgcommon.la $(LIB_KPARTS)
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
index a1cc5739..05bbf489 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
@@ -6,11 +6,11 @@
#include <kaction.h>
#include <kstdaction.h>
#include <kfiledialog.h>
-#include <kparts/genericfactory.h>
-#include <ktexteditor/markinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/configinterface.h>
+#include <tdeparts/genericfactory.h>
+#include <tdetexteditor/markinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/configinterface.h>
#include <kate/view.h>
#include <tqfile.h>
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.h b/kxsldbg/kxsldbgpart/kxsldbg_part.h
index e8de28a7..173d22cf 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.h
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.h
@@ -1,7 +1,7 @@
#ifndef KXSLDBGKPART_H
#define KXSLDBGKPART_H
-#include <kparts/part.h>
+#include <tdeparts/part.h>
#include <tqvariant.h>
#include <tqdict.h>
#include <tqmainwindow.h>
@@ -9,8 +9,8 @@
#include "xsldbginspector.h"
#include <dcopclient.h>
#include "kxsldbg_partif.h"
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
class TQVBoxLayout;
class TQHBoxLayout;
diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp
index eac763e0..e4fafe5d 100644
--- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp
+++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp
@@ -6,8 +6,8 @@
*/
#include "qxsldbgdoc.h"
-#include <ktexteditor/markinterface.h>
-#include <ktexteditor/editorchooser.h>
+#include <tdetexteditor/markinterface.h>
+#include <tdetexteditor/editorchooser.h>
#include <tqfile.h>
#include <tqdir.h>
#include <tqtextstream.h>
diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.h b/kxsldbg/kxsldbgpart/qxsldbgdoc.h
index 2fabde26..49f18070 100644
--- a/kxsldbg/kxsldbgpart/qxsldbgdoc.h
+++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.h
@@ -13,8 +13,8 @@
#include <tqptrlist.h>
#include <tqstring.h>
#include <tqguardedptr.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
class QXsldbgDoc : public TQObject {