summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:12:26 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:12:26 -0600
commit0ec603a650cc7b82eda626d8498af000496d9cbb (patch)
tree7f32e1663683d941125ead68ff07881d046b540b
parent2b37df4ca0c9bae516c4fa00579584d6e3fcfd27 (diff)
downloadktechlab-0ec603a650cc7b82eda626d8498af000496d9cbb.tar.gz
ktechlab-0ec603a650cc7b82eda626d8498af000496d9cbb.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r--acinclude.m422
-rw-r--r--aclocal.m422
-rw-r--r--microbe/Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/katemdi.h4
-rw-r--r--src/ktechlabkateui.rc2
-rw-r--r--src/ktechlabtextui.rc2
-rw-r--r--src/ktechlabui.rc2
-rw-r--r--src/textview.cpp6
9 files changed, 32 insertions, 32 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 4fca662..9eef0ce 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2072,15 +2072,15 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
- AC_SUBST(LIB_KHTML, "-lkhtml")
- AC_SUBST(LIB_KSPELL, "-lkspell")
- AC_SUBST(LIB_KPARTS, "-lkparts")
+ AC_SUBST(LIB_KHTML, "-ltdehtml")
+ AC_SUBST(LIB_KSPELL, "-ltdespell")
+ AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
- AC_SUBST(LIB_KUTILS, "-lkutils")
+ AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
- AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+ AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
- AC_SUBST(LIB_KDNSSD, "-lkdnssd")
+ AC_SUBST(LIB_KDNSSD, "-ltdednssd")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
@@ -2088,13 +2088,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
- AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+ AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab")
- AC_SUBST(LIB_KHTML, "-lkhtml")
- AC_SUBST(LIB_KSPELL, "-lkspell")
- AC_SUBST(LIB_KPARTS, "-lkparts")
+ AC_SUBST(LIB_KHTML, "-ltdehtml")
+ AC_SUBST(LIB_KSPELL, "-ltdespell")
+ AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@@ -2549,7 +2549,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
diff --git a/aclocal.m4 b/aclocal.m4
index 666146e..02df154 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2084,15 +2084,15 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
- AC_SUBST(LIB_KHTML, "-lkhtml")
- AC_SUBST(LIB_KSPELL, "-lkspell")
- AC_SUBST(LIB_KPARTS, "-lkparts")
+ AC_SUBST(LIB_KHTML, "-ltdehtml")
+ AC_SUBST(LIB_KSPELL, "-ltdespell")
+ AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
- AC_SUBST(LIB_KUTILS, "-lkutils")
+ AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
- AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+ AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
- AC_SUBST(LIB_KDNSSD, "-lkdnssd")
+ AC_SUBST(LIB_KDNSSD, "-ltdednssd")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
@@ -2100,13 +2100,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
- AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+ AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab")
- AC_SUBST(LIB_KHTML, "-lkhtml")
- AC_SUBST(LIB_KSPELL, "-lkspell")
- AC_SUBST(LIB_KPARTS, "-lkparts")
+ AC_SUBST(LIB_KHTML, "-ltdehtml")
+ AC_SUBST(LIB_KSPELL, "-ltdespell")
+ AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@@ -2561,7 +2561,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
diff --git a/microbe/Makefile.am b/microbe/Makefile.am
index 512d860..f86b8fb 100644
--- a/microbe/Makefile.am
+++ b/microbe/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = $(all_includes)
METASOURCES = AUTO
bin_PROGRAMS = microbe
-microbe_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+microbe_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
microbe_SOURCES = btreebase.cpp btreenode.cpp main.cpp traverser.cpp \
expression.cpp pic14.cpp variable.cpp optimizer.cpp instruction.cpp microbe.cpp \
parser.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 2200020..c386dc9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@ ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \
$(top_builddir)/src/mechanics/libmechanics.la $(top_builddir)/src/electronics/libelectronics.la \
$(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la \
$(top_builddir)/src/languages/liblanguages.la $(top_builddir)/src/drawparts/libdrawparts.la \
- $(top_builddir)/src/core/libcore.la -lkutils -lktexteditor $(LIB_KFILE) $(LIB_TDEPRINT) $(LIB_QT) $(LIB_GPSIM)
+ $(top_builddir)/src/core/libcore.la -ltdeutils -ltdetexteditor $(LIB_KFILE) $(LIB_TDEPRINT) $(LIB_QT) $(LIB_GPSIM)
# which sources should be compiled for ktechlab
ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \
diff --git a/src/katemdi.h b/src/katemdi.h
index c17881e..7a74e65 100644
--- a/src/katemdi.h
+++ b/src/katemdi.h
@@ -21,9 +21,9 @@
#ifndef __KATE_MDI_H__
#define __KATE_MDI_H__
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
#include <tqdict.h>
#include <tqintdict.h>
diff --git a/src/ktechlabkateui.rc b/src/ktechlabkateui.rc
index 9d901f1..876baec 100644
--- a/src/ktechlabkateui.rc
+++ b/src/ktechlabkateui.rc
@@ -95,7 +95,7 @@
<Action name="bookmarks" group="bookmarks_merge"/>
</MenuBar>
- <!--<Menu name="ktexteditor_popup">
+ <!--<Menu name="tdetexteditor_popup">
<Action name="edit_undo" group="popup_operations" />
<Action name="edit_redo" group="popup_operations" />
<Separator group="popup_operations" />
diff --git a/src/ktechlabtextui.rc b/src/ktechlabtextui.rc
index 0c35801..8fa38a5 100644
--- a/src/ktechlabtextui.rc
+++ b/src/ktechlabtextui.rc
@@ -62,7 +62,7 @@
</Menu>
</MenuBar>
- <!--<Menu name="ktexteditor_popup">
+ <!--<Menu name="tdetexteditor_popup">
<Action name="edit_undo" group="popup_operations" />
<Action name="edit_redo" group="popup_operations" />
<Separator group="popup_operations" />
diff --git a/src/ktechlabui.rc b/src/ktechlabui.rc
index ade29e5..664126b 100644
--- a/src/ktechlabui.rc
+++ b/src/ktechlabui.rc
@@ -117,7 +117,7 @@
<ActionList name="component_actionlist"/>
</Menu>
- <Menu name="ktexteditor_popup">
+ <Menu name="tdetexteditor_popup">
<Action name="edit_undo" group="popup_operations" />
<Action name="edit_redo" group="popup_operations" />
<Separator group="popup_operations" />
diff --git a/src/textview.cpp b/src/textview.cpp
index 309ac6a..d6692c5 100644
--- a/src/textview.cpp
+++ b/src/textview.cpp
@@ -23,8 +23,8 @@
#include "variablelabel.h"
#include "viewiface.h"
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/texthintinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/texthintinterface.h>
// #include "kateview.h"
#include <kdebug.h>
@@ -93,7 +93,7 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u
m_statusBar->insertItem( "", ViewStatusBar::LineCol );
- m_view->installPopup( static_cast<TQPopupMenu*>( p_ktechlab->factory()->container( "ktexteditor_popup", p_ktechlab ) ) );
+ m_view->installPopup( static_cast<TQPopupMenu*>( p_ktechlab->factory()->container( "tdetexteditor_popup", p_ktechlab ) ) );
connect( m_view, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(slotCursorPositionChanged()) );
connect( m_view, TQT_SIGNAL(gotFocus(Kate::View*)), this, TQT_SLOT(setFocused()) );