From 05daee3290a2c980df329e26fafef20e1c6673ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:58:11 +0200 Subject: [PATCH] Additional k => tde renaming and fixes --- acinclude.m4 | 24 +++++++++---------- admin | 2 +- doc/ru/interface.docbook | 2 +- doc/ru/interface.html | 2 +- ksquirrel.kdevprj | 2 +- ksquirrel/Makefile.am | 2 +- .../ksquirrel-libs-configurator/Makefile.am | 4 ++-- ksquirrel/ksquirrelpart/Makefile.am | 4 ++-- ksquirrel/sq_archivehandler.h | 2 +- ksquirrel/sq_navigatordropmenu.h | 2 +- ksquirrel/sq_thumbnailsunused.h | 2 +- po/de.po | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index e020916..3033e7b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-ltdednssd") - AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") diff --git a/admin b/admin index b4d585c..6b7f722 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/doc/ru/interface.docbook b/doc/ru/interface.docbook index 0e32410..5109bb6 100644 --- a/doc/ru/interface.docbook +++ b/doc/ru/interface.docbook @@ -29,7 +29,7 @@ -В навигаторе также имеется возможность просматривать содержимое архивов .tar.gz, .tar.bz2, .zip, .rar (если установлен tdeio_rar), .7z (если установлен tdeio_p7zip), ходить по сети с помощью smb://, ftp:// и других протоколов, поддерживаемых kio-slaves. +В навигаторе также имеется возможность просматривать содержимое архивов .tar.gz, .tar.bz2, .zip, .rar (если установлен tdeio_rar), .7z (если установлен tdeio_p7zip), ходить по сети с помощью smb://, ftp:// и других протоколов, поддерживаемых tdeio-slaves. diff --git a/doc/ru/interface.html b/doc/ru/interface.html index 65047a4..938d965 100644 --- a/doc/ru/interface.html +++ b/doc/ru/interface.html @@ -4,7 +4,7 @@ KSquirrel имеет простой файловый менеджер, кото
Эскизы
-В навигаторе также имеется возможность просматривать содержимое архивов .tar.gz, .tar.bz2, .zip, .rar (если установлен tdeio_rar), .7z (если установлен tdeio_p7zip), ходить по сети с помощью smb://, ftp:// и других протоколов, поддерживаемых kio-slaves. +В навигаторе также имеется возможность просматривать содержимое архивов .tar.gz, .tar.bz2, .zip, .rar (если установлен tdeio_rar), .7z (если установлен tdeio_p7zip), ходить по сети с помощью smb://, ftp:// и других протоколов, поддерживаемых tdeio-slaves.

Пред.
След.
Начало
Свои библиотеки 
 Боковая панель
Уровень выше


Would you like to make a comment or contribute an update to this page?
Send feedback to the KDE Docs Team

\ No newline at end of file diff --git a/ksquirrel.kdevprj b/ksquirrel.kdevprj index c767d71..748f21b 100644 --- a/ksquirrel.kdevprj +++ b/ksquirrel.kdevprj @@ -22,7 +22,7 @@ bin_program=ksquirrel cflags= cppflags= cxxflags=\s-O2 -Wall -ldadd=$(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEPRINT) $(LIB_KUTILS) $(LIB_KIO) $(ksquirrellibs_LIBS) -lkonq -lqui $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) +ldadd=$(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEPRINT) $(LIB_TDEUTILS) $(LIB_TDEIO) $(ksquirrellibs_LIBS) -lkonq -lqui $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ldflags=\s-s \s [General] diff --git a/ksquirrel/Makefile.am b/ksquirrel/Makefile.am index 185ef04..82d77b8 100644 --- a/ksquirrel/Makefile.am +++ b/ksquirrel/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = ksquirrel ## INCLUDES were found outside tdevelop specific part ksquirrel_SOURCES = sq_slideshowwidget.cpp sq_slideshow.ui sq_slideshowlisting.ui fmt_filters.cpp sq_glwidget_stuff.cpp sq_tabopendialog.ui sq_dragprovider.cpp sq_utils_scale.cpp sq_utils.cpp sq_thumbnailsunused.cpp sq_dirthumbs.cpp sq_downloader.cpp sq_glselectionpainter.cpp sq_glwidget.cpp sq_glparts.cpp sq_codecsettings.cpp sq_filedialog.cpp sq_codecsettingsskeleton.ui sq_kipimanager.cpp sq_kipiinterface.cpp sq_progressbox.cpp sq_thumbnailloadjob.cpp sq_splashscreen.cpp sq_popupmenu.cpp sq_glinfo.ui sq_glwidget_helpers.cpp sq_imageloader.cpp sq_pluginsinfo.ui sq_iconloader.cpp sq_selectdeselectgroup.ui sq_thumbnailcachemaster.ui sq_errorstring.cpp sq_navigatordropmenu.cpp sq_fileiconviewbase.cpp sq_helpwidget.ui sq_glview.cpp sq_viewcache.ui sq_filethumbviewitem.cpp sq_progress.cpp sq_thumbnailsize.cpp sq_pixmapcache.cpp sq_filethumbview.cpp sq_dir.cpp sq_iconlistbox.cpp sq_iconlistitem.cpp sq_widgetstack.cpp sq_options.ui sq_libraryhandler.cpp sq_imageproperties.ui sq_hloptions.cpp sq_glu.cpp sq_filters.ui sq_fileiconview.cpp sq_filedetailview.cpp sq_externaltools.ui sq_externaltool.cpp sq_diroperator.cpp sq_config.cpp sq_bookmarkowner.cpp sq_archivehandler.cpp ksquirrel.cpp main.cpp -ksquirrel_LDADD = ./sidebar/libsidebar.a ./imageedit/libimageedit.a $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEPRINT) $(LIB_KUTILS) $(LIB_KIO) $(ksquirrellibs_LIBS) -lkonq $(LIB_QUI) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP -ltdefx +ksquirrel_LDADD = ./sidebar/libsidebar.a ./imageedit/libimageedit.a $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEPRINT) $(LIB_TDEUTILS) $(LIB_TDEIO) $(ksquirrellibs_LIBS) -lkonq $(LIB_QUI) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP -ltdefx SUBDIRS = sidebar imageedit mime diff --git a/ksquirrel/ksquirrel-libs-configurator/Makefile.am b/ksquirrel/ksquirrel-libs-configurator/Makefile.am index ec4fc8b..1c331fa 100644 --- a/ksquirrel/ksquirrel-libs-configurator/Makefile.am +++ b/ksquirrel/ksquirrel-libs-configurator/Makefile.am @@ -4,8 +4,8 @@ bin_PROGRAMS = ksquirrel-libs-configurator-real bin_SCRIPTS = ksquirrel-libs-configurator ksquirrel_libs_configurator_real_SOURCES = main.cpp klc.ui -ksquirrel_libs_configurator_real_LDADD = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_KIO) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) $(LIB_QT) -ksquirrel_libs_configurator_real_LDFLAGS = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_KIO) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) $(LIB_QT) +ksquirrel_libs_configurator_real_LDADD = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEIO) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) $(LIB_QT) +ksquirrel_libs_configurator_real_LDFLAGS = $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEIO) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) $(LIB_QT) AM_CXXFLAGS = $(ksquirrellibs_CFLAGS) diff --git a/ksquirrel/ksquirrelpart/Makefile.am b/ksquirrel/ksquirrelpart/Makefile.am index e124de9..a411947 100644 --- a/ksquirrel/ksquirrelpart/Makefile.am +++ b/ksquirrel/ksquirrelpart/Makefile.am @@ -13,8 +13,8 @@ endif AM_CCASFLAGS = -I$(srcdir) $(KSQUIRREL_ASM_DEFS) libksquirrelpart_la_SOURCES = ksquirrelpart.cpp sq_glparts.cpp sq_glu.cpp sq_glwidget.cpp sq_glwidget_stuff.cpp sq_libraryhandler.cpp sq_downloader.cpp sq_iconloader.cpp fmt_filters.cpp sq_externaltool.cpp sq_config.cpp sq_filedialog.cpp sq_imagefilter.ui sq_imagebcg.ui sq_glselectionpainter.cpp sq_glwidget_helpers.cpp sq_label.cpp sq_bcglabel.cpp sq_popupmenu.cpp sq_codecsettingsskeleton.ui sq_codecsettings.cpp sq_imageproperties.ui sq_utils.cpp sq_helpwidget.ui sq_utils_asm_scale.S sq_utils_scale.cpp sq_diroperator.cpp sq_glview.cpp sq_errorstring.cpp -libksquirrelpart_la_LIBADD = $(LIB_KPARTS) -libksquirrelpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEFX) $(KDE_PLUGIN) $(ksquirrellibs_LIBS) $(LIB_TDEPRINT) -lkonq -ltdefx $(LIB_QUI) +libksquirrelpart_la_LIBADD = $(LIB_TDEPARTS) +libksquirrelpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEFX) $(KDE_PLUGIN) $(ksquirrellibs_LIBS) $(LIB_TDEPRINT) -lkonq -ltdefx $(LIB_QUI) if SQ_HAVE_KEXIF libksquirrelpart_la_LDFLAGS += $(libkexif_LIBS) diff --git a/ksquirrel/sq_archivehandler.h b/ksquirrel/sq_archivehandler.h index e95bb72..b4ba8d3 100644 --- a/ksquirrel/sq_archivehandler.h +++ b/ksquirrel/sq_archivehandler.h @@ -20,7 +20,7 @@ class KURL; #define SQ_AH SQ_ArchiveHandler /* - * Helper class for archive extracting via kio-slaves (since 0.7.1). + * Helper class for archive extracting via tdeio-slaves (since 0.7.1). */ class SQ_ArchiveHandler : public TQObject, TQMap diff --git a/ksquirrel/sq_navigatordropmenu.h b/ksquirrel/sq_navigatordropmenu.h index 973b1be..9536624 100644 --- a/ksquirrel/sq_navigatordropmenu.h +++ b/ksquirrel/sq_navigatordropmenu.h @@ -68,7 +68,7 @@ class SQ_NavigatorDropMenu : public TQObject private slots: /* - * These slots will use KIO to + * These slots will use TDEIO to * copy, move or link files. */ void slotCopy(); diff --git a/ksquirrel/sq_thumbnailsunused.h b/ksquirrel/sq_thumbnailsunused.h index e55899b..7c2da3e 100644 --- a/ksquirrel/sq_thumbnailsunused.h +++ b/ksquirrel/sq_thumbnailsunused.h @@ -30,7 +30,7 @@ class TDEConfig; /* * This is small helper class for thumbnail loader. It is used only on * non-local filesystems to cache information on unsupported file - * types to avoid downloading them from [possibly] slow kio-slave + * types to avoid downloading them from [possibly] slow tdeio-slave * (for example, smb:/ on slow network). */ diff --git a/po/de.po b/po/de.po index 93f9f30..878493d 100644 --- a/po/de.po +++ b/po/de.po @@ -11,7 +11,7 @@ msgstr "" "POT-Creation-Date: 2007-08-07 09:34+0300\n" "PO-Revision-Date: 2007-11-03 20:25+0100\n" "Last-Translator: Oliver Dörr \n" -"Language-Team: german \n" +"Language-Team: german \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"