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

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

Browse Source
feat/lzip-support
Timothy Pearson 11 years ago
parent 527c1d6eee
commit fcfa140974
19 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape View File

@ -2075,16 +2075,16 @@ 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_KUNITTEST, "-lkunittest")
AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
@ -2092,13 +2092,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)")
@ -2547,7 +2547,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
@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN)

2
doc/en/archives.docbook
Unescape View File

@ -10,7 +10,7 @@
the following archives types: ace, arj, bzip2, deb, gzip, iso,
lha, rar, rpm, tar, zip and 7-zip and supports the following
passworded archives: arj, ace, rar and zip. Passwords can be
stored in &kwallet;. Please note that the archive
stored in &tdewallet;. Please note that the archive
support first needs to be properly
<link linkend="konfig-archives">configured</link> in
Konfigurator. To open the archive, use &Enter;,

4
doc/en/features.docbook
Unescape View File

@ -56,7 +56,7 @@
<listitem>
<para>Powerful internal
<link linkend="krviewer">viewer and editor</link> via
kparts supporting almost every file format.</para>
tdeparts supporting almost every file format.</para>
</listitem>
<listitem>
<para>&advanced-search-module-lnk; :
@ -289,7 +289,7 @@
<para>
<link linkend="archives">Password support</link> for: arj,
ace, rar and zip. Passwords can be stored in
&kwallet;</para>
&tdewallet;</para>
</listitem>
<listitem>
<para>

2
doc/en/index.docbook
Unescape View File

@ -297,7 +297,7 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf
<!ENTITY filelight '<application>Filelight</application>'>
<!ENTITY tdevelop '<application>Kdevelop</application>'>
<!ENTITY keditbookmarks '<application>KeditBookmarks</application>'>
<!ENTITY kwallet "<application>Kwallet</application>">
<!ENTITY tdewallet "<application>Kwallet</application>">
<!-- (TM) Trademark ENTITIES -->
<!ENTITY fedora '<trademark>Fedora</trademark>'>

2
doc/en/remote-connections.docbook
Unescape View File

@ -182,7 +182,7 @@
<para>
Let's start with installing all the packages we need:
<screen>
<prompt>#</prompt> <userinput><command>apt-get install</command> <option>avahi-daemon libnss-mdns kdnssd</option></userinput>
<prompt>#</prompt> <userinput><command>apt-get install</command> <option>avahi-daemon libnss-mdns tdednssd</option></userinput>
</screen>
Everything is installed, now let's do some configuration. First, we need our services to be announced on LAN.

4
doc/ru/features.docbook
Unescape View File

@ -83,7 +83,7 @@
<para
>Мощный встроенный <link linkend="krviewer"
>просмотрщик и редактор</link
> через kparts поддерживает все доступные форматы файлов!</para>
> через tdeparts поддерживает все доступные форматы файлов!</para>
</listitem>
<listitem>
<para
@ -353,7 +353,7 @@
<para
><link linkend="archives"
>Поддержка паролей</link
> для: arj, ace, rar и zip. Пароли будут сохраняться в &kwallet;</para>
> для: arj, ace, rar и zip. Пароли будут сохраняться в &tdewallet;</para>
</listitem>
<listitem>

2
doc/ru/index.docbook
Unescape View File

@ -713,7 +713,7 @@ since the Entity Backspace is not defined in
<!ENTITY keditbookmarks '<application
>KeditBookmarks</application
>'>
<!ENTITY kwallet "<application
<!ENTITY tdewallet "<application
>Kwallet</application
>">

2
doc/ru/using-krusader.docbook
Unescape View File

@ -446,7 +446,7 @@
<title
>Browsing Archives</title>
<para
>The &vfs_lnk; allows to browse archives as it was a directory. &krusader; supports currently the following archives types: ace, arj, bzip2, deb, gzip, iso, lha, rar, rpm, tar, zip and 7-zip and supports the next passworded archives: arj, ace, rar and zip. Passwords can be stored in &kwallet;. Please note that the archive support first needs to be properly <link linkend="konfig-archives"
>The &vfs_lnk; allows to browse archives as it was a directory. &krusader; supports currently the following archives types: ace, arj, bzip2, deb, gzip, iso, lha, rar, rpm, tar, zip and 7-zip and supports the next passworded archives: arj, ace, rar and zip. Passwords can be stored in &tdewallet;. Please note that the archive support first needs to be properly <link linkend="konfig-archives"
>configured</link
> in Konfigurator. To open the archive use &Enter;, (double-)click or the <keycap
>Right Arrow</keycap

6
krusader/KViewer/krviewer.cpp
Unescape View File

@ -23,8 +23,8 @@
#include <kmenubar.h>
#include <kmimetype.h>
#include <klocale.h>
#include <kparts/part.h>
#include <kparts/componentfactory.h>
#include <tdeparts/part.h>
#include <tdeparts/componentfactory.h>
#include <kmessagebox.h>
#include <klibloader.h>
#include <ktrader.h>
@ -34,7 +34,7 @@
#include <kstatusbar.h>
#include <kdebug.h>
#include <klargefile.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <kprocess.h>
#include <kfileitem.h>
// Krusader includes

6
krusader/KViewer/krviewer.h
Unescape View File

@ -20,10 +20,10 @@
#include <tqwidget.h>
#include <tqptrlist.h>
#include <kparts/mainwindow.h>
#include <tdeparts/mainwindow.h>
#include <ktempfile.h>
#include <kparts/partmanager.h>
#include <kparts/browserextension.h>
#include <tdeparts/partmanager.h>
#include <tdeparts/browserextension.h>
#include <tqguardedptr.h>
#include <ktabwidget.h>

4
krusader/KViewer/panelviewer.cpp
Unescape View File

@ -2,8 +2,8 @@
#include <tqstring.h>
#include <tqwidgetstack.h>
#include <tqapplication.h>
#include <kparts/part.h>
#include <kparts/browserextension.h>
#include <tdeparts/part.h>
#include <tdeparts/browserextension.h>
#include <kmessagebox.h>
#include <tqdict.h>
#include <tqlabel.h>

2
krusader/KViewer/panelviewer.h
Unescape View File

@ -4,7 +4,7 @@
#include <kurl.h>
#include <tqstring.h>
#include <tqwidgetstack.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <kio/job.h>
#include <ktempfile.h>
#include <tqdict.h>

6
krusader/Makefile.am
Unescape View File

@ -103,12 +103,12 @@ krusader_LDADD = \
$(LIB_QT) \
$(LIBSOCKET) \
-ltdefx \
-lkutils \
-lkwalletclient
-ltdeutils \
-ltdewalletclient
# the library search path.
krusader_LDFLAGS = $(all_libraries) $(kde_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkwalletclient
krusader_LDFLAGS = $(all_libraries) $(kde_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdewalletclient
###########################################################

2
krusader/VFS/krarchandler.h
Unescape View File

@ -34,7 +34,7 @@
#include <tqobject.h>
#include <kprocess.h>
#include <kurl.h>
#include <kwallet.h>
#include <tdewallet.h>
class KRarcHandler: public TQObject {
Q_OBJECT

2
krusader/krusader.cpp
Unescape View File

@ -713,7 +713,7 @@ void Krusader::setupActions() {
// SLOTS, TQT_SLOT( execFilter() ), actionCollection(), "exec files" );
actCustomFilter = new KAction( i18n( "&Custom" ), SHIFT + Key_F12,
SLOTS, TQT_SLOT( customFilter() ), actionCollection(), "custom files" );
actCompare = new KAction( i18n( "Compare b&y Content..." ), "kmultiple", 0,
actCompare = new KAction( i18n( "Compare b&y Content..." ), "tdemultiple", 0,
SLOTS, TQT_SLOT( compareContent() ), actionCollection(), "compare" );
actMultiRename = new KAction( i18n( "Multi &Rename..." ), "krename", SHIFT + Key_F9,
SLOTS, TQT_SLOT( multiRename() ), actionCollection(), "multirename" );

2
krusader/krusader.h
Unescape View File

@ -39,7 +39,7 @@
// KDE includes
#include <kapplication.h>
#include <kparts/mainwindow.h>
#include <tdeparts/mainwindow.h>
#include <kstdaction.h>
#include <kaction.h>
#include <kconfig.h>

2
krusader/krusaderview.h
Unescape View File

@ -37,7 +37,7 @@
#include <klocale.h>
#include <kaccel.h>
#include <kapplication.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
// QT includes
#include <tqlayout.h>

2
tar/Makefile.am
Unescape View File

@ -1,7 +1,7 @@
## Makefile.am of tdebase/kioslave/tar
INCLUDES = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_tar.la

2
virt/Makefile.am
Unescape View File

@ -1,7 +1,7 @@
## Makefile.am of tdebase/kioslave/tar
INCLUDES = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_virt.la

Write Preview
Loading…
Cancel
Save