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

Additional k => tde renaming and fixes

Browse Source
feat/lzip-support
Slávek Banko 11 years ago
parent c13efa9992
commit c3b78c84d8
29 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File

4
FAQ
Unescape View File

@ -470,13 +470,13 @@ Usage FAQ
Install the krarc slave properly: Install the krarc slave properly:
Copy the tdeio_krarc.so, tdeio_krarc.la files into $TDEDIR/lib/trinity Copy the tdeio_krarc.so, tdeio_krarc.la files into $TDEDIR/lib/trinity
Copy the krarc.protocol file into $TDEDIR/share/services Copy the krarc.protocol file into $TDEDIR/share/services
or the directory where the KIO slaves are placed in your Linux<75> or the directory where the TDEIO slaves are placed in your Linux<75>
distribution. distribution.
8. I get the error message "Protocol not supported by Krusader: "krarc:/path/ 8. I get the error message "Protocol not supported by Krusader: "krarc:/path/
to/foo-archive", when I try to open foo-Archive, what to do? to/foo-archive", when I try to open foo-Archive, what to do?
The icons, tdeio_slaves and documentation must be installed in the correct The icons, tdeio_slaves and documentation must be installed in the correct
places in the TDE directory tree. The tdeio_krarc.* files must be in the same places in the TDE directory tree. The tdeio_krarc.* files must be in the same
directory with the other KIO slaves. Try this: locate tdeio_tar.* and copy/ directory with the other TDEIO slaves. Try this: locate tdeio_tar.* and copy/
link the tdeio_krarc.* files to the same location. Don't forget to run # link the tdeio_krarc.* files to the same location. Don't forget to run #
ldconfig on this directory when you're done. For more information click ldconfig on this directory when you're done. For more information click
here. here.

2
README
Unescape View File

@ -398,7 +398,7 @@ Plus: extensive Archive handling, mounted Filesystem support, FTP,
advanced Search module, viewer/Editor, directory Synchronization, advanced Search module, viewer/Editor, directory Synchronization,
file content Comparisons, powerful batch Renaming and much, much more. file content Comparisons, powerful batch Renaming and much, much more.
It supports a wide variety of archive formats and can handle other KIO It supports a wide variety of archive formats and can handle other TDEIO
slaves such as smb or fish. It is (almost) completely customizable, very slaves such as smb or fish. It is (almost) completely customizable, very
user friendly, fast and looks great on your desktop! user friendly, fast and looks great on your desktop!

24
acinclude.m4
Unescape View File

@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
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_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
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")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# 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)")

2
admin

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

6
configure.in
Unescape View File

@ -144,11 +144,11 @@ fi
AM_CONDITIONAL(include_libkjsembed, test "$have_libkjsembed" = yes) AM_CONDITIONAL(include_libkjsembed, test "$have_libkjsembed" = yes)
################################################### ###################################################
# If our own tar-KIO schould be build # If our own tar-TDEIO schould be build
################################################### ###################################################
AC_ARG_WITH(kiotar, AC_ARG_WITH(kiotar,
AC_HELP_STRING([--with-kiotar],[use our write-enabled version of KDE's tar KIO-Slave [default=without]]), AC_HELP_STRING([--with-kiotar],[use our write-enabled version of KDE's tar TDEIO-Slave [default=without]]),
[with_tar=$withval], [with_tar=$withval],
[with_tar=no] [with_tar=no]
) )
@ -281,7 +281,7 @@ if (test $warn_js);
fi fi
if (test $with_tar != "no"); if (test $with_tar != "no");
then echo "NOTICE: Our write-enabled version of KDE's tar KIO-Slave will be build. \"make install\" will may overwrite the KDE-version!" then echo "NOTICE: Our write-enabled version of KDE's tar TDEIO-Slave will be build. \"make install\" will may overwrite the KDE-version!"
fi fi
if (test -z "$TDEDIR"); if (test -z "$TDEDIR");

8
configure.in.in
Unescape View File

@ -81,11 +81,11 @@ fi
AM_CONDITIONAL(include_libkjsembed, test "$have_libkjsembed" = yes) AM_CONDITIONAL(include_libkjsembed, test "$have_libkjsembed" = yes)
################################################### ###################################################
# If our own tar-KIO should be built # If our own tar-TDEIO should be built
################################################### ###################################################
AC_ARG_WITH(kiotar, AC_ARG_WITH(kiotar,
AC_HELP_STRING([--with-kiotar],[use our write-enabled version of KDE's tar KIO-Slave [default=without]]), AC_HELP_STRING([--with-kiotar],[use our write-enabled version of KDE's tar TDEIO-Slave [default=without]]),
[with_tar=$withval], [with_tar=$withval],
[with_tar=no] [with_tar=no]
) )
@ -95,11 +95,11 @@ AM_CONDITIONAL(with_tar, test "$with_tar" != "no")
################################################### ###################################################
################################################### ###################################################
# If our own iso-KIO should be built # If our own iso-TDEIO should be built
################################################### ###################################################
AC_ARG_WITH(kioiso, AC_ARG_WITH(kioiso,
AC_HELP_STRING([--with-kioiso],[use our version of Trinity's iso KIO-slave [default=without]]), AC_HELP_STRING([--with-kioiso],[use our version of Trinity's iso TDEIO-slave [default=without]]),
[with_iso=$withval], [with_iso=$withval],
[with_iso=no] [with_iso=no]
) )

2
doc/en/credits.docbook
Unescape View File

@ -157,7 +157,7 @@
module for the 3rd Hand Panel</para> module for the 3rd Hand Panel</para>
</listitem> </listitem>
<listitem> <listitem>
<para>Szombathelyi Gy&ouml;rgy, ISO KIO <para>Szombathelyi Gy&ouml;rgy, ISO TDEIO
slave</para> slave</para>
</listitem> </listitem>
<listitem> <listitem>

4
doc/en/faq.docbook
Unescape View File

@ -935,7 +935,7 @@
<filename>krarc.protocol</filename> file into <filename>krarc.protocol</filename> file into
<filename class="directory"> <filename class="directory">
$TDEDIR/share/services</filename></para> $TDEDIR/share/services</filename></para>
<para>or the directory where the KIO slaves are placed in <para>or the directory where the TDEIO slaves are placed in
your &Linux; distribution.</para> your &Linux; distribution.</para>
<para></para> <para></para>
<!-- Empty line to make it more readable --> <!-- Empty line to make it more readable -->
@ -952,7 +952,7 @@
installed in the correct places in the &kde; installed in the correct places in the &kde;
directory tree. The directory tree. The
<filename>tdeio_krarc.*</filename> files must be in the same <filename>tdeio_krarc.*</filename> files must be in the same
directory with the other KIO slaves. Try this: locate directory with the other TDEIO slaves. Try this: locate
<filename>tdeio_tar.*</filename> and copy/link the <filename>tdeio_tar.*</filename> and copy/link the
<filename>tdeio_krarc.*</filename> files to the same <filename>tdeio_krarc.*</filename> files to the same
location. Don't forget to run location. Don't forget to run

4
doc/en/glossary.docbook
Unescape View File

@ -186,9 +186,9 @@
viewer.</para> viewer.</para>
</glossdef> </glossdef>
</glossentry> </glossentry>
<glossentry id="gloss-kio"> <glossentry id="gloss-tdeio">
<glossterm> <glossterm>
<acronym>KIO</acronym> or tdeioslave</glossterm> <acronym>TDEIO</acronym> or tdeioslave</glossterm>
<glossdef> <glossdef>
<para> <para>
<ulink url="http://en.wikipedia.org/wiki/Kioslave">KDE <ulink url="http://en.wikipedia.org/wiki/Kioslave">KDE

2
doc/en/index.docbook
Unescape View File

@ -174,7 +174,7 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf
<!ENTITY rpm-guide-url '<ulink url="http://fedora.redhat.com/docs/drafts/rpm-guide-en/">RPM Guide</ulink>'> <!ENTITY rpm-guide-url '<ulink url="http://fedora.redhat.com/docs/drafts/rpm-guide-en/">RPM Guide</ulink>'>
<!ENTITY tdeioslaves1-url '<ulink url="http://docs.kde.org/development/en/tdebase/tdeioslave/index.html">KIOSlaves</ulink>'> <!ENTITY tdeioslaves1-url '<ulink url="http://docs.kde.org/development/en/tdebase/tdeioslave/index.html">KIOSlaves</ulink>'>
<!ENTITY tdeioslaves2-url '<ulink url="http://developer.kde.org/documentation/library/3.4-api/tdeio/html/index.html">KIOSlaves</ulink>'> <!ENTITY tdeioslaves2-url '<ulink url="http://developer.kde.org/documentation/library/3.4-api/tdeio/html/index.html">KIOSlaves</ulink>'>
<!ENTITY kio-ipodslave-url '<ulink url="http://sourceforge.net/projects/kpod">KIOipod-slave</ulink>'> <!ENTITY tdeio-ipodslave-url '<ulink url="http://sourceforge.net/projects/kpod">KIOipod-slave</ulink>'>
<!ENTITY tdelibs-url '<ulink url="http://lxr.kde.org/source/tdelibs/tdeioslave">&kde;libs</ulink>'> <!ENTITY tdelibs-url '<ulink url="http://lxr.kde.org/source/tdelibs/tdeioslave">&kde;libs</ulink>'>
<!ENTITY tdebase-url '<ulink url="http://lxr.kde.org/source/tdebase/tdeioslave">&kde;base</ulink>'> <!ENTITY tdebase-url '<ulink url="http://lxr.kde.org/source/tdebase/tdeioslave">&kde;base</ulink>'>
<!ENTITY gnome-url '<ulink url="http://www.gnome.org"><application>GNOME</application></ulink>'> <!ENTITY gnome-url '<ulink url="http://www.gnome.org"><application>GNOME</application></ulink>'>

2
doc/en/user-interface.docbook
Unescape View File

@ -202,7 +202,7 @@
<para> <para>
<userinput> <userinput>
<command>ipod:/</command> <command>ipod:/</command>
</userinput>uses the &kio-ipodslave-url; to </userinput>uses the &tdeio-ipodslave-url; to
access, upload and organize the music stored on access, upload and organize the music stored on
&appleipod;.</para> &appleipod;.</para>
</listitem> </listitem>

2
doc/ru/credits.docbook
Unescape View File

@ -183,7 +183,7 @@
</listitem> </listitem>
<listitem <listitem
><para ><para
>Szombathelyi Gy&ouml;rgy, ISO KIO slave</para> >Szombathelyi Gy&ouml;rgy, ISO TDEIO slave</para>
</listitem> </listitem>
<listitem <listitem
><para ><para

4
doc/ru/faq.docbook
Unescape View File

@ -918,7 +918,7 @@
>$TDEDIR/share/services</filename >$TDEDIR/share/services</filename
></para> ></para>
<para <para
>или директорию , в которой находятся KIO slaves вашего дистрибутива &Linux;. </para> >или директорию , в которой находятся TDEIO slaves вашего дистрибутива &Linux;. </para>
<!-- Empty line to make it more readable --> <!-- Empty line to make it more readable -->
</answer> </answer>
</qandaentry> </qandaentry>
@ -933,7 +933,7 @@
<para <para
>Иконки, tdeio_slaves и документация должны быть правильно установлены в дереве каталогов &kde;. Файлы <filename >Иконки, tdeio_slaves и документация должны быть правильно установлены в дереве каталогов &kde;. Файлы <filename
>tdeio_krarc.*</filename >tdeio_krarc.*</filename
> быть в той же директории , что и остальные KIO slaves.Попробуйте : locate <filename > быть в той же директории , что и остальные TDEIO slaves.Попробуйте : locate <filename
>tdeio_tar.*</filename >tdeio_tar.*</filename
> и копируйте/сделайте ссылки на файлы <filename > и копируйте/сделайте ссылки на файлы <filename
>tdeio_krarc.*</filename >tdeio_krarc.*</filename

2
doc/update_pot
Unescape View File

@ -46,7 +46,7 @@ for FILENAME in $(ls *.docbook);do
# This file is distributed under the same license as the Krusader package/g' ${FILENAME}.pot # This file is distributed under the same license as the Krusader package/g' ${FILENAME}.pot
perl -p -i -e 's/Project-Id-Version: PACKAGE VERSION/Project-Id-Version: Krusader-doc-'$VERSION' '$DATENOW'/g' ${FILENAME}.pot perl -p -i -e 's/Project-Id-Version: PACKAGE VERSION/Project-Id-Version: Krusader-doc-'$VERSION' '$DATENOW'/g' ${FILENAME}.pot
perl -p -i -e 's/Report-Msgid-Bugs-To: http:\/\/bugs.kde.org/Report-Msgid-Bugs-To: <frank_schoolmeesters\@yahoo.com>/g' ${FILENAME}.pot perl -p -i -e 's/Report-Msgid-Bugs-To: http:\/\/bugs.kde.org/Report-Msgid-Bugs-To: <frank_schoolmeesters\@yahoo.com>/g' ${FILENAME}.pot
perl -p -i -e 's/tde-i18n-doc\@kde.org/krusader-i18n\@googlegroups.com/g' ${FILENAME}.pot perl -p -i -e 's/kde-i18n-doc\@kde.org/krusader-i18n\@googlegroups.com/g' ${FILENAME}.pot
done done
# move pot files to folder krusader_trinity/doc/i18n/pot since they don't belong in the english folder # move pot files to folder krusader_trinity/doc/i18n/pot since they don't belong in the english folder

2
iso/Makefile.am
Unescape View File

@ -9,7 +9,7 @@ INCLUDES = $(all_includes)
tdeio_iso_la_METASOURCES=AUTO tdeio_iso_la_METASOURCES=AUTO
tdeio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp tdeio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp
tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO)
tdeio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) tdeio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)

2
iso/libisofs/Makefile.am
Unescape View File

@ -9,7 +9,7 @@ INCLUDES = $(all_includes)
libisofs_la_METASOURCES=AUTO libisofs_la_METASOURCES=AUTO
libisofs_la_SOURCES = isofs.c libisofs_la_SOURCES = isofs.c
#libisofs_la_LIBADD = $(LIB_KIO) #libisofs_la_LIBADD = $(LIB_TDEIO)
#libisofs_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) #libisofs_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)

2
krArc/Makefile.am
Unescape View File

@ -10,7 +10,7 @@ INCLUDES = $(all_includes)
tdeio_krarc_la_METASOURCES=AUTO tdeio_krarc_la_METASOURCES=AUTO
tdeio_krarc_la_SOURCES = krarc.cpp tdeio_krarc_la_SOURCES = krarc.cpp
tdeio_krarc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) tdeio_krarc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO)
# $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) # $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
tdeio_krarc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) tdeio_krarc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)

2
krusader.kdevprj
Unescape View File

@ -22,7 +22,7 @@ bin_program=krusader
cflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE cflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE
cppflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE cppflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE
cxxflags=\s-O0 -Wall cxxflags=\s-O0 -Wall
ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_KPARTS) $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_TDEPARTS) $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
ldflags=\s \s ldflags=\s \s
[General] [General]

2
krusader.spec
Unescape View File

@ -26,7 +26,7 @@ It provides all the file management features you could possibly want.
Plus: extensive archive handling, mounted filesystem support, FTP, advanced Plus: extensive archive handling, mounted filesystem support, FTP, advanced
search module, an internal viewer/editor, directory synchronisation, search module, an internal viewer/editor, directory synchronisation,
file content comparisons, powerful batch renaming and much much more. file content comparisons, powerful batch renaming and much much more.
It supports a wide variety of archive formats and can handle other KIO slaves It supports a wide variety of archive formats and can handle other TDEIO slaves
such as smb or fish. It is (almost) completely customizable, very user such as smb or fish. It is (almost) completely customizable, very user
friendly, fast and looks great on your desktop! You should give it a try. friendly, fast and looks great on your desktop! You should give it a try.

2
krusader/BookMan/krbookmarkhandler.cpp
Unescape View File

@ -143,7 +143,7 @@ void KrBookmarkHandler::exportToFileFolder(TQDomDocument &doc, TQDomElement &par
// <title>My own bookmarks</title> // <title>My own bookmarks</title>
// <bookmark href="http://www.koffice.org"><title>KOffice Web Site</title></bookmark> // <bookmark href="http://www.koffice.org"><title>KOffice Web Site</title></bookmark>
// <separator/> // <separator/>
// <bookmark href="http://www.tdevelop.org"><title>KDevelop Web Site</title></bookmark> // <bookmark href="http://www.kdevelop.org"><title>KDevelop Web Site</title></bookmark>
// </folder> // </folder>
// </folder> // </folder>
// </xbel> // </xbel>

4
krusader/Makefile.am
Unescape View File

@ -95,7 +95,7 @@ krusader_LDADD = \
GUI/libGUI.a \ GUI/libGUI.a \
$(LIB_KONQ) \ $(LIB_KONQ) \
$(LIB_KJSEMBED) \ $(LIB_KJSEMBED) \
$(LIB_KPARTS) \ $(LIB_TDEPARTS) \
$(LIB_TDEFILE) \ $(LIB_TDEFILE) \
$(LIB_TDEHTML) \ $(LIB_TDEHTML) \
$(LIB_TDEUI) \ $(LIB_TDEUI) \
@ -108,7 +108,7 @@ krusader_LDADD = \
# the library search path. # the library search path.
krusader_LDFLAGS = $(all_libraries) $(kde_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdewalletclient krusader_LDFLAGS = $(all_libraries) $(kde_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdewalletclient
########################################################### ###########################################################

4
krusader/Splitter/combiner.cpp
Unescape View File

@ -243,7 +243,7 @@ void Combiner::combineDataReceived(TDEIO::Job *, const TQByteArray &byteArray)
void Combiner::combineReceiveFinished(TDEIO::Job *job) void Combiner::combineReceiveFinished(TDEIO::Job *job)
{ {
combineReadJob = 0; /* KIO automatically deletes the object after Finished signal */ combineReadJob = 0; /* TDEIO automatically deletes the object after Finished signal */
if( job->error() ) if( job->error() )
{ {
@ -288,7 +288,7 @@ void Combiner::combineDataSend(TDEIO::Job *, TQByteArray &byteArray)
void Combiner::combineSendFinished(TDEIO::Job *job) void Combiner::combineSendFinished(TDEIO::Job *job)
{ {
combineWriteJob = 0; /* KIO automatically deletes the object after Finished signal */ combineWriteJob = 0; /* TDEIO automatically deletes the object after Finished signal */
if( job->error() ) /* any error occurred? */ if( job->error() ) /* any error occurred? */
{ {

6
krusader/Splitter/splitter.cpp
Unescape View File

@ -114,7 +114,7 @@ void Splitter::splitDataReceived(TDEIO::Job *, const TQByteArray &byteArray)
void Splitter::splitReceiveFinished(TDEIO::Job *job) void Splitter::splitReceiveFinished(TDEIO::Job *job)
{ {
splitReadJob = 0; /* KIO automatically deletes the object after Finished signal */ splitReadJob = 0; /* TDEIO automatically deletes the object after Finished signal */
if( splitWriteJob ) /* write out the end of the file */ if( splitWriteJob ) /* write out the end of the file */
splitWriteJob->resume(); splitWriteJob->resume();
@ -193,7 +193,7 @@ void Splitter::splitDataSend(TDEIO::Job *, TQByteArray &byteArray)
void Splitter::splitSendFinished(TDEIO::Job *job) void Splitter::splitSendFinished(TDEIO::Job *job)
{ {
splitWriteJob = 0; /* KIO automatically deletes the object after Finished signal */ splitWriteJob = 0; /* TDEIO automatically deletes the object after Finished signal */
if( job->error() ) /* any error occurred? */ if( job->error() ) /* any error occurred? */
{ {
@ -237,7 +237,7 @@ void Splitter::splitFileSend(TDEIO::Job *, TQByteArray &byteArray)
void Splitter::splitFileFinished(TDEIO::Job *job) void Splitter::splitFileFinished(TDEIO::Job *job)
{ {
splitWriteJob = 0; /* KIO automatically deletes the object after Finished signal */ splitWriteJob = 0; /* TDEIO automatically deletes the object after Finished signal */
if( job->error() ) /* any error occurred? */ if( job->error() ) /* any error occurred? */
{ {

2
krusader/VFS/krquery.h
Unescape View File

@ -57,7 +57,7 @@ public:
// matching a file with the query // matching a file with the query
bool match( vfile *file ) const;// checks if the given vfile object matches the conditions bool match( vfile *file ) const;// checks if the given vfile object matches the conditions
// matching a KIO file with the query // matching a TDEIO file with the query
bool match( KFileItem *file ) const;// checks if the given vfile object matches the conditions bool match( KFileItem *file ) const;// checks if the given vfile object matches the conditions
// matching a name with the query // matching a name with the query
bool match( const TQString &name ) const;// matching the filename only bool match( const TQString &name ) const;// matching the filename only

2
krusader/VFS/normal_vfs.cpp
Unescape View File

@ -71,7 +71,7 @@ normal_vfs::normal_vfs(TQObject* panel):vfs(panel), watcher(0) {
bool normal_vfs::populateVfsList(const KURL& origin, bool showHidden){ bool normal_vfs::populateVfsList(const KURL& origin, bool showHidden){
TQString path = origin.path(-1); TQString path = origin.path(-1);
// set the writable attribute to true, if that's not the case - the KIO job // set the writable attribute to true, if that's not the case - the TDEIO job
// will give the warnings and errors // will give the warnings and errors
isWritable = true; isWritable = true;

2
krusader/VFS/preservingcopyjob.cpp
Unescape View File

@ -155,7 +155,7 @@ void PreservingCopyJob::slotAboutToCreate( TDEIO::Job */*job*/, const TQValueLis
void PreservingCopyJob::slotResult( Job *job ) { void PreservingCopyJob::slotResult( Job *job ) {
if( !job->error() ) { if( !job->error() ) {
if( job->inherits( "TDEIO::StatJob" ) ) { /* Unfortunately KIO forgets to set times when the file is in the */ if( job->inherits( "TDEIO::StatJob" ) ) { /* Unfortunately TDEIO forgets to set times when the file is in the */
KURL url = ((TDEIO::SimpleJob *)job)->url(); /* base directory. That's why we capture every StatJob and set the */ KURL url = ((TDEIO::SimpleJob *)job)->url(); /* base directory. That's why we capture every StatJob and set the */
/* time manually. */ /* time manually. */
TDEIO::UDSEntry entry = static_cast<TDEIO::StatJob*>(job)->statResult(); TDEIO::UDSEntry entry = static_cast<TDEIO::StatJob*>(job)->statResult();

2
krusader/main.cpp
Unescape View File

@ -135,7 +135,7 @@ int main(int argc, char *argv[]) {
aboutData.addCredit("Mark Eatough", "Handbook Proof-Reader", "markeatough@yahoo.com", 0); aboutData.addCredit("Mark Eatough", "Handbook Proof-Reader", "markeatough@yahoo.com", 0);
aboutData.addCredit("Jan Halasa", "The old Bookmark Module", "xhalasa@fi.muni.cz", 0); aboutData.addCredit("Jan Halasa", "The old Bookmark Module", "xhalasa@fi.muni.cz", 0);
aboutData.addCredit("Hans Loeffler", "Dir history button", 0, 0); aboutData.addCredit("Hans Loeffler", "Dir history button", 0, 0);
aboutData.addCredit("Szombathelyi György", "ISO KIO slave", 0, 0); aboutData.addCredit("Szombathelyi György", "ISO TDEIO slave", 0, 0);
aboutData.addCredit("Jan Willem van de Meent (Adios)", "Icons for Krusader", "janwillem@lorentz.leidenuniv.nl", 0); aboutData.addCredit("Jan Willem van de Meent (Adios)", "Icons for Krusader", "janwillem@lorentz.leidenuniv.nl", 0);
aboutData.addCredit("Mikolaj Machowski", "Usability and QA", "<mikmach@wp.pl>", 0); aboutData.addCredit("Mikolaj Machowski", "Usability and QA", "<mikmach@wp.pl>", 0);
aboutData.addCredit("Cristi Dumitrescu","QA, bug-hunting, patches and general help","cristid@chip.ro",0); aboutData.addCredit("Cristi Dumitrescu","QA, bug-hunting, patches and general help","cristid@chip.ro",0);

6
tar/Makefile.am
Unescape View File

@ -1,19 +1,19 @@
## Makefile.am of tdebase/tdeioslave/tar ## Makefile.am of tdebase/tdeioslave/tar
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO METASOURCES = AUTO
kde_module_LTLIBRARIES = tdeio_tar.la kde_module_LTLIBRARIES = tdeio_tar.la
tdeio_tar_la_SOURCES = tar.cc tdeio_tar_la_SOURCES = tar.cc
tdeio_tar_la_LIBADD = $(LIB_KSYCOCA) tdeio_tar_la_LIBADD = $(LIB_TDESYCOCA)
tdeio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) tdeio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
check_PROGRAMS = ktartest check_PROGRAMS = ktartest
ktartest_SOURCES = ktartest.cpp ktartest_SOURCES = ktartest.cpp
ktartest_LDADD = $(LIB_KSYCOCA) ktartest_LDADD = $(LIB_TDESYCOCA)
noinst_HEADERS = tar.h noinst_HEADERS = tar.h

4
virt/Makefile.am
Unescape View File

@ -1,13 +1,13 @@
## Makefile.am of tdebase/tdeioslave/tar ## Makefile.am of tdebase/tdeioslave/tar
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO METASOURCES = AUTO
kde_module_LTLIBRARIES = tdeio_virt.la kde_module_LTLIBRARIES = tdeio_virt.la
tdeio_virt_la_SOURCES = virt.cc tdeio_virt_la_SOURCES = virt.cc
tdeio_virt_la_LIBADD = $(LIB_KSYCOCA) tdeio_virt_la_LIBADD = $(LIB_TDESYCOCA)
tdeio_virt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) tdeio_virt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE)
noinst_HEADERS = virt.h noinst_HEADERS = virt.h

Write Preview
Loading…
Cancel
Save