TDE
/
kdirstat
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 6cddb500f2
commit d04d2847e1
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

8
acinclude.m4
Unescape View File

@ -590,7 +590,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity2ornewer"; then if test -n "$trinity2ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@ -1741,7 +1741,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2037,7 +2037,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2047,7 +2047,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])

6
kdirstat.spec
Unescape View File

@ -64,7 +64,7 @@ make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
%dir /opt/trinity/share/icons/locolor/16x16/apps %dir /opt/trinity/share/icons/locolor/16x16/apps
%dir /opt/trinity/share/icons/locolor/32x32/apps %dir /opt/trinity/share/icons/locolor/32x32/apps
/opt/trinity/share/icons/??color/??x??/*/kdirstat* /opt/trinity/share/icons/??color/??x??/*/kdirstat*
%dir /opt/trinity/share/apps/kconf_update %dir /opt/trinity/share/apps/tdeconf_update
/opt/trinity/share/apps/kconf_update/kdirstat.upd /opt/trinity/share/apps/tdeconf_update/kdirstat.upd
/opt/trinity/share/apps/kconf_update/fix_move_to_trash_bin.pl /opt/trinity/share/apps/tdeconf_update/fix_move_to_trash_bin.pl

2
kdirstat/Makefile.am
Unescape View File

@ -53,7 +53,7 @@ EXTRA_DIST = \
hi16-app-kdirstat.png hi16-app-kdirstat.png
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/tdeconf_update
update_DATA = kdirstat.upd update_DATA = kdirstat.upd
update_SCRIPTS = fix_move_to_trash_bin.pl update_SCRIPTS = fix_move_to_trash_bin.pl

2
kdirstat/kactivitytracker.cpp
Unescape View File

@ -11,7 +11,7 @@
#include <kapp.h> #include <kapp.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "kactivitytracker.h" #include "kactivitytracker.h"

4
kdirstat/kdirstatapp.cpp
Unescape View File

@ -17,8 +17,8 @@
#include <kaccel.h> #include <kaccel.h>
#include <kaction.h> #include <kaction.h>
#include <kapp.h> #include <kapp.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kmenubar.h> #include <kmenubar.h>

8
kdirstat/kdirtree.cpp
Unescape View File

@ -14,13 +14,13 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <kapp.h> #include <kapp.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "kdirtree.h" #include "kdirtree.h"
#include "kdirtreeiterators.h" #include "kdirtreeiterators.h"
#include "kdirtreeview.h" #include "kdirtreeview.h"
#include "kdirsaver.h" #include "kdirsaver.h"
#include "kio/job.h" #include "tdeio/job.h"
#include "kio/netaccess.h" #include "tdeio/netaccess.h"
#define HAVE_STUPID_COMPILER 0 #define HAVE_STUPID_COMPILER 0
@ -1556,7 +1556,7 @@ KDirStat::fixedUrl( const TQString & dirtyUrl )
} }
// Strip off the rightmost slash - some kioslaves (e.g. 'tar') can't handle that. // Strip off the rightmost slash - some tdeioslaves (e.g. 'tar') can't handle that.
TQString path = url.path(); TQString path = url.path();

4
kdirstat/kdirtree.h
Unescape View File

@ -21,8 +21,8 @@
#include <dirent.h> #include <dirent.h>
#include <tqptrqueue.h> #include <tqptrqueue.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#ifndef NOT_USED #ifndef NOT_USED
# define NOT_USED(PARAM) ( (void) (PARAM) ) # define NOT_USED(PARAM) ( (void) (PARAM) )

2
kdirstat/ktreemapview.cpp
Unescape View File

@ -14,7 +14,7 @@
#include <tqregexp.h> #include <tqregexp.h>
#include <kapp.h> #include <kapp.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>

Write Preview
Loading…
Cancel
Save