From 48e190dec2189c895c53c51215c12cf3fe561a2b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 16 Nov 2011 13:42:15 -0600 Subject: [PATCH] Additional renaming of kde to tde --- Doxyfile | 2 +- INSTALL | 2 +- Makefile.am | 4 +- acinclude.m4 | 120 ++++++++++----------- configure.in | 2 +- configure.in.in | 2 +- doc/Makefile.am | 4 +- doc/ru/index.docbook | 2 +- doc/ru/installation.html | 2 +- ksquirrel/Makefile.am | 6 +- ksquirrel/fmt_filters.h | 2 +- ksquirrel/imageedit/Makefile.am | 6 +- ksquirrel/ksquirrelpart/fmt_filters.h | 2 +- ksquirrel/ksquirrelpart/sq_utils_scale.cpp | 2 +- ksquirrel/mime/Makefile.am | 4 +- ksquirrel/sidebar/Makefile.am | 6 +- ksquirrel/sq_diroperator.cpp | 2 +- ksquirrel/sq_iconlistitem.h | 2 +- ksquirrel/sq_utils_scale.cpp | 2 +- pics/Makefile.am | 4 +- pics/imageedit/Makefile.am | 4 +- pics/menu/Makefile.am | 4 +- pics/toolbar/Makefile.am | 4 +- po/Makefile.am | 4 +- po/de.po | 2 +- 25 files changed, 98 insertions(+), 98 deletions(-) diff --git a/Doxyfile b/Doxyfile index c627edd..aa3e4c0 100644 --- a/Doxyfile +++ b/Doxyfile @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = ksquirrel.kdevelop +PROJECT_NAME = ksquirrel.tdevelop PROJECT_NUMBER = OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO diff --git a/INSTALL b/INSTALL index 2f9fbc6..a94f43d 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ To compile KSquirrel from sources you need to install kde-devel package. It will install all needed header files. In Mandriva or same systems -you should also install kdebase-devel package. +you should also install tdebase-devel package. In Debian do diff --git a/Makefile.am b/Makefile.am index 2defde4..bb2e418 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = ksquirrel po pics EXTRA_DIST = ksquirrel.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README TODO ksquirrel.lsm -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ SUBDIRS += doc diff --git a/acinclude.m4 b/acinclude.m4 index 485ee0e..2004717 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -378,7 +378,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -3503,9 +3503,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3513,26 +3513,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -4557,7 +4557,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4947,7 +4947,7 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], @@ -4994,9 +4994,9 @@ AC_DEFUN([KDE_SET_PREFIX], kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5662,7 +5662,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5682,7 +5682,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5919,9 +5919,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/configure.in b/configure.in index 633050d..12fc38b 100644 --- a/configure.in +++ b/configure.in @@ -152,7 +152,7 @@ fi AM_PROG_AS -# MMX test duped from kdelibs/tdefx - it should be probably moved to admin/ +# MMX test duped from tdelibs/tdefx - it should be probably moved to admin/ dnl ----------------------------------------------------- dnl IA32 checks dnl ----------------------------------------------------- diff --git a/configure.in.in b/configure.in.in index e3dce43..d064ddc 100644 --- a/configure.in.in +++ b/configure.in.in @@ -87,7 +87,7 @@ fi AM_PROG_AS -# MMX test duped from kdelibs/tdefx - it should be probably moved to admin/ +# MMX test duped from tdelibs/tdefx - it should be probably moved to admin/ dnl ----------------------------------------------------- dnl IA32 checks dnl ----------------------------------------------------- diff --git a/doc/Makefile.am b/doc/Makefile.am index b527d71..fccb172 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,7 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ SUBDIRS = ru man_MANS = ksquirrel.1 diff --git a/doc/ru/index.docbook b/doc/ru/index.docbook index b7810f0..331784a 100644 --- a/doc/ru/index.docbook +++ b/doc/ru/index.docbook @@ -62,7 +62,7 @@ Установка из исходников -&kappname; из исходников устанавливается как обычно, за исключением некоторых моментов. Для успешной компиляции &kappname; Вам необходимо установить пакет kde-devel, и в системах типа Mandriva дополнительно kdebase-devel. Рассмотрим все шаги инсталляции подробнее. +&kappname; из исходников устанавливается как обычно, за исключением некоторых моментов. Для успешной компиляции &kappname; Вам необходимо установить пакет kde-devel, и в системах типа Mandriva дополнительно tdebase-devel. Рассмотрим все шаги инсталляции подробнее. diff --git a/doc/ru/installation.html b/doc/ru/installation.html index 9943728..6cc73f8 100644 --- a/doc/ru/installation.html +++ b/doc/ru/installation.html @@ -1,5 +1,5 @@ Приложение A. Инсталляция
Инсталляция
Пред.
След.
 

Приложение A. Инсталляция

Содержание

Установка из исходников
Установка ksquirrel-libs
Установка KSquirrel
Установка из бинарных пакетов

Установка из исходников

-KSquirrel из исходников устанавливается как обычно, за исключением некоторых моментов. Для успешной компиляции KSquirrel Вам необходимо установить пакет kde-devel, и в системах типа Mandriva дополнительно kdebase-devel. Рассмотрим все шаги инсталляции подробнее. +KSquirrel из исходников устанавливается как обычно, за исключением некоторых моментов. Для успешной компиляции KSquirrel Вам необходимо установить пакет kde-devel, и в системах типа Mandriva дополнительно tdebase-devel. Рассмотрим все шаги инсталляции подробнее.

Установка ksquirrel-libs

Сперва необходимо установить ksquirrel-libs. diff --git a/ksquirrel/Makefile.am b/ksquirrel/Makefile.am index 6f5a85b..27d9a19 100644 --- a/ksquirrel/Makefile.am +++ b/ksquirrel/Makefile.am @@ -1,7 +1,7 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## bin_PROGRAMS = ksquirrel -## INCLUDES were found outside kdevelop specific part +## 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 -lqui $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP -ltdefx @@ -26,7 +26,7 @@ uninstall-local: -rm -f $(kde_datadir)/konqueror/servicemenus/konqksquirrel-dir.desktop -rm -f $(kde_datadir)/dolphin/servicemenus/dolphksquirrel-dir.desktop -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ xdg_apps_DATA = ksquirrel.desktop diff --git a/ksquirrel/fmt_filters.h b/ksquirrel/fmt_filters.h index 6ec4855..9f6cb5d 100644 --- a/ksquirrel/fmt_filters.h +++ b/ksquirrel/fmt_filters.h @@ -184,7 +184,7 @@ namespace fmt_filters // // All the following filters are ported from KDE's - // KImageEffect. See kdelibs/tdefx/kimageeffect.cpp + // KImageEffect. See tdelibs/tdefx/kimageeffect.cpp // for more. // diff --git a/ksquirrel/imageedit/Makefile.am b/ksquirrel/imageedit/Makefile.am index db91cb5..fe318b1 100644 --- a/ksquirrel/imageedit/Makefile.am +++ b/ksquirrel/imageedit/Makefile.am @@ -1,7 +1,7 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## noinst_LIBRARIES = libimageedit.a -## INCLUDES were found outside kdevelop specific part +## INCLUDES were found outside tdevelop specific part libimageedit_a_METASOURCES = AUTO @@ -10,6 +10,6 @@ libimageedit_a_SOURCES = sq_writeoption.ui sq_label.cpp sq_imagefilter.ui sq_ima EXTRA_DIST = sq_bcglabel.h sq_converter.h sq_imagebcg.ui.h sq_imageconvert.ui.h sq_imageedit.h sq_imageeditoptions.ui.h sq_imagefilter.ui.h sq_label.h sq_bcglabel.cpp sq_converter.cpp sq_imagebcg.ui sq_imageconvert.ui sq_imageeditoptions.ui sq_imagefilter.ui sq_label.cpp sq_writeoption.ui -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ INCLUDES = $(all_includes) -I$(srcdir) -I$(top_srcdir)/ksquirrel diff --git a/ksquirrel/ksquirrelpart/fmt_filters.h b/ksquirrel/ksquirrelpart/fmt_filters.h index 6ec4855..9f6cb5d 100644 --- a/ksquirrel/ksquirrelpart/fmt_filters.h +++ b/ksquirrel/ksquirrelpart/fmt_filters.h @@ -184,7 +184,7 @@ namespace fmt_filters // // All the following filters are ported from KDE's - // KImageEffect. See kdelibs/tdefx/kimageeffect.cpp + // KImageEffect. See tdelibs/tdefx/kimageeffect.cpp // for more. // diff --git a/ksquirrel/ksquirrelpart/sq_utils_scale.cpp b/ksquirrel/ksquirrelpart/sq_utils_scale.cpp index f484223..53124ee 100644 --- a/ksquirrel/ksquirrelpart/sq_utils_scale.cpp +++ b/ksquirrel/ksquirrelpart/sq_utils_scale.cpp @@ -74,7 +74,7 @@ #include #include -#include +#include #include #include diff --git a/ksquirrel/mime/Makefile.am b/ksquirrel/mime/Makefile.am index 50baa80..a5e3673 100644 --- a/ksquirrel/mime/Makefile.am +++ b/ksquirrel/mime/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = x-avs.desktop x-cut.desktop x-dxf.desktop x-iff.desktop x-jbig.desktop x-koala.desktop x-leaf.desktop x-lif.desktop x-mac.desktop x-msp.desktop x-mtv.desktop x-neo.desktop x-pi1.desktop x-pict.desktop x-pix.desktop x-pxr.desktop x-ras.desktop x-ras.magic x-rawrgb.desktop x-sct.desktop x-sun.desktop x-sun.magic x-utah.desktop x-utah.magic x-wal.desktop x-wbmp.desktop x-xim.desktop x-xwd.desktop x-pi3.desktop ljpeg.desktop x-dicom.desktop x-mdl.desktop x-psp.desktop @@ -106,4 +106,4 @@ uninstall-local: -rm -f $(kde_mimedir)/image/x-mdl.desktop -rm -f $(kde_mimedir)/image/x-psp.desktop -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/ksquirrel/sidebar/Makefile.am b/ksquirrel/sidebar/Makefile.am index c28df1b..49b3699 100644 --- a/ksquirrel/sidebar/Makefile.am +++ b/ksquirrel/sidebar/Makefile.am @@ -1,7 +1,7 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## noinst_LIBRARIES = libsidebar.a -## INCLUDES were found outside kdevelop specific part +## INCLUDES were found outside tdevelop specific part libsidebar_a_METASOURCES = AUTO @@ -10,6 +10,6 @@ libsidebar_a_SOURCES = sq_mountviewitem.cpp sq_mountview.cpp sq_imagebasket.cpp EXTRA_DIST = sq_mountview.h sq_multibar.cpp sq_multibar.h sq_treeview.cpp sq_treeview.h sq_categoriesview.h sq_categorybrowsermenu.h sq_threaddirlister.cpp sq_threaddirlister.h sq_treeviewitem.h sq_treeviewitem.cpp sq_mountviewitem.h sq_imagebasket.h sq_storagefile.h sq_storagefile.cpp sq_previewwidget.cpp sq_previewwidget.h sq_treeviewmenu.cpp sq_treeviewmenu.h sq_directorybasket.h sq_categoriesview.cpp sq_categorybrowsermenu.cpp sq_directorybasket.cpp sq_imagebasket.cpp sq_mountview.cpp sq_mountviewitem.cpp -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ INCLUDES = $(all_includes) -I$(srcdir) -I$(top_srcdir)/ksquirrel diff --git a/ksquirrel/sq_diroperator.cpp b/ksquirrel/sq_diroperator.cpp index 06232c9..3716641 100644 --- a/ksquirrel/sq_diroperator.cpp +++ b/ksquirrel/sq_diroperator.cpp @@ -616,7 +616,7 @@ void SQ_DirOperator::slotSetThumbSize(const TQString &size) * Smart update. Store all file items, reset view, * and transfer all items back. * - * Taken from kdelibs-3.2.3/kio/kfile/kdiroperator.cpp + * Taken from tdelibs-3.2.3/kio/kfile/kdiroperator.cpp */ void SQ_DirOperator::smartUpdate() { diff --git a/ksquirrel/sq_iconlistitem.h b/ksquirrel/sq_iconlistitem.h index f0e997b..6e7597d 100644 --- a/ksquirrel/sq_iconlistitem.h +++ b/ksquirrel/sq_iconlistitem.h @@ -29,7 +29,7 @@ class TQPixmap; * * With SQ_IconListBox it is used in SQ_Options. * - * Taken from kdelibs. + * Taken from tdelibs. */ class SQ_IconListItem : public TQListBoxItem diff --git a/ksquirrel/sq_utils_scale.cpp b/ksquirrel/sq_utils_scale.cpp index ae80207..143e012 100644 --- a/ksquirrel/sq_utils_scale.cpp +++ b/ksquirrel/sq_utils_scale.cpp @@ -74,7 +74,7 @@ #include #include -#include +#include #include #include diff --git a/pics/Makefile.am b/pics/Makefile.am index 68d097a..5e70ad0 100644 --- a/pics/Makefile.am +++ b/pics/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = menu imageedit toolbar @@ -44,4 +44,4 @@ uninstall-local: -rm -f $(kde_datadir)/ksquirrel/images/marks/mark_4.png -rm -f $(kde_datadir)/ksquirrel/images/splash.png -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/pics/imageedit/Makefile.am b/pics/imageedit/Makefile.am index 006aabc..dc0caf5 100644 --- a/pics/imageedit/Makefile.am +++ b/pics/imageedit/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = reset_value.png resize_toolbutton.png resize_toolbutton2.png @@ -16,4 +16,4 @@ uninstall-local: -rm -f $(kde_datadir)/ksquirrel/images/imageedit/resize_toolbutton.png -rm -f $(kde_datadir)/ksquirrel/images/imageedit/resize_toolbutton2.png -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/pics/menu/Makefile.am b/pics/menu/Makefile.am index 0dcadf2..660de55 100644 --- a/pics/menu/Makefile.am +++ b/pics/menu/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = 18016.png animate16.png background16.png close16.png first16.png flipH16.png flipV16.png fullscreen16.png last16.png moveDown16.png moveLeft16.png moveRight16.png moveUp16.png next16.png page116.png page216.png page316.png page416.png prev16.png prop16.png reset16.png rotateLeft16.png rotateRight16.png statusbar16.png tickmarks16.png toolbar16.png window16.png zoom-16.png zoom+16.png zoom16.png zoom100016.png zoom10016.png zoom20016.png zoom30016.png zoom50016.png zoom70016.png zoom90016.png @@ -118,4 +118,4 @@ uninstall-local: -rm -f $(kde_datadir)/ksquirrel/images/menu/zoom70016.png -rm -f $(kde_datadir)/ksquirrel/images/menu/zoom90016.png -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/pics/toolbar/Makefile.am b/pics/toolbar/Makefile.am index e664038..f05afc9 100644 --- a/pics/toolbar/Makefile.am +++ b/pics/toolbar/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = file_first.png file_last.png file_next.png file_prev.png flipH.png flipV.png rotateL.png rotateR.png zoom-.png zoom+.png fullscreen.png ifless.png images.png prop.png reload.png zoom100.png zoomH.png zoom_template.png zoomWH.png zoomW.png glselection_ellipse.png glselection_rect.png glselection.png shownav.png configure.png print.png @@ -85,4 +85,4 @@ uninstall-local: -rm -f $(kde_datadir)/ksquirrel/images/actions/configure.png -rm -f $(kde_datadir)/ksquirrel/images/actions/print.png -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/po/Makefile.am b/po/Makefile.am index 50aeed8..630dedf 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -1,6 +1,6 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ POFILES = AUTO diff --git a/po/de.po b/po/de.po index 878493d..93f9f30 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"