From 9523b86a5b99317135eb3dcdb7d10199361eab97 Mon Sep 17 00:00:00 2001 From: Mavridis Philippe Date: Fri, 25 Jun 2021 19:06:28 +0300 Subject: [PATCH] =?UTF-8?q?Conversion=20KDE3=E2=86=92TDE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mavridis Philippe --- ChangeLog | 8 +- Doxyfile | 4 +- INSTALL | 6 +- Makefile.in | 32 +-- acinclude.m4 | 270 +++++++++---------- configure | 440 +++++++++++++++---------------- configure.in | 8 +- configure.in.in | 4 +- debian/changelog | 16 +- debian/control | 10 +- debian/copyright | 2 +- kwin-decor-suse2.spec | 16 +- po/Makefile.in | 32 +-- po/cs.po | 4 +- po/da.po | 4 +- po/es.po | 2 +- po/et.po | 4 +- po/fi.po | 4 +- po/fr.po | 2 +- po/hu.po | 6 +- po/it.po | 2 +- po/ja.po | 2 +- po/km.po | 4 +- po/lt.po | 4 +- po/nb.po | 4 +- po/nl.po | 6 +- po/pa.po | 4 +- po/pl.po | 4 +- po/pt_BR.po | 2 +- po/ru.po | 4 +- po/sv.po | 4 +- po/uk.po | 4 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- src/Makefile.am | 22 +- src/Makefile.in | 180 ++++++------- src/SUSE2.cpp | 14 +- src/SUSE2.desktop | 2 +- src/SUSE2client.cpp | 2 +- src/config/Makefile.am | 8 +- src/config/Makefile.in | 108 ++++---- src/config/config.cpp | 30 +-- src/config/config.h | 10 +- src/shadow.cpp | 2 +- src/shadow.h | 2 +- suse2.kdevelop => suse2.tdevelop | 4 +- 46 files changed, 653 insertions(+), 653 deletions(-) rename suse2.kdevelop => suse2.tdevelop (99%) diff --git a/ChangeLog b/ChangeLog index aaa6504..fc8e144 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,15 +51,15 @@ -spinbox to adjust titlebar height 0.3.1rc1 --cache button icons (copied/inspired from kdebase/plastik KDE 3.5, Sandro Giessl) +-cache button icons (copied/inspired from tdebase/plastik KDE 3.5, Sandro Giessl) -turn static to "normal" members from handler -Handler()-function (replaces SUSE2Handler::) -redesigned configdialog -updated german translation 0.3.1beta1 --tweak to have the buttons icons always centered (from kdebase/plastik KDE 3.5) --draw buttons icons instead of xpms (sharper, better scalable) (from kdebase/plastik KDE 3.5, Sandro Giessl) +-tweak to have the buttons icons always centered (from tdebase/plastik KDE 3.5) +-draw buttons icons instead of xpms (sharper, better scalable) (from tdebase/plastik KDE 3.5, Sandro Giessl) -option to use titlefonts settings (color, shadow) for buttons 0.3 @@ -121,7 +121,7 @@ -changed the titlebar image and handling a bit to make it easier to adapt 0.1 --extracted from kdebase3-SUSE source package +-extracted from tdebase3-SUSE source package -changed titlebar icon to debian logo -added colorscheme diff --git a/Doxyfile b/Doxyfile index de21444..c4b122b 100644 --- a/Doxyfile +++ b/Doxyfile @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = suse2.kdevelop +PROJECT_NAME = suse2.tdevelop PROJECT_NUMBER = 0.4.1 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO @@ -82,7 +82,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = /home/gerd/programming/kwin-decor-suse2-0.2 +INPUT = /home/gerd/programming/twin-decor-suse2-0.2 FILE_PATTERNS = *.c \ *.cc \ *.cxx \ diff --git a/INSTALL b/INSTALL index 5534e45..5a85fd1 100644 --- a/INSTALL +++ b/INSTALL @@ -7,20 +7,20 @@ Usually the chain make make install -should work. The installation paths are detected with kde-config. +should work. The installation paths are detected with tde-config. If not you can tune them with the --prefix= option for configure. For more options see the output of './configure --help'. For Debian based systems there is a debian/ directory so you can execute 'dpkg-buildpackage [-rfakeroot]' -from inside the kwin-decor-suse2 directory. +from inside the twin-decor-suse2 directory. For RPM packages there is a spec file to build one with 'rpmbuild -tb XXX.tar.bz2'. For Gentoo Aaron Rusnak contributed a gentoo ebuild. According to him it should be put in -$PORTDIR_OVERLAY/x11-themes/kwin-decor-suse2. +$PORTDIR_OVERLAY/x11-themes/twin-decor-suse2. It points to the stable version on kde-look. diff --git a/Makefile.in b/Makefile.in index b606d3f..80ee440 100644 --- a/Makefile.in +++ b/Makefile.in @@ -171,24 +171,24 @@ LIBUTIL = @LIBUTIL@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -199,7 +199,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -300,7 +300,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -794,7 +794,7 @@ uninstall-info: uninstall-info-recursive .NOEXPORT: #>+ 2 -KDE_DIST=suse2.kdevses stamp-h.in subdirs Makefile.in configure.files config.h.in suse2.kdevelop configure.in Makefile.cvs aclocal.m4 Doxyfile suse2.kdevelop.pcs configure.in.in Makefile.am acinclude.m4 configure kwin-decor-suse2.spec +KDE_DIST=suse2.kdevses stamp-h.in subdirs Makefile.in configure.files config.h.in suse2.tdevelop configure.in Makefile.cvs aclocal.m4 Doxyfile suse2.tdevelop.pcs configure.in.in Makefile.am acinclude.m4 configure twin-decor-suse2.spec #>+ 2 docs-am: diff --git a/acinclude.m4 b/acinclude.m4 index 31a1e7d..e6a9507 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! @@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS], fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) 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 -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$kde32ornewer"; 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)]) fi if test -n "$kde33ornewer"; then - KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) - AC_SUBST(MAKEKDEWIDGETS) + KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)]) + AC_SUBST(MAKETDEWIDGETS) fi KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -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. ]) @@ -1785,16 +1785,16 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1805,15 +1805,15 @@ 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}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $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" kde_widgetdir=NO dnl this might be somewhere else -AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) +AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir) if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then AC_MSG_ERROR([ @@ -1821,10 +1821,10 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail. So, check this please and use another prefix!]) fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.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" @@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext < int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); @@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-lkimproxy") + AC_SUBST(LIB_KABC, "-ltdeabc") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-lkdnssd") - AC_SUBST(LIB_KUNITTEST, "-lkunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-lkio") - AC_SUBST(LIB_KFILE, "-lkio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") + AC_SUBST(LIB_KFILE, "-ltdeio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then @@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" AC_SUBST(KDE_PLUGIN) -# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. +# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs. KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" AC_SUBST(KDE_CHECK_PLUGIN) @@ -3502,9 +3502,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 @@ -3512,26 +3512,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 ]) @@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4556,7 +4556,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) @@ -4946,14 +4946,14 @@ 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 +dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX], unset CDPATH dnl We can't give real code to that macro, only a value. dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) + AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi 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` @@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix @@ -5661,7 +5661,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 @@ -5681,7 +5681,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 @@ -5918,9 +5918,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 b/configure index 6a973cf..8ca0acd 100755 --- a/configure +++ b/configure @@ -716,7 +716,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= ac_unique_file="acinclude.m4" -ac_default_prefix=${KDEDIR:-the kde prefix} +ac_default_prefix=${TDEDIR:-the kde prefix} # Factoring default headers for most tests. ac_includes_default="\ #include @@ -941,7 +941,7 @@ all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE -MAKEKDEWIDGETS +MAKETDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG @@ -971,28 +971,28 @@ kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir -kdeinitdir +tdeinitdir kde_styledir kde_widgetdir LIB_KDED -LIB_KDECORE -LIB_KDEUI -LIB_KIO +LIB_TDECORE +LIB_TDEUI +LIB_TDEIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC -LIB_KHTML -LIB_KSPELL -LIB_KPARTS -LIB_KDEPRINT -LIB_KUTILS -LIB_KDEPIM -LIB_KIMPROXY +LIB_TDEHTML +LIB_TDESPELL +LIB_TDEPARTS +LIB_TDEPRINT +LIB_TDEUTILS +LIB_TDEPIM +LIB_TDEIMPROXY LIB_KNEWSTUFF -LIB_KDNSSD -LIB_KUNITTEST -LIB_KSYCOCA +LIB_TDEDNSSD +LIB_TDEUNITTEST +LIB_TDESYCOCA LIB_KFILE LIB_KFM TOPSUBDIRS @@ -2555,7 +2555,7 @@ fi # Define the identity of the package. - PACKAGE=kwin_SUSE2 + PACKAGE=twin_SUSE2 VERSION=0.4.1 @@ -2708,11 +2708,11 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -2720,12 +2720,12 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' if test "x$prefix" = "xNONE"; then - { echo "$as_me:$LINENO: checking for kde-config" >&5 -echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for tde-config" >&5 +echo $ECHO_N "checking for tde-config... $ECHO_C" >&6; } if test -n "$KDECONFIG"; then kde_cv_path="$KDECONFIG"; else - kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` + kde_cache=`echo tde-config | sed 'y%./+-%__p_%'` if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2744,16 +2744,16 @@ else IFS=$kde_save_IFS for dir in $dirs; do - if test -x "$dir/kde-config"; then + if test -x "$dir/tde-config"; then if test -n "" then - evalstr="$dir/kde-config 2>&1 " + evalstr="$dir/tde-config 2>&1 " if eval $evalstr; then - kde_cv_path="$dir/kde-config" + kde_cv_path="$dir/tde-config" break fi else - kde_cv_path="$dir/kde-config" + kde_cv_path="$dir/tde-config" break fi fi @@ -2773,10 +2773,10 @@ fi { echo "$as_me:$LINENO: result: not found" >&5 echo "${ECHO_T}not found" >&6; } - { { echo "$as_me:$LINENO: error: The important program kde-config was not found! + { { echo "$as_me:$LINENO: error: The important program tde-config was not found! Please check whether you installed KDE correctly. " >&5 -echo "$as_me: error: The important program kde-config was not found! +echo "$as_me: error: The important program tde-config was not found! Please check whether you installed KDE correctly. " >&2;} { (exit 1); exit 1; }; } @@ -2792,12 +2792,12 @@ echo "${ECHO_T}$kde_cv_path" >&6; } kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - { echo "$as_me:$LINENO: checking for kde-config" >&5 -echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for tde-config" >&5 +echo $ECHO_N "checking for tde-config... $ECHO_C" >&6; } if test -n "$KDECONFIG"; then kde_cv_path="$KDECONFIG"; else - kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` + kde_cache=`echo tde-config | sed 'y%./+-%__p_%'` if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2816,16 +2816,16 @@ else IFS=$kde_save_IFS for dir in $dirs; do - if test -x "$dir/kde-config"; then + if test -x "$dir/tde-config"; then if test -n "" then - evalstr="$dir/kde-config 2>&1 " + evalstr="$dir/tde-config 2>&1 " if eval $evalstr; then - kde_cv_path="$dir/kde-config" + kde_cv_path="$dir/tde-config" break fi else - kde_cv_path="$dir/kde-config" + kde_cv_path="$dir/tde-config" break fi fi @@ -2845,10 +2845,10 @@ fi { echo "$as_me:$LINENO: result: not found" >&5 echo "${ECHO_T}not found" >&6; } - { { echo "$as_me:$LINENO: error: The important program kde-config was not found! + { { echo "$as_me:$LINENO: error: The important program tde-config was not found! Please check whether you installed KDE correctly. " >&5 -echo "$as_me: error: The important program kde-config was not found! +echo "$as_me: error: The important program tde-config was not found! Please check whether you installed KDE correctly. " >&2;} { (exit 1); exit 1; }; } @@ -2865,13 +2865,13 @@ echo "${ECHO_T}$kde_cv_path" >&6; } kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + { { echo "$as_me:$LINENO: 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. " >&5 -echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. +echo "$as_me: 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. " >&2;} { (exit 1); exit 1; }; } fi @@ -2881,8 +2881,8 @@ echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_ echo $ECHO_N "checking where to install... $ECHO_C" >&6; } if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5 -echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; } + { echo "$as_me:$LINENO: result: $prefix (as returned by tde-config)" >&5 +echo "${ECHO_T}$prefix (as returned by tde-config)" >&6; } else given_prefix=$prefix { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5 @@ -8256,13 +8256,13 @@ fi # Check whether --enable-libsuffix was given. if test "${enable_libsuffix+set}" = set; then - enableval=$enable_libsuffix; kdelibsuff=$enableval + enableval=$enable_libsuffix; tdelibsuff=$enableval else - kdelibsuff="auto" + tdelibsuff="auto" fi - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -8270,17 +8270,17 @@ 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 { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5 echo "${ECHO_T}not using lib directory suffix" >&6; } @@ -8290,16 +8290,16 @@ _ACEOF else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" libdir="$libdir" fi cat >>confdefs.h <<_ACEOF -#define KDELIBSUFF "${kdelibsuff}" +#define KDELIBSUFF "${tdelibsuff}" _ACEOF - { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5 -echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; } + { echo "$as_me:$LINENO: result: using lib directory suffix $tdelibsuff" >&5 +echo "${ECHO_T}using lib directory suffix $tdelibsuff" >&6; } fi # Check whether --enable-fast-install was given. @@ -23768,7 +23768,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" -# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. +# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs. KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" @@ -24234,7 +24234,7 @@ if test "x$kde_cv_func_strlcat" = xyes; then else case "strlcat" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_strlcat="yes - in libkdefakes" + kde_cv_proto_strlcat="yes - in libtdefakes" ;; *) kde_cv_proto_strlcat=unknown @@ -24478,7 +24478,7 @@ if test "x$kde_cv_func_strlcpy" = xyes; then else case "strlcpy" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_strlcpy="yes - in libkdefakes" + kde_cv_proto_strlcpy="yes - in libtdefakes" ;; *) kde_cv_proto_strlcpy=unknown @@ -26976,7 +26976,7 @@ if test "x$kde_cv_func_res_init" = xyes; then else case "res_init" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_res_init="yes - in libkdefakes" + kde_cv_proto_res_init="yes - in libtdefakes" ;; *) kde_cv_proto_res_init=unknown @@ -31278,41 +31278,41 @@ sed 's/^/| /' conftest.$ac_ext >&5 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 for ac_extension in a so sl; do @@ -31377,7 +31377,7 @@ fi 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 @@ -32904,7 +32904,7 @@ qt_includes="" # Check whether --with-qt-dir was given. if test "${with_qt_dir+set}" = set; then withval=$with_qt_dir; ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin fi @@ -32969,7 +32969,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 @@ -33786,16 +33786,16 @@ else if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z ""; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdir=NO @@ -33824,8 +33824,8 @@ So, check this please and use another prefix!" >&2;} { (exit 1); exit 1; }; } 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}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdir=NO @@ -33849,7 +33849,7 @@ kde_widgetdir=NO kde_widgetdir=NO for i in $kde_libdirs; do - for j in "kde3/plugins/designer/kdewidgets.la"; + for j in "kde3/plugins/designer/tdewidgets.la"; do echo "configure: 33854: $i/$j" >&5 if test -r "$i/$j"; then @@ -33871,13 +33871,13 @@ So, check this please and use another prefix!" >&2;} { (exit 1); exit 1; }; } fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then { { echo "$as_me:$LINENO: error: I can't find the designer plugins. These are required and should have been installed -by kdelibs" >&5 +by tdelibs" >&5 echo "$as_me: error: I can't find the designer plugins. These are required and should have been installed -by kdelibs" >&2;} +by tdelibs" >&2;} { (exit 1); exit 1; }; } fi @@ -34011,20 +34011,20 @@ fi echo "${ECHO_T}$kde_cv_uic_plugins" >&6; } if test "$kde_cv_uic_plugins" != yes; then { { echo "$as_me:$LINENO: 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. " >&5 echo "$as_me: 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. " >&2;} @@ -34199,20 +34199,20 @@ cat > conftest.$ac_ext < int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); @@ -34275,7 +34275,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 @@ -34287,22 +34287,22 @@ echo "${ECHO_T}yes" >&6; } else { { echo "$as_me:$LINENO: 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." >&5 echo "$as_me: 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." >&2;} { (exit 1); exit 1; }; } fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes @@ -34501,20 +34501,20 @@ cat > conftest.$ac_ext < int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); @@ -34577,7 +34577,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 @@ -34589,22 +34589,22 @@ echo "${ECHO_T}yes" >&6; } else { { echo "$as_me:$LINENO: 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." >&5 echo "$as_me: 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." >&2;} { (exit 1); exit 1; }; } fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes @@ -34713,11 +34713,11 @@ _ACEOF kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -35091,12 +35091,12 @@ echo "${ECHO_T}$kde_cv_path" >&6; } if test -n "$kde32ornewer"; then - { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5 -echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for tdeconfig_compiler" >&5 +echo $ECHO_N "checking for tdeconfig_compiler... $ECHO_C" >&6; } if test -n "$KCONFIG_COMPILER"; then kde_cv_path="$KCONFIG_COMPILER"; else - kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'` + kde_cache=`echo tdeconfig_compiler | sed 'y%./+-%__p_%'` if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -35115,16 +35115,16 @@ else IFS=$kde_save_IFS for dir in $dirs; do - if test -x "$dir/kconfig_compiler"; then + if test -x "$dir/tdeconfig_compiler"; then if test -n "" then - evalstr="$dir/kconfig_compiler 2>&1 " + evalstr="$dir/tdeconfig_compiler 2>&1 " if eval $evalstr; then - kde_cv_path="$dir/kconfig_compiler" + kde_cv_path="$dir/tdeconfig_compiler" break fi else - kde_cv_path="$dir/kconfig_compiler" + kde_cv_path="$dir/tdeconfig_compiler" break fi fi @@ -35144,10 +35144,10 @@ fi { echo "$as_me:$LINENO: result: not found" >&5 echo "${ECHO_T}not found" >&6; } - { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found! + { { echo "$as_me:$LINENO: error: The important program tdeconfig_compiler was not found! Please check whether you installed KDE correctly. " >&5 -echo "$as_me: error: The important program kconfig_compiler was not found! +echo "$as_me: error: The important program tdeconfig_compiler was not found! Please check whether you installed KDE correctly. " >&2;} { (exit 1); exit 1; }; } @@ -35231,12 +35231,12 @@ echo "${ECHO_T}$kde_cv_path" >&6; } fi if test -n "$kde33ornewer"; then - { echo "$as_me:$LINENO: checking for makekdewidgets" >&5 -echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; } - if test -n "$MAKEKDEWIDGETS"; then - kde_cv_path="$MAKEKDEWIDGETS"; + { echo "$as_me:$LINENO: checking for maketdewidgets" >&5 +echo $ECHO_N "checking for maketdewidgets... $ECHO_C" >&6; } + if test -n "$MAKETDEWIDGETS"; then + kde_cv_path="$MAKETDEWIDGETS"; else - kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'` + kde_cache=`echo maketdewidgets | sed 'y%./+-%__p_%'` if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -35255,16 +35255,16 @@ else IFS=$kde_save_IFS for dir in $dirs; do - if test -x "$dir/makekdewidgets"; then + if test -x "$dir/maketdewidgets"; then if test -n "" then - evalstr="$dir/makekdewidgets 2>&1 " + evalstr="$dir/maketdewidgets 2>&1 " if eval $evalstr; then - kde_cv_path="$dir/makekdewidgets" + kde_cv_path="$dir/maketdewidgets" break fi else - kde_cv_path="$dir/makekdewidgets" + kde_cv_path="$dir/maketdewidgets" break fi fi @@ -35284,10 +35284,10 @@ fi { echo "$as_me:$LINENO: result: not found" >&5 echo "${ECHO_T}not found" >&6; } - { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found! + { { echo "$as_me:$LINENO: error: The important program maketdewidgets was not found! Please check whether you installed KDE correctly. " >&5 -echo "$as_me: error: The important program makekdewidgets was not found! +echo "$as_me: error: The important program maketdewidgets was not found! Please check whether you installed KDE correctly. " >&2;} { (exit 1); exit 1; }; } @@ -35295,7 +35295,7 @@ Please check whether you installed KDE correctly. else { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 echo "${ECHO_T}$kde_cv_path" >&6; } - MAKEKDEWIDGETS=$kde_cv_path + MAKETDEWIDGETS=$kde_cv_path fi @@ -35365,7 +35365,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; } if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" KDE_XSL_STYLESHEET=NO for i in $kde_sharedirs; @@ -35427,7 +35427,7 @@ done -kdeinitdir='$(kde_moduledir)' +tdeinitdir='$(kde_moduledir)' @@ -35446,16 +35446,16 @@ fi if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac LIB_KDED=$lib_kded - LIB_KDECORE="-lkdecore" + LIB_TDECORE="-ltdecore" - LIB_KDEUI="-lkdeui" + LIB_TDEUI="-ltdeui" - LIB_KIO="-lkio" + LIB_TDEIO="-ltdeio" LIB_KJS="-lkjs" @@ -35463,66 +35463,66 @@ if test $kde_qtver = 3; then LIB_KAB="-lkab" - LIB_KABC="-lkabc" + LIB_KABC="-ltdeabc" - LIB_KHTML="-lkhtml" + LIB_TDEHTML="-ltdehtml" - LIB_KSPELL="-lkspell" + LIB_TDESPELL="-ltdespell" - LIB_KPARTS="-lkparts" + LIB_TDEPARTS="-ltdeparts" - LIB_KDEPRINT="-lkdeprint" + LIB_TDEPRINT="-ltdeprint" - LIB_KUTILS="-lkutils" + LIB_TDEUTILS="-ltdeutils" - LIB_KDEPIM="-lkdepim" + LIB_TDEPIM="-ltdepim" - LIB_KIMPROXY="-lkimproxy" + LIB_TDEIMPROXY="-ltdeimproxy" LIB_KNEWSTUFF="-lknewstuff" - LIB_KDNSSD="-lkdnssd" + LIB_TDEDNSSD="-ltdednssd" - LIB_KUNITTEST="-lkunittest" + LIB_TDEUNITTEST="-ltdeunittest" # these are for backward compatibility - LIB_KSYCOCA="-lkio" + LIB_TDESYCOCA="-ltdeio" - LIB_KFILE="-lkio" + LIB_KFILE="-ltdeio" elif test $kde_qtver = 2; then - LIB_KDECORE="-lkdecore" + LIB_TDECORE="-ltdecore" - LIB_KDEUI="-lkdeui" + LIB_TDEUI="-ltdeui" - LIB_KIO="-lkio" + LIB_TDEIO="-ltdeio" - LIB_KSYCOCA="-lksycoca" + LIB_TDESYCOCA="-ltdesycoca" LIB_SMB="-lsmb" - LIB_KFILE="-lkfile" + LIB_KFILE="-ltdefile" LIB_KAB="-lkab" - LIB_KHTML="-lkhtml" + LIB_TDEHTML="-ltdehtml" - LIB_KSPELL="-lkspell" + LIB_TDESPELL="-ltdespell" - LIB_KPARTS="-lkparts" + LIB_TDEPARTS="-ltdeparts" - LIB_KDEPRINT="-lkdeprint" + LIB_TDEPRINT="-ltdeprint" else - LIB_KDECORE="-lkdecore -lXext $(LIB_QT)" + LIB_TDECORE="-ltdecore -lXext $(LIB_QT)" - LIB_KDEUI="-lkdeui $(LIB_KDECORE)" + LIB_TDEUI="-ltdeui $(LIB_TDECORE)" - LIB_KFM="-lkfm $(LIB_KDECORE)" + LIB_KFM="-lkfm $(LIB_TDECORE)" - LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)" + LIB_KFILE="-ltdefile $(LIB_KFM) $(LIB_TDEUI)" - LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)" + LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_TDECORE)" fi @@ -36029,9 +36029,9 @@ if test $ac_cv_header_kcommondecoration_h = yes; then : else { { echo "$as_me:$LINENO: error: -Required header kcommondecoration.h is missing! (either you need KDE >= 3.5.0 or you are missing the kdebase devel package)" >&5 +Required header kcommondecoration.h is missing! (either you need KDE >= 3.5.0 or you are missing the tdebase devel package)" >&5 echo "$as_me: error: -Required header kcommondecoration.h is missing! (either you need KDE >= 3.5.0 or you are missing the kdebase devel package)" >&2;} +Required header kcommondecoration.h is missing! (either you need KDE >= 3.5.0 or you are missing the tdebase devel package)" >&2;} { (exit 1); exit 1; }; } fi @@ -36987,7 +36987,7 @@ all_libraries!$all_libraries$ac_delim AUTODIRS!$AUTODIRS$ac_delim include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim -MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim +MAKETDEWIDGETS!$MAKETDEWIDGETS$ac_delim KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim DCOPIDLNG!$DCOPIDLNG$ac_delim @@ -37058,28 +37058,28 @@ kde_templatesdir!$kde_templatesdir$ac_delim kde_servicesdir!$kde_servicesdir$ac_delim kde_servicetypesdir!$kde_servicetypesdir$ac_delim kde_moduledir!$kde_moduledir$ac_delim -kdeinitdir!$kdeinitdir$ac_delim +tdeinitdir!$tdeinitdir$ac_delim kde_styledir!$kde_styledir$ac_delim kde_widgetdir!$kde_widgetdir$ac_delim LIB_KDED!$LIB_KDED$ac_delim -LIB_KDECORE!$LIB_KDECORE$ac_delim -LIB_KDEUI!$LIB_KDEUI$ac_delim -LIB_KIO!$LIB_KIO$ac_delim +LIB_TDECORE!$LIB_TDECORE$ac_delim +LIB_TDEUI!$LIB_TDEUI$ac_delim +LIB_TDEIO!$LIB_TDEIO$ac_delim LIB_KJS!$LIB_KJS$ac_delim LIB_SMB!$LIB_SMB$ac_delim LIB_KAB!$LIB_KAB$ac_delim LIB_KABC!$LIB_KABC$ac_delim -LIB_KHTML!$LIB_KHTML$ac_delim -LIB_KSPELL!$LIB_KSPELL$ac_delim -LIB_KPARTS!$LIB_KPARTS$ac_delim -LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim -LIB_KUTILS!$LIB_KUTILS$ac_delim -LIB_KDEPIM!$LIB_KDEPIM$ac_delim -LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim +LIB_TDEHTML!$LIB_TDEHTML$ac_delim +LIB_TDESPELL!$LIB_TDESPELL$ac_delim +LIB_TDEPARTS!$LIB_TDEPARTS$ac_delim +LIB_TDEPRINT!$LIB_TDEPRINT$ac_delim +LIB_TDEUTILS!$LIB_TDEUTILS$ac_delim +LIB_TDEPIM!$LIB_TDEPIM$ac_delim +LIB_TDEIMPROXY!$LIB_TDEIMPROXY$ac_delim LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim -LIB_KDNSSD!$LIB_KDNSSD$ac_delim -LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim -LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim +LIB_TDEDNSSD!$LIB_TDEDNSSD$ac_delim +LIB_TDEUNITTEST!$LIB_TDEUNITTEST$ac_delim +LIB_TDESYCOCA!$LIB_TDESYCOCA$ac_delim LIB_KFILE!$LIB_KFILE$ac_delim LIB_KFM!$LIB_KFM$ac_delim TOPSUBDIRS!$TOPSUBDIRS$ac_delim @@ -37688,13 +37688,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/configure.in b/configure.in index 627d6a1..2deb15e 100644 --- a/configure.in +++ b/configure.in @@ -40,7 +40,7 @@ dnl Perform program name transformation AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(kwin_SUSE2, 0.4.1) dnl searches for some needed programs +AM_INIT_AUTOMAKE(twin_SUSE2, 0.4.1) dnl searches for some needed programs KDE_SET_PREFIX @@ -69,7 +69,7 @@ dnl PACKAGE set before AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN KDE_CHECK_HEADER(kcommondecoration.h,, AC_MSG_ERROR([ -Required header kcommondecoration.h is missing! (either you need KDE >= 3.5.0 or you are missing the kdebase devel package)])) +Required header kcommondecoration.h is missing! (either you need KDE >= 3.5.0 or you are missing the tdebase devel package)])) KDE_CREATE_SUBDIRSLIST AC_CONFIG_FILES([ Makefile ]) @@ -82,13 +82,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/configure.in.in b/configure.in.in index 8dafa43..678cd1a 100644 --- a/configure.in.in +++ b/configure.in.in @@ -1,8 +1,8 @@ #MIN_CONFIG(3.3.0) -AM_INIT_AUTOMAKE(kwin_SUSE2, 0.4.1) +AM_INIT_AUTOMAKE(twin_SUSE2, 0.4.1) AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN KDE_CHECK_HEADER(kcommondecoration.h,, AC_MSG_ERROR([ -Required header kcommondecoration.h is missing! (either you need KDE >= 3.5.0 or you are missing the kdebase devel package)])) +Required header kcommondecoration.h is missing! (either you need KDE >= 3.5.0 or you are missing the tdebase devel package)])) diff --git a/debian/changelog b/debian/changelog index 189925c..5276b27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,36 +1,36 @@ -kwin-decor-suse2 (0.4.1-1) unstable; urgency=low +twin-decor-suse2 (0.4.1-1) unstable; urgency=low * Updated to 0.4.1 -- Gerd Fleischer Sat, 17 Jun 2007 19:56:34 +0200 -kwin-decor-suse2 (0.4-1) unstable; urgency=low +twin-decor-suse2 (0.4-1) unstable; urgency=low * Updated to 0.4 -- Gerd Fleischer Thu, 02 Nov 2006 19:56:34 +0200 -kwin-decor-suse2 (0.3.5-1) unstable; urgency=low +twin-decor-suse2 (0.3.5-1) unstable; urgency=low * Updated to 0.3.5 -- Gerd Fleischer Sat, 20 May 2006 19:56:34 +0200 -kwin-decor-suse2 (0.3.4-1) unstable; urgency=low +twin-decor-suse2 (0.3.4-1) unstable; urgency=low * Updated to 0.3.4 -- Gerd Fleischer Thu, 23 Feb 2006 19:56:34 +0200 -kwin-decor-suse2 (0.3.2-1) unstable; urgency=low +twin-decor-suse2 (0.3.2-1) unstable; urgency=low * Updated to 0.3.2 - * renamed to kwin-style-suse2 to match debian naming rules - * replaces older kwin-decor-suse2 named packages + * renamed to twin-style-suse2 to match debian naming rules + * replaces older twin-decor-suse2 named packages -- Gerd Fleischer Thu, 08 Dec 2005 19:56:34 +0200 -kwin-decor-suse2 (0.3.1-1) unstable; urgency=low +twin-decor-suse2 (0.3.1-1) unstable; urgency=low * Updated to 0.3.1 diff --git a/debian/control b/debian/control index ae71baf..aceff05 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,14 @@ -Source: kwin-decor-suse2 +Source: twin-decor-suse2 Section: kde Priority: optional Maintainer: Adrian Neumaier -Build-Depends: debhelper (>= 4.0.0), kdelibs4-dev (>= 4:3.5.0), kdebase-dev (>= 4:3.5.0), cdbs +Build-Depends: debhelper (>= 4.0.0), tdelibs4-dev (>= 4:3.5.0), tdebase-dev (>= 4:3.5.0), cdbs Standards-Version: 3.6.2 -Package: kwin-style-suse2 +Package: twin-style-suse2 Architecture: any Depends: ${shlibs:Depends} -Replaces: kwin-decor-suse2 +Replaces: twin-decor-suse2 Description: KDE window decoration from SUSE 9.3 This the the SUSE 9.3 KDE Window decoration extracted from SUSE. . @@ -17,4 +17,4 @@ Description: KDE window decoration from SUSE 9.3 . A color scheme for KDE is provided too. . - Homepage: http://www.gerdfleischer.de/kwin-decor-suse2/ + Homepage: http://www.gerdfleischer.de/twin-decor-suse2/ diff --git a/debian/copyright b/debian/copyright index 20aa3b3..d5f625f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ This package was debianized by Adrian Neumaier on Mon, 19 Sep 2005 19:56:34 +0200 -It was downloaded from http://www.gerdfleischer.de/kwin-decor-suse2/ +It was downloaded from http://www.gerdfleischer.de/twin-decor-suse2/ Authors: Adrian Schroeter Gerd Fleischer diff --git a/kwin-decor-suse2.spec b/kwin-decor-suse2.spec index 80835d2..7fab40d 100644 --- a/kwin-decor-suse2.spec +++ b/kwin-decor-suse2.spec @@ -1,5 +1,5 @@ # -# spec file for package kwin-decor-suse (Version 0.2) +# spec file for package twin-decor-suse (Version 0.2) # # Copyright (c) 2005 Gerd Fleischer # This file and all modifications and additions to the pristine @@ -7,8 +7,8 @@ %define DIST %(if [ -r /etc/SuSE-release ]; then echo "SuSE"; else echo "Unknown"; fi) -Name: kwin-decor-suse2 -URL: http://www.gerdfleischer.de/kwin-decor-suse2/ +Name: twin-decor-suse2 +URL: http://www.gerdfleischer.de/twin-decor-suse2/ License: GPL Group: System/GUI/KDE Summary: The KDE window decoration from SUSE 9.3 - 10.2 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 %description -The KDE window decoration from SUSE 9.3 - 10.2 extracted from the kdebase3-SUSE package. +The KDE window decoration from SUSE 9.3 - 10.2 extracted from the tdebase3-SUSE package. Authors: -------- @@ -49,8 +49,8 @@ make %install make DESTDIR=$RPM_BUILD_ROOT install-strip -install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/kwin-decor-suse2 -install -m 644 ChangeLog README COPYING INSTALL AUTHORS NEWS $RPM_BUILD_ROOT%{_docdir}/kwin-decor-suse2/ +install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/twin-decor-suse2 +install -m 644 ChangeLog README COPYING INSTALL AUTHORS NEWS $RPM_BUILD_ROOT%{_docdir}/twin-decor-suse2/ %files %defattr(-,root,root) @@ -61,9 +61,9 @@ install -m 644 ChangeLog README COPYING INSTALL AUTHORS NEWS $RPM_BUILD_ROOT%{_d /usr/%{_lib} /usr/share/ %endif -%{_docdir}/kwin-decor-suse2/ +%{_docdir}/twin-decor-suse2/ -%changelog -n kwin-decor-suse2 +%changelog -n twin-decor-suse2 * Sun Nov 20 2005 - gerdfleischer@web.de - use _lib * Sun May 01 2005 - gerdfleischer@web.de diff --git a/po/Makefile.in b/po/Makefile.in index 5ea252c..d57349d 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -140,24 +140,24 @@ LIBUTIL = @LIBUTIL@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -168,7 +168,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -269,7 +269,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -494,7 +494,7 @@ uninstall-am: uninstall-info-am .NOEXPORT: #>+ 2 -KDE_DIST=tr.gmo bs.po zh_CN.po sv.gmo ta.gmo sr.gmo ko.gmo sl.gmo da.po ru.gmo he.gmo nb.gmo uk.po de.po et.po ta.po ja.gmo bs.gmo nb.po fr.po el.po et.gmo cs.po tr.po zh_CN.gmo he.po sk.gmo id.gmo en_US.po ro.po bg.po ja.po pt_BR.po it.gmo fi.gmo hi.gmo de.gmo lo.gmo es.po pt.gmo hi.po es.gmo en_GB.po it.po nl.gmo da.gmo pa.po id.po sr.po nl.po zh_TW.gmo pl.gmo pt.po uk.gmo hr.po km.gmo ru.po kwin_SUSE2.pot bg.gmo en_GB.gmo fi.po ko.po el.gmo fr.gmo ro.gmo zh_TW.po cs.gmo lt.gmo pt_BR.gmo Makefile.in hr.gmo cy.gmo sv.po hu.po cy.po pl.po lt.po en_US.gmo km.po pa.gmo lo.po sk.po hu.gmo Makefile.am sl.po +KDE_DIST=tr.gmo bs.po zh_CN.po sv.gmo ta.gmo sr.gmo ko.gmo sl.gmo da.po ru.gmo he.gmo nb.gmo uk.po de.po et.po ta.po ja.gmo bs.gmo nb.po fr.po el.po et.gmo cs.po tr.po zh_CN.gmo he.po sk.gmo id.gmo en_US.po ro.po bg.po ja.po pt_BR.po it.gmo fi.gmo hi.gmo de.gmo lo.gmo es.po pt.gmo hi.po es.gmo en_GB.po it.po nl.gmo da.gmo pa.po id.po sr.po nl.po zh_TW.gmo pl.gmo pt.po uk.gmo hr.po km.gmo ru.po twin_SUSE2.pot bg.gmo en_GB.gmo fi.po ko.po el.gmo fr.gmo ro.gmo zh_TW.po cs.gmo lt.gmo pt_BR.gmo Makefile.in hr.gmo cy.gmo sv.po hu.po cy.po pl.po lt.po en_US.gmo km.po pa.gmo lo.po sk.po hu.gmo Makefile.am sl.po #>+ 124 sk.gmo: sk.po diff --git a/po/cs.po b/po/cs.po index b4d51e8..83844f5 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,4 +1,4 @@ -# translation of kwin_SUSE2.cs.po to Czech +# translation of twin_SUSE2.cs.po to Czech # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -8,7 +8,7 @@ # Jakub Friedl , 2006. msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2.cs\n" +"Project-Id-Version: twin_SUSE2.cs\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-10-27 11:08+0200\n" diff --git a/po/da.po b/po/da.po index fa89fcf..d25fc39 100644 --- a/po/da.po +++ b/po/da.po @@ -1,4 +1,4 @@ -# translation of kwin_SUSE2.po to +# translation of twin_SUSE2.po to # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -8,7 +8,7 @@ # Jan Madsen , 2006. msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-10-26 17:58+0200\n" diff --git a/po/es.po b/po/es.po index 8b5185c..193f8b0 100644 --- a/po/es.po +++ b/po/es.po @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-20 10:07\n" diff --git a/po/et.po b/po/et.po index 6020bfe..f6c8aae 100644 --- a/po/et.po +++ b/po/et.po @@ -1,4 +1,4 @@ -# translation of kwin_SUSE2.et.po to Estonian +# translation of twin_SUSE2.et.po to Estonian # translation of # Copyright (C) 2006 SUSE Linux Products GmbH. # Estonian message file for YaST2 (@memory@). @@ -6,7 +6,7 @@ # Ain Vagula , 2006. msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2.et\n" +"Project-Id-Version: twin_SUSE2.et\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-02 20:51+0200\n" diff --git a/po/fi.po b/po/fi.po index 384e52c..fafc54b 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,4 +1,4 @@ -# translation of kwin_SUSE2.po to Finnish +# translation of twin_SUSE2.po to Finnish # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -8,7 +8,7 @@ # Ilkka Pirskanen , 2006. msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-10-28 17:13+0300\n" diff --git a/po/fr.po b/po/fr.po index bf5f2e6..a6b8cd5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-02 14:16\n" diff --git a/po/hu.po b/po/hu.po index 8a0f612..6d6cf39 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,5 +1,5 @@ -# translation of kwin_SUSE2.hu.po to Hungarian -# translation of kwin_SUSE2.hu.po to +# translation of twin_SUSE2.hu.po to Hungarian +# translation of twin_SUSE2.hu.po to # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -8,7 +8,7 @@ # Kalman Kemenczy , 2006. msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2.hu\n" +"Project-Id-Version: twin_SUSE2.hu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-02 09:26+0100\n" diff --git a/po/it.po b/po/it.po index 589ca8d..15bfda4 100644 --- a/po/it.po +++ b/po/it.po @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-03 15:41\n" diff --git a/po/ja.po b/po/ja.po index 8bca057..4b4b51f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-20 11:36\n" diff --git a/po/km.po b/po/km.po index a9907fe..42f5bbf 100644 --- a/po/km.po +++ b/po/km.po @@ -1,4 +1,4 @@ -# translation of kwin_SUSE2.po to Khmer +# translation of twin_SUSE2.po to Khmer # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -9,7 +9,7 @@ # Khoem Sokhem , 2006. msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-14 15:51+0700\n" diff --git a/po/lt.po b/po/lt.po index d7a08ad..e9979cb 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,4 +1,4 @@ -# translation of kwin_SUSE2.po to Lietuvių +# translation of twin_SUSE2.po to Lietuvių # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -7,7 +7,7 @@ # Andrius Štikonas , 2006. msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-10-27 20:03+0300\n" diff --git a/po/nb.po b/po/nb.po index 9763bc0..5b644d8 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,11 +1,11 @@ -# translation of kwin_SUSE2.po to +# translation of twin_SUSE2.po to # Olav Pettershagen , 2006. # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # This file is distributed under the same license as @PACKAGE@ package. FIRST msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-03 20:43+0100\n" diff --git a/po/nl.po b/po/nl.po index fb40d2b..a7444ea 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,4 +1,4 @@ -# translation of kwin_SUSE2.nl.po to Dutch +# translation of twin_SUSE2.nl.po to Dutch # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -7,12 +7,12 @@ # Rinse de Vries , 2006. msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2.nl\n" +"Project-Id-Version: twin_SUSE2.nl\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-07 17:30+0100\n" "Last-Translator: Rinse de Vries \n" -"Language-Team: Dutch \n" +"Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/pa.po b/po/pa.po index 217b462..75685b5 100644 --- a/po/pa.po +++ b/po/pa.po @@ -1,4 +1,4 @@ -# translation of kwin_SUSE2.po to Punjabi +# translation of twin_SUSE2.po to Punjabi # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -7,7 +7,7 @@ # A S Alam , 2006. msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-10-07 11:12+0530\n" diff --git a/po/pl.po b/po/pl.po index c2931dd..9bcb305 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,4 +1,4 @@ -# translation of kwin_SUSE2.po to Polski +# translation of twin_SUSE2.po to Polski # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -8,7 +8,7 @@ # Rafal Milecki , 2006. msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-09 12:47+0100\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index c516954..4d2d0fb 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-06 13:58\n" diff --git a/po/ru.po b/po/ru.po index 723d188..2eb16d5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,4 +1,4 @@ -# translation of kwin_SUSE2.ru.po to Russian +# translation of twin_SUSE2.ru.po to Russian # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -7,7 +7,7 @@ # Aleksey Osipov , 2006. msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2.ru\n" +"Project-Id-Version: twin_SUSE2.ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-09 23:12+0200\n" diff --git a/po/sv.po b/po/sv.po index 48d4d67..90eb97a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,4 +1,4 @@ -# translation of kwin_SUSE2.po to Swedish +# translation of twin_SUSE2.po to Swedish # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -7,7 +7,7 @@ # Mattias Newzella , 2006. msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-16 19:05+0100\n" diff --git a/po/uk.po b/po/uk.po index 70545ac..25b032c 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,4 +1,4 @@ -# Translation of kwin_SUSE2.uk.po to Ukrainian +# Translation of twin_SUSE2.uk.po to Ukrainian # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # @@ -7,7 +7,7 @@ # Ivan Petrouchtchak , 2006. msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2.uk\n" +"Project-Id-Version: twin_SUSE2.uk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-06 18:22-0800\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 6c90306..befd059 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-02 14:21\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index bde204e..7637397 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kwin_SUSE2\n" +"Project-Id-Version: twin_SUSE2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-11 20:29+0200\n" "PO-Revision-Date: 2006-11-02 14:23\n" diff --git a/src/Makefile.am b/src/Makefile.am index 425cbeb..990bc68 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,26 +2,26 @@ INCLUDES = -I$(top_srcdir) $(all_includes) SUBDIRS = config -kde_module_LTLIBRARIES = kwin3_SUSE2.la +kde_module_LTLIBRARIES = twin3_SUSE2.la -kwin3_SUSE2_la_SOURCES = SUSE2.cpp SUSE2client.cpp SUSE2button.cpp misc.cpp shadow.cpp +twin3_SUSE2_la_SOURCES = SUSE2.cpp SUSE2client.cpp SUSE2button.cpp misc.cpp shadow.cpp -kwin3_SUSE2_la_LIBADD = $(LIB_KDEUI) -lkdecorations -kwin3_SUSE2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin3_SUSE2_la_LIBADD = $(LIB_TDEUI) -ltdecorations +twin3_SUSE2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module METASOURCES = AUTO messages: rc.cpp $(EXTRACTRC) config/*.ui >> rc.cpp - $(XGETTEXT) *.cpp config/*.cpp -o $(podir)/kwin_SUSE2.pot + $(XGETTEXT) *.cpp config/*.cpp -o $(podir)/twin_SUSE2.pot -linkdir = $(kde_datadir)/kwin/ +linkdir = $(kde_datadir)/twin/ link_DATA = SUSE2.desktop -kwin_pics_data_DATA = titlebar_decor.png -kwin_pics_datadir = $(kde_datadir)/kwin/pics +twin_pics_data_DATA = titlebar_decor.png +twin_pics_datadir = $(kde_datadir)/twin/pics -kdisplay_colorscheme_DATA = SUSE2.kcsrc -kdisplay_colorschemedir = $(kde_datadir)/kdisplay/color-schemes +tdedisplay_colorscheme_DATA = SUSE2.kcsrc +tdedisplay_colorschemedir = $(kde_datadir)/tdedisplay/color-schemes -EXTRA_DIST = $(kwin_pics_data_DATA) $(link_DATA) $(kdisplay_colorscheme_DATA) +EXTRA_DIST = $(twin_pics_data_DATA) $(link_DATA) $(tdedisplay_colorscheme_DATA) diff --git a/src/Makefile.in b/src/Makefile.in index 6127792..152591d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -56,21 +56,21 @@ am__vpath_adj = case $$p in \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ - "$(DESTDIR)$(kdisplay_colorschemedir)" \ - "$(DESTDIR)$(kwin_pics_datadir)" "$(DESTDIR)$(linkdir)" + "$(DESTDIR)$(tdedisplay_colorschemedir)" \ + "$(DESTDIR)$(twin_pics_datadir)" "$(DESTDIR)$(linkdir)" kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(kde_module_LTLIBRARIES) am__DEPENDENCIES_1 = -kwin3_SUSE2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_kwin3_SUSE2_la_OBJECTS = SUSE2.lo SUSE2client.lo SUSE2button.lo \ +twin3_SUSE2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_twin3_SUSE2_la_OBJECTS = SUSE2.lo SUSE2client.lo SUSE2button.lo \ misc.lo shadow.lo -#>- kwin3_SUSE2_la_OBJECTS = $(am_kwin3_SUSE2_la_OBJECTS) +#>- twin3_SUSE2_la_OBJECTS = $(am_twin3_SUSE2_la_OBJECTS) #>+ 5 -kwin3_SUSE2_la_final_OBJECTS = kwin3_SUSE2_la.all_cpp.lo -kwin3_SUSE2_la_nofinal_OBJECTS = SUSE2.lo SUSE2client.lo SUSE2button.lo \ +twin3_SUSE2_la_final_OBJECTS = twin3_SUSE2_la.all_cpp.lo +twin3_SUSE2_la_nofinal_OBJECTS = SUSE2.lo SUSE2client.lo SUSE2button.lo \ misc.lo shadow.lo -@KDE_USE_FINAL_FALSE@kwin3_SUSE2_la_OBJECTS = $(kwin3_SUSE2_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kwin3_SUSE2_la_OBJECTS = $(kwin3_SUSE2_la_final_OBJECTS) +@KDE_USE_FINAL_FALSE@twin3_SUSE2_la_OBJECTS = $(twin3_SUSE2_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@twin3_SUSE2_la_OBJECTS = $(twin3_SUSE2_la_final_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles @@ -92,8 +92,8 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(kwin3_SUSE2_la_SOURCES) -DIST_SOURCES = $(kwin3_SUSE2_la_SOURCES) +SOURCES = $(twin3_SUSE2_la_SOURCES) +DIST_SOURCES = $(twin3_SUSE2_la_SOURCES) #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ #>- html-recursive info-recursive install-data-recursive \ #>- install-exec-recursive install-info-recursive \ @@ -107,10 +107,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive nmcheck-recursive bcheck-recursive -kdisplay_colorschemeDATA_INSTALL = $(INSTALL_DATA) -kwin_pics_dataDATA_INSTALL = $(INSTALL_DATA) +tdedisplay_colorschemeDATA_INSTALL = $(INSTALL_DATA) +twin_pics_dataDATA_INSTALL = $(INSTALL_DATA) linkDATA_INSTALL = $(INSTALL_DATA) -DATA = $(kdisplay_colorscheme_DATA) $(kwin_pics_data_DATA) \ +DATA = $(tdedisplay_colorscheme_DATA) $(twin_pics_data_DATA) \ $(link_DATA) ETAGS = etags CTAGS = ctags @@ -204,24 +204,24 @@ LIBUTIL = @LIBUTIL@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -232,7 +232,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -333,7 +333,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -364,18 +364,18 @@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ INCLUDES = -I$(top_srcdir) $(all_includes) SUBDIRS = config -kde_module_LTLIBRARIES = kwin3_SUSE2.la -kwin3_SUSE2_la_SOURCES = SUSE2.cpp SUSE2client.cpp SUSE2button.cpp misc.cpp shadow.cpp -kwin3_SUSE2_la_LIBADD = $(LIB_KDEUI) -lkdecorations -kwin3_SUSE2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kde_module_LTLIBRARIES = twin3_SUSE2.la +twin3_SUSE2_la_SOURCES = SUSE2.cpp SUSE2client.cpp SUSE2button.cpp misc.cpp shadow.cpp +twin3_SUSE2_la_LIBADD = $(LIB_TDEUI) -ltdecorations +twin3_SUSE2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -linkdir = $(kde_datadir)/kwin/ +linkdir = $(kde_datadir)/twin/ link_DATA = SUSE2.desktop -kwin_pics_data_DATA = titlebar_decor.png -kwin_pics_datadir = $(kde_datadir)/kwin/pics -kdisplay_colorscheme_DATA = SUSE2.kcsrc -kdisplay_colorschemedir = $(kde_datadir)/kdisplay/color-schemes -EXTRA_DIST = $(kwin_pics_data_DATA) $(link_DATA) $(kdisplay_colorscheme_DATA) +twin_pics_data_DATA = titlebar_decor.png +twin_pics_datadir = $(kde_datadir)/twin/pics +tdedisplay_colorscheme_DATA = SUSE2.kcsrc +tdedisplay_colorschemedir = $(kde_datadir)/tdedisplay/color-schemes +EXTRA_DIST = $(twin_pics_data_DATA) $(link_DATA) $(tdedisplay_colorscheme_DATA) #>- all: all-recursive #>+ 1 all: docs-am all-recursive @@ -451,11 +451,11 @@ clean-kde_moduleLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -#>- kwin3_SUSE2.la: $(kwin3_SUSE2_la_OBJECTS) $(kwin3_SUSE2_la_DEPENDENCIES) +#>- twin3_SUSE2.la: $(twin3_SUSE2_la_OBJECTS) $(twin3_SUSE2_la_DEPENDENCIES) #>+ 2 -@KDE_USE_CLOSURE_TRUE@kwin3_SUSE2.la: kwin3_SUSE2.la.closure $(kwin3_SUSE2_la_OBJECTS) $(kwin3_SUSE2_la_DEPENDENCIES) -@KDE_USE_CLOSURE_FALSE@kwin3_SUSE2.la: $(kwin3_SUSE2_la_OBJECTS) $(kwin3_SUSE2_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(kwin3_SUSE2_la_LDFLAGS) $(kwin3_SUSE2_la_OBJECTS) $(kwin3_SUSE2_la_LIBADD) $(LIBS) +@KDE_USE_CLOSURE_TRUE@twin3_SUSE2.la: twin3_SUSE2.la.closure $(twin3_SUSE2_la_OBJECTS) $(twin3_SUSE2_la_DEPENDENCIES) +@KDE_USE_CLOSURE_FALSE@twin3_SUSE2.la: $(twin3_SUSE2_la_OBJECTS) $(twin3_SUSE2_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(twin3_SUSE2_la_LDFLAGS) $(twin3_SUSE2_la_OBJECTS) $(twin3_SUSE2_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -499,39 +499,39 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -install-kdisplay_colorschemeDATA: $(kdisplay_colorscheme_DATA) +install-tdedisplay_colorschemeDATA: $(tdedisplay_colorscheme_DATA) @$(NORMAL_INSTALL) - test -z "$(kdisplay_colorschemedir)" || $(mkdir_p) "$(DESTDIR)$(kdisplay_colorschemedir)" - @list='$(kdisplay_colorscheme_DATA)'; for p in $$list; do \ + test -z "$(tdedisplay_colorschemedir)" || $(mkdir_p) "$(DESTDIR)$(tdedisplay_colorschemedir)" + @list='$(tdedisplay_colorscheme_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(kdisplay_colorschemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdisplay_colorschemedir)/$$f'"; \ - $(kdisplay_colorschemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdisplay_colorschemedir)/$$f"; \ + echo " $(tdedisplay_colorschemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(tdedisplay_colorschemedir)/$$f'"; \ + $(tdedisplay_colorschemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(tdedisplay_colorschemedir)/$$f"; \ done -uninstall-kdisplay_colorschemeDATA: +uninstall-tdedisplay_colorschemeDATA: @$(NORMAL_UNINSTALL) - @list='$(kdisplay_colorscheme_DATA)'; for p in $$list; do \ + @list='$(tdedisplay_colorscheme_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(kdisplay_colorschemedir)/$$f'"; \ - rm -f "$(DESTDIR)$(kdisplay_colorschemedir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(tdedisplay_colorschemedir)/$$f'"; \ + rm -f "$(DESTDIR)$(tdedisplay_colorschemedir)/$$f"; \ done -install-kwin_pics_dataDATA: $(kwin_pics_data_DATA) +install-twin_pics_dataDATA: $(twin_pics_data_DATA) @$(NORMAL_INSTALL) - test -z "$(kwin_pics_datadir)" || $(mkdir_p) "$(DESTDIR)$(kwin_pics_datadir)" - @list='$(kwin_pics_data_DATA)'; for p in $$list; do \ + test -z "$(twin_pics_datadir)" || $(mkdir_p) "$(DESTDIR)$(twin_pics_datadir)" + @list='$(twin_pics_data_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(kwin_pics_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kwin_pics_datadir)/$$f'"; \ - $(kwin_pics_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kwin_pics_datadir)/$$f"; \ + echo " $(twin_pics_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(twin_pics_datadir)/$$f'"; \ + $(twin_pics_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(twin_pics_datadir)/$$f"; \ done -uninstall-kwin_pics_dataDATA: +uninstall-twin_pics_dataDATA: @$(NORMAL_UNINSTALL) - @list='$(kwin_pics_data_DATA)'; for p in $$list; do \ + @list='$(twin_pics_data_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(kwin_pics_datadir)/$$f'"; \ - rm -f "$(DESTDIR)$(kwin_pics_datadir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(twin_pics_datadir)/$$f'"; \ + rm -f "$(DESTDIR)$(twin_pics_datadir)/$$f"; \ done install-linkDATA: $(link_DATA) @$(NORMAL_INSTALL) @@ -730,7 +730,7 @@ check: check-recursive all-am: Makefile $(LTLIBRARIES) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdisplay_colorschemedir)" "$(DESTDIR)$(kwin_pics_datadir)" "$(DESTDIR)$(linkdir)"; do \ + for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(tdedisplay_colorschemedir)" "$(DESTDIR)$(twin_pics_datadir)" "$(DESTDIR)$(linkdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -784,11 +784,11 @@ info: info-recursive info-am: #>- install-data-am: install-kde_moduleLTLIBRARIES \ -#>- install-kdisplay_colorschemeDATA install-kwin_pics_dataDATA \ +#>- install-tdedisplay_colorschemeDATA install-twin_pics_dataDATA \ #>- install-linkDATA #>+ 3 install-data-am: \ - install-kdisplay_colorschemeDATA install-kwin_pics_dataDATA \ + install-tdedisplay_colorschemeDATA install-twin_pics_dataDATA \ install-linkDATA #>- install-exec-am: @@ -820,8 +820,8 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ - uninstall-kdisplay_colorschemeDATA \ - uninstall-kwin_pics_dataDATA uninstall-linkDATA + uninstall-tdedisplay_colorschemeDATA \ + uninstall-twin_pics_dataDATA uninstall-linkDATA uninstall-info: uninstall-info-recursive @@ -833,7 +833,7 @@ uninstall-info: uninstall-info-recursive html-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-kde_moduleLTLIBRARIES \ - install-kdisplay_colorschemeDATA install-kwin_pics_dataDATA \ + install-tdedisplay_colorschemeDATA install-twin_pics_dataDATA \ install-linkDATA install-man install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive \ @@ -841,24 +841,24 @@ uninstall-info: uninstall-info-recursive mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am uninstall-info-am \ uninstall-kde_moduleLTLIBRARIES \ - uninstall-kdisplay_colorschemeDATA \ - uninstall-kwin_pics_dataDATA uninstall-linkDATA + uninstall-tdedisplay_colorschemeDATA \ + uninstall-twin_pics_dataDATA uninstall-linkDATA messages: rc.cpp $(EXTRACTRC) config/*.ui >> rc.cpp - $(XGETTEXT) *.cpp config/*.cpp -o $(podir)/kwin_SUSE2.pot + $(XGETTEXT) *.cpp config/*.cpp -o $(podir)/twin_SUSE2.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: #>+ 8 -kwin3_SUSE2.la.closure: $(kwin3_SUSE2_la_OBJECTS) $(kwin3_SUSE2_la_DEPENDENCIES) - @echo "int main() {return 0;}" > kwin3_SUSE2_la_closure.cpp - @$(LTCXXCOMPILE) -c kwin3_SUSE2_la_closure.cpp - $(CXXLINK) kwin3_SUSE2_la_closure.lo $(kwin3_SUSE2_la_LDFLAGS) $(kwin3_SUSE2_la_OBJECTS) $(kwin3_SUSE2_la_LIBADD) $(LIBS) - @rm -f kwin3_SUSE2_la_closure.* kwin3_SUSE2.la.closure - @echo "timestamp" > kwin3_SUSE2.la.closure +twin3_SUSE2.la.closure: $(twin3_SUSE2_la_OBJECTS) $(twin3_SUSE2_la_DEPENDENCIES) + @echo "int main() {return 0;}" > twin3_SUSE2_la_closure.cpp + @$(LTCXXCOMPILE) -c twin3_SUSE2_la_closure.cpp + $(CXXLINK) twin3_SUSE2_la_closure.lo $(twin3_SUSE2_la_LDFLAGS) $(twin3_SUSE2_la_OBJECTS) $(twin3_SUSE2_la_LIBADD) $(LIBS) + @rm -f twin3_SUSE2_la_closure.* twin3_SUSE2.la.closure + @echo "timestamp" > twin3_SUSE2.la.closure #>+ 3 @@ -884,7 +884,7 @@ KDE_DIST=shadow.h SUSE2button.h misc.h SUSE2client.h SUSE2.kcsrc titlebar_decor. #>+ 3 clean-closures: - -rm -f kwin3_SUSE2.la.closure + -rm -f twin3_SUSE2.la.closure #>+ 2 docs-am: @@ -928,36 +928,36 @@ bcheck-am: #>+ 11 -kwin3_SUSE2_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/SUSE2.cpp $(srcdir)/SUSE2client.cpp $(srcdir)/SUSE2button.cpp $(srcdir)/misc.cpp $(srcdir)/shadow.cpp SUSE2button.moc SUSE2.moc - @echo 'creating kwin3_SUSE2_la.all_cpp.cpp ...'; \ - rm -f kwin3_SUSE2_la.all_cpp.files kwin3_SUSE2_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwin3_SUSE2_la.all_cpp.final; \ +twin3_SUSE2_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/SUSE2.cpp $(srcdir)/SUSE2client.cpp $(srcdir)/SUSE2button.cpp $(srcdir)/misc.cpp $(srcdir)/shadow.cpp SUSE2button.moc SUSE2.moc + @echo 'creating twin3_SUSE2_la.all_cpp.cpp ...'; \ + rm -f twin3_SUSE2_la.all_cpp.files twin3_SUSE2_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> twin3_SUSE2_la.all_cpp.final; \ for file in SUSE2.cpp SUSE2client.cpp SUSE2button.cpp misc.cpp shadow.cpp ; do \ - echo "#include \"$$file\"" >> kwin3_SUSE2_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin3_SUSE2_la.all_cpp.final; \ + echo "#include \"$$file\"" >> twin3_SUSE2_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> twin3_SUSE2_la.all_cpp.final; \ done; \ - cat kwin3_SUSE2_la.all_cpp.final kwin3_SUSE2_la.all_cpp.files > kwin3_SUSE2_la.all_cpp.cpp; \ - rm -f kwin3_SUSE2_la.all_cpp.final kwin3_SUSE2_la.all_cpp.files + cat twin3_SUSE2_la.all_cpp.final twin3_SUSE2_la.all_cpp.files > twin3_SUSE2_la.all_cpp.cpp; \ + rm -f twin3_SUSE2_la.all_cpp.final twin3_SUSE2_la.all_cpp.files #>+ 3 clean-final: - -rm -f kwin3_SUSE2_la.all_cpp.cpp + -rm -f twin3_SUSE2_la.all_cpp.cpp #>+ 3 final: - $(MAKE) kwin3_SUSE2_la_OBJECTS="$(kwin3_SUSE2_la_final_OBJECTS)" all-am + $(MAKE) twin3_SUSE2_la_OBJECTS="$(twin3_SUSE2_la_final_OBJECTS)" all-am #>+ 3 final-install: - $(MAKE) kwin3_SUSE2_la_OBJECTS="$(kwin3_SUSE2_la_final_OBJECTS)" install-am + $(MAKE) twin3_SUSE2_la_OBJECTS="$(twin3_SUSE2_la_final_OBJECTS)" install-am #>+ 3 no-final: - $(MAKE) kwin3_SUSE2_la_OBJECTS="$(kwin3_SUSE2_la_nofinal_OBJECTS)" all-am + $(MAKE) twin3_SUSE2_la_OBJECTS="$(twin3_SUSE2_la_nofinal_OBJECTS)" all-am #>+ 3 no-final-install: - $(MAKE) kwin3_SUSE2_la_OBJECTS="$(kwin3_SUSE2_la_nofinal_OBJECTS)" install-am + $(MAKE) twin3_SUSE2_la_OBJECTS="$(twin3_SUSE2_la_nofinal_OBJECTS)" install-am #>+ 3 kde-rpo-clean: diff --git a/src/SUSE2.cpp b/src/SUSE2.cpp index 570309b..f336167 100644 --- a/src/SUSE2.cpp +++ b/src/SUSE2.cpp @@ -27,9 +27,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -47,8 +47,8 @@ SUSE2Handler::SUSE2Handler() { memset(m_pixmaps, 0, sizeof(TQPixmap *) * NumButtonStatus * NumButtonIcons); // set elements to 0 - KGlobal::locale()->insertCatalogue("kwin_clients"); - KGlobal::locale()->insertCatalogue("kwin_SUSE2"); + TDEGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_SUSE2"); reset(0); } @@ -140,7 +140,7 @@ bool SUSE2Handler::supports( Ability ability ) const void SUSE2Handler::readConfig() { // create a config object - KConfig config("kwinSUSE2rc"); + TDEConfig config("twinSUSE2rc"); config.setGroup("General"); // grab settings @@ -186,7 +186,7 @@ void SUSE2Handler::readConfig() m_titleLogo = config.readBoolEntry("TitleBarLogo", true); m_titleLogoOffset = config.readNumEntry("TitleBarLogoOffset", 3); - m_titleLogoURL = config.readEntry("TitleBarLogoURL", locate("data", "kwin/pics/titlebar_decor.png")); + m_titleLogoURL = config.readEntry("TitleBarLogoURL", locate("data", "twin/pics/titlebar_decor.png")); } TQColor SUSE2Handler::getColor(KWinSUSE2::ColorType type, const bool active) const diff --git a/src/SUSE2.desktop b/src/SUSE2.desktop index 906eadd..723004a 100644 --- a/src/SUSE2.desktop +++ b/src/SUSE2.desktop @@ -1,4 +1,4 @@ [Desktop Entry] Name=SUSE2 Name[xx]=xxSUSE2xx -X-KDE-Library=kwin3_SUSE2 +X-TDE-Library=twin3_SUSE2 diff --git a/src/SUSE2client.cpp b/src/SUSE2client.cpp index ee443c5..a3a7f87 100644 --- a/src/SUSE2client.cpp +++ b/src/SUSE2client.cpp @@ -22,7 +22,7 @@ Boston, MA 02110-1301 USA. */ -#include +#include #include #include #include diff --git a/src/config/Makefile.am b/src/config/Makefile.am index 57d3bb8..c418cb3 100644 --- a/src/config/Makefile.am +++ b/src/config/Makefile.am @@ -1,9 +1,9 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kwin_SUSE2_config.la +kde_module_LTLIBRARIES = twin_SUSE2_config.la -kwin_SUSE2_config_la_SOURCES = config.cpp configdialog.ui -kwin_SUSE2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_SUSE2_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +twin_SUSE2_config_la_SOURCES = config.cpp configdialog.ui +twin_SUSE2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_SUSE2_config_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) METASOURCES = AUTO diff --git a/src/config/Makefile.in b/src/config/Makefile.in index bce9800..3a3f44d 100644 --- a/src/config/Makefile.in +++ b/src/config/Makefile.in @@ -58,15 +58,15 @@ am__installdirs = "$(DESTDIR)$(kde_moduledir)" kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(kde_module_LTLIBRARIES) am__DEPENDENCIES_1 = -kwin_SUSE2_config_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +twin_SUSE2_config_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am_kwin_SUSE2_config_la_OBJECTS = config.lo -#>- kwin_SUSE2_config_la_OBJECTS = $(am_kwin_SUSE2_config_la_OBJECTS) +am_twin_SUSE2_config_la_OBJECTS = config.lo +#>- twin_SUSE2_config_la_OBJECTS = $(am_twin_SUSE2_config_la_OBJECTS) #>+ 4 -kwin_SUSE2_config_la_final_OBJECTS = kwin_SUSE2_config_la.all_cpp.lo -kwin_SUSE2_config_la_nofinal_OBJECTS = config.lo configdialog.lo -@KDE_USE_FINAL_FALSE@kwin_SUSE2_config_la_OBJECTS = $(kwin_SUSE2_config_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kwin_SUSE2_config_la_OBJECTS = $(kwin_SUSE2_config_la_final_OBJECTS) +twin_SUSE2_config_la_final_OBJECTS = twin_SUSE2_config_la.all_cpp.lo +twin_SUSE2_config_la_nofinal_OBJECTS = config.lo configdialog.lo +@KDE_USE_FINAL_FALSE@twin_SUSE2_config_la_OBJECTS = $(twin_SUSE2_config_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@twin_SUSE2_config_la_OBJECTS = $(twin_SUSE2_config_la_final_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles @@ -88,8 +88,8 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(kwin_SUSE2_config_la_SOURCES) -DIST_SOURCES = $(kwin_SUSE2_config_la_SOURCES) +SOURCES = $(twin_SUSE2_config_la_SOURCES) +DIST_SOURCES = $(twin_SUSE2_config_la_SOURCES) ETAGS = etags CTAGS = ctags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -181,24 +181,24 @@ LIBUTIL = @LIBUTIL@ LIBZ = @LIBZ@ LIB_KAB = @LIB_KAB@ LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ +LIB_TDECORE = @LIB_TDECORE@ LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ +LIB_TDEPIM = @LIB_TDEPIM@ +LIB_TDEPRINT = @LIB_TDEPRINT@ +LIB_TDEUI = @LIB_TDEUI@ +LIB_TDEDNSSD = @LIB_TDEDNSSD@ LIB_KFILE = @LIB_KFILE@ LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ +LIB_TDEHTML = @LIB_TDEHTML@ +LIB_TDEIMPROXY = @LIB_TDEIMPROXY@ +LIB_TDEIO = @LIB_TDEIO@ LIB_KJS = @LIB_KJS@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUNITTEST = @LIB_TDEUNITTEST@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ @@ -209,7 +209,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -310,7 +310,7 @@ kde_styledir = @kde_styledir@ kde_templatesdir = @kde_templatesdir@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ +tdeinitdir = @tdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -340,12 +340,12 @@ xdg_appsdir = @xdg_appsdir@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kwin_SUSE2_config.la -#>- kwin_SUSE2_config_la_SOURCES = config.cpp configdialog.ui +kde_module_LTLIBRARIES = twin_SUSE2_config.la +#>- twin_SUSE2_config_la_SOURCES = config.cpp configdialog.ui #>+ 1 -kwin_SUSE2_config_la_SOURCES=config.cpp configdialog.cpp -kwin_SUSE2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_SUSE2_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +twin_SUSE2_config_la_SOURCES=config.cpp configdialog.cpp +twin_SUSE2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_SUSE2_config_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) #>- METASOURCES = AUTO #>- all: all-am #>+ 1 @@ -422,11 +422,11 @@ clean-kde_moduleLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -#>- kwin_SUSE2_config.la: $(kwin_SUSE2_config_la_OBJECTS) $(kwin_SUSE2_config_la_DEPENDENCIES) +#>- twin_SUSE2_config.la: $(twin_SUSE2_config_la_OBJECTS) $(twin_SUSE2_config_la_DEPENDENCIES) #>+ 2 -@KDE_USE_CLOSURE_TRUE@kwin_SUSE2_config.la: kwin_SUSE2_config.la.closure $(kwin_SUSE2_config_la_OBJECTS) $(kwin_SUSE2_config_la_DEPENDENCIES) -@KDE_USE_CLOSURE_FALSE@kwin_SUSE2_config.la: $(kwin_SUSE2_config_la_OBJECTS) $(kwin_SUSE2_config_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(kwin_SUSE2_config_la_LDFLAGS) $(kwin_SUSE2_config_la_OBJECTS) $(kwin_SUSE2_config_la_LIBADD) $(LIBS) +@KDE_USE_CLOSURE_TRUE@twin_SUSE2_config.la: twin_SUSE2_config.la.closure $(twin_SUSE2_config_la_OBJECTS) $(twin_SUSE2_config_la_DEPENDENCIES) +@KDE_USE_CLOSURE_FALSE@twin_SUSE2_config.la: $(twin_SUSE2_config_la_OBJECTS) $(twin_SUSE2_config_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(twin_SUSE2_config_la_LDFLAGS) $(twin_SUSE2_config_la_OBJECTS) $(twin_SUSE2_config_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -651,12 +651,12 @@ uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES .NOEXPORT: #>+ 8 -kwin_SUSE2_config.la.closure: $(kwin_SUSE2_config_la_OBJECTS) $(kwin_SUSE2_config_la_DEPENDENCIES) - @echo "int main() {return 0;}" > kwin_SUSE2_config_la_closure.cpp - @$(LTCXXCOMPILE) -c kwin_SUSE2_config_la_closure.cpp - $(CXXLINK) kwin_SUSE2_config_la_closure.lo $(kwin_SUSE2_config_la_LDFLAGS) $(kwin_SUSE2_config_la_OBJECTS) $(kwin_SUSE2_config_la_LIBADD) $(LIBS) - @rm -f kwin_SUSE2_config_la_closure.* kwin_SUSE2_config.la.closure - @echo "timestamp" > kwin_SUSE2_config.la.closure +twin_SUSE2_config.la.closure: $(twin_SUSE2_config_la_OBJECTS) $(twin_SUSE2_config_la_DEPENDENCIES) + @echo "int main() {return 0;}" > twin_SUSE2_config_la_closure.cpp + @$(LTCXXCOMPILE) -c twin_SUSE2_config_la_closure.cpp + $(CXXLINK) twin_SUSE2_config_la_closure.lo $(twin_SUSE2_config_la_LDFLAGS) $(twin_SUSE2_config_la_OBJECTS) $(twin_SUSE2_config_la_LIBADD) $(LIBS) + @rm -f twin_SUSE2_config_la_closure.* twin_SUSE2_config.la.closure + @echo "timestamp" > twin_SUSE2_config.la.closure #>+ 3 @@ -680,7 +680,7 @@ clean-ui: #>+ 3 clean-closures: - -rm -f kwin_SUSE2_config.la.closure + -rm -f twin_SUSE2_config.la.closure #>+ 2 docs-am: @@ -724,36 +724,36 @@ bcheck-am: #>+ 11 -kwin_SUSE2_config_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/config.cpp $(srcdir)/configdialog.cpp configdialog.moc config.moc - @echo 'creating kwin_SUSE2_config_la.all_cpp.cpp ...'; \ - rm -f kwin_SUSE2_config_la.all_cpp.files kwin_SUSE2_config_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwin_SUSE2_config_la.all_cpp.final; \ +twin_SUSE2_config_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/config.cpp $(srcdir)/configdialog.cpp configdialog.moc config.moc + @echo 'creating twin_SUSE2_config_la.all_cpp.cpp ...'; \ + rm -f twin_SUSE2_config_la.all_cpp.files twin_SUSE2_config_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> twin_SUSE2_config_la.all_cpp.final; \ for file in config.cpp configdialog.cpp ; do \ - echo "#include \"$$file\"" >> kwin_SUSE2_config_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_SUSE2_config_la.all_cpp.final; \ + echo "#include \"$$file\"" >> twin_SUSE2_config_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> twin_SUSE2_config_la.all_cpp.final; \ done; \ - cat kwin_SUSE2_config_la.all_cpp.final kwin_SUSE2_config_la.all_cpp.files > kwin_SUSE2_config_la.all_cpp.cpp; \ - rm -f kwin_SUSE2_config_la.all_cpp.final kwin_SUSE2_config_la.all_cpp.files + cat twin_SUSE2_config_la.all_cpp.final twin_SUSE2_config_la.all_cpp.files > twin_SUSE2_config_la.all_cpp.cpp; \ + rm -f twin_SUSE2_config_la.all_cpp.final twin_SUSE2_config_la.all_cpp.files #>+ 3 clean-final: - -rm -f kwin_SUSE2_config_la.all_cpp.cpp + -rm -f twin_SUSE2_config_la.all_cpp.cpp #>+ 3 final: - $(MAKE) kwin_SUSE2_config_la_OBJECTS="$(kwin_SUSE2_config_la_final_OBJECTS)" all-am + $(MAKE) twin_SUSE2_config_la_OBJECTS="$(twin_SUSE2_config_la_final_OBJECTS)" all-am #>+ 3 final-install: - $(MAKE) kwin_SUSE2_config_la_OBJECTS="$(kwin_SUSE2_config_la_final_OBJECTS)" install-am + $(MAKE) twin_SUSE2_config_la_OBJECTS="$(twin_SUSE2_config_la_final_OBJECTS)" install-am #>+ 3 no-final: - $(MAKE) kwin_SUSE2_config_la_OBJECTS="$(kwin_SUSE2_config_la_nofinal_OBJECTS)" all-am + $(MAKE) twin_SUSE2_config_la_OBJECTS="$(twin_SUSE2_config_la_nofinal_OBJECTS)" all-am #>+ 3 no-final-install: - $(MAKE) kwin_SUSE2_config_la_OBJECTS="$(kwin_SUSE2_config_la_nofinal_OBJECTS)" install-am + $(MAKE) twin_SUSE2_config_la_OBJECTS="$(twin_SUSE2_config_la_nofinal_OBJECTS)" install-am #>+ 3 kde-rpo-clean: @@ -770,7 +770,7 @@ config.o: config.moc configdialog.cpp: $(srcdir)/configdialog.ui configdialog.h configdialog.moc rm -f configdialog.cpp echo '#include ' > configdialog.cpp - echo '#include ' >> configdialog.cpp + echo '#include ' >> configdialog.cpp $(UIC) -tr ${UIC_TR} -i configdialog.h $(srcdir)/configdialog.ui > configdialog.cpp.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" configdialog.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_configdialog,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> configdialog.cpp ;\ rm -f configdialog.cpp.temp ;\ diff --git a/src/config/config.cpp b/src/config/config.cpp index 7ff53f7..d0a72bf 100644 --- a/src/config/config.cpp +++ b/src/config/config.cpp @@ -35,29 +35,29 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include -#include +#include #include #include "config.h" #include "configdialog.h" -SUSE2Config::SUSE2Config(KConfig *config, TQWidget *parent) +SUSE2Config::SUSE2Config(TDEConfig *config, TQWidget *parent) : TQObject(parent), m_config(0), m_dialog(0) { m_parent = parent; // create the configuration object - m_config = new KConfig("kwinSUSE2rc"); - KGlobal::locale()->insertCatalogue("kwin_clients"); - KGlobal::locale()->insertCatalogue("kwin_SUSE2"); + m_config = new TDEConfig("twinSUSE2rc"); + TDEGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_SUSE2"); // create and show the configuration dialog m_dialog = new ConfigDialog(parent); @@ -102,7 +102,7 @@ SUSE2Config::~SUSE2Config() if (m_config) delete m_config; } -void SUSE2Config::load(KConfig *) +void SUSE2Config::load(TDEConfig *) { m_config->setGroup("General"); @@ -172,14 +172,14 @@ void SUSE2Config::load(KConfig *) int titleBarLogoOffset = m_config->readNumEntry("TitleBarLogoOffset", 3); m_dialog->titleBarLogoOffset->setValue(titleBarLogoOffset); - TQString titleBarImage = locate("data", "kwin/pics/titlebar_decor.png"); + TQString titleBarImage = locate("data", "twin/pics/titlebar_decor.png"); titlebarLogoURL = m_config->readEntry("TitleBarLogoURL", titleBarImage); TQImage tmpLogo = TQImage::TQImage(titlebarLogoURL); m_dialog->logoImage->setPixmap(TQPixmap(tmpLogo.smoothScale(120, 20, TQImage::ScaleMin))); } -void SUSE2Config::save(KConfig *) const +void SUSE2Config::save(TDEConfig *) const { m_config->setGroup("General"); @@ -237,7 +237,7 @@ void SUSE2Config::defaults() m_dialog->titleBarLogo->setChecked(false); m_dialog->titleBarLogoOffset->setValue(3); - titlebarLogoURL = locate("data", "kwin/pics/titlebar_decor.png"); + titlebarLogoURL = locate("data", "twin/pics/titlebar_decor.png"); TQImage tmpLogo = TQImage::TQImage(titlebarLogoURL); m_dialog->logoImage->setPixmap(TQPixmap(tmpLogo.smoothScale(120, 20, TQImage::ScaleMin))); } @@ -274,7 +274,7 @@ void SUSE2Config::selectImage() extern "C" { - KDE_EXPORT TQObject *allocate_config(KConfig *config, TQWidget *parent) { + KDE_EXPORT TQObject *allocate_config(TDEConfig *config, TQWidget *parent) { return (new SUSE2Config(config, parent)); } } diff --git a/src/config/config.h b/src/config/config.h index 704f38e..8863792 100644 --- a/src/config/config.h +++ b/src/config/config.h @@ -28,7 +28,7 @@ class TQButtonGroup; class TQGroupBox; -class KConfig; +class TDEConfig; class ConfigDialog; class SUSE2Config : public TQObject @@ -36,20 +36,20 @@ class SUSE2Config : public TQObject Q_OBJECT public: - SUSE2Config(KConfig *config, TQWidget *parent); + SUSE2Config(TDEConfig *config, TQWidget *parent); ~SUSE2Config(); signals: void changed(); public slots: - void load(KConfig *config); - void save(KConfig *config) const; + void load(TDEConfig *config); + void save(TDEConfig *config) const; void defaults(); private: TQWidget *m_parent; - KConfig *m_config; + TDEConfig *m_config; ConfigDialog *m_dialog; TQString titlebarLogoURL; diff --git a/src/shadow.cpp b/src/shadow.cpp index 99a424f..ef97c39 100644 --- a/src/shadow.cpp +++ b/src/shadow.cpp @@ -1,7 +1,7 @@ /* Copyright (C) 2005 Gerd Fleischer * Copyright (C) 2003 by Sandro Giessl * based on the nice CVS KDesktop KShadowEngine class. thanks! - * looking forward to see KShadowEngine in kdefx somewhen btw.. :) + * looking forward to see KShadowEngine in tdefx somewhen btw.. :) * ------------------------------------------------------------------------ * these are the original copyright notes: * This file is proposed to be part of the KDE libraries. diff --git a/src/shadow.h b/src/shadow.h index d8814ff..c2e7966 100644 --- a/src/shadow.h +++ b/src/shadow.h @@ -1,7 +1,7 @@ /* Copyright (C) 2005 Gerd Fleischer * Copyright (C) 2003 by Sandro Giessl * based on the nice CVS KDesktop KShadowEngine class. thanks! - * looking forward to see KShadowEngine in kdefx somewhen btw.. :) + * looking forward to see KShadowEngine in tdefx somewhen btw.. :) * ------------------------------------------------------------------------ * these are the original copyright notes: * This file is proposed to be part of the KDE libraries. diff --git a/suse2.kdevelop b/suse2.tdevelop similarity index 99% rename from suse2.kdevelop rename to suse2.tdevelop index 0fddfac..3299ad0 100644 --- a/suse2.kdevelop +++ b/suse2.tdevelop @@ -1,5 +1,5 @@ - + Gerd Fleischer gerdfleischer@web.de @@ -203,4 +203,4 @@ -f0 -1 - +