Browse Source

Initial TDE conversion

tags/r14.0.0
Slávek Banko 6 years ago
parent
commit
39500a10a6

+ 4
- 4
ChangeLog View File

@@ -1,5 +1,5 @@
10-05-08 - Kurt Granroth (3.9)
o Converted KBiff into a full-fledged kdeinit module compatible
o Converted KBiff into a full-fledged tdeinit module compatible
with the latest KDE 3.5 (previous support was outdated)
o Yet more tweaks to compile under the gcc 4.x running target
without warnings
@@ -144,7 +144,7 @@

05-25-01 - Kurt Granroth
o Use KRun::runCommand to start programs instead of the homegrown
code using KProcess
code using TDEProcess

05-25-01 - Balaji Ramani
o Fixed sizing of status window.
@@ -153,7 +153,7 @@
o If the state is already New in the POP3 code, just emit the
currentState signal (no more dialog box for each new mail).
Thanks to Steve Evans <stevee@zuken.co.uk> for the heads up.
o Make kbiff a kdeinit module (should save some memory). Thanks to
o Make kbiff a tdeinit module (should save some memory). Thanks to
Lubos Lunak <l.lunak@sh.cvut.cz> for the patch!
o Added "hicolor" 16x16 icon since locolor icons are no longer the
default in KDE
@@ -355,7 +355,7 @@
to fail even though there is code to get around that...(patched)

01-13-99 - Kurt Granroth
o Put KProcess handling code by itself so that all executing code passes
o Put TDEProcess handling code by itself so that all executing code passes
through it.
o Added profile name to tooltip

+ 136
- 136
acinclude.m4 View File

@@ -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)])
KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS)
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
@@ -1226,7 +1226,7 @@ if test $kde_qtver = 4; then
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${tdelibsuff}/qt-3.3"
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
@@ -1426,7 +1426,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
])

@@ -1475,7 +1475,7 @@ ac_qt_includes="$qt_incdir"

qt_libdirs=""
for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir/lib $dir"
done
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -1668,11 +1668,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.
])
@@ -1809,16 +1809,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"
@@ -1829,8 +1829,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!])
fi

kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/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"
@@ -1848,7 +1848,7 @@ fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by kdelibs])
by tdelibs])
fi

if test -n "$kde_widgetdir"; then
@@ -1863,7 +1863,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"

@@ -2003,20 +2003,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h>

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");
@@ -2054,7 +2054,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([
@@ -2088,48 +2088,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_KIO, "-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_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest")
AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-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_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-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_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-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
])

@@ -2194,7 +2194,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
@@ -2513,7 +2513,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
])

@@ -2571,7 +2571,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
@@ -3514,7 +3514,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)

@@ -3527,9 +3527,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 <stdio.h>
@@ -3537,26 +3537,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
])

@@ -3574,7 +3574,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
@@ -4581,7 +4581,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)
@@ -4971,14 +4971,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
@@ -5002,25 +5002,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`
@@ -5028,7 +5028,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
@@ -5114,15 +5114,15 @@ pushdef([AC_PROG_INSTALL],
fi
])dnl

AC_DEFUN([KDE_LANG_CPLUSPLUS],
AC_DEFUN([TDE_LANG_CPLUSPLUS],
[AC_LANG_CPLUSPLUS
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS])
pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) TDE_LANG_CPLUSPLUS])
])

pushdef([AC_LANG_CPLUSPLUS],
[popdef([AC_LANG_CPLUSPLUS])
KDE_LANG_CPLUSPLUS
TDE_LANG_CPLUSPLUS
])

AC_DEFUN([KDE_CHECK_LONG_LONG],
@@ -5686,7 +5686,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
@@ -5706,7 +5706,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
@@ -5943,9 +5943,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])

+ 2
- 2
configure.in View File

@@ -120,13 +120,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

+ 1
- 1
doc/de/kbiff/Makefile.am View File

@@ -1,3 +1,3 @@

KDE_DOCS = AUTO
KDE_LANG = de
TDE_LANG = de

+ 5
- 5
doc/de/kbiff/index.docbook View File

@@ -493,17 +493,17 @@ ist aber m&ouml;glich das diese Gruppe aus nur einem einzigen Postfach besteht.<

<para>KBiff sucht nach den Icons im normalen KDE Icon-Pfad. Derzeit ist dies:</para>

<para><programlisting>kdedir()/share/apps/kbiff/toolbar
kdedir()/share/toolbar
kdedir()/share/icons
kdedir()/share/apps/kbiff/pics
<para><programlisting>tdedir()/share/apps/kbiff/toolbar
tdedir()/share/toolbar
tdedir()/share/icons
tdedir()/share/apps/kbiff/pics
&dollar;HOME/.kde/share/apps/kbiff/toolbar
&dollar;HOME/.kde/share/toolbar
&dollar;HOME/.kde/share/icons
&dollar;HOME/.kde/share/apps/kbiff/pics</programlisting>
</para>

<para>&Uuml;blicherweise steht "kdedir()" f&uuml;r "/opt/kde" und &dollar;HOME ist ihr "home
<para>&Uuml;blicherweise steht "tdedir()" f&uuml;r "/opt/kde" und &dollar;HOME ist ihr "home
directory" (= Heimatverzeichnis). Wenn Sie eigene Icons verwenden m&ouml;chten,
k&ouml;nnen Sie diese einfach in eines der genannten Verzeichnisse einf&uuml;gen. Am
besten geeignet ist <literal>&dollar;HOME/.kde/share/apps/kbiff/pics</literal></para>

+ 1
- 1
doc/en/kbiff/Makefile.am View File

@@ -1,2 +1,2 @@
KDE_LANG = en
TDE_LANG = en
KDE_DOCS = AUTO

+ 5
- 5
doc/en/kbiff/index.docbook View File

@@ -512,17 +512,17 @@ a physical entity that can be monitored by KBiff. An example of a mailbox is
<para>Short answer: select them using the setup dialog.
Longer answer: KBiff
searches for its icons in the standard KDE icon path. Currently, this is
<programlisting>kdedir()/share/apps/kbiff/toolbar
kdedir()/share/toolbar
kdedir()/share/icons
kdedir()/share/apps/kbiff/pics
<programlisting>tdedir()/share/apps/kbiff/toolbar
tdedir()/share/toolbar
tdedir()/share/icons
tdedir()/share/apps/kbiff/pics
&dollar;HOME/.kde/share/apps/kbiff/toolbar
&dollar;HOME/.kde/share/toolbar
&dollar;HOME/.kde/share/icons
&dollar;HOME/.kde/share/apps/kbiff/pics</programlisting>
</para>

<para>Where "kdedir()" is usally "/opt/kde" and &dollar;HOME is your home
<para>Where "tdedir()" is usally "/opt/kde" and &dollar;HOME is your home
directory. If you put your pixmaps in any of these directories (the last one
listed is recommended), then KBiff should have no problems finding and using
them.</para>

+ 1
- 1
doc/es/kbiff/Makefile.am View File

@@ -1,4 +1,4 @@

KDE_LANG = es
TDE_LANG = es
KDE_DOCS = AUTO


+ 5
- 5
doc/es/kbiff/index.docbook View File

@@ -536,17 +536,17 @@ física que puede ser monitorizada por KBiff. Un ejemplo de buzón es
Respuesta más larga: KBiff
busca los iconos en el trayecto estandar de KDE para los iconos.
Actualmente es
<programlisting>kdedir()/share/apps/kbiff/toolbar
kdedir()/share/toolbar
kdedir()/share/icons
kdedir()/share/apps/kbiff/pics
<programlisting>tdedir()/share/apps/kbiff/toolbar
tdedir()/share/toolbar
tdedir()/share/icons
tdedir()/share/apps/kbiff/pics
&dollar;HOME/.kde/share/apps/kbiff/toolbar
&dollar;HOME/.kde/share/toolbar
&dollar;HOME/.kde/share/icons
&dollar;HOME/.kde/share/apps/kbiff/pics</programlisting>
</para>

<para>Donde "kdedir()" es a menudo "/opt/kde" y &dollar;HOME es tu directorio
<para>Donde "tdedir()" es a menudo "/opt/kde" y &dollar;HOME es tu directorio
habitual. Si pones tus propios iconos en cualquiera de esos directorios (se
recomienda el último de los listados), entonces KBiff no deberá tener
problemas para encontrarlos y usarlos.</para>

+ 1
- 1
doc/fr/kbiff/Makefile.am View File

@@ -1,3 +1,3 @@
KDE_LANG = fr
TDE_LANG = fr
KDE_DOCS = AUTO


+ 6
- 6
doc/fr/kbiff/index.docbook View File

@@ -139,7 +139,7 @@ toujours sur le site de
KBiff, à l'adresse
<ulink
url="http://www.granroth.org/kbiff">http://www.granroth.org/kbiff</ulink>.
KBiff fait également à présent partie du paquetage réseau "kdenetwork" et donc la version
KBiff fait également à présent partie du paquetage réseau "tdenetwork" et donc la version
en cours de développement se trouve toujours dans le référentiel CVS de
KDE.</para>
</sect1>
@@ -640,17 +640,17 @@ de boîte aux lettres est "/usr/var/username".</para>
<para>Réponse rapide: choisissez-les dans le menu de configuration.
Reponse plus approfondie: KBiff recherche ses icônes dans le chemin des icônes
de KDE. En ce moment, elles sont dans
<programlisting>kdedir()/share/apps/kbiff/toolbar
kdedir()/share/toolbar
kdedir()/share/icons
kdedir()/share/apps/kbiff/pics
<programlisting>tdedir()/share/apps/kbiff/toolbar
tdedir()/share/toolbar
tdedir()/share/icons
tdedir()/share/apps/kbiff/pics
&dollar;HOME/.kde/share/apps/kbiff/toolbar
&dollar;HOME/.kde/share/toolbar
&dollar;HOME/.kde/share/icons
&dollar;HOME/.kde/share/apps/kbiff/pics</programlisting>
</para>

<para>Où "kdedir()" est habituellement "/opt/kde" et où &dollar;HOME est votre
<para>Où "tdedir()" est habituellement "/opt/kde" et où &dollar;HOME est votre
répertoire personnel. Si vous placez vos images dans l'un de ces répertoires
(le dernier de la liste étant celui qu'on recommande), alors KBiff
ne devrait pas avoir de problèmes à les trouver et à les utiliser</para>

+ 1
- 1
kbiff/Makefile.am View File

@@ -12,7 +12,7 @@ SUBDIRS = pics
# you can add here more. This one gets installed
bin_PROGRAMS =
lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kbiff.la
tdeinit_LTLIBRARIES = kbiff.la

# Which sources should be compiled for kbiff.
kbiff_la_SOURCES = setupdlg.cpp kbiff.cpp main.cpp kbiffmonitor.cpp \

+ 12
- 12
kbiff/kbiff.cpp View File

@@ -11,15 +11,15 @@
#include <ntqtooltip.h>

#include <kaudioplayer.h>
#include <kconfig.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <tdeglobal.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kprocess.h>
#include <krun.h>
#include <kwin.h>
#include <twin.h>

#include "setupdlg.h"
#include "notify.h"
@@ -198,7 +198,7 @@ bool KBiff::isDocked() const

void KBiff::readSessionConfig()
{
KConfig *config = kapp->sessionConfig();
TDEConfig *config = kapp->sessionConfig();

config->setGroup("KBiff");

@@ -354,7 +354,7 @@ void KBiff::saveYourself()
{
if (sessions)
{
KConfig *config = kapp->sessionConfig();
TDEConfig *config = kapp->sessionConfig();
config->setGroup("KBiff");

config->writeEntry("Profile", profile);
@@ -454,7 +454,7 @@ void KBiff::displayPixmap()
pixmap_name = info.dirPath() + "/" + filename;
}
}
TQString filename = KGlobal::iconLoader()->iconPath( pixmap_name, KIcon::User );
TQString filename = TDEGlobal::iconLoader()->iconPath( pixmap_name, TDEIcon::User );
TQFileInfo file(filename);

// at this point, we have the file to display. so display it
@@ -542,8 +542,8 @@ void KBiff::haveNewMail(const int num, const TQString& the_mailbox)
notify_dlg->show();

// half-hearted attempt to center this
int x_pos = (KApplication::desktop()->width() - notify_dlg->width()) / 2;
int y_pos = (KApplication::desktop()->height() - notify_dlg->height()) / 2;
int x_pos = (TDEApplication::desktop()->width() - notify_dlg->width()) / 2;
int y_pos = (TDEApplication::desktop()->height() - notify_dlg->height()) / 2;
notify_dlg->move(x_pos, y_pos);
}
}
@@ -720,7 +720,7 @@ void KBiff::start()
///////////////////////////////////////////////////////////////////////////
void KBiff::popupMenu()
{
KPopupMenu *popup = new KPopupMenu(0, "popup");
TDEPopupMenu *popup = new TDEPopupMenu(0, "popup");
popup->insertTitle(kapp->miniIcon(), profile);

// if secure, disable everything but exit

+ 1
- 1
kbiff/kbiffcodec.cpp View File

@@ -1,5 +1,5 @@
/*
This is taken from kdmcodec.h from kdelibs/kdecore in KDE 2.2
This is taken from tdmcodec.h from tdelibs/tdecore in KDE 2.2
-------------------------------------------------------------

Copyright (C) 2000-2001 Dawit Alemayehu <adawit@kde.org>

+ 1
- 1
kbiff/kbiffcodec.h View File

@@ -1,5 +1,5 @@
/*
This is taken from kdmcodec.h from kdelibs/kdecore in KDE 2.2
This is taken from tdmcodec.h from tdelibs/tdecore in KDE 2.2
-------------------------------------------------------------

Copyright (C) 2000-2001 Dawit Alemayehu <adawit@kde.org>

+ 1
- 1
kbiff/kbiffmonitor.cpp View File

@@ -8,7 +8,7 @@
#include "kbiffmonitor.h"
#include "kbiffmonitor.moc"

#include <kmessagebox.h>
#include <tdemessagebox.h>

#include <sys/types.h>
#ifndef __STRICT_ANSI__

+ 11
- 11
kbiff/main.cpp View File

@@ -1,17 +1,17 @@
#include "kbiff.h"
#include "version.h"
#include <kwin.h>
#include <twin.h>
#include <kapp.h>
#include <klocale.h>
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>

#include "setupdlg.h"

static const char *description =
I18N_NOOP("Full featured mail notification utility.");

static KCmdLineOptions option[] =
static TDECmdLineOptions option[] =
{
{ "secure", I18N_NOOP("Run in secure mode"), 0 },
{ "profile <profile>", I18N_NOOP("Use 'profile'"), 0 },
@@ -20,14 +20,14 @@ static KCmdLineOptions option[] =

extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KAboutData aboutData( "kbiff", I18N_NOOP("KBiff"),
kbiff_version, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kbiff", I18N_NOOP("KBiff"),
kbiff_version, description, TDEAboutData::License_GPL,
"(c) 1998-2008, Kurt Granroth");
aboutData.addAuthor("Kurt Granroth",0, "granroth@kde.org");
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions(option);
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions(option);

KApplication app;
TDEApplication app;
KBiff kbiff(app.dcopClient());
KBiffSetup* setup = 0;
bool is_secure = false;
@@ -36,7 +36,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])

app.setMainWidget(&kbiff);

KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

is_secure = args->isSet("secure");


+ 3
- 3
kbiff/notify.cpp View File

@@ -14,11 +14,11 @@
#include <ntqpushbutton.h>

#include <kapp.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kprocess.h>
#include <kwin.h>
#include <twin.h>

KBiffNotify::KBiffNotify(TQWidget *parent_, const int num_new,
const TQString& mailbx)

+ 18
- 18
kbiff/setupdlg.cpp View File

@@ -29,19 +29,19 @@
#include <ntqstylesheet.h>

#include <kaudioplayer.h>
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <tdemessagebox.h>
#include <tdefiledialog.h>
#include <kapp.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kstddirs.h>
#include <ksimpleconfig.h>
#include <kbiffurl.h>
#include <kprocess.h>
#include <krun.h>
#include <kurllabel.h>
#include <kwin.h>
#include <twin.h>

#include <kbiffcodec.h>
#include "version.h"
@@ -563,36 +563,36 @@ KBiffGeneralTab::KBiffGeneralTab(const TQString& profile_, TQWidget *parent_)

// "stopped" pixmap button
TQLabel* stopped_label = new TQLabel(i18n("&Stopped:"), icons_groupbox);
buttonStopped = new KIconButton(icons_groupbox);
buttonStopped = new TDEIconButton(icons_groupbox);
buttonStopped->setFixedSize(50, 50);
buttonStopped->setIconType(KIcon::User, KIcon::Any, true);
buttonStopped->setIconType(TDEIcon::User, TDEIcon::Any, true);
stopped_label->setBuddy(buttonStopped);

// "no mailbox" pixmap button
TQLabel* noconn_label = new TQLabel(i18n("No Mail&box:"), icons_groupbox);
buttonNoConn = new KIconButton(icons_groupbox);
buttonNoConn = new TDEIconButton(icons_groupbox);
buttonNoConn->setFixedSize(50, 50);
buttonNoConn->setIconType(KIcon::User, KIcon::Any, true);
buttonNoConn->setIconType(TDEIcon::User, TDEIcon::Any, true);
noconn_label->setBuddy(buttonNoConn);

// "no mail" pixmap button
TQLabel* nomail_label = new TQLabel(i18n("No M&ail:"), icons_groupbox);
buttonNoMail = new KIconButton(icons_groupbox);
buttonNoMail->setIconType(KIcon::User, KIcon::Any, true);
buttonNoMail = new TDEIconButton(icons_groupbox);
buttonNoMail->setIconType(TDEIcon::User, TDEIcon::Any, true);
buttonNoMail->setFixedSize(50, 50);
nomail_label->setBuddy(buttonNoMail);

// "old mail" pixmap button
TQLabel* oldmail_label = new TQLabel(i18n("O&ld Mail:"), icons_groupbox);
buttonOldMail = new KIconButton(icons_groupbox);
buttonOldMail->setIconType(KIcon::User, KIcon::Any, true);
buttonOldMail = new TDEIconButton(icons_groupbox);
buttonOldMail->setIconType(TDEIcon::User, TDEIcon::Any, true);
buttonOldMail->setFixedSize(50, 50);
oldmail_label->setBuddy(buttonOldMail);

// "new mail" pixmap button
TQLabel* newmail_label = new TQLabel(i18n("N&ew Mail:"), icons_groupbox);
buttonNewMail = new KIconButton(icons_groupbox);
buttonNewMail->setIconType(KIcon::User, KIcon::Any, true);
buttonNewMail = new TDEIconButton(icons_groupbox);
buttonNewMail->setIconType(TDEIcon::User, TDEIcon::Any, true);
buttonNewMail->setFixedSize(50, 50);
newmail_label->setBuddy(buttonNewMail);

@@ -757,7 +757,7 @@ static TQString justIconName(const TQString& icon_name)
return icon_name;

// now we see if we can load based just on the basename
TQPixmap icon = KGlobal::iconLoader()->loadIcon( info.baseName(), KIcon::User );
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( info.baseName(), TDEIcon::User );

// if it's null, then it's in a non-standard path so we must use an
// absolute path. no need to go further
@@ -766,8 +766,8 @@ static TQString justIconName(const TQString& icon_name)

// now we know that the icon loader can find it.. but is it the same
// one as the one the user picked?
if ( KGlobal::iconLoader()->iconPath( info.baseName(), KIcon::User ) !=
KGlobal::iconLoader()->iconPath( icon_name, KIcon::User ) )
if ( TDEGlobal::iconLoader()->iconPath( info.baseName(), TDEIcon::User ) !=
TDEGlobal::iconLoader()->iconPath( icon_name, TDEIcon::User ) )
return icon_name;

// FINALLY done! if we got this far, then we know that the icon

+ 5
- 5
kbiff/setupdlg.h View File

@@ -132,11 +132,11 @@ private:
TQCheckBox* checkNoSession;
TQCheckBox* checkNoStartup;

KIconButton *buttonNoMail;
KIconButton *buttonOldMail;
KIconButton *buttonNewMail;
KIconButton *buttonNoConn;
KIconButton *buttonStopped;
TDEIconButton *buttonNoMail;
TDEIconButton *buttonOldMail;
TDEIconButton *buttonNewMail;
TDEIconButton *buttonNoConn;
TDEIconButton *buttonStopped;
};

class KBiffNewMailTab : public TQWidget

+ 2
- 2
kbiff/status.cpp View File

@@ -9,7 +9,7 @@
#include "status.moc"

#include <kapp.h>
#include <klocale.h>
#include <tdelocale.h>

#include <ntqdesktopwidget.h>
#include <ntqpoint.h>
@@ -77,7 +77,7 @@ void KBiffStatus::updateListView(const KBiffStatusList& list)

void KBiffStatus::popup(const TQPoint& pos_)
{
TQDesktopWidget *desktop = KApplication::desktop();
TQDesktopWidget *desktop = TDEApplication::desktop();
int cx = pos_.x(), cy = pos_.y();

// for some reason, the width and height are incorrect until

+ 1
- 1
po/Makefile.am View File

@@ -1,3 +1,3 @@
POFILES = AUTO
KDE_LANG = br cs da de es et fi fr he hr hu is it ja nl nb nn pl pt pt_BR \
TDE_LANG = br cs da de es et fi fr he hr hu is it ja nl nb nn pl pt pt_BR \
ro sk sl sv tr uk zh_TW.Big5

+ 1
- 1
po/de.po View File

@@ -4,7 +4,7 @@ msgstr ""
"POT-Creation-Date: 2001-07-20 12:58-0700\n"
"PO-Revision-Date: 2000-08-13 13:37+MET\n"
"Last-Translator: Thomas Diehl <thd@kde.org>\n"
"Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
"Language-Team: Deutsch <tde-i18n-de@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

+ 1
- 1
po/hr.po View File

@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: kdenetwork\n"
"Project-Id-Version: tdenetwork\n"
"POT-Creation-Date: 2001-07-20 12:58-0700\n"
"PO-Revision-Date: Wed Dec 1 1999 13:45:21+0200\n"
"Last-Translator: Vladimir Vuksan <vuksan@veus.hr>\n"

+ 1
- 1
po/it.po View File

@@ -4,7 +4,7 @@ msgstr ""
"POT-Creation-Date: 2001-07-20 12:58-0700\n"
"PO-Revision-Date: 2000-09-06 09:59GMT+2\n"
"Last-Translator: Andrea Rizzi <rizzi@kde.org>\n"
"Language-Team: Italiano <kde-i18n-it@kde.org>\n"
"Language-Team: Italiano <tde-i18n-it@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

+ 1
- 1
po/pt_BR.po View File

@@ -4,7 +4,7 @@ msgstr ""
"POT-Creation-Date: 2001-07-20 12:58-0700\n"
"PO-Revision-Date: 2000-09-26 01:51-0300\n"
"Last-Translator: Elvis Pfützenreuter <epx@conectiva.com.br>\n"
"Language-Team: Brazilian Portuguese <kde-i18n-pt_BR@kde.org>\n"
"Language-Team: Brazilian Portuguese <tde-i18n-pt_BR@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

+ 1
- 1
po/sl.po View File

@@ -7,7 +7,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: kdenetwork\n"
"Project-Id-Version: tdenetwork\n"
"POT-Creation-Date: 2001-07-20 12:58-0700\n"
"PO-Revision-Date: 2000-09-30 22:03+0200\n"
"Last-Translator: Gregor Rakar <gregor.rakar@kiss.uni-lj.si>\n"

+ 1
- 1
po/tr.po View File

@@ -8,7 +8,7 @@ msgstr ""
"POT-Creation-Date: 2001-07-20 12:58-0700\n"
"PO-Revision-Date: 2000-06-14 15:22+0200\n"
"Last-Translator: Muhsin Yeþilyýlmaz <muhsinyy@hotmail.com>\n"
"Language-Team: Turkish <kde-i18n-tr@kde.org>\n"
"Language-Team: Turkish <tde-i18n-tr@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8-bit\n"

Loading…
Cancel
Save