TDE
/
ktechlab
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ktechlab
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of libraries and executables to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 2b37df4ca0
commit 0ec603a650
9 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File

22
acinclude.m4
Unescape View File

@ -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

22
aclocal.m4 vendored
Unescape View File

@ -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

2
microbe/Makefile.am
Unescape View File

@ -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

2
src/Makefile.am
Unescape View File

@ -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 \

4
src/katemdi.h
Unescape View File

@ -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>

2
src/ktechlabkateui.rc
Unescape View File

@ -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" />

2
src/ktechlabtextui.rc
Unescape View File

@ -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" />

2
src/ktechlabui.rc
Unescape View File

@ -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" />

6
src/textview.cpp
Unescape View File

@ -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()) );

Write Preview
Loading…
Cancel
Save