Additional k => tde renaming and fixes

pull/1/head
Slávek Banko 11 years ago
parent 4187997322
commit a045bba8d3

@ -2018,30 +2018,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

@ -1 +1 @@
Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461

@ -1720,7 +1720,7 @@ problem. Just remember &kdirstat; knows how to deal with them. ;-)
<para> <para>
Please note that this special handling is only in effect if &kdirstat;'s Please note that this special handling is only in effect if &kdirstat;'s
optimized read methods for local files are used (you can turn this on and off optimized read methods for local files are used (you can turn this on and off
in the <guibutton>Settings -&gt; General</guibutton> dialog) - KDE's KIO in the <guibutton>Settings -&gt; General</guibutton> dialog) - KDE's TDEIO
methods do not return this kind of information. methods do not return this kind of information.
</para> </para>
</answer> </answer>
@ -1799,7 +1799,7 @@ difference, and this is why &kdirstat; has special handling for them.
<para> <para>
Please note that this special handling is only in effect if &kdirstat;'s Please note that this special handling is only in effect if &kdirstat;'s
optimized read methods for local files are used (you can turn this on and off optimized read methods for local files are used (you can turn this on and off
in the <guibutton>Settings -&gt; General</guibutton> dialog) - KDE's KIO in the <guibutton>Settings -&gt; General</guibutton> dialog) - KDE's TDEIO
methods do not return this kind of information. methods do not return this kind of information.
</para> </para>
</answer> </answer>

@ -85,7 +85,7 @@ INCLUDES= $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # the library search path.
kdirstat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kdirstat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
rcdir = $(kde_datadir)/kdirstat rcdir = $(kde_datadir)/kdirstat
rc_DATA = kdirstatui.rc rc_DATA = kdirstatui.rc

@ -1231,7 +1231,7 @@ KDirTree::startReading( const KURL & url )
} }
else else
{ {
// kdDebug() << "Using KIO methods for " << url.url() << endl; // kdDebug() << "Using TDEIO methods for " << url.url() << endl;
KURL cleanUrl( url ); KURL cleanUrl( url );
cleanUrl.cleanPath(); // Resolve relative paths, get rid of multiple '/' cleanUrl.cleanPath(); // Resolve relative paths, get rid of multiple '/'
_readMethod = KDirReadKIO; _readMethod = KDirReadKIO;

@ -71,7 +71,7 @@ namespace KDirStat
{ {
KDirReadUnknown, // Unknown (yet) KDirReadUnknown, // Unknown (yet)
KDirReadLocal, // Use opendir() and lstat() KDirReadLocal, // Use opendir() and lstat()
KDirReadKIO // Use KDE 2.x's KIO network transparent methods KDirReadKIO // Use KDE 2.x's TDEIO network transparent methods
} KDirReadMethod; } KDirReadMethod;
@ -82,7 +82,7 @@ namespace KDirStat
* Information about one single directory entry. This is the type of info * Information about one single directory entry. This is the type of info
* typically obtained by stat() / lstat() or similar calls. Most of this * typically obtained by stat() / lstat() or similar calls. Most of this
* can also be obtained by @ref TDEIO::KDirListJob, but not all: The device * can also be obtained by @ref TDEIO::KDirListJob, but not all: The device
* this file resides on is something none of KIO's many classes will tell * this file resides on is something none of TDEIO's many classes will tell
* (since of course this only makes sense for local files) - yet this had * (since of course this only makes sense for local files) - yet this had
* been _the_ single most requested feature of KDirStat <1.0: Stay on one * been _the_ single most requested feature of KDirStat <1.0: Stay on one
* filesystem. To facilitate this, information about the device is * filesystem. To facilitate this, information about the device is
@ -1071,13 +1071,13 @@ namespace KDirStat
protected slots: protected slots:
/** /**
* Receive directory entries from a KIO job. * Receive directory entries from a TDEIO job.
**/ **/
void entries( TDEIO::Job * job, void entries( TDEIO::Job * job,
const TDEIO::UDSEntryList & entryList ); const TDEIO::UDSEntryList & entryList );
/** /**
* KIO job is finished. * TDEIO job is finished.
**/ **/
void finished( TDEIO::Job * job ); void finished( TDEIO::Job * job );

Loading…
Cancel
Save