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

Initial TDE conversion

Browse Source
pull/1/head
Slávek Banko 11 years ago
parent 5f5e7c5455
commit f2d4b48ad7
97 changed files with 800 additions and 800 deletions
Show Stats Download Patch File Download Diff File

10
ChangeLog
Unescape View File

@ -264,7 +264,7 @@
* ValueWidget, WebQueryZ3950, SettingsSearchURL, FieldListView, * ValueWidget, WebQueryZ3950, SettingsSearchURL, FieldListView,
SettingsUserDefinedInput: Minor UI fixes SettingsUserDefinedInput: Minor UI fixes
* IdSuggestionWidget: Fixing deletion of id components * IdSuggestionWidget: Fixing deletion of id components
* EntryWidget: Using code from KMainWindow to save and restore window size * EntryWidget: Using code from TDEMainWindow to save and restore window size
* Iso6937Converter, Iso5426Converter, MessageHandler, Latin1Literal: * Iso6937Converter, Iso5426Converter, MessageHandler, Latin1Literal:
Adding Z39.50 files from Tellico Adding Z39.50 files from Tellico
* FileImporterBibTeX: Checking for duplicate fields * FileImporterBibTeX: Checking for duplicate fields
@ -974,7 +974,7 @@
PersonContainer, Person, KeywordContainer, Keyword, PersonContainer, Person, KeywordContainer, Keyword,
ValueItem: Completely new/rewritten classes to handle ValueItem: Completely new/rewritten classes to handle
BibTeX data BibTeX data
* WebQueryPubMed: Switching to KIO::NetAccess, but still * WebQueryPubMed: Switching to TDEIO::NetAccess, but still
work in progress work in progress
* WebQuerySRU: Work in progress * WebQuerySRU: Work in progress
@ -1248,7 +1248,7 @@
2006-07-05 Thomas Fischer <fischer@unix-ag.uni-kl.de> 2006-07-05 Thomas Fischer <fischer@unix-ag.uni-kl.de>
* DocumentSourceView: Crash in destructor fixed (code is still alpha) * DocumentSourceView: Crash in destructor fixed (code is still alpha)
* KBibTeX: Switched from KApplication::quit to KApplication::closeAllWindows * KBibTeX: Switched from TDEApplication::quit to TDEApplication::closeAllWindows
for KBibTeX's quit operation for KBibTeX's quit operation
2006-07-02 Thomas Fischer <fischer@unix-ag.uni-kl.de> 2006-07-02 Thomas Fischer <fischer@unix-ag.uni-kl.de>
@ -1487,7 +1487,7 @@
* KBibTeXPart: Progress bar when opening, importing or saving files * KBibTeXPart: Progress bar when opening, importing or saving files
improved improved
* BibTeXEncoder: Encoding of tilde character fixed * BibTeXEncoder: Encoding of tilde character fixed
* KBibTeXActionTextSearch: Restoring old code as KListViewSearchLine is only * KBibTeXActionTextSearch: Restoring old code as TDEListViewSearchLine is only
in KDE 3.4 and newer in KDE 3.4 and newer
* Going to release 0.1.2 * Going to release 0.1.2
@ -1508,7 +1508,7 @@
drops now drops now
2005-09-16 Thomas Fischer <fischer@unix-ag.uni-kl.de> 2005-09-16 Thomas Fischer <fischer@unix-ag.uni-kl.de>
* KBibTeXActionTextSearch: Using KListViewSearchLineWidget instead of QLabel * KBibTeXActionTextSearch: Using TDEListViewSearchLineWidget instead of QLabel
and QLineEdit. Code is more simple and cleaner now. and QLineEdit. Code is more simple and cleaner now.
* admin/libtool.m4.in, admin/acinclude.m4.in: Various unnecessary tests * admin/libtool.m4.in, admin/acinclude.m4.in: Various unnecessary tests
(Fortran, audio libraries, ...) removed from configure script (Fortran, audio libraries, ...) removed from configure script

2
Doxyfile
Unescape View File

@ -3,7 +3,7 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Project related configuration options # Project related configuration options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
PROJECT_NAME = kbibtex.kdevelop PROJECT_NAME = kbibtex.tdevelop
PROJECT_NUMBER = 0.2 PROJECT_NUMBER = 0.2
OUTPUT_DIRECTORY = OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO CREATE_SUBDIRS = NO

270
acinclude.m4
Unescape View File

@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository. dnl carried into every other module in the repository.
dnl dnl
dnl Single-module modifications are best placed in configure.in for kdelibs dnl Single-module modifications are best placed in configure.in for tdelibs
dnl and kdebase or configure.in.in if present. dnl and tdebase or configure.in.in if present.
# KDE_PATH_X_DIRECT # KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X. dnl Internal subroutine of AC_PATH_X.
@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS" [LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works. # First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release. # 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}/` \ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \ /usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \ /usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \ /usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \ /usr/X11R4/lib${tdelibsuff} \
\ \
/usr/lib${kdelibsuff}/X11 \ /usr/lib${tdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \ /usr/lib${tdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \ /usr/lib${tdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \ /usr/lib${tdelibsuff}/X11R4 \
\ \
/usr/local/X11/lib${kdelibsuff} \ /usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \ /usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \ /usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \ /usr/local/X11R4/lib${tdelibsuff} \
\ \
/usr/local/lib${kdelibsuff}/X11 \ /usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \ /usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \ /usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \ /usr/local/lib${tdelibsuff}/X11R4 \
\ \
/usr/X386/lib${kdelibsuff} \ /usr/X386/lib${tdelibsuff} \
/usr/x386/lib${kdelibsuff} \ /usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \ /usr/XFree86/lib${tdelibsuff}/X11 \
\ \
/usr/lib${kdelibsuff} \ /usr/lib${tdelibsuff} \
/usr/local/lib${kdelibsuff} \ /usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \ /usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${kdelibsuff} \ /usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \ /usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \ /usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \ /lib/usr/lib${tdelibsuff}/X11 \
\ \
/usr/openwin/lib${kdelibsuff} \ /usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \ /usr/openwin/share/lib${tdelibsuff} \
; \ ; \
do do
dnl Don't even attempt the hair of trying to link an X program! 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 fi
AC_MSG_CHECKING([for KDE libraries installed]) 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 if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_ERROR([your system fails at linking a small KDE application! 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 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.]) For more details about this problem, look at the end of config.log.])
fi fi
if eval `KDEDIR= ./conftest 2>&5`; then if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done kde_result=done
else else
kde_result=problems kde_result=problems
fi 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_have_all_paths=yes
KDE_SET_PATHS($kde_result) KDE_SET_PATHS($kde_result)
@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], 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" 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" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$kde32ornewer"; then 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)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$kde33ornewer"; then 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) AC_SUBST(MAKEKDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then 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" 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) AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET="" KDE_XSL_STYLESHEET=""
@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir) AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)') AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir) AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir) AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
@ -937,7 +937,7 @@ mips-sgi-irix6*)
ac_x_includes="." ac_x_includes="."
fi fi
if test -z "$ac_x_libraries"; then if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${kdelibsuff}" ac_x_libraries="/usr/lib${tdelibsuff}"
fi fi
esac esac
#from now on we use our own again #from now on we use our own again
@ -1418,7 +1418,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir, AC_ARG_WITH(qt-dir,
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
[ ac_qt_includes="$withval"/include [ ac_qt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin ac_qt_bindir="$withval"/bin
]) ])
@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs="" qt_libdirs=""
for dir in $kde_qt_dirs; do for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then if test ! "$ac_qt_libraries" = "NO"; then
@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins]) AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([ 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 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 kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 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 _same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings. configuration settings.
]) ])
@ -1785,16 +1785,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then 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" 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 "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir" ac_kde_includes="$kde_incdir"
@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi 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}" 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 "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir" ac_kde_libraries="$kde_libdir"
@ -1824,7 +1824,7 @@ 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/kdewidgets.la"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs]) by tdelibs])
fi fi
if test -n "$kde_widgetdir"; then if test -n "$kde_widgetdir"; then
@ -1839,7 +1839,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi 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" ac_cv_have_kde="have_kde=no"
@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_cxxflags_safe="$CXXFLAGS" kde_cxxflags_safe="$CXXFLAGS"
LIBS="-lkde-qt-addon $LIBQT $LIBS" 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" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([
@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;; *) lib_kded="" ;;
esac esac
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])
@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
else else
case "$1" in case "$1" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) 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 kde_cv_proto_$1=unknown
@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else else
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi fi
]) ])
@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we 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 if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then 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)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) 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)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)
@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64],
AC_ARG_ENABLE(libsuffix, AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix], AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none,auto[=default])]), [/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 cat > conftest.c << EOF
#include <stdio.h> #include <stdio.h>
@ -3512,26 +3512,26 @@ int main() {
return 0; return 0;
} }
EOF 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, s,.*/lib\([[^\/]]*\)/.*,\1,
p p
}'` }'`
rm -rf conftest.* rm -rf conftest.*
fi fi
if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
kdelibsuff= tdelibsuff=
fi fi
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
AC_MSG_RESULT([not using lib directory suffix]) AC_MSG_RESULT([not using lib directory suffix])
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
else else
if test "$libdir" = '${exec_prefix}/lib'; then if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$libdir${kdelibsuff}" libdir="$libdir${tdelibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi fi
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
fi fi
]) ])
@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM AC_ARG_PROGRAM
AM_INIT_AUTOMAKE($1, $2) AM_INIT_AUTOMAKE($1, $2)
AM_DISABLE_LIBRARIES AM_DISABLE_LIBRARIES
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
AC_CHECK_COMPILERS AC_CHECK_COMPILERS
KDE_PROG_LIBTOOL KDE_PROG_LIBTOOL
AM_KDE_WITH_NLS AM_KDE_WITH_NLS
@ -4556,7 +4556,7 @@ fi
PYTHONINC=-I$python_incdir 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) AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES) AC_SUBST(CONF_FILES)
])dnl ])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 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], AC_DEFUN([KDE_SET_PREFIX_CORE],
[ [
unset CDPATH unset CDPATH
dnl make $KDEDIR the default for the installation dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix prefix=$ac_default_prefix
@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX],
unset CDPATH unset CDPATH
dnl We can't give real code to that macro, only a value. 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. 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 KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it dnl no prefix given: look for tde-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) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
else 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" kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$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" PATH="$kde_save_PATH"
fi fi
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then 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 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 fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars` kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX],
AC_MSG_CHECKING([where to install]) AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix prefix=$kde_libs_prefix
AC_MSG_RESULT([$prefix (as returned by kde-config)]) AC_MSG_RESULT([$prefix (as returned by tde-config)])
else else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix given_prefix=$prefix
@ -5089,15 +5089,15 @@ pushdef([AC_PROG_INSTALL],
fi fi
])dnl ])dnl
AC_DEFUN([KDE_LANG_CPLUSPLUS], AC_DEFUN([TDE_LANG_CPLUSPLUS],
[AC_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' 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], pushdef([AC_LANG_CPLUSPLUS],
[popdef([AC_LANG_CPLUSPLUS]) [popdef([AC_LANG_CPLUSPLUS])
KDE_LANG_CPLUSPLUS TDE_LANG_CPLUSPLUS
]) ])
AC_DEFUN([KDE_CHECK_LONG_LONG], AC_DEFUN([KDE_CHECK_LONG_LONG],
@ -5661,7 +5661,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir, AC_ARG_WITH(ssl-dir,
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
[ ac_ssl_includes="$withval"/include [ ac_ssl_includes="$withval"/include
ac_ssl_libraries="$withval"/lib$kdelibsuff ac_ssl_libraries="$withval"/lib$tdelibsuff
]) ])
want_ssl=yes 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_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
ac_ssl_includes="$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 if test ! "$ac_ssl_libraries" = "NO"; then
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
fi fi
@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
dnl also defines KSTUFF_PKG_ERRORS on error dnl also defines KSTUFF_PKG_ERRORS on error
AC_DEFUN([KDE_PKG_CHECK_MODULES], [ 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 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 fi
export PKG_CONFIG_PATH export PKG_CONFIG_PATH
PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) PKG_CHECK_MODULES([$1],[$2],[$3],[$4])

4
configure.in
Unescape View File

@ -97,13 +97,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
# And if so, warn when they don't match # And if so, warn when they don't match
if test "$kde_libs_prefix" != "$given_prefix"; then if test "$kde_libs_prefix" != "$given_prefix"; then
# And if kde doesn't know about the prefix yet # And if kde doesn't know about the prefix yet
echo ":"`kde-config --path exe`":" | grep --color=never ":$given_prefix/bin/:" 2>&1 >/dev/null echo ":"`tde-config --path exe`":" | grep --color=never ":$given_prefix/bin/:" 2>&1 >/dev/null
if test $? -ne 0; then if test $? -ne 0; then
echo "" echo ""
echo "Warning: you chose to install this package in $given_prefix," echo "Warning: you chose to install this package in $given_prefix,"
echo "but KDE was found in $kde_libs_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 "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 "Then restart KDE."
echo "" echo ""
fi fi

2
doc/en/Makefile.am
Unescape View File

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

4
kbibtex.kdevelop
Unescape View File

@ -1,5 +1,5 @@
<?xml version = '1.0'?> <?xml version = '1.0'?>
<kdevelop> <tdevelop>
<general> <general>
<author>Thomas Fischer</author> <author>Thomas Fischer</author>
<email>fischer@unix-ag.uni-kl.de</email> <email>fischer@unix-ag.uni-kl.de</email>
@ -296,4 +296,4 @@
<customTagfilePath>//home/fish/playground/kbibtexKDE3/tags</customTagfilePath> <customTagfilePath>//home/fish/playground/kbibtexKDE3/tags</customTagfilePath>
<activeTagsFiles/> <activeTagsFiles/>
</ctagspart> </ctagspart>
</kdevelop> </tdevelop>

2
po/it.po
Unescape View File

@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2010-07-01 13:55+0200\n" "POT-Creation-Date: 2010-07-01 13:55+0200\n"
"PO-Revision-Date: 2009-01-04 19:45+0100\n" "PO-Revision-Date: 2009-01-04 19:45+0100\n"
"Last-Translator: Berto\n" "Last-Translator: Berto\n"
"Language-Team: American English <kde-i18n-doc@lists.kde.org>\n" "Language-Team: American English <tde-i18n-doc@lists.kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

4
src/Makefile.am
Unescape View File

@ -43,7 +43,7 @@ bin_PROGRAMS = kbibtex
# the application source, library search path, and link libraries # the application source, library search path, and link libraries
kbibtex_SOURCES = kbibtexshell.cpp main.cpp kbibtex_SOURCES = kbibtexshell.cpp main.cpp
kbibtex_LDFLAGS = $(all_libraries) kbibtex_LDFLAGS = $(all_libraries)
kbibtex_LDADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) kbibtex_LDADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
# this is where the desktop file will go # this is where the desktop file will go
shelldesktopdir = $(xdg_appsdir) shelldesktopdir = $(xdg_appsdir)
@ -75,7 +75,7 @@ libkbibtexpart_la_SOURCES = comment.cpp fileexporterdocbook5.cpp commentwidget.c
xsltransform.cpp webquerysciencedirect.cpp findduplicates.cpp settingsz3950.cpp \ xsltransform.cpp webquerysciencedirect.cpp findduplicates.cpp settingsz3950.cpp \
messagehandler.cpp iso6937converter.cpp iso5426converter.cpp webquerymathscinet.cpp messagehandler.cpp iso6937converter.cpp iso5426converter.cpp webquerymathscinet.cpp
libkbibtexpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) libkbibtexpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
libkbibtexpart_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_KFILE) $(LIB_KUTILS) $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIBYAZ_LIBS) $(LIBBIBUTILS_LIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP -lkatepartinterfaces -lktexteditor libkbibtexpart_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_KFILE) $(LIB_KUTILS) $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIBYAZ_LIBS) $(LIBBIBUTILS_LIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP -lkatepartinterfaces -ltdetexteditor
# this is where the desktop file will go # this is where the desktop file will go
partdesktopdir = $(kde_servicesdir) partdesktopdir = $(kde_servicesdir)

8
src/commentwidget.cpp
Unescape View File

@ -22,9 +22,9 @@
#include <ntqlayout.h> #include <ntqlayout.h>
#include <ntqcheckbox.h> #include <ntqcheckbox.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kglobalsettings.h> #include <tdeglobalsettings.h>
#include <klocale.h> #include <tdelocale.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <comment.h> #include <comment.h>
#include <element.h> #include <element.h>
@ -56,7 +56,7 @@ namespace KBibTeX
layout->addWidget( label ); layout->addWidget( label );
m_multiLineEdit = new TQMultiLineEdit( this ); m_multiLineEdit = new TQMultiLineEdit( this );
m_multiLineEdit->setFont( KGlobalSettings::fixedFont() ); m_multiLineEdit->setFont( TDEGlobalSettings::fixedFont() );
layout->addWidget( m_multiLineEdit ); layout->addWidget( m_multiLineEdit );
label->setBuddy( m_multiLineEdit ); label->setBuddy( m_multiLineEdit );
m_multiLineEdit->setReadOnly( m_isReadOnly ); m_multiLineEdit->setReadOnly( m_isReadOnly );

46
src/documentlistview.cpp
Unescape View File

@ -33,16 +33,16 @@
#include <ntqtextstream.h> #include <ntqtextstream.h>
#include <ntqtimer.h> #include <ntqtimer.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <ktempfile.h> #include <tdetempfile.h>
#include <klocale.h> #include <tdelocale.h>
#include <kurl.h> #include <kurl.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <kaction.h> #include <tdeaction.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kprogress.h> #include <kprogress.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -70,7 +70,7 @@
namespace KBibTeX namespace KBibTeX
{ {
DocumentListView::DocumentListView( KBibTeX::DocumentWidget *docWidget, bool isReadOnly, TQWidget *parent, const char *name ) DocumentListView::DocumentListView( KBibTeX::DocumentWidget *docWidget, bool isReadOnly, TQWidget *parent, const char *name )
: KListView( parent, name ), m_docWidget( docWidget ), m_bibtexFile( NULL ), m_contextMenu( NULL ), m_headerMenu( NULL ), m_isReadOnly( isReadOnly ), m_newElementCounter( 1 ) : TDEListView( parent, name ), m_docWidget( docWidget ), m_bibtexFile( NULL ), m_contextMenu( NULL ), m_headerMenu( NULL ), m_isReadOnly( isReadOnly ), m_newElementCounter( 1 )
{ {
setAllColumnsShowFocus( true ); setAllColumnsShowFocus( true );
setShowSortIndicator( true ); setShowSortIndicator( true );
@ -85,7 +85,7 @@ namespace KBibTeX
setDropVisualizer( TRUE ); setDropVisualizer( TRUE );
connect( header(), SIGNAL( clicked( int ) ), this, SLOT( setSortingColumn( int ) ) ); connect( header(), SIGNAL( clicked( int ) ), this, SLOT( setSortingColumn( int ) ) );
connect( this, SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), this, SLOT( showBibtexListContextMenu( KListView *, TQListViewItem *, const TQPoint & ) ) ); connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, SLOT( showBibtexListContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
connect( this, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, SLOT( slotDoubleClick( TQListViewItem* ) ) ); connect( this, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, SLOT( slotDoubleClick( TQListViewItem* ) ) );
connect( this, SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), this, SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); connect( this, SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), this, SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) );
} }
@ -97,7 +97,7 @@ namespace KBibTeX
void DocumentListView::setFactory( KXMLGUIFactory *factory, KXMLGUIClient *client ) void DocumentListView::setFactory( KXMLGUIFactory *factory, KXMLGUIClient *client )
{ {
m_contextMenu = static_cast<KPopupMenu*>( factory -> container( "popup_bibtexlist", client ) ); m_contextMenu = static_cast<TDEPopupMenu*>( factory -> container( "popup_bibtexlist", client ) );
} }
bool DocumentListView::setBibTeXFile( BibTeX::File *bibtexFile ) bool DocumentListView::setBibTeXFile( BibTeX::File *bibtexFile )
@ -237,15 +237,15 @@ namespace KBibTeX
if ( settings->editing_UseSpecialFont ) if ( settings->editing_UseSpecialFont )
setFont( settings->editing_SpecialFont ); setFont( settings->editing_SpecialFont );
else else
setFont( KGlobalSettings::generalFont() ); setFont( TDEGlobalSettings::generalFont() );
header() ->setFont( KGlobalSettings::generalFont() ); header() ->setFont( TDEGlobalSettings::generalFont() );
restoreColumnIndex(); restoreColumnIndex();
restoreColumnWidths(); restoreColumnWidths();
restoreSortingColumn(); restoreSortingColumn();
} }
void DocumentListView::setViewShowColumnsMenu( KActionMenu *actionMenu ) void DocumentListView::setViewShowColumnsMenu( TDEActionMenu *actionMenu )
{ {
if ( m_headerMenu == NULL ) if ( m_headerMenu == NULL )
{ {
@ -446,7 +446,7 @@ namespace KBibTeX
return FALSE; return FALSE;
// build popup menu // build popup menu
KPopupMenu * popup = new KPopupMenu( this, "pastePopup" ); TDEPopupMenu * popup = new TDEPopupMenu( this, "pastePopup" );
popup->insertTitle( i18n( "Paste text as..." ) ); popup->insertTitle( i18n( "Paste text as..." ) );
for ( int i = ( int ) BibTeX::EntryField::ftAuthor; i <= ( int ) BibTeX::EntryField::ftYear; i++ ) for ( int i = ( int ) BibTeX::EntryField::ftAuthor; i <= ( int ) BibTeX::EntryField::ftYear; i++ )
{ {
@ -454,7 +454,7 @@ namespace KBibTeX
popup->insertItem( Settings::fieldTypeToI18NString( ft ), i ); popup->insertItem( Settings::fieldTypeToI18NString( ft ), i );
} }
popup->insertSeparator(); popup->insertSeparator();
TQIconSet cancelPixmap = KGlobal::iconLoader() ->loadIconSet( "cancel", KIcon::Small ); TQIconSet cancelPixmap = TDEGlobal::iconLoader() ->loadIconSet( "cancel", TDEIcon::Small );
int cancelId = popup->insertItem( cancelPixmap, i18n( "Cancel" ) ); int cancelId = popup->insertItem( cancelPixmap, i18n( "Cancel" ) );
// show popup menu // show popup menu
@ -563,7 +563,7 @@ namespace KBibTeX
} }
} }
void DocumentListView::showBibtexListContextMenu( KListView *, TQListViewItem *, const TQPoint & p ) void DocumentListView::showBibtexListContextMenu( TDEListView *, TQListViewItem *, const TQPoint & p )
{ {
if ( m_contextMenu != NULL ) if ( m_contextMenu != NULL )
{ {
@ -665,22 +665,22 @@ namespace KBibTeX
{ {
TQString url = urlList.at( 0 ); TQString url = urlList.at( 0 );
TQString tmpFile; TQString tmpFile;
if ( ! KIO::NetAccess::download( url, tmpFile, 0 ) ) if ( ! TDEIO::NetAccess::download( url, tmpFile, 0 ) )
{ {
KMessageBox::error( this, KIO::NetAccess::lastErrorString() ); KMessageBox::error( this, TDEIO::NetAccess::lastErrorString() );
return ; return ;
} }
TQFile f( tmpFile ); TQFile f( tmpFile );
if ( ! f.open( IO_ReadOnly ) ) if ( ! f.open( IO_ReadOnly ) )
{ {
KMessageBox::error( this, f.errorString() ); KMessageBox::error( this, f.errorString() );
KIO::NetAccess::removeTempFile( tmpFile ); TDEIO::NetAccess::removeTempFile( tmpFile );
return ; return ;
} }
TQByteArray ba = f.readAll(); TQByteArray ba = f.readAll();
text = TQString( ba ); text = TQString( ba );
f.close(); f.close();
KIO::NetAccess::removeTempFile( tmpFile ); TDEIO::NetAccess::removeTempFile( tmpFile );
} }
else if ( !TQTextDrag::decode( event, text ) ) else if ( !TQTextDrag::decode( event, text ) )
return; return;
@ -710,7 +710,7 @@ namespace KBibTeX
} }
} }
return KListView::eventFilter( watched, e ); return TDEListView::eventFilter( watched, e );
} }
void DocumentListView::keyPressEvent( TQKeyEvent *e ) void DocumentListView::keyPressEvent( TQKeyEvent *e )
@ -724,7 +724,7 @@ namespace KBibTeX
emit executed( item ); emit executed( item );
} }
else else
KListView::keyPressEvent( e ); TDEListView::keyPressEvent( e );
} }
void DocumentListView::showColumn( int col, int colWidth ) void DocumentListView::showColumn( int col, int colWidth )

18
src/documentlistview.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef KBIBTEXDOCUMENTLISTVIEW_H #ifndef KBIBTEXDOCUMENTLISTVIEW_H
#define KBIBTEXDOCUMENTLISTVIEW_H #define KBIBTEXDOCUMENTLISTVIEW_H
#include <klistview.h> #include <tdelistview.h>
#include <kxmlguifactory.h> #include <kxmlguifactory.h>
#include <fileimporter.h> #include <fileimporter.h>
@ -29,15 +29,15 @@
class TQString; class TQString;
class KURL; class KURL;
class KActionMenu; class TDEActionMenu;
class KPopupMenu; class TDEPopupMenu;
namespace KBibTeX namespace KBibTeX
{ {
class DocumentWidget; class DocumentWidget;
class DocumentListViewItem; class DocumentListViewItem;
class DocumentListView : public KListView class DocumentListView : public TDEListView
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -45,7 +45,7 @@ namespace KBibTeX
~DocumentListView(); ~DocumentListView();
void setFactory( KXMLGUIFactory *factory, KXMLGUIClient *client ); void setFactory( KXMLGUIFactory *factory, KXMLGUIClient *client );
void setViewShowColumnsMenu( KActionMenu *actionMenu ); void setViewShowColumnsMenu( TDEActionMenu *actionMenu );
bool setBibTeXFile( BibTeX::File *bibtexFile ); bool setBibTeXFile( BibTeX::File *bibtexFile );
BibTeX::File* getBibTeXFile( ); BibTeX::File* getBibTeXFile( );
@ -82,7 +82,7 @@ namespace KBibTeX
private slots: private slots:
void slotDoubleClick( TQListViewItem * item = NULL ); void slotDoubleClick( TQListViewItem * item = NULL );
void setSortingColumn( int column ); void setSortingColumn( int column );
void showBibtexListContextMenu( KListView *, TQListViewItem *, const TQPoint &p ); void showBibtexListContextMenu( TDEListView *, TQListViewItem *, const TQPoint &p );
void slotDropped( TQDropEvent* event, TQListViewItem* item ); void slotDropped( TQDropEvent* event, TQListViewItem* item );
void saveColumnIndex(); void saveColumnIndex();
void restoreColumnIndex(); void restoreColumnIndex();
@ -103,9 +103,9 @@ namespace KBibTeX
static const int maxColumns = 256; static const int maxColumns = 256;
KBibTeX::DocumentWidget *m_docWidget; KBibTeX::DocumentWidget *m_docWidget;
BibTeX::File *m_bibtexFile; BibTeX::File *m_bibtexFile;
KPopupMenu *m_contextMenu; TDEPopupMenu *m_contextMenu;
KPopupMenu *m_headerMenu; TDEPopupMenu *m_headerMenu;
KActionMenu *m_columnVisibleAction; TDEActionMenu *m_columnVisibleAction;
bool m_isReadOnly; bool m_isReadOnly;
TQValueList<DocumentListViewItem*> m_unreadItems; TQValueList<DocumentListViewItem*> m_unreadItems;

8
src/documentlistviewitem.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <ntqpainter.h> #include <ntqpainter.h>
#include <ntqpen.h> #include <ntqpen.h>
#include <klocale.h> #include <tdelocale.h>
#include "documentlistviewitem.h" #include "documentlistviewitem.h"
#include "entry.h" #include "entry.h"
@ -31,12 +31,12 @@
namespace KBibTeX namespace KBibTeX
{ {
DocumentListViewItem::DocumentListViewItem( BibTeX::File *file, BibTeX::Element *element, DocumentListView *parent ) : KListViewItem( parent, parent->lastItem() ), m_element( element ), m_bibtexFile( file ), m_parent( parent ), m_unreadStatus( FALSE ) DocumentListViewItem::DocumentListViewItem( BibTeX::File *file, BibTeX::Element *element, DocumentListView *parent ) : TDEListViewItem( parent, parent->lastItem() ), m_element( element ), m_bibtexFile( file ), m_parent( parent ), m_unreadStatus( FALSE )
{ {
setTexts(); setTexts();
} }
DocumentListViewItem::DocumentListViewItem( BibTeX::File *file, BibTeX::Element *element, DocumentListView *parent, TQListViewItem *after ) : KListViewItem( parent, after ), m_element( element ), m_bibtexFile( file ), m_parent( parent ) DocumentListViewItem::DocumentListViewItem( BibTeX::File *file, BibTeX::Element *element, DocumentListView *parent, TQListViewItem *after ) : TDEListViewItem( parent, after ), m_element( element ), m_bibtexFile( file ), m_parent( parent )
{ {
setTexts(); setTexts();
} }
@ -74,7 +74,7 @@ namespace KBibTeX
p->setFont( f ); p->setFont( f );
} }
KListViewItem::paintCell( p, cg, column, width, align ); TDEListViewItem::paintCell( p, cg, column, width, align );
} }

4
src/documentlistviewitem.h
Unescape View File

@ -20,14 +20,14 @@
#ifndef DOCUMENTLISTVIEWITEM_H #ifndef DOCUMENTLISTVIEWITEM_H
#define DOCUMENTLISTVIEWITEM_H #define DOCUMENTLISTVIEWITEM_H
#include <klistview.h> #include <tdelistview.h>
#include <element.h> #include <element.h>
#include "documentlistview.h" #include "documentlistview.h"
namespace KBibTeX namespace KBibTeX
{ {
class DocumentListViewItem : public KListViewItem class DocumentListViewItem : public TDEListViewItem
{ {
public: public:
DocumentListViewItem( BibTeX::File *file, BibTeX::Element *element, DocumentListView *parent ); DocumentListViewItem( BibTeX::File *file, BibTeX::Element *element, DocumentListView *parent );

24
src/documentsourceview.cpp
Unescape View File

@ -23,20 +23,20 @@
#include <klibloader.h> #include <klibloader.h>
#include <kxmlguifactory.h> #include <kxmlguifactory.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <klibloader.h> #include <klibloader.h>
#include <kfinddialog.h> #include <kfinddialog.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <tdelocale.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <ktrader.h> #include <ktrader.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kservice.h> #include <kservice.h>
#include <kprogress.h> #include <kprogress.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <ktexteditor/configinterface.h> #include <tdetexteditor/configinterface.h>
#include <ktexteditor/editorchooser.h> #include <tdetexteditor/editorchooser.h>
#include <ktexteditor/undointerface.h> #include <tdetexteditor/undointerface.h>
#include <fileexporterbibtex.h> #include <fileexporterbibtex.h>
#include <fileimporterbibtex.h> #include <fileimporterbibtex.h>
@ -122,7 +122,7 @@ namespace KBibTeX
void DocumentSourceView::setFactory( KXMLGUIFactory *factory, KXMLGUIClient * client ) void DocumentSourceView::setFactory( KXMLGUIFactory *factory, KXMLGUIClient * client )
{ {
KTextEditor::PopupMenuInterface * popupInterface = dynamic_cast<KTextEditor::PopupMenuInterface*>( m_view ); KTextEditor::PopupMenuInterface * popupInterface = dynamic_cast<KTextEditor::PopupMenuInterface*>( m_view );
popupInterface->installPopup(( TQPopupMenu* )( factory ->container( "ktexteditor_popup", client ) ) ); popupInterface->installPopup(( TQPopupMenu* )( factory ->container( "tdetexteditor_popup", client ) ) );
} }
void DocumentSourceView::configureEditor() void DocumentSourceView::configureEditor()
@ -314,17 +314,17 @@ namespace KBibTeX
void DocumentSourceView::readConfig() void DocumentSourceView::readConfig()
{ {
KConfig * config = kapp->config(); TDEConfig * config = kapp->config();
readConfig( config ); readConfig( config );
} }
void DocumentSourceView::writeConfig() void DocumentSourceView::writeConfig()
{ {
KConfig * config = kapp->config(); TDEConfig * config = kapp->config();
writeConfig( config ); writeConfig( config );
} }
void DocumentSourceView::readConfig( KConfig *config ) void DocumentSourceView::readConfig( TDEConfig *config )
{ {
if ( m_view ) if ( m_view )
{ {
@ -334,7 +334,7 @@ namespace KBibTeX
} }
} }
void DocumentSourceView::writeConfig( KConfig *config ) void DocumentSourceView::writeConfig( TDEConfig *config )
{ {
if ( m_view ) if ( m_view )
{ {

6
src/documentsourceview.h
Unescape View File

@ -24,7 +24,7 @@
#include <file.h> #include <file.h>
#include <ktexteditor/editinterface.h> #include <tdetexteditor/editinterface.h>
#include <kate/view.h> #include <kate/view.h>
#include <kate/document.h> #include <kate/document.h>
@ -82,8 +82,8 @@ namespace KBibTeX
void setupGUI(); void setupGUI();
void readConfig(); void readConfig();
void writeConfig(); void writeConfig();
void readConfig( KConfig *config ); void readConfig( TDEConfig *config );
void writeConfig( KConfig *config ); void writeConfig( TDEConfig *config );
void search( int fromLine, int fromCol ); void search( int fromLine, int fromCol );

44
src/documentwidget.cpp
Unescape View File

@ -34,17 +34,17 @@
#include <ntqfileinfo.h> #include <ntqfileinfo.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <tdelocale.h>
#include <ktempfile.h> #include <tdetempfile.h>
#include <kglobalsettings.h> #include <tdeglobalsettings.h>
#include <kurl.h> #include <kurl.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <klineedit.h> #include <klineedit.h>
#include <kdebug.h> #include <kdebug.h>
#include <ktextedit.h> #include <ktextedit.h>
@ -140,7 +140,7 @@ namespace KBibTeX
m_sourceView = new DocumentSourceView( this, m_isReadOnly, this , "source_view" ); m_sourceView = new DocumentSourceView( this, m_isReadOnly, this , "source_view" );
addTab( m_sourceView, i18n( "So&urce view" ) ); addTab( m_sourceView, i18n( "So&urce view" ) );
m_sourceView->setFont( KGlobalSettings::fixedFont() ); m_sourceView->setFont( TDEGlobalSettings::fixedFont() );
// Setup actions // Setup actions
connect( m_searchBar, SIGNAL( onlineSearch() ), this, SLOT( onlineSearch() ) ); connect( m_searchBar, SIGNAL( onlineSearch() ), this, SLOT( onlineSearch() ) );
@ -362,7 +362,7 @@ namespace KBibTeX
case BibTeX::FileExporterExternal::exporterNone: case BibTeX::FileExporterExternal::exporterNone:
case BibTeX::FileExporterExternal::exporterXSLT: case BibTeX::FileExporterExternal::exporterXSLT:
{ {
KStandardDirs * kstd = KGlobal::dirs(); TDEStandardDirs * kstd = TDEGlobal::dirs();
TQString resPath = kstd->findResource( "data", "kbibtexpart/xslt/html.xsl" ); TQString resPath = kstd->findResource( "data", "kbibtexpart/xslt/html.xsl" );
if ( resPath != NULL ) if ( resPath != NULL )
transform = new BibTeX::XSLTransform( resPath ); transform = new BibTeX::XSLTransform( resPath );
@ -624,10 +624,10 @@ namespace KBibTeX
m_listViewElements->setFactory( factory, client ); m_listViewElements->setFactory( factory, client );
m_sourceView->setFactory( factory, client ); m_sourceView->setFactory( factory, client );
m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) ); m_viewDocumentActionMenu = dynamic_cast<TDEActionMenu*>( client->action( "view_document" ) );
if ( m_viewDocumentActionMenu != NULL ) if ( m_viewDocumentActionMenu != NULL )
connect( m_viewDocumentActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotViewDocument( int ) ) ); connect( m_viewDocumentActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotViewDocument( int ) ) );
m_assignKeywordsActionMenu = dynamic_cast<KActionMenu*>( client->action( "assign_keywords" ) ); m_assignKeywordsActionMenu = dynamic_cast<TDEActionMenu*>( client->action( "assign_keywords" ) );
if ( m_assignKeywordsActionMenu != NULL ) if ( m_assignKeywordsActionMenu != NULL )
connect( m_assignKeywordsActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotAssignKeywords( int ) ) ); connect( m_assignKeywordsActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotAssignKeywords( int ) ) );
@ -638,8 +638,8 @@ namespace KBibTeX
m_actionEditSelectAll = client->action( "edit_select_all" ); m_actionEditSelectAll = client->action( "edit_select_all" );
m_actionEditFind = client->action( "edit_find" ); m_actionEditFind = client->action( "edit_find" );
m_actionEditFindNext = client->action( "edit_find_next" ); m_actionEditFindNext = client->action( "edit_find_next" );
m_listViewElements->setViewShowColumnsMenu( dynamic_cast<KActionMenu*>( client->action( "view_showcolumns" ) ) ); m_listViewElements->setViewShowColumnsMenu( dynamic_cast<TDEActionMenu*>( client->action( "view_showcolumns" ) ) );
m_searchWebsitesActionMenu = dynamic_cast<KActionMenu*>( client->action( "search_document_online" ) ); m_searchWebsitesActionMenu = dynamic_cast<TDEActionMenu*>( client->action( "search_document_online" ) );
} }
void DocumentWidget::updateViewDocumentMenu( ) void DocumentWidget::updateViewDocumentMenu( )
@ -650,7 +650,7 @@ namespace KBibTeX
return; return;
} }
KPopupMenu * popup = m_viewDocumentActionMenu->popupMenu(); TDEPopupMenu * popup = m_viewDocumentActionMenu->popupMenu();
popup->clear(); popup->clear();
m_viewDocumentActionMenuURLs.clear(); m_viewDocumentActionMenuURLs.clear();
@ -699,7 +699,7 @@ namespace KBibTeX
return; return;
} }
KPopupMenu * popup = m_assignKeywordsActionMenu->popupMenu(); TDEPopupMenu * popup = m_assignKeywordsActionMenu->popupMenu();
popup->clear(); popup->clear();
m_assignKeywordsActionMenuURLs.clear(); m_assignKeywordsActionMenuURLs.clear();
TQStringList entryKeywords; TQStringList entryKeywords;
@ -788,7 +788,7 @@ namespace KBibTeX
{ {
int maxCountPerSubMenu = ( int )sqrt( allKeywords.count() ) + 1; int maxCountPerSubMenu = ( int )sqrt( allKeywords.count() ) + 1;
int countPerSubMenu = 0; int countPerSubMenu = 0;
KPopupMenu *subMenu = new KPopupMenu( popup ); TDEPopupMenu *subMenu = new TDEPopupMenu( popup );
connect( subMenu, SIGNAL( activated( int ) ), this, SLOT( slotAssignKeywords( int ) ) ); connect( subMenu, SIGNAL( activated( int ) ), this, SLOT( slotAssignKeywords( int ) ) );
TQString startWord, endWord; TQString startWord, endWord;
for ( TQStringList::Iterator it = allKeywords.begin(); it != allKeywords.end(); ++it ) for ( TQStringList::Iterator it = allKeywords.begin(); it != allKeywords.end(); ++it )
@ -804,7 +804,7 @@ namespace KBibTeX
if ( countPerSubMenu >= maxCountPerSubMenu ) if ( countPerSubMenu >= maxCountPerSubMenu )
{ {
popup->insertItem( TQString( i18n( "%1 ... %2" ) ).arg( startWord ).arg( endWord ), subMenu ); popup->insertItem( TQString( i18n( "%1 ... %2" ) ).arg( startWord ).arg( endWord ), subMenu );
subMenu = new KPopupMenu( popup ); subMenu = new TDEPopupMenu( popup );
connect( subMenu, SIGNAL( activated( int ) ), this, SLOT( slotAssignKeywords( int ) ) ); connect( subMenu, SIGNAL( activated( int ) ), this, SLOT( slotAssignKeywords( int ) ) );
countPerSubMenu = 0; countPerSubMenu = 0;
} }
@ -822,10 +822,10 @@ namespace KBibTeX
popup->insertSeparator(); popup->insertSeparator();
TQWidget *container = new TQWidget( popup ); TQWidget *container = new TQWidget( popup );
container->setBackgroundColor( KGlobalSettings::baseColor() ); container->setBackgroundColor( TDEGlobalSettings::baseColor() );
TQHBoxLayout *layout = new TQHBoxLayout( container, 1, 1 ); TQHBoxLayout *layout = new TQHBoxLayout( container, 1, 1 );
TQLabel *label = new TQLabel( i18n( "New keyword:" ), container ); TQLabel *label = new TQLabel( i18n( "New keyword:" ), container );
label->setBackgroundColor( KGlobalSettings::baseColor() ); label->setBackgroundColor( TDEGlobalSettings::baseColor() );
layout->addWidget( label ); layout->addWidget( label );
m_lineEditNewKeyword = new KLineEdit( container ); m_lineEditNewKeyword = new KLineEdit( container );
layout->addWidget( m_lineEditNewKeyword ); layout->addWidget( m_lineEditNewKeyword );
@ -861,7 +861,7 @@ namespace KBibTeX
if ( m_searchWebsitesActionMenu != NULL ) if ( m_searchWebsitesActionMenu != NULL )
{ {
KPopupMenu * popup = m_searchWebsitesActionMenu->popupMenu(); TDEPopupMenu * popup = m_searchWebsitesActionMenu->popupMenu();
popup->clear(); popup->clear();
int i = 0; int i = 0;
for ( TQValueList<Settings::SearchURL*>::ConstIterator it = settings->searchURLs.begin(); it != settings->searchURLs.end(); ++it ) for ( TQValueList<Settings::SearchURL*>::ConstIterator it = settings->searchURLs.begin(); it != settings->searchURLs.end(); ++it )
@ -871,7 +871,7 @@ namespace KBibTeX
if ( settings->editing_UseSpecialFont ) if ( settings->editing_UseSpecialFont )
m_preview->setFont( settings->editing_SpecialFont ); m_preview->setFont( settings->editing_SpecialFont );
else else
m_preview->setFont( KGlobalSettings::generalFont() ); m_preview->setFont( TDEGlobalSettings::generalFont() );
} }
@ -1419,7 +1419,7 @@ namespace KBibTeX
if ( entry != NULL ) if ( entry != NULL )
m_bibtexfile->completeReferencedFields( entry ); m_bibtexfile->completeReferencedFields( entry );
KStandardDirs * kstd = KGlobal::dirs(); TDEStandardDirs * kstd = TDEGlobal::dirs();
BibTeX::XSLTransform *transform = new BibTeX::XSLTransform( kstd->findResource( "data", "kbibtexpart/xslt/html.xsl" ) ); BibTeX::XSLTransform *transform = new BibTeX::XSLTransform( kstd->findResource( "data", "kbibtexpart/xslt/html.xsl" ) );
if ( transform != NULL ) if ( transform != NULL )

26
src/documentwidget.h
Unescape View File

@ -34,8 +34,8 @@ class TQListViewItem;
class TQWidget; class TQWidget;
class TQSplitter; class TQSplitter;
class KPopupMenu; class TDEPopupMenu;
class KActionMenu; class TDEActionMenu;
class KURL; class KURL;
class KTextEdit; class KTextEdit;
class KLineEdit; class KLineEdit;
@ -126,19 +126,19 @@ namespace KBibTeX
TQProgressDialog *m_progressDialog; TQProgressDialog *m_progressDialog;
int m_newElementCounter; int m_newElementCounter;
EditMode m_editMode; EditMode m_editMode;
KActionMenu *m_viewDocumentActionMenu; TDEActionMenu *m_viewDocumentActionMenu;
KActionMenu *m_assignKeywordsActionMenu; TDEActionMenu *m_assignKeywordsActionMenu;
TQStringList m_viewDocumentActionMenuURLs; TQStringList m_viewDocumentActionMenuURLs;
TQMap<int, TQString> m_assignKeywordsActionMenuURLs; TQMap<int, TQString> m_assignKeywordsActionMenuURLs;
KActionMenu *m_searchWebsitesActionMenu; TDEActionMenu *m_searchWebsitesActionMenu;
KAction *m_actionEditCut; TDEAction *m_actionEditCut;
KAction *m_actionEditCopy; TDEAction *m_actionEditCopy;
KAction *m_actionEditCopyRef; TDEAction *m_actionEditCopyRef;
KAction *m_actionEditPaste; TDEAction *m_actionEditPaste;
KAction *m_actionEditSelectAll; TDEAction *m_actionEditSelectAll;
KAction *m_actionEditFind; TDEAction *m_actionEditFind;
KAction *m_actionEditFindNext; TDEAction *m_actionEditFindNext;
KAction *m_actionNormalizeIds; TDEAction *m_actionNormalizeIds;
KDirWatch m_dirWatch; KDirWatch m_dirWatch;
void setupGUI(); void setupGUI();

24
src/entrywidget.cpp
Unescape View File

@ -31,13 +31,13 @@
#include <ntqtimer.h> #include <ntqtimer.h>
#include <ntqlineedit.h> #include <ntqlineedit.h>
#include <klocale.h> #include <tdelocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kwin.h> #include <twin.h>
#include <entry.h> #include <entry.h>
#include <entryfield.h> #include <entryfield.h>
@ -113,7 +113,7 @@ namespace KBibTeX
delete m_wqa; delete m_wqa;
KConfig * config = kapp->config(); TDEConfig * config = kapp->config();
config->setGroup( "EntryWidget" ); config->setGroup( "EntryWidget" );
saveWindowSize( config ); saveWindowSize( config );
} }
@ -125,7 +125,7 @@ namespace KBibTeX
if ( ewt != NULL ) if ( ewt != NULL )
ewt->m_fieldLineEditTitle->setFocus(); ewt->m_fieldLineEditTitle->setFocus();
KConfig * config = kapp->config(); TDEConfig * config = kapp->config();
config->setGroup( "EntryWidget" ); config->setGroup( "EntryWidget" );
restoreWindowSize( config ); restoreWindowSize( config );
} }
@ -350,7 +350,7 @@ namespace KBibTeX
m_checkBoxEnableAll = new TQCheckBox( i18n( "Enable all &fields for editing" ), this ); m_checkBoxEnableAll = new TQCheckBox( i18n( "Enable all &fields for editing" ), this );
layout->addMultiCellWidget( m_checkBoxEnableAll, 2, 2, 0, 4 ); layout->addMultiCellWidget( m_checkBoxEnableAll, 2, 2, 0, 4 );
m_pushButtonRefetch = new TQPushButton( KGlobal::iconLoader() ->loadIconSet( "reload", KIcon::Small ), i18n( "Refetch" ), this ); m_pushButtonRefetch = new TQPushButton( TDEGlobal::iconLoader() ->loadIconSet( "reload", TDEIcon::Small ), i18n( "Refetch" ), this );
layout->addWidget( m_pushButtonRefetch, 2, 5 ); layout->addWidget( m_pushButtonRefetch, 2, 5 );
connect( m_pushButtonRefetch, SIGNAL( clicked() ), this, SLOT( refreshFromURL() ) ); connect( m_pushButtonRefetch, SIGNAL( clicked() ), this, SLOT( refreshFromURL() ) );
@ -542,8 +542,8 @@ namespace KBibTeX
m_lineEditID->setText( m_idToSuggestion[id] ); m_lineEditID->setText( m_idToSuggestion[id] );
} }
/* This function was taken form KMainWindow of KDE 3.5 and modified to fit KBibTeX */ /* This function was taken form TDEMainWindow of KDE 3.5 and modified to fit KBibTeX */
void EntryWidget::saveWindowSize( KConfig *config ) const void EntryWidget::saveWindowSize( TDEConfig *config ) const
{ {
int scnum = TQApplication::desktop()->screenNumber( parentWidget() ); int scnum = TQApplication::desktop()->screenNumber( parentWidget() );
TQRect desk = TQApplication::desktop()->screenGeometry( scnum ); TQRect desk = TQApplication::desktop()->screenGeometry( scnum );
@ -576,8 +576,8 @@ namespace KBibTeX
config->writeEntry( heightString, h ); config->writeEntry( heightString, h );
} }
/* This function was taken form KMainWindow of KDE 3.5 and modified to fit KBibTeX */ /* This function was taken form TDEMainWindow of KDE 3.5 and modified to fit KBibTeX */
void EntryWidget::restoreWindowSize( KConfig *config ) void EntryWidget::restoreWindowSize( TDEConfig *config )
{ {
// restore the size // restore the size
int scnum = TQApplication::desktop()->screenNumber( parentWidget() ); int scnum = TQApplication::desktop()->screenNumber( parentWidget() );

6
src/entrywidget.h
Unescape View File

@ -39,7 +39,7 @@ class TQString;
class TQTimer; class TQTimer;
class TQListView; class TQListView;
class KConfig; class TDEConfig;
namespace KBibTeX namespace KBibTeX
{ {
@ -115,8 +115,8 @@ namespace KBibTeX
void updateGUI(); void updateGUI();
void internalApply( BibTeX::Entry *entry ); void internalApply( BibTeX::Entry *entry );
void internalReset( BibTeX::Entry *entry ); void internalReset( BibTeX::Entry *entry );
void restoreWindowSize( KConfig *config ); void restoreWindowSize( TDEConfig *config );
void saveWindowSize( KConfig *config ) const; void saveWindowSize( TDEConfig *config ) const;
}; };
class EntryWidgetDialog: public KDialogBase class EntryWidgetDialog: public KDialogBase

2
src/entrywidgetauthor.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <ntqlabel.h> #include <ntqlabel.h>
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <fieldlistview.h> #include <fieldlistview.h>
#include <entrywidgetwarningsitem.h> #include <entrywidgetwarningsitem.h>

8
src/entrywidgetexternal.cpp
Unescape View File

@ -23,12 +23,12 @@
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kurl.h> #include <kurl.h>
#include <kurllabel.h> #include <kurllabel.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <fieldlineedit.h> #include <fieldlineedit.h>
#include <settings.h> #include <settings.h>
@ -278,7 +278,7 @@ namespace KBibTeX
containerLayout->addStretch( 10 ); containerLayout->addStretch( 10 );
m_pushButtonBrowseLocalFile->setIconSet( TQIconSet( SmallIcon( "fileopen" ) ) ); m_pushButtonBrowseLocalFile->setIconSet( TQIconSet( SmallIcon( "fileopen" ) ) );
KPopupMenu *menu = new KPopupMenu( m_pushButtonBrowseLocalFile ); TDEPopupMenu *menu = new TDEPopupMenu( m_pushButtonBrowseLocalFile );
menu->insertTitle( i18n( "Select base directory" ) ); menu->insertTitle( i18n( "Select base directory" ) );
menu->insertItem( TQIconSet( SmallIcon( "favorite" ) ), i18n( "Current directory" ), m_menuIdCurrentDirectory ); menu->insertItem( TQIconSet( SmallIcon( "favorite" ) ), i18n( "Current directory" ), m_menuIdCurrentDirectory );
if ( m_previousDirectory != TQString::null ) if ( m_previousDirectory != TQString::null )

10
src/entrywidgetkeyword.cpp
Unescape View File

@ -25,11 +25,11 @@
#include <ntqlabel.h> #include <ntqlabel.h>
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <klistview.h> #include <tdelistview.h>
#include <kguiitem.h> #include <kguiitem.h>
#include <kdebug.h> #include <kdebug.h>
@ -38,7 +38,7 @@
namespace KBibTeX namespace KBibTeX
{ {
KeywordListViewItem::KeywordListViewItem( KListView * parent, const TQString & text, bool global ) : TQCheckListItem( parent, text, TQCheckListItem::CheckBox ) KeywordListViewItem::KeywordListViewItem( TDEListView * parent, const TQString & text, bool global ) : TQCheckListItem( parent, text, TQCheckListItem::CheckBox )
{ {
setGlobal( global ); setGlobal( global );
} }
@ -225,7 +225,7 @@ namespace KBibTeX
TQGridLayout * gridLayout = new TQGridLayout( this, 6, 2, KDialog::marginHint(), KDialog::spacingHint(), "gridLayout" ); TQGridLayout * gridLayout = new TQGridLayout( this, 6, 2, KDialog::marginHint(), KDialog::spacingHint(), "gridLayout" );
gridLayout->setRowStretch( 4, 1 ); gridLayout->setRowStretch( 4, 1 );
m_listviewKeywords = new KListView( this ); m_listviewKeywords = new TDEListView( this );
m_listviewKeywords->setEnabled( !m_isReadOnly ); m_listviewKeywords->setEnabled( !m_isReadOnly );
m_listviewKeywords->addColumn( i18n( "Keyword" ) ); m_listviewKeywords->addColumn( i18n( "Keyword" ) );
m_listviewKeywords->addColumn( i18n( "Origin" ) ); m_listviewKeywords->addColumn( i18n( "Origin" ) );

6
src/entrywidgetkeyword.h
Unescape View File

@ -23,14 +23,14 @@
#include <entrywidgettab.h> #include <entrywidgettab.h>
class TQPushButton; class TQPushButton;
class KListView; class TDEListView;
namespace KBibTeX namespace KBibTeX
{ {
class KeywordListViewItem: public TQCheckListItem class KeywordListViewItem: public TQCheckListItem
{ {
public: public:
KeywordListViewItem( KListView * parent, const TQString & text, bool isGlobal ); KeywordListViewItem( TDEListView * parent, const TQString & text, bool isGlobal );
~KeywordListViewItem(); ~KeywordListViewItem();
bool isGlobal() bool isGlobal()
@ -75,7 +75,7 @@ namespace KBibTeX
TQStringList m_fileKeywords; TQStringList m_fileKeywords;
TQStringList m_usedKeywords; TQStringList m_usedKeywords;
bool m_isModified; bool m_isModified;
KListView *m_listviewKeywords; TDEListView *m_listviewKeywords;
TQPushButton *m_buttonNew; TQPushButton *m_buttonNew;
TQPushButton *m_buttonEdit; TQPushButton *m_buttonEdit;
TQPushButton *m_buttonToggleGlobal; TQPushButton *m_buttonToggleGlobal;

2
src/entrywidgetmisc.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <ntqlabel.h> #include <ntqlabel.h>
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <fieldlineedit.h> #include <fieldlineedit.h>
#include <value.h> #include <value.h>

10
src/entrywidgetother.cpp
Unescape View File

@ -24,11 +24,11 @@
#include <ntqwhatsthis.h> #include <ntqwhatsthis.h>
#include <kdialog.h> #include <kdialog.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <klistview.h> #include <tdelistview.h>
#include <klocale.h> #include <tdelocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <klineedit.h> #include <klineedit.h>
@ -149,7 +149,7 @@ namespace KBibTeX
TQSpacerItem* spacer = new TQSpacerItem( 20, 110, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); TQSpacerItem* spacer = new TQSpacerItem( 20, 110, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
gridLayout->addItem( spacer, 2, 0 ); gridLayout->addItem( spacer, 2, 0 );
m_listViewFields = new KListView( this, "m_listViewFields" ); m_listViewFields = new TDEListView( this, "m_listViewFields" );
m_listViewFields->addColumn( i18n( "Key" ) ); m_listViewFields->addColumn( i18n( "Key" ) );
m_listViewFields->addColumn( i18n( "Value" ) ); m_listViewFields->addColumn( i18n( "Value" ) );
m_listViewFields->setAllColumnsShowFocus( true ); m_listViewFields->setAllColumnsShowFocus( true );

4
src/entrywidgetother.h
Unescape View File

@ -25,7 +25,7 @@
#include <entrywidgettab.h> #include <entrywidgettab.h>
class TQPushButton; class TQPushButton;
class KListView; class TDEListView;
class TQLineEdit; class TQLineEdit;
namespace KBibTeX namespace KBibTeX
@ -59,7 +59,7 @@ namespace KBibTeX
TQPushButton *m_pushButtonOpen; TQPushButton *m_pushButtonOpen;
TQLineEdit *m_lineEditKey; TQLineEdit *m_lineEditKey;
FieldLineEdit *m_fieldLineEditValue; FieldLineEdit *m_fieldLineEditValue;
KListView *m_listViewFields; TDEListView *m_listViewFields;
KURL m_internalURL; KURL m_internalURL;
void setupGUI(); void setupGUI();

2
src/entrywidgetpublication.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <kurl.h> #include <kurl.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <settings.h> #include <settings.h>
#include <fieldlineedit.h> #include <fieldlineedit.h>

6
src/entrywidgetsource.cpp
Unescape View File

@ -23,8 +23,8 @@
#include <kdialog.h> #include <kdialog.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <klocale.h> #include <tdelocale.h>
#include <kglobalsettings.h> #include <tdeglobalsettings.h>
#include <fileexporterbibtex.h> #include <fileexporterbibtex.h>
#include <fileimporterbibtex.h> #include <fileimporterbibtex.h>
@ -149,7 +149,7 @@ namespace KBibTeX
m_textEditSource = new TQTextEdit( this ); m_textEditSource = new TQTextEdit( this );
gridLayout->addMultiCellWidget( m_textEditSource, 0, 0, 0, 1 ); gridLayout->addMultiCellWidget( m_textEditSource, 0, 0, 0, 1 );
m_textEditSource->setFont( KGlobalSettings::fixedFont() ); m_textEditSource->setFont( TDEGlobalSettings::fixedFont() );
m_textEditSource->setReadOnly( m_isReadOnly ); m_textEditSource->setReadOnly( m_isReadOnly );
KPushButton *btnReset = new KPushButton( i18n( "Restore" ), this ); KPushButton *btnReset = new KPushButton( i18n( "Restore" ), this );

2
src/entrywidgettab.cpp
Unescape View File

@ -17,7 +17,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include <klocale.h> #include <tdelocale.h>
#include <entry.h> #include <entry.h>
#include <entrywidgetwarningsitem.h> #include <entrywidgetwarningsitem.h>

2
src/entrywidgettitle.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <ntqlayout.h> #include <ntqlayout.h>
#include <ntqlabel.h> #include <ntqlabel.h>
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <fieldlineedit.h> #include <fieldlineedit.h>
#include <value.h> #include <value.h>

2
src/entrywidgetuserdefined.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kdialog.h> #include <kdialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <tdelocale.h>
#include <settings.h> #include <settings.h>
#include "entrywidgetuserdefined.h" #include "entrywidgetuserdefined.h"

10
src/entrywidgetwarningsitem.cpp
Unescape View File

@ -18,7 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <tdelocale.h>
#include "entrywidgetwarningsitem.h" #include "entrywidgetwarningsitem.h"
@ -28,17 +28,17 @@ namespace KBibTeX
EntryWidgetWarningsItem::EntryWidgetWarningsItem( WarningLevel level, const TQString &message, TQWidget *widget, TQListView *parent, const char* name ) EntryWidgetWarningsItem::EntryWidgetWarningsItem( WarningLevel level, const TQString &message, TQWidget *widget, TQListView *parent, const char* name )
: TQListViewItem( parent, name ), m_widget( widget ) : TQListViewItem( parent, name ), m_widget( widget )
{ {
KIconLoader * loader = KGlobal::instance() ->iconLoader(); TDEIconLoader * loader = TDEGlobal::instance() ->iconLoader();
switch ( level ) switch ( level )
{ {
case wlInformation: case wlInformation:
setPixmap( 0, loader->loadIcon( "messagebox_info", KIcon::NoGroup, KIcon::SizeSmall ) ); setPixmap( 0, loader->loadIcon( "messagebox_info", TDEIcon::NoGroup, TDEIcon::SizeSmall ) );
break; break;
case wlWarning: case wlWarning:
setPixmap( 0, loader->loadIcon( "messagebox_warning", KIcon::NoGroup, KIcon::SizeSmall ) ); setPixmap( 0, loader->loadIcon( "messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeSmall ) );
break; break;
case wlError: case wlError:
setPixmap( 0, loader->loadIcon( "messagebox_critical", KIcon::NoGroup, KIcon::SizeSmall ) ); setPixmap( 0, loader->loadIcon( "messagebox_critical", TDEIcon::NoGroup, TDEIcon::SizeSmall ) );
break; break;
default: default:
{ {

2
src/fieldlineedit.cpp
Unescape View File

@ -24,7 +24,7 @@
#include <ntqtextedit.h> #include <ntqtextedit.h>
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klineedit.h> #include <klineedit.h>

4
src/fieldlineedit.h
Unescape View File

@ -28,7 +28,7 @@
class KLineEdit; class KLineEdit;
class TQTextEdit; class TQTextEdit;
class TQPushButton; class TQPushButton;
class KCompletion; class TDECompletion;
namespace KBibTeX namespace KBibTeX
{ {
@ -95,7 +95,7 @@ namespace KBibTeX
InputType m_inputType; InputType m_inputType;
bool m_isModified; bool m_isModified;
BibTeX::EntryField::FieldType m_fieldType; BibTeX::EntryField::FieldType m_fieldType;
KCompletion *m_completion; TDECompletion *m_completion;
void setupGUI( const char *name ); void setupGUI( const char *name );
void enableSignals( bool enabled ); void enableSignals( bool enabled );

14
src/fieldlistview.cpp
Unescape View File

@ -27,10 +27,10 @@
#include <ntqpushbutton.h> #include <ntqpushbutton.h>
#include <ntqcheckbox.h> #include <ntqcheckbox.h>
#include <klistview.h> #include <tdelistview.h>
#include <klineedit.h> #include <klineedit.h>
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -201,7 +201,7 @@ namespace KBibTeX
{ {
if ( isSimple() ) if ( isSimple() )
{ {
KListViewItem * item = new KListViewItem( m_listViewElements, m_listViewElements->lastItem(), TQString( "%1%2" ).arg( m_prefixNew ).arg( ++m_newValueCounter ) ); TDEListViewItem * item = new TDEListViewItem( m_listViewElements, m_listViewElements->lastItem(), TQString( "%1%2" ).arg( m_prefixNew ).arg( ++m_newValueCounter ) );
m_listViewElements->setSelected( item, TRUE ); m_listViewElements->setSelected( item, TRUE );
updateGUI(); updateGUI();
TQTimer::singleShot( 100, this, SLOT( slotEdit() ) ); TQTimer::singleShot( 100, this, SLOT( slotEdit() ) );
@ -212,7 +212,7 @@ namespace KBibTeX
{ {
if ( isSimple() ) if ( isSimple() )
{ {
KListViewItem * item = static_cast<KListViewItem*>( m_listViewElements->selectedItem() ); TDEListViewItem * item = static_cast<TDEListViewItem*>( m_listViewElements->selectedItem() );
if ( item != NULL ) if ( item != NULL )
m_listViewElements->rename( item, 0 ); m_listViewElements->rename( item, 0 );
} }
@ -293,10 +293,10 @@ namespace KBibTeX
TQGridLayout * layout = new TQGridLayout( this, 8, 2, 0, KDialog::spacingHint() ); TQGridLayout * layout = new TQGridLayout( this, 8, 2, 0, KDialog::spacingHint() );
layout->setRowStretch( 5, 1 ); layout->setRowStretch( 5, 1 );
m_listViewElements = new KListView( this ); m_listViewElements = new TDEListView( this );
layout->addMultiCellWidget( m_listViewElements, 0, 6, 0, 0 ); layout->addMultiCellWidget( m_listViewElements, 0, 6, 0, 0 );
m_listViewElements->renameLineEdit() ->setCompletionObject( settings->completion( m_fieldType ) ); m_listViewElements->renameLineEdit() ->setCompletionObject( settings->completion( m_fieldType ) );
m_listViewElements->renameLineEdit() ->setCompletionMode( KGlobalSettings::CompletionPopup ); m_listViewElements->renameLineEdit() ->setCompletionMode( TDEGlobalSettings::CompletionPopup );
m_listViewElements->renameLineEdit() ->completionObject() ->setIgnoreCase( true ); m_listViewElements->renameLineEdit() ->completionObject() ->setIgnoreCase( true );
m_listViewElements->setDefaultRenameAction( TQListView::Accept ); m_listViewElements->setDefaultRenameAction( TQListView::Accept );
m_listViewElements->addColumn( m_caption ); m_listViewElements->addColumn( m_caption );
@ -304,7 +304,7 @@ namespace KBibTeX
m_listViewElements->setItemsRenameable( TRUE ); m_listViewElements->setItemsRenameable( TRUE );
if ( settings->editing_UseSpecialFont ) if ( settings->editing_UseSpecialFont )
m_listViewElements->setFont( settings->editing_SpecialFont ); m_listViewElements->setFont( settings->editing_SpecialFont );
m_listViewElements->header() ->setFont( KGlobalSettings::generalFont() ); m_listViewElements->header() ->setFont( TDEGlobalSettings::generalFont() );
m_listViewElements->header() ->setClickEnabled( FALSE ); m_listViewElements->header() ->setClickEnabled( FALSE );
m_listViewElements->header() ->setStretchEnabled( TRUE, 0 ); m_listViewElements->header() ->setStretchEnabled( TRUE, 0 );

4
src/fieldlistview.h
Unescape View File

@ -26,7 +26,7 @@
#include <entryfield.h> #include <entryfield.h>
class TQString; class TQString;
class KListView; class TDEListView;
class TQListViewItem; class TQListViewItem;
class TQPushButton; class TQPushButton;
class TQCheckBox; class TQCheckBox;
@ -81,7 +81,7 @@ namespace KBibTeX
bool m_isModified; bool m_isModified;
int m_newValueCounter; int m_newValueCounter;
BibTeX::EntryField::FieldType m_fieldType; BibTeX::EntryField::FieldType m_fieldType;
KListView *m_listViewElements; TDEListView *m_listViewElements;
TQPushButton *m_pushButtonAdd; TQPushButton *m_pushButtonAdd;
TQPushButton *m_pushButtonEdit; TQPushButton *m_pushButtonEdit;
TQPushButton *m_pushButtonDelete; TQPushButton *m_pushButtonDelete;

4
src/findduplicates.cpp
Unescape View File

@ -25,8 +25,8 @@
#include <ntqapplication.h> #include <ntqapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <tdelocale.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kprogress.h> #include <kprogress.h>
#include <element.h> #include <element.h>

2
src/idsuggestions.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#include <ntqregexp.h> #include <ntqregexp.h>
#include <klocale.h> #include <tdelocale.h>
#include <encoderlatex.h> #include <encoderlatex.h>
#include <file.h> #include <file.h>

24
src/idsuggestionswidget.cpp
Unescape View File

@ -24,14 +24,14 @@
#include <ntqobjectlist.h> #include <ntqobjectlist.h>
#include <ntqscrollview.h> #include <ntqscrollview.h>
#include <kglobalsettings.h> #include <tdeglobalsettings.h>
#include <klineedit.h> #include <klineedit.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <tdelocale.h>
#include <idsuggestions.h> #include <idsuggestions.h>
#include <fileimporter.h> #include <fileimporter.h>
@ -117,8 +117,8 @@ namespace KBibTeX
TQFont labelFont( label->font() ); TQFont labelFont( label->font() );
labelFont.setBold( TRUE ); labelFont.setBold( TRUE );
label->setFont( labelFont ); label->setFont( labelFont );
label->setBackgroundColor( KGlobalSettings::highlightColor() ); label->setBackgroundColor( TDEGlobalSettings::highlightColor() );
label->setPaletteForegroundColor( KGlobalSettings::highlightedTextColor() ); label->setPaletteForegroundColor( TDEGlobalSettings::highlightedTextColor() );
label->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); label->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
layout->addMultiCellWidget( label, 0, 0, 0, 2 ); layout->addMultiCellWidget( label, 0, 0, 0, 2 );
@ -206,8 +206,8 @@ namespace KBibTeX
TQFont labelFont( label->font() ); TQFont labelFont( label->font() );
labelFont.setBold( TRUE ); labelFont.setBold( TRUE );
label->setFont( labelFont ); label->setFont( labelFont );
label->setBackgroundColor( KGlobalSettings::highlightColor() ); label->setBackgroundColor( TDEGlobalSettings::highlightColor() );
label->setPaletteForegroundColor( KGlobalSettings::highlightedTextColor() ); label->setPaletteForegroundColor( TDEGlobalSettings::highlightedTextColor() );
label->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); label->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
layout->addMultiCellWidget( label, 0, 0, 0, 2 ); layout->addMultiCellWidget( label, 0, 0, 0, 2 );
@ -281,8 +281,8 @@ namespace KBibTeX
TQFont labelFont( label->font() ); TQFont labelFont( label->font() );
labelFont.setBold( TRUE ); labelFont.setBold( TRUE );
label->setFont( labelFont ); label->setFont( labelFont );
label->setBackgroundColor( KGlobalSettings::highlightColor() ); label->setBackgroundColor( TDEGlobalSettings::highlightColor() );
label->setPaletteForegroundColor( KGlobalSettings::highlightedTextColor() ); label->setPaletteForegroundColor( TDEGlobalSettings::highlightedTextColor() );
label->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); label->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
layout->addMultiCellWidget( label, 0, 0, 0, 2 ); layout->addMultiCellWidget( label, 0, 0, 0, 2 );
@ -316,8 +316,8 @@ namespace KBibTeX
TQFont labelFont( label->font() ); TQFont labelFont( label->font() );
labelFont.setBold( TRUE ); labelFont.setBold( TRUE );
label->setFont( labelFont ); label->setFont( labelFont );
label->setBackgroundColor( KGlobalSettings::highlightColor() ); label->setBackgroundColor( TDEGlobalSettings::highlightColor() );
label->setPaletteForegroundColor( KGlobalSettings::highlightedTextColor() ); label->setPaletteForegroundColor( TDEGlobalSettings::highlightedTextColor() );
label->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); label->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
layout->addMultiCellWidget( label, 0, 0, 0, 2 ); layout->addMultiCellWidget( label, 0, 0, 0, 2 );
@ -479,7 +479,7 @@ namespace KBibTeX
TQVBoxLayout *listLayout = new TQVBoxLayout( m_listOfComponents, 0, KDialog::spacingHint() ); TQVBoxLayout *listLayout = new TQVBoxLayout( m_listOfComponents, 0, KDialog::spacingHint() );
listLayout->setAutoAdd( TRUE ); listLayout->setAutoAdd( TRUE );
KPopupMenu *addMenu = new KPopupMenu( m_pushButtonAdd ); TDEPopupMenu *addMenu = new TDEPopupMenu( m_pushButtonAdd );
addMenu->insertItem( i18n( "Author" ), 1 ); addMenu->insertItem( i18n( "Author" ), 1 );
addMenu->insertItem( i18n( "Year" ), 2 ); addMenu->insertItem( i18n( "Year" ), 2 );
addMenu->insertItem( i18n( "Title" ), 3 ); addMenu->insertItem( i18n( "Title" ), 3 );

4
src/kbibtex.desktop
Unescape View File

@ -7,6 +7,6 @@ X-DocPath=kbibtex/kbibtex.html
Comment=A BibTeX editor for KDE Comment=A BibTeX editor for KDE
Comment[de]=Ein BibTeX-Editor für KDE Comment[de]=Ein BibTeX-Editor für KDE
MimeType=text/x-bibtex; MimeType=text/x-bibtex;
Categories=Qt;KDE;Office; Categories=Qt;TDE;Office;
X-KDE-HasTempFileOption=true X-TDE-HasTempFileOption=true
X-DCOP-ServiceType=Unique X-DCOP-ServiceType=Unique

142
src/kbibtex_part.cpp
Unescape View File

@ -33,26 +33,26 @@
#include <ntqtextedit.h> #include <ntqtextedit.h>
#include <ntqclipboard.h> #include <ntqclipboard.h>
#include <kinstance.h> #include <kinstance.h>
#include <kaction.h> #include <tdeaction.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <klistview.h> #include <tdelistview.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <tdelocale.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <ktempfile.h> #include <tdetempfile.h>
#include <kconfigdialog.h> #include <tdeconfigdialog.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kglobalsettings.h> #include <tdeglobalsettings.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kshortcut.h> #include <tdeshortcut.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kxmlguifactory.h> #include <kxmlguifactory.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kmainwindow.h> #include <tdemainwindow.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -76,7 +76,7 @@ KBibTeXPart::KBibTeXPart( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name ) TQObject *parent, const char *name )
: KParts::ReadWritePart( parent, name ), m_defInitCounter( 0 ), m_settingsDlg( NULL ), m_initializationDone( FALSE ), m_inPipe( NULL ) : KParts::ReadWritePart( parent, name ), m_defInitCounter( 0 ), m_settingsDlg( NULL ), m_initializationDone( FALSE ), m_inPipe( NULL )
{ {
m_mainWindow = dynamic_cast<KMainWindow*>( parent ); m_mainWindow = dynamic_cast<TDEMainWindow*>( parent );
if ( m_mainWindow == NULL ) if ( m_mainWindow == NULL )
kdDebug( ) << "Cannot determine main window" << endl; kdDebug( ) << "Cannot determine main window" << endl;
@ -131,7 +131,7 @@ void KBibTeXPart::setReadWrite( bool rw )
void KBibTeXPart::setModified( bool modified ) void KBibTeXPart::setModified( bool modified )
{ {
// get a handle on our Save action and make sure it is valid // get a handle on our Save action and make sure it is valid
KAction * save = actionCollection() ->action( KStdAction::stdName( KStdAction::Save ) ); TDEAction * save = actionCollection() ->action( KStdAction::stdName( KStdAction::Save ) );
if ( save ) if ( save )
{ {
@ -229,7 +229,7 @@ bool KBibTeXPart::saveFile()
usedFileName = KBibTeX::Settings::resolveLink( m_file, fi.readLink() ); usedFileName = KBibTeX::Settings::resolveLink( m_file, fi.readLink() );
m_documentWidget->dirWatch().stopScan(); m_documentWidget->dirWatch().stopScan();
success = KIO::NetAccess::file_copy( KURL( tempBibFile.name() ), KURL( usedFileName ), -1, true, false, widget() ); success = TDEIO::NetAccess::file_copy( KURL( tempBibFile.name() ), KURL( usedFileName ), -1, true, false, widget() );
m_documentWidget->dirWatch().startScan(); m_documentWidget->dirWatch().startScan();
} }
@ -253,7 +253,7 @@ bool KBibTeXPart::saveAs()
if ( saveURL.isValid() && !saveURL.isEmpty() ) if ( saveURL.isValid() && !saveURL.isEmpty() )
{ {
if ( KIO::NetAccess::exists( saveURL, FALSE, widget() ) && KMessageBox::warningContinueCancel( widget(), i18n( "A file named '%1' already exists. Are you sure you want to overwrite it?" ).arg( saveURL.filename() ), TQString::null, i18n( "Overwrite" ) ) != KMessageBox::Continue ) if ( TDEIO::NetAccess::exists( saveURL, FALSE, widget() ) && KMessageBox::warningContinueCancel( widget(), i18n( "A file named '%1' already exists. Are you sure you want to overwrite it?" ).arg( saveURL.filename() ), TQString::null, i18n( "Overwrite" ) ) != KMessageBox::Continue )
return result; return result;
if ( ReadWritePart::saveAs( saveURL ) ) if ( ReadWritePart::saveAs( saveURL ) )
@ -274,7 +274,7 @@ void KBibTeXPart::slotFileExport()
if ( exportURL.isValid() && !exportURL.isEmpty() ) if ( exportURL.isValid() && !exportURL.isEmpty() )
{ {
if ( KIO::NetAccess::exists( exportURL, FALSE, widget() ) ) if ( TDEIO::NetAccess::exists( exportURL, FALSE, widget() ) )
{ {
if ( KMessageBox::warningContinueCancel( widget(), i18n( "A file named '%1' already exists. Are you sure you want to overwrite it?" ).arg( exportURL.filename() ), TQString::null, i18n( "Overwrite" ) ) != KMessageBox::Continue ) if ( KMessageBox::warningContinueCancel( widget(), i18n( "A file named '%1' already exists. Are you sure you want to overwrite it?" ).arg( exportURL.filename() ), TQString::null, i18n( "Overwrite" ) ) != KMessageBox::Continue )
return ; return ;
@ -334,12 +334,12 @@ void KBibTeXPart::slotFileExport()
if ( !error ) if ( !error )
{ {
tempBibFile.close(); tempBibFile.close();
error = !KIO::NetAccess::file_copy( KURL( tempBibFile.name() ), exportURL, -1, TRUE, FALSE, widget() ); error = !TDEIO::NetAccess::file_copy( KURL( tempBibFile.name() ), exportURL, -1, TRUE, FALSE, widget() );
} }
if ( error ) if ( error )
{ {
#if (KDE_VERSION_MINOR>=4) && (KDE_VERSION_MAJOR>=3) #if (TDE_VERSION_MINOR>=4) && (TDE_VERSION_MAJOR>=3)
if ( !errorLog.empty() ) if ( !errorLog.empty() )
KMessageBox::errorList( widget(), TQString( i18n( "File could not be exported in '%1'." ) ).arg( exportURL.prettyURL() ).append( i18n( "\n\nSee the following error log for details." ) ), errorLog, i18n( "Exporting failed" ) ); KMessageBox::errorList( widget(), TQString( i18n( "File could not be exported in '%1'." ) ).arg( exportURL.prettyURL() ).append( i18n( "\n\nSee the following error log for details." ) ), errorLog, i18n( "Exporting failed" ) );
else else
@ -378,7 +378,7 @@ void KBibTeXPart::slotFileMerge()
return; return;
extension = extension.mid( extPos ); extension = extension.mid( extPos );
if ( !KIO::NetAccess::exists( mergeURL, TRUE, widget() ) ) if ( !TDEIO::NetAccess::exists( mergeURL, TRUE, widget() ) )
{ {
KMessageBox::error( widget(), i18n( "The given file could not be read, check if it exists or if it is readable for the current user." ) ); KMessageBox::error( widget(), i18n( "The given file could not be read, check if it exists or if it is readable for the current user." ) );
return ; return ;
@ -386,7 +386,7 @@ void KBibTeXPart::slotFileMerge()
KTempFile tempBibFile = KTempFile( locateLocal( "tmp", "bibmerge" ), extension ); KTempFile tempBibFile = KTempFile( locateLocal( "tmp", "bibmerge" ), extension );
tempBibFile.setAutoDelete( TRUE ); tempBibFile.setAutoDelete( TRUE );
bool error = !KIO::NetAccess::file_copy( mergeURL, KURL( tempBibFile.name() ), -1, TRUE, FALSE, widget() ); bool error = !TDEIO::NetAccess::file_copy( mergeURL, KURL( tempBibFile.name() ), -1, TRUE, FALSE, widget() );
if ( !error ) if ( !error )
error = !m_documentWidget->open( tempBibFile.name(), TRUE ); error = !m_documentWidget->open( tempBibFile.name(), TRUE );
@ -427,11 +427,11 @@ void KBibTeXPart::setupActions()
KStdAction::save( this, SLOT( save() ), actionCollection() ) ->setToolTip( i18n( "Save the current file" ) ); KStdAction::save( this, SLOT( save() ), actionCollection() ) ->setToolTip( i18n( "Save the current file" ) );
KStdAction::saveAs( this, SLOT( slotFileSaveAs() ), actionCollection() ) ->setToolTip( i18n( "Save the current file under a new filename" ) ); KStdAction::saveAs( this, SLOT( slotFileSaveAs() ), actionCollection() ) ->setToolTip( i18n( "Save the current file under a new filename" ) );
} }
m_actionFileStatistics = new KAction( i18n( "Statistics..." ), CTRL + SHIFT + Key_I, this, SLOT( slotFileStatistics() ), actionCollection(), "file_statistics" ); m_actionFileStatistics = new TDEAction( i18n( "Statistics..." ), CTRL + SHIFT + Key_I, this, SLOT( slotFileStatistics() ), actionCollection(), "file_statistics" );
m_actionFileFindDups = new KAction( i18n( "Find Duplicates..." ), CTRL + SHIFT + Key_D, this, SLOT( slotFileFindDups() ), actionCollection(), "file_finddups" ); m_actionFileFindDups = new TDEAction( i18n( "Find Duplicates..." ), CTRL + SHIFT + Key_D, this, SLOT( slotFileFindDups() ), actionCollection(), "file_finddups" );
m_actionFileExport = new KAction( i18n( "Export..." ), SmallIconSet( "goto" ), CTRL + Key_E, this, SLOT( slotFileExport() ), actionCollection(), "file_export" ); m_actionFileExport = new TDEAction( i18n( "Export..." ), SmallIconSet( "goto" ), CTRL + Key_E, this, SLOT( slotFileExport() ), actionCollection(), "file_export" );
m_actionFileExport->setToolTip( i18n( "Export to a different file format" ) ); m_actionFileExport->setToolTip( i18n( "Export to a different file format" ) );
m_actionFileMerge = new KAction( i18n( "Merge..." ), SmallIconSet( "reload" ), CTRL + Key_M, this, SLOT( slotFileMerge() ), actionCollection(), "file_merge" ); m_actionFileMerge = new TDEAction( i18n( "Merge..." ), SmallIconSet( "reload" ), CTRL + Key_M, this, SLOT( slotFileMerge() ), actionCollection(), "file_merge" );
m_actionFileMerge->setToolTip( i18n( "Merge BibTeX entries from another file" ) ); m_actionFileMerge->setToolTip( i18n( "Merge BibTeX entries from another file" ) );
m_actionEditCut = KStdAction::cut( m_documentWidget, SLOT( cutElements() ), actionCollection() ); m_actionEditCut = KStdAction::cut( m_documentWidget, SLOT( cutElements() ), actionCollection() );
@ -442,14 +442,14 @@ void KBibTeXPart::setupActions()
m_actionEditCopy->setEnabled( FALSE ); m_actionEditCopy->setEnabled( FALSE );
m_actionEditUndo = KStdAction::undo( m_documentWidget, SLOT( undoEditor() ), actionCollection() ); m_actionEditUndo = KStdAction::undo( m_documentWidget, SLOT( undoEditor() ), actionCollection() );
connect( m_documentWidget, SIGNAL( undoChanged( bool ) ), this, SLOT( slotUndoChanged( bool ) ) ); connect( m_documentWidget, SIGNAL( undoChanged( bool ) ), this, SLOT( slotUndoChanged( bool ) ) );
m_actionEditCopyRef = new KAction( i18n( "Copy &Reference" ), CTRL + SHIFT + Key_C, m_documentWidget, SLOT( copyRefElements() ), actionCollection(), "edit_copyref" ); m_actionEditCopyRef = new TDEAction( i18n( "Copy &Reference" ), CTRL + SHIFT + Key_C, m_documentWidget, SLOT( copyRefElements() ), actionCollection(), "edit_copyref" );
m_actionEditCopyRef->setToolTip( i18n( "Copy a reference of the selected BibTeX elements to the clipboard" ) ); m_actionEditCopyRef->setToolTip( i18n( "Copy a reference of the selected BibTeX elements to the clipboard" ) );
m_actionEditCopyRef->setEnabled( FALSE ); m_actionEditCopyRef->setEnabled( FALSE );
m_actionEditPaste = KStdAction::paste( m_documentWidget, SLOT( pasteElements() ), actionCollection() ); m_actionEditPaste = KStdAction::paste( m_documentWidget, SLOT( pasteElements() ), actionCollection() );
m_actionEditPaste->setToolTip( i18n( "Paste BibTeX elements from the clipboard" ) ); m_actionEditPaste->setToolTip( i18n( "Paste BibTeX elements from the clipboard" ) );
m_actionEditSelectAll = KStdAction::selectAll( m_documentWidget, SLOT( selectAll() ), actionCollection() ); m_actionEditSelectAll = KStdAction::selectAll( m_documentWidget, SLOT( selectAll() ), actionCollection() );
m_actionEditSelectAll->setToolTip( i18n( "Select all BibTeX elements" ) ); m_actionEditSelectAll->setToolTip( i18n( "Select all BibTeX elements" ) );
m_actionElementSendToLyX = new KAction( i18n( "Send Reference to &LyX" ), CTRL + SHIFT + Key_L, m_documentWidget, SLOT( sendSelectedToLyx() ), actionCollection(), "element_sendtolyx" ); m_actionElementSendToLyX = new TDEAction( i18n( "Send Reference to &LyX" ), CTRL + SHIFT + Key_L, m_documentWidget, SLOT( sendSelectedToLyx() ), actionCollection(), "element_sendtolyx" );
m_actionElementSendToLyX->setToolTip( i18n( "Send a reference of the selected BibTeX elements to LyX" ) ); m_actionElementSendToLyX->setToolTip( i18n( "Send a reference of the selected BibTeX elements to LyX" ) );
m_actionElementSendToLyX->setEnabled( FALSE ); m_actionElementSendToLyX->setEnabled( FALSE );
m_actionEditFind = KStdAction::find( m_documentWidget, SLOT( find() ), actionCollection() ); m_actionEditFind = KStdAction::find( m_documentWidget, SLOT( find() ), actionCollection() );
@ -459,66 +459,66 @@ void KBibTeXPart::setupActions()
m_actionEditFind->setEnabled( FALSE ); m_actionEditFind->setEnabled( FALSE );
m_actionEditFindNext->setEnabled( FALSE ); m_actionEditFindNext->setEnabled( FALSE );
m_actionSearchOnlineDatabases = new KAction( i18n( "Search Online Databases" ), SmallIconSet( "network" ), CTRL + SHIFT + Key_S, m_documentWidget, SLOT( onlineSearch() ), actionCollection(), "search_onlinedatabases" ); m_actionSearchOnlineDatabases = new TDEAction( i18n( "Search Online Databases" ), SmallIconSet( "network" ), CTRL + SHIFT + Key_S, m_documentWidget, SLOT( onlineSearch() ), actionCollection(), "search_onlinedatabases" );
m_actionSearchOnlineDatabases->setToolTip( i18n( "Search online databases to import bibliography data" ) ); m_actionSearchOnlineDatabases->setToolTip( i18n( "Search online databases to import bibliography data" ) );
m_actionMenuSearchWebsites = new KActionMenu( i18n( "Search Document Online" ), actionCollection(), "search_document_online" ); m_actionMenuSearchWebsites = new TDEActionMenu( i18n( "Search Document Online" ), actionCollection(), "search_document_online" );
m_actionMenuSearchWebsites->setToolTip( i18n( "Search websites for the selected BibTeX element" ) ); m_actionMenuSearchWebsites->setToolTip( i18n( "Search websites for the selected BibTeX element" ) );
connect( m_actionMenuSearchWebsites->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotSearchWebsites( int ) ) ); connect( m_actionMenuSearchWebsites->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotSearchWebsites( int ) ) );
m_actionMenuSearchWebsites->setEnabled( FALSE ); m_actionMenuSearchWebsites->setEnabled( FALSE );
m_actionViewShowColumns = new KActionMenu( i18n( "&Show Columns" ), actionCollection(), "view_showcolumns" ); m_actionViewShowColumns = new TDEActionMenu( i18n( "&Show Columns" ), actionCollection(), "view_showcolumns" );
m_actionViewShowColumns->setToolTip( i18n( "Select columns to show in the main list" ) ); m_actionViewShowColumns->setToolTip( i18n( "Select columns to show in the main list" ) );
m_actionViewDocument = new KActionMenu( i18n( "View Document" ), actionCollection(), "view_document" ); m_actionViewDocument = new TDEActionMenu( i18n( "View Document" ), actionCollection(), "view_document" );
m_actionViewDocument->setToolTip( i18n( "View the documents associated with this BibTeX entry" ) ); m_actionViewDocument->setToolTip( i18n( "View the documents associated with this BibTeX entry" ) );
m_actionViewDocument->setEnabled( FALSE ); m_actionViewDocument->setEnabled( FALSE );
m_actionViewFirstDocument = new KAction( i18n( "View Primary Document" ), 0, m_documentWidget, SLOT( slotViewFirstDocument() ), actionCollection(), "view_first_document" ); m_actionViewFirstDocument = new TDEAction( i18n( "View Primary Document" ), 0, m_documentWidget, SLOT( slotViewFirstDocument() ), actionCollection(), "view_first_document" );
m_actionViewFirstDocument->setShortcut( TQt::Key_F4 ); m_actionViewFirstDocument->setShortcut( TQt::Key_F4 );
m_actionViewDocumentOnlineRef = new KAction( i18n( "View Primary Online Reference" ), 0, m_documentWidget, SLOT( slotViewFirstDocumentsOnlineRef() ), actionCollection(), "view_first_documents_online_ref" ); m_actionViewDocumentOnlineRef = new TDEAction( i18n( "View Primary Online Reference" ), 0, m_documentWidget, SLOT( slotViewFirstDocumentsOnlineRef() ), actionCollection(), "view_first_documents_online_ref" );
m_actionViewDocumentOnlineRef->setShortcut( TQt::Key_F5 ); m_actionViewDocumentOnlineRef->setShortcut( TQt::Key_F5 );
m_actionAssignKeywords = new KActionMenu( i18n( "Assign Keywords" ), actionCollection(), "assign_keywords" ); m_actionAssignKeywords = new TDEActionMenu( i18n( "Assign Keywords" ), actionCollection(), "assign_keywords" );
m_actionAssignKeywords->setToolTip( i18n( "Assign keywords to this entry" ) ); m_actionAssignKeywords->setToolTip( i18n( "Assign keywords to this entry" ) );
m_actionAssignKeywords->setEnabled( FALSE ); m_actionAssignKeywords->setEnabled( FALSE );
m_actionNormalizeIds = new KAction( i18n( "Normalize Entry Ids" ), 0, m_documentWidget, SLOT( slotNormalizeIds() ), actionCollection( ), "normalize_ids" ); m_actionNormalizeIds = new TDEAction( i18n( "Normalize Entry Ids" ), 0, m_documentWidget, SLOT( slotNormalizeIds() ), actionCollection( ), "normalize_ids" );
m_actionNormalizeIds->setToolTip( i18n( "Set entry ids as specified in the id suggestion settings" ) ); m_actionNormalizeIds->setToolTip( i18n( "Set entry ids as specified in the id suggestion settings" ) );
m_actionNormalizeIds->setEnabled( FALSE ); m_actionNormalizeIds->setEnabled( FALSE );
m_actionPreferences = KStdAction::preferences( this, SLOT( slotPreferences() ), actionCollection() ); m_actionPreferences = KStdAction::preferences( this, SLOT( slotPreferences() ), actionCollection() );
m_actionPreferences->setToolTip( i18n( "Configure KBibTeX" ) ); m_actionPreferences->setToolTip( i18n( "Configure KBibTeX" ) );
KAction *actionSourceEditor = new KAction( i18n( "Configure Source View..." ), 0, m_documentWidget, SLOT( configureEditor() ), actionCollection(), "options_configure_editor" ); TDEAction *actionSourceEditor = new TDEAction( i18n( "Configure Source View..." ), 0, m_documentWidget, SLOT( configureEditor() ), actionCollection(), "options_configure_editor" );
actionSourceEditor ->setToolTip( i18n( "Configure the Source Editor" ) ); actionSourceEditor ->setToolTip( i18n( "Configure the Source Editor" ) );
( new KAction( i18n( "Article" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_article" ) ) ->setToolTip( i18n( "Add an article to the BibTeX file" ) ); ( new TDEAction( i18n( "Article" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_article" ) ) ->setToolTip( i18n( "Add an article to the BibTeX file" ) );
( new KAction( i18n( "Book" ), "element_new_entry_book", CTRL + Key_B, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_book" ) ) ->setToolTip( i18n( "Add a book to the BibTeX file" ) ); ( new TDEAction( i18n( "Book" ), "element_new_entry_book", CTRL + Key_B, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_book" ) ) ->setToolTip( i18n( "Add a book to the BibTeX file" ) );
( new KAction( i18n( "Booklet" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_booklet" ) ) ->setToolTip( i18n( "Add a booklet to the BibTeX file" ) ); ( new TDEAction( i18n( "Booklet" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_booklet" ) ) ->setToolTip( i18n( "Add a booklet to the BibTeX file" ) );
( new KAction( i18n( "Electronic (IEEE)" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_electronic" ) ) ->setToolTip( i18n( "Add an electronic reference (IEEE) to the BibTeX file" ) ); ( new TDEAction( i18n( "Electronic (IEEE)" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_electronic" ) ) ->setToolTip( i18n( "Add an electronic reference (IEEE) to the BibTeX file" ) );
( new KAction( i18n( "InBook" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_inbook" ) ) ->setToolTip( i18n( "Add a part of a book to the BibTeX file" ) ); ( new TDEAction( i18n( "InBook" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_inbook" ) ) ->setToolTip( i18n( "Add a part of a book to the BibTeX file" ) );
( new KAction( i18n( "InCollection" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_incollection" ) ) ->setToolTip( i18n( "Add a publication which is part of some collection to the BibTeX file" ) ); ( new TDEAction( i18n( "InCollection" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_incollection" ) ) ->setToolTip( i18n( "Add a publication which is part of some collection to the BibTeX file" ) );
( new KAction( i18n( "InProceedings" ), "element_new_entry_inproceedings", CTRL + Key_I, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_inproceedings" ) ) ->setToolTip( i18n( "Add a publication which is part of some proceedings to the BibTeX file" ) ); ( new TDEAction( i18n( "InProceedings" ), "element_new_entry_inproceedings", CTRL + Key_I, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_inproceedings" ) ) ->setToolTip( i18n( "Add a publication which is part of some proceedings to the BibTeX file" ) );
( new KAction( i18n( "Manual" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_manual" ) ) ->setToolTip( i18n( "Add a manual to the BibTeX file" ) ); ( new TDEAction( i18n( "Manual" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_manual" ) ) ->setToolTip( i18n( "Add a manual to the BibTeX file" ) );
( new KAction( i18n( "MastersThesis" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_mastersthesis" ) ) ->setToolTip( i18n( "Add a master or diploma thesis to the BibTeX file" ) ); ( new TDEAction( i18n( "MastersThesis" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_mastersthesis" ) ) ->setToolTip( i18n( "Add a master or diploma thesis to the BibTeX file" ) );
( new KAction( i18n( "Misc" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_misc" ) ) ->setToolTip( i18n( "Add a not specified document or reference to the BibTeX file" ) ); ( new TDEAction( i18n( "Misc" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_misc" ) ) ->setToolTip( i18n( "Add a not specified document or reference to the BibTeX file" ) );
( new KAction( i18n( "PhDThesis" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_phdthesis" ) ) ->setToolTip( i18n( "Add a PhD thesis to the BibTeX file" ) ); ( new TDEAction( i18n( "PhDThesis" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_phdthesis" ) ) ->setToolTip( i18n( "Add a PhD thesis to the BibTeX file" ) );
( new KAction( i18n( "Proceedings" ), "element_new_entry_phdthesis" , CTRL + Key_P, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_proceedings" ) ) ->setToolTip( i18n( "Add some proceedings to the BibTeX file" ) ); ( new TDEAction( i18n( "Proceedings" ), "element_new_entry_phdthesis" , CTRL + Key_P, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_proceedings" ) ) ->setToolTip( i18n( "Add some proceedings to the BibTeX file" ) );
( new KAction( i18n( "TechReport" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_techreport" ) ) ->setToolTip( i18n( "Add a technical report to the BibTeX file" ) ); ( new TDEAction( i18n( "TechReport" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_techreport" ) ) ->setToolTip( i18n( "Add a technical report to the BibTeX file" ) );
( new KAction( i18n( "Unpublished" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_unpublished" ) ) ->setToolTip( i18n( "Add an unpublished document to the BibTeX file" ) ); ( new TDEAction( i18n( "Unpublished" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_unpublished" ) ) ->setToolTip( i18n( "Add an unpublished document to the BibTeX file" ) );
( new KAction( i18n( "Preamble" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_preamble" ) ) ->setToolTip( i18n( "Add a preamble to the BibTeX file" ) ); ( new TDEAction( i18n( "Preamble" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_preamble" ) ) ->setToolTip( i18n( "Add a preamble to the BibTeX file" ) );
( new KAction( i18n( "Comment" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_comment" ) ) ->setToolTip( i18n( "Add a comment to the BibTeX file" ) ); ( new TDEAction( i18n( "Comment" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_comment" ) ) ->setToolTip( i18n( "Add a comment to the BibTeX file" ) );
( new KAction( i18n( "Macro" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_macro" ) ) ->setToolTip( i18n( "Add a macro to the BibTeX file" ) ); ( new TDEAction( i18n( "Macro" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_macro" ) ) ->setToolTip( i18n( "Add a macro to the BibTeX file" ) );
m_actionEditElement = new KAction( i18n( "&Edit" ), 0, m_documentWidget, SLOT( editElement() ), actionCollection(), "element_edit" ); m_actionEditElement = new TDEAction( i18n( "&Edit" ), 0, m_documentWidget, SLOT( editElement() ), actionCollection(), "element_edit" );
m_actionEditElement->setToolTip( i18n( "Edit the selected BibTeX element" ) ); m_actionEditElement->setToolTip( i18n( "Edit the selected BibTeX element" ) );
m_actionEditElement->setEnabled( FALSE ); m_actionEditElement->setEnabled( FALSE );
m_actionDeleteElement = new KAction( i18n( "&Delete" ), 0, m_documentWidget, SLOT( deleteElements() ), actionCollection(), "element_delete" ); m_actionDeleteElement = new TDEAction( i18n( "&Delete" ), 0, m_documentWidget, SLOT( deleteElements() ), actionCollection(), "element_delete" );
m_actionDeleteElement->setToolTip( i18n( "Delete the selected BibTeX elements" ) ); m_actionDeleteElement->setToolTip( i18n( "Delete the selected BibTeX elements" ) );
m_actionDeleteElement->setEnabled( FALSE ); m_actionDeleteElement->setEnabled( FALSE );
m_actionShowComments = new KToggleAction( i18n( "Show &Comments" ), 0, this, SLOT( slotToggleShowSpecialElements() ), actionCollection(), "view_showcomments" ); m_actionShowComments = new TDEToggleAction( i18n( "Show &Comments" ), 0, this, SLOT( slotToggleShowSpecialElements() ), actionCollection(), "view_showcomments" );
m_actionShowComments->setToolTip( i18n( "Show the comments of a BibTeX document" ) ); m_actionShowComments->setToolTip( i18n( "Show the comments of a BibTeX document" ) );
m_actionShowMacros = new KToggleAction( i18n( "Show &Macros" ), 0, this, SLOT( slotToggleShowSpecialElements() ), actionCollection(), "view_showmacros" ); m_actionShowMacros = new TDEToggleAction( i18n( "Show &Macros" ), 0, this, SLOT( slotToggleShowSpecialElements() ), actionCollection(), "view_showmacros" );
m_actionShowMacros->setToolTip( i18n( "Show the macros of a BibTeX document" ) ); m_actionShowMacros->setToolTip( i18n( "Show the macros of a BibTeX document" ) );
m_actionUseInPipe = new KToggleAction( i18n( "Accept input from other programs" ), 0, this , SLOT( slotUseInPipe() ), actionCollection(), "useinpipe" ); m_actionUseInPipe = new TDEToggleAction( i18n( "Accept input from other programs" ), 0, this , SLOT( slotUseInPipe() ), actionCollection(), "useinpipe" );
connect( m_documentWidget, SIGNAL( listViewSelectionChanged( int ) ), this, SLOT( slotUpdateMenu( int ) ) ); connect( m_documentWidget, SIGNAL( listViewSelectionChanged( int ) ), this, SLOT( slotUpdateMenu( int ) ) );
@ -534,7 +534,7 @@ void KBibTeXPart::setupActions()
actionCollection() ->setHighlightingEnabled( true ); actionCollection() ->setHighlightingEnabled( true );
KActionMenu *acmElementNew = new KActionMenu( i18n( "&New" ), TQIconSet( SmallIcon( "filenew" ) ), actionCollection(), "element_new" ); TDEActionMenu *acmElementNew = new TDEActionMenu( i18n( "&New" ), TQIconSet( SmallIcon( "filenew" ) ), actionCollection(), "element_new" );
acmElementNew->setToolTip( i18n( "Add a new element to this BibTeX document" ) ); acmElementNew->setToolTip( i18n( "Add a new element to this BibTeX document" ) );
acmElementNew->setEnabled( FALSE ); acmElementNew->setEnabled( FALSE );
} }
@ -568,7 +568,7 @@ bool KBibTeXPart::slotNewElement()
void KBibTeXPart::readSettings() void KBibTeXPart::readSettings()
{ {
KBibTeX::Settings * settings = KBibTeX::Settings::self(); KBibTeX::Settings * settings = KBibTeX::Settings::self();
KConfig * config = KBibTeXPartFactory::instance() ->config(); TDEConfig * config = KBibTeXPartFactory::instance() ->config();
settings->load( config ); settings->load( config );
m_actionShowComments->setChecked( settings->editing_ShowComments ); m_actionShowComments->setChecked( settings->editing_ShowComments );
@ -583,7 +583,7 @@ void KBibTeXPart::writeSettings()
KBibTeX::Settings * settings = KBibTeX::Settings::self(); KBibTeX::Settings * settings = KBibTeX::Settings::self();
m_documentWidget->saveState(); m_documentWidget->saveState();
KConfig * config = KBibTeXPartFactory::instance() ->config(); TDEConfig * config = KBibTeXPartFactory::instance() ->config();
settings->editing_ShowComments = m_actionShowComments->isChecked(); settings->editing_ShowComments = m_actionShowComments->isChecked();
settings->editing_ShowMacros = m_actionShowMacros->isChecked(); settings->editing_ShowMacros = m_actionShowMacros->isChecked();
@ -700,12 +700,12 @@ void KBibTeXPart::slotDeferredInitialization()
} }
// It's usually safe to leave the factory code alone.. with the // It's usually safe to leave the factory code alone.. with the
// notable exception of the KAboutData data // notable exception of the TDEAboutData data
#include <kaboutdata.h> #include <tdeaboutdata.h>
#include <klocale.h> #include <tdelocale.h>
KInstance* KBibTeXPartFactory::s_instance = 0L; TDEInstance* KBibTeXPartFactory::s_instance = 0L;
KAboutData* KBibTeXPartFactory::s_about = 0L; TDEAboutData* KBibTeXPartFactory::s_about = 0L;
KBibTeXPartFactory::KBibTeXPartFactory() KBibTeXPartFactory::KBibTeXPartFactory()
: KParts::Factory() : KParts::Factory()
@ -735,13 +735,13 @@ KParts::Part* KBibTeXPartFactory::createPartObject( TQWidget *parentWidget, cons
return obj; return obj;
} }
KInstance* KBibTeXPartFactory::instance() TDEInstance* KBibTeXPartFactory::instance()
{ {
if ( !s_instance ) if ( !s_instance )
{ {
s_about = new KAboutData( "kbibtexpart", I18N_NOOP( "KBibTeXPart" ), "0.2.3.91" ); s_about = new TDEAboutData( "kbibtexpart", I18N_NOOP( "KBibTeXPart" ), "0.2.3.91" );
s_about->addAuthor( "Thomas Fischer", 0, "fischer@unix-ag.uni-kl.de" ); s_about->addAuthor( "Thomas Fischer", 0, "fischer@unix-ag.uni-kl.de" );
s_instance = new KInstance( s_about ); s_instance = new TDEInstance( s_about );
} }
return s_instance; return s_instance;
} }

2
src/kbibtex_part.desktop
Unescape View File

@ -11,5 +11,5 @@ Name[pt_BR]=Parte do KBibTeX
Name[de]=Einbettungsfähige Komponente von KBibTeX Name[de]=Einbettungsfähige Komponente von KBibTeX
MimeType=text/x-bibtex;application/x-endnote-library; MimeType=text/x-bibtex;application/x-endnote-library;
ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
X-KDE-Library=libkbibtexpart X-TDE-Library=libkbibtexpart
Type=Service Type=Service

82
src/kbibtex_part.h
Unescape View File

@ -21,8 +21,8 @@
#ifndef _KBIBTEXPART_H_ #ifndef _KBIBTEXPART_H_
#define _KBIBTEXPART_H_ #define _KBIBTEXPART_H_
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kparts/factory.h> #include <tdeparts/factory.h>
#include <element.h> #include <element.h>
#include <xsltransform.h> #include <xsltransform.h>
@ -38,11 +38,11 @@ class TQPainter;
class TQListViewItem; class TQListViewItem;
class TQProgressDialog; class TQProgressDialog;
class KURL; class KURL;
class KListView; class TDEListView;
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
class KToggleAction; class TDEToggleAction;
class KMainWindow; class TDEMainWindow;
class KBibTeXPart : public KParts::ReadWritePart class KBibTeXPart : public KParts::ReadWritePart
{ {
@ -104,35 +104,35 @@ private:
TQProgressDialog *m_progressDialog; TQProgressDialog *m_progressDialog;
KBibTeX::DocumentWidget *m_documentWidget; KBibTeX::DocumentWidget *m_documentWidget;
KBibTeX::SettingsDlg *m_settingsDlg; KBibTeX::SettingsDlg *m_settingsDlg;
KAction *m_actionFileMerge; TDEAction *m_actionFileMerge;
KAction *m_actionFileExport; TDEAction *m_actionFileExport;
KAction *m_actionFileStatistics; TDEAction *m_actionFileStatistics;
KAction *m_actionFileFindDups; TDEAction *m_actionFileFindDups;
KAction *m_actionEditUndo; TDEAction *m_actionEditUndo;
KAction *m_actionElementSendToLyX; TDEAction *m_actionElementSendToLyX;
KAction *m_actionEditElement; TDEAction *m_actionEditElement;
KAction *m_actionDeleteElement; TDEAction *m_actionDeleteElement;
KAction *m_actionEditCut; TDEAction *m_actionEditCut;
KAction *m_actionEditCopy; TDEAction *m_actionEditCopy;
KAction *m_actionEditCopyRef; TDEAction *m_actionEditCopyRef;
KAction *m_actionEditPaste; TDEAction *m_actionEditPaste;
KAction *m_actionEditSelectAll; TDEAction *m_actionEditSelectAll;
KAction *m_actionEditFind; TDEAction *m_actionEditFind;
KAction *m_actionEditFindNext; TDEAction *m_actionEditFindNext;
KAction *m_actionPreferences; TDEAction *m_actionPreferences;
KAction *m_actionSearchOnlineDatabases; TDEAction *m_actionSearchOnlineDatabases;
KActionMenu *m_actionViewDocument; TDEActionMenu *m_actionViewDocument;
KAction *m_actionViewFirstDocument; TDEAction *m_actionViewFirstDocument;
KAction *m_actionViewDocumentOnlineRef; TDEAction *m_actionViewDocumentOnlineRef;
KActionMenu *m_actionAssignKeywords; TDEActionMenu *m_actionAssignKeywords;
KAction *m_actionNormalizeIds; TDEAction *m_actionNormalizeIds;
KActionMenu *m_actionMenuSearchWebsites; TDEActionMenu *m_actionMenuSearchWebsites;
KActionMenu *m_actionViewShowColumns; TDEActionMenu *m_actionViewShowColumns;
KAction *m_actionSearchNCBI; TDEAction *m_actionSearchNCBI;
KToggleAction *m_actionUseInPipe; TDEToggleAction *m_actionUseInPipe;
KToggleAction *m_actionShowComments; TDEToggleAction *m_actionShowComments;
KToggleAction *m_actionShowMacros; TDEToggleAction *m_actionShowMacros;
KMainWindow *m_mainWindow; TDEMainWindow *m_mainWindow;
TQValueList<KBibTeX::WebQuery*> webQueryList; TQValueList<KBibTeX::WebQuery*> webQueryList;
bool m_initializationDone; bool m_initializationDone;
TQFile *m_inPipe; TQFile *m_inPipe;
@ -147,8 +147,8 @@ signals:
void progressCancel(); void progressCancel();
}; };
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class KBibTeXPartFactory : public KParts::Factory class KBibTeXPartFactory : public KParts::Factory
{ {
@ -159,11 +159,11 @@ public:
virtual KParts::Part* createPartObject( TQWidget * parentWidget, const char * widgetName, virtual KParts::Part* createPartObject( TQWidget * parentWidget, const char * widgetName,
TQObject * parent, const char * name, TQObject * parent, const char * name,
const char * classname, const TQStringList & /* args */ ); const char * classname, const TQStringList & /* args */ );
static KInstance* instance(); static TDEInstance* instance();
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
static KAboutData* s_about; static TDEAboutData* s_about;
}; };
#endif // _KBIBTEXPART_H_ #endif // _KBIBTEXPART_H_

2
src/kbibtex_part.rc
Unescape View File

@ -127,7 +127,7 @@
<Action name="element_new_comment" /> <Action name="element_new_comment" />
<Action name="element_new_macro" /> <Action name="element_new_macro" />
</Menu> </Menu>
<Menu name="ktexteditor_popup" noMerge="1"> <Menu name="tdetexteditor_popup" noMerge="1">
<Menu name="element_new"><text>&amp;New</text> <Menu name="element_new"><text>&amp;New</text>
<Action name="element_new_entry_article" /> <Action name="element_new_entry_article" />
<Action name="element_new_entry_book" /> <Action name="element_new_entry_book" />

50
src/kbibtexshell.cpp
Unescape View File

@ -21,18 +21,18 @@
#include <kkeydialog.h> #include <kkeydialog.h>
#include <kencodingfiledialog.h> #include <kencodingfiledialog.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kurl.h> #include <kurl.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <kedittoolbar.h> #include <kedittoolbar.h>
#include <kdebug.h> #include <kdebug.h>
#include <kaction.h> #include <tdeaction.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <klibloader.h> #include <klibloader.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <klocale.h> #include <tdelocale.h>
#include <kbibtex_part.h> #include <kbibtex_part.h>
#include "kbibtexshell.h" #include "kbibtexshell.h"
@ -137,7 +137,7 @@ KParts::ReadWritePart * KBibTeXShell::part()
return m_part; return m_part;
} }
void KBibTeXShell::readConfig( KConfig *config ) void KBibTeXShell::readConfig( TDEConfig *config )
{ {
config->setGroup( "Session" ); config->setGroup( "Session" );
m_recentFiles->loadEntries( config ); m_recentFiles->loadEntries( config );
@ -145,7 +145,7 @@ void KBibTeXShell::readConfig( KConfig *config )
m_recentFiles->setToolTip( i18n( "Click to open a file\nClick and hold to open a recent file" ) ); m_recentFiles->setToolTip( i18n( "Click to open a file\nClick and hold to open a recent file" ) );
} }
void KBibTeXShell::writeConfig( KConfig *config ) void KBibTeXShell::writeConfig( TDEConfig *config )
{ {
config->setGroup( "Session" ); config->setGroup( "Session" );
m_recentFiles->saveEntries( config ); m_recentFiles->saveEntries( config );
@ -154,13 +154,13 @@ void KBibTeXShell::writeConfig( KConfig *config )
void KBibTeXShell::readConfig() void KBibTeXShell::readConfig()
{ {
KConfig * config = kapp->config(); TDEConfig * config = kapp->config();
readConfig( config ); readConfig( config );
} }
void KBibTeXShell::writeConfig() void KBibTeXShell::writeConfig()
{ {
KConfig * config = kapp->config(); TDEConfig * config = kapp->config();
writeConfig( config ); writeConfig( config );
} }
@ -176,11 +176,11 @@ void KBibTeXShell::slotAddRecentURL( const KURL&url )
void KBibTeXShell::setupActions() void KBibTeXShell::setupActions()
{ {
KAction * action; TDEAction * action;
action = KStdAction::openNew( this, SLOT( slotFileNew() ), actionCollection() ); action = KStdAction::openNew( this, SLOT( slotFileNew() ), actionCollection() );
action ->setToolTip( i18n( "Create a new window for a new BibTeX file" ) ); action ->setToolTip( i18n( "Create a new window for a new BibTeX file" ) );
KAction *actionOpen = KStdAction::open( this, SLOT( slotFileOpen() ), actionCollection() ); TDEAction *actionOpen = KStdAction::open( this, SLOT( slotFileOpen() ), actionCollection() );
actionOpen->setToolTip( i18n( "Open an existing BibTeX file" ) ); actionOpen->setToolTip( i18n( "Open an existing BibTeX file" ) );
m_recentFiles = KStdAction::openRecent( this, SLOT( slotFileOpen( const KURL& ) ), actionCollection() ); m_recentFiles = KStdAction::openRecent( this, SLOT( slotFileOpen( const KURL& ) ), actionCollection() );
@ -210,14 +210,14 @@ void KBibTeXShell::slotActionStatusText( const TQString &text )
stb->message( text ); stb->message( text );
} }
void KBibTeXShell::saveProperties( KConfig* /*config*/ ) void KBibTeXShell::saveProperties( TDEConfig* /*config*/ )
{ {
// the 'config' object points to the session managed // the 'config' object points to the session managed
// config file. anything you write here will be available // config file. anything you write here will be available
// later when this app is restored // later when this app is restored
} }
void KBibTeXShell::readProperties( KConfig* /*config*/ ) void KBibTeXShell::readProperties( TDEConfig* /*config*/ )
{ {
// the 'config' object points to the session managed // the 'config' object points to the session managed
// config file. this function is automatically called whenever // config file. this function is automatically called whenever
@ -248,14 +248,14 @@ void KBibTeXShell::optionsConfigureKeys()
void KBibTeXShell::optionsConfigureToolbars() void KBibTeXShell::optionsConfigureToolbars()
{ {
#if defined(KDE_MAKE_VERSION) #if defined(TDE_MAKE_VERSION)
# if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
saveMainWindowSettings( KGlobal::config(), autoSaveGroup() ); saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
# else # else
saveMainWindowSettings( KGlobal::config() ); saveMainWindowSettings( TDEGlobal::config() );
# endif # endif
#else #else
saveMainWindowSettings( KGlobal::config() ); saveMainWindowSettings( TDEGlobal::config() );
#endif #endif
// use the standard toolbar editor // use the standard toolbar editor
@ -267,14 +267,14 @@ void KBibTeXShell::optionsConfigureToolbars()
void KBibTeXShell::applyNewToolbarConfig() void KBibTeXShell::applyNewToolbarConfig()
{ {
#if defined(KDE_MAKE_VERSION) #if defined(TDE_MAKE_VERSION)
# if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
# else # else
applyMainWindowSettings( KGlobal::config() ); applyMainWindowSettings( TDEGlobal::config() );
# endif # endif
#else #else
applyMainWindowSettings( KGlobal::config() ); applyMainWindowSettings( TDEGlobal::config() );
#endif #endif
} }
@ -326,7 +326,7 @@ void KBibTeXShell::slotFileOpen( const KURL& url )
{ {
if ( url.isEmpty() ) return ; if ( url.isEmpty() ) return ;
if ( !KIO::NetAccess::exists( url, TRUE, this ) ) if ( !TDEIO::NetAccess::exists( url, TRUE, this ) )
{ {
m_recentFiles->removeURL( url ); m_recentFiles->removeURL( url );
KMessageBox::error( this, i18n( "The given file could not be read, check if it exists or if it is readable for the current user." ) ); KMessageBox::error( this, i18n( "The given file could not be read, check if it exists or if it is readable for the current user." ) );

22
src/kbibtexshell.h
Unescape View File

@ -25,15 +25,15 @@
#include <config.h> #include <config.h>
#endif #endif
#include <kapplication.h> #include <tdeapplication.h>
#include <kparts/mainwindow.h> #include <tdeparts/mainwindow.h>
class TQWidget; class TQWidget;
class TQFrame; class TQFrame;
class KToggleAction; class TDEToggleAction;
class KConfig; class TDEConfig;
class KRecentFilesAction; class TDERecentFilesAction;
class KBibTeXShell : public KParts::MainWindow class KBibTeXShell : public KParts::MainWindow
{ {
@ -50,8 +50,8 @@ public:
//config file functions //config file functions
public: public:
void readConfig( KConfig * ); void readConfig( TDEConfig * );
void writeConfig( KConfig * ); void writeConfig( TDEConfig * );
void readConfig(); void readConfig();
void writeConfig(); void writeConfig();
@ -82,12 +82,12 @@ private:
KParts::ReadWritePart *m_part; KParts::ReadWritePart *m_part;
TQWidget* m_parentWidget; TQWidget* m_parentWidget;
KToggleAction *m_statusbarAction; TDEToggleAction *m_statusbarAction;
KRecentFilesAction *m_recentFiles; TDERecentFilesAction *m_recentFiles;
void saveProperties( KConfig * ); void saveProperties( TDEConfig * );
void readProperties( KConfig * ); void readProperties( TDEConfig * );
void setupAccel(); void setupAccel();
void setupActions(); void setupActions();

2
src/macrowidget.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <klineedit.h> #include <klineedit.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klocale.h> #include <tdelocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <element.h> #include <element.h>

30
src/main.cpp
Unescape View File

@ -25,13 +25,13 @@
#ifdef UNIQUEAPP #ifdef UNIQUEAPP
#include <kuniqueapplication.h> #include <kuniqueapplication.h>
#else // UNIQUEAPP #else // UNIQUEAPP
#include <kapplication.h> #include <tdeapplication.h>
#endif // UNIQUEAPP #endif // UNIQUEAPP
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kaboutdata.h> #include <tdeaboutdata.h>
#include <kcmdlineargs.h> #include <tdecmdlineargs.h>
#include <klocale.h> #include <tdelocale.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kdebug.h> #include <kdebug.h>
#include "kbibtexshell.h" #include "kbibtexshell.h"
@ -41,17 +41,17 @@ static const char description[] =
static const char version[] = "0.2.3.91"; static const char version[] = "0.2.3.91";
static KCmdLineOptions options[] = static TDECmdLineOptions options[] =
{ {
{ "+[URL]", I18N_NOOP( "Document to open." ), 0 { "+[URL]", I18N_NOOP( "Document to open." ), 0
}, },
KCmdLineLastOption TDECmdLineLastOption
}; };
#ifdef UNIQUEAPP #ifdef UNIQUEAPP
class KBibTeXApplication: public KUniqueApplication class KBibTeXApplication: public KUniqueApplication
#else // UNIQUEAPP #else // UNIQUEAPP
class KBibTeXApplication: public KApplication class KBibTeXApplication: public TDEApplication
#endif // UNIQUEAPP #endif // UNIQUEAPP
{ {
public: public:
@ -64,7 +64,7 @@ public:
int newInstance() int newInstance()
{ {
#else // UNIQUEAPP #else // UNIQUEAPP
KBibTeXApplication() : KApplication() KBibTeXApplication() : TDEApplication()
{ {
#endif // UNIQUEAPP #endif // UNIQUEAPP
// see if we are starting with session management // see if we are starting with session management
@ -75,7 +75,7 @@ public:
else else
{ {
// no session.. just start up normally // no session.. just start up normally
KCmdLineArgs * args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs * args = TDECmdLineArgs::parsedArgs();
if ( args->count() == 0 ) if ( args->count() == 0 )
{ {
@ -108,12 +108,12 @@ public:
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KAboutData about( "kbibtex", I18N_NOOP( "KBibTeX" ), version, description, TDEAboutData about( "kbibtex", I18N_NOOP( "KBibTeX" ), version, description,
KAboutData::License_GPL, "(C) 2004-2009 Thomas Fischer", 0, "http://www.unix-ag.uni-kl.de/~fischer/kbibtex/", "fischer@unix-ag.uni-kl.de" ); TDEAboutData::License_GPL, "(C) 2004-2009 Thomas Fischer", 0, "http://www.unix-ag.uni-kl.de/~fischer/kbibtex/", "fischer@unix-ag.uni-kl.de" );
about.addAuthor( "Thomas Fischer", 0, "fischer@unix-ag.uni-kl.de" ); about.addAuthor( "Thomas Fischer", 0, "fischer@unix-ag.uni-kl.de" );
about.setTranslator( I18N_NOOP( "NAME OF TRANSLATORS" ), I18N_NOOP( "EMAIL OF TRANSLATORS" ) ); about.setTranslator( I18N_NOOP( "NAME OF TRANSLATORS" ), I18N_NOOP( "EMAIL OF TRANSLATORS" ) );
KCmdLineArgs::init( argc, argv, &about ); TDECmdLineArgs::init( argc, argv, &about );
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
#ifdef UNIQUEAPP #ifdef UNIQUEAPP
if ( !KUniqueApplication::start() ) if ( !KUniqueApplication::start() )

28
src/mergeelements.cpp
Unescape View File

@ -24,14 +24,14 @@
#include <ntqprogressbar.h> #include <ntqprogressbar.h>
#include <ntqtimer.h> #include <ntqtimer.h>
#include <klocale.h> #include <tdelocale.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <ktextedit.h> #include <ktextedit.h>
#include <klistview.h> #include <tdelistview.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kwin.h> #include <twin.h>
#include <macro.h> #include <macro.h>
#include <comment.h> #include <comment.h>
@ -128,7 +128,7 @@ namespace KBibTeX
MergeElements::~MergeElements() MergeElements::~MergeElements()
{ {
KConfig * config = kapp->config(); TDEConfig * config = kapp->config();
config->setGroup( "MergeElements" ); config->setGroup( "MergeElements" );
saveWindowSize( config ); saveWindowSize( config );
} }
@ -143,7 +143,7 @@ namespace KBibTeX
TQLabel *label = new TQLabel( i18n( "Select elements to merge. At least two elements must be checked to perform a merge operation. Checked entries will be replaced by the merged element, unchecked elements will be kept." ), vboxContainer ); TQLabel *label = new TQLabel( i18n( "Select elements to merge. At least two elements must be checked to perform a merge operation. Checked entries will be replaced by the merged element, unchecked elements will be kept." ), vboxContainer );
label->setAlignment( TQt::WordBreak ); label->setAlignment( TQt::WordBreak );
vboxLayout->addWidget( label ); vboxLayout->addWidget( label );
m_listViewClique = new KListView( vboxContainer ); m_listViewClique = new TDEListView( vboxContainer );
m_listViewClique->addColumn( i18n( "Entry/Macro Id" ) ); m_listViewClique->addColumn( i18n( "Entry/Macro Id" ) );
m_listViewClique->setFullWidth( true ); m_listViewClique->setFullWidth( true );
m_listViewClique->setAllColumnsShowFocus( true ); m_listViewClique->setAllColumnsShowFocus( true );
@ -159,7 +159,7 @@ namespace KBibTeX
label = new TQLabel( i18n( "Choose from this list which alternatives you want to keep in the merged element." ), vboxContainer ); label = new TQLabel( i18n( "Choose from this list which alternatives you want to keep in the merged element." ), vboxContainer );
label->setAlignment( TQt::WordBreak ); label->setAlignment( TQt::WordBreak );
vboxLayout->addWidget( label ); vboxLayout->addWidget( label );
m_listViewAlternatives = new KListView( vboxContainer ); m_listViewAlternatives = new TDEListView( vboxContainer );
m_listViewAlternatives->addColumn( i18n( "Field/Key" ) ); m_listViewAlternatives->addColumn( i18n( "Field/Key" ) );
m_listViewAlternatives->setFullWidth( true ); m_listViewAlternatives->setFullWidth( true );
m_listViewAlternatives->setAllColumnsShowFocus( true ); m_listViewAlternatives->setAllColumnsShowFocus( true );
@ -768,8 +768,8 @@ namespace KBibTeX
KBibTeX::PreambleWidget::execute( meci->preamble, TRUE, this ); KBibTeX::PreambleWidget::execute( meci->preamble, TRUE, this );
} }
/* This function was taken form KMainWindow of KDE 3.5 and modified to fit KBibTeX */ /* This function was taken form TDEMainWindow of KDE 3.5 and modified to fit KBibTeX */
void MergeElements::saveWindowSize( KConfig *config ) const void MergeElements::saveWindowSize( TDEConfig *config ) const
{ {
int scnum = TQApplication::desktop()->screenNumber( parentWidget() ); int scnum = TQApplication::desktop()->screenNumber( parentWidget() );
TQRect desk = TQApplication::desktop()->screenGeometry( scnum ); TQRect desk = TQApplication::desktop()->screenGeometry( scnum );
@ -811,13 +811,13 @@ namespace KBibTeX
void MergeElements::slotRestore() void MergeElements::slotRestore()
{ {
tqDebug( "slotRestore" ); tqDebug( "slotRestore" );
KConfig * config = kapp->config(); TDEConfig * config = kapp->config();
config->setGroup( "MergeElements" ); config->setGroup( "MergeElements" );
restoreWindowSize( config ); restoreWindowSize( config );
} }
/* This function was taken form KMainWindow of KDE 3.5 and modified to fit KBibTeX */ /* This function was taken form TDEMainWindow of KDE 3.5 and modified to fit KBibTeX */
void MergeElements::restoreWindowSize( KConfig *config ) void MergeElements::restoreWindowSize( TDEConfig *config )
{ {
// restore the size // restore the size
int scnum = TQApplication::desktop()->screenNumber( parentWidget() ); int scnum = TQApplication::desktop()->screenNumber( parentWidget() );

10
src/mergeelements.h
Unescape View File

@ -28,7 +28,7 @@
class KPushButton; class KPushButton;
class KTextEdit; class KTextEdit;
class KListView; class TDEListView;
class TQProgressBar; class TQProgressBar;
namespace KBibTeX namespace KBibTeX
@ -159,8 +159,8 @@ namespace KBibTeX
TQString preambleText; TQString preambleText;
} MergeSet; } MergeSet;
KListView *m_listViewClique; TDEListView *m_listViewClique;
KListView *m_listViewAlternatives; TDEListView *m_listViewAlternatives;
TQProgressBar *m_progressBar; TQProgressBar *m_progressBar;
FindDuplicates::DuplicateCliqueList m_duplicateCliqueList; FindDuplicates::DuplicateCliqueList m_duplicateCliqueList;
MergeSet **m_mergeSetList; MergeSet **m_mergeSetList;
@ -170,8 +170,8 @@ namespace KBibTeX
void setClique( int cliqueIndex ); void setClique( int cliqueIndex );
void restoreCurrentMergeSet(); void restoreCurrentMergeSet();
void applyMergeSet( BibTeX::File *bibTeXFile, BibTeX::File *otherBibTeXFile = NULL ); void applyMergeSet( BibTeX::File *bibTeXFile, BibTeX::File *otherBibTeXFile = NULL );
void restoreWindowSize( KConfig *config ); void restoreWindowSize( TDEConfig *config );
void saveWindowSize( KConfig *config ) const; void saveWindowSize( TDEConfig *config ) const;
}; };
} }

2
src/messagehandler.cpp
Unescape View File

@ -22,7 +22,7 @@
#include "messagehandler.h" #include "messagehandler.h"
#include <kmessagebox.h> #include <tdemessagebox.h>
namespace KBibTeX { namespace KBibTeX {

2
src/preamblewidget.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <ntqlayout.h> #include <ntqlayout.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klocale.h> #include <tdelocale.h>
#include "preamblewidget.h" #include "preamblewidget.h"

10
src/searchbar.cpp
Unescape View File

@ -27,10 +27,10 @@
#include <kcombobox.h> #include <kcombobox.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <klocale.h> #include <tdelocale.h>
#include <kdialog.h> #include <kdialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <settings.h> #include <settings.h>
#include "searchbar.h" #include "searchbar.h"
@ -54,7 +54,7 @@ namespace KBibTeX
void SearchBar::setFactory( KXMLGUIFactory *factory, KXMLGUIClient *client ) void SearchBar::setFactory( KXMLGUIFactory *factory, KXMLGUIClient *client )
{ {
KPopupMenu * menu = static_cast<KPopupMenu*>( factory -> container( "popup_newelements", client ) ); TDEPopupMenu * menu = static_cast<TDEPopupMenu*>( factory -> container( "popup_newelements", client ) );
Settings * settings = Settings::self(); Settings * settings = Settings::self();
m_pushButtonAddElement->setPopup( menu ); m_pushButtonAddElement->setPopup( menu );
m_comboboxFilter->setHistoryItems( settings->editing_FilterHistory ); m_comboboxFilter->setHistoryItems( settings->editing_FilterHistory );
@ -66,7 +66,7 @@ namespace KBibTeX
if ( settings->editing_UseSpecialFont ) if ( settings->editing_UseSpecialFont )
m_comboboxFilter->setFont( settings->editing_SpecialFont ); m_comboboxFilter->setFont( settings->editing_SpecialFont );
else else
m_comboboxFilter->setFont( KGlobalSettings::generalFont() ); m_comboboxFilter->setFont( TDEGlobalSettings::generalFont() );
} }
void SearchBar::setSearch( const TQString&text, BibTeX::Element::FilterType filterType, BibTeX::EntryField::FieldType fieldType ) void SearchBar::setSearch( const TQString&text, BibTeX::Element::FilterType filterType, BibTeX::EntryField::FieldType fieldType )
@ -84,7 +84,7 @@ namespace KBibTeX
void SearchBar::setupGUI() void SearchBar::setupGUI()
{ {
TQBoxLayout * layout = new TQHBoxLayout( this, 3 /* KDialog::marginHint()*/, KDialog::spacingHint() ); TQBoxLayout * layout = new TQHBoxLayout( this, 3 /* KDialog::marginHint()*/, KDialog::spacingHint() );
KIconLoader iconLoader = KIconLoader( "kbibtex" ); TDEIconLoader iconLoader = TDEIconLoader( "kbibtex" );
m_pushButtonAddElement = new KPushButton( this ); m_pushButtonAddElement = new KPushButton( this );
m_pushButtonAddElement->setIconSet( TQIconSet( BarIcon( "add" ) ) ); m_pushButtonAddElement->setIconSet( TQIconSet( BarIcon( "add" ) ) );

2
src/searchbar.h
Unescape View File

@ -29,7 +29,7 @@
class TQTimer; class TQTimer;
class KPushButton; class KPushButton;
class KPopupMenu; class TDEPopupMenu;
class KHistoryCombo; class KHistoryCombo;
class KComboBox; class KComboBox;

50
src/settings.cpp
Unescape View File

@ -26,13 +26,13 @@
#include <ntqprocess.h> #include <ntqprocess.h>
#include <ntqapplication.h> #include <ntqapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <klocale.h> #include <tdelocale.h>
#include <kbibtex_part.h> #include <kbibtex_part.h>
#include <kdebug.h> #include <kdebug.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <entryfield.h> #include <entryfield.h>
#include <element.h> #include <element.h>
@ -51,19 +51,19 @@ namespace KBibTeX
{ {
checkExternalToolsAvailable(); checkExternalToolsAvailable();
KStandardDirs * kstd = KGlobal::dirs(); TDEStandardDirs * kstd = TDEGlobal::dirs();
external_XSLTStylesheetHTML = kstd->findResource( "data", "kbibtexpart/xslt/html.xsl" ); external_XSLTStylesheetHTML = kstd->findResource( "data", "kbibtexpart/xslt/html.xsl" );
if ( external_XSLTStylesheetHTML == NULL ) if ( external_XSLTStylesheetHTML == NULL )
KMessageBox::error( NULL, i18n( "Could not determine filename for XSLT file" ), i18n( "Initialization failed" ) ); KMessageBox::error( NULL, i18n( "Could not determine filename for XSLT file" ), i18n( "Initialization failed" ) );
int numCompletions = BibTeX::EntryField::ftYear - BibTeX::EntryField::ftAbstract + 4; int numCompletions = BibTeX::EntryField::ftYear - BibTeX::EntryField::ftAbstract + 4;
m_completion = new KCompletion * [ numCompletions ]; m_completion = new TDECompletion * [ numCompletions ];
for ( int i = 0; i < numCompletions; ++i ) for ( int i = 0; i < numCompletions; ++i )
{ {
m_completion[ i ] = new KCompletion(); m_completion[ i ] = new TDECompletion();
m_completion[ i ] ->setIgnoreCase( TRUE ); m_completion[ i ] ->setIgnoreCase( TRUE );
} }
completionMacro = new KCompletion(); completionMacro = new TDECompletion();
completionMacro->setIgnoreCase( FALSE ); completionMacro->setIgnoreCase( FALSE );
currentBibTeXFile = NULL; currentBibTeXFile = NULL;
@ -88,7 +88,7 @@ namespace KBibTeX
return staticSettings; return staticSettings;
} }
void Settings::load( KConfig * config ) void Settings::load( TDEConfig * config )
{ {
config->setGroup( "FileIO" ); config->setGroup( "FileIO" );
fileIO_Encoding = config->readEntry( "Encoding", "latex" ); fileIO_Encoding = config->readEntry( "Encoding", "latex" );
@ -118,7 +118,7 @@ namespace KBibTeX
editing_ShowMacros = config->readBoolEntry( "ShowMacros", TRUE ); editing_ShowMacros = config->readBoolEntry( "ShowMacros", TRUE );
editing_HorSplitterSizes = config->readIntListEntry( "HorizontalSplitterSizes" ); editing_HorSplitterSizes = config->readIntListEntry( "HorizontalSplitterSizes" );
editing_VertSplitterSizes = config->readIntListEntry( "VerticalSplitterSizes" ); editing_VertSplitterSizes = config->readIntListEntry( "VerticalSplitterSizes" );
TQFont defaultFont = KGlobalSettings::generalFont(); TQFont defaultFont = TDEGlobalSettings::generalFont();
editing_SpecialFont = config->readFontEntry( "SpecialFont", &defaultFont ); editing_SpecialFont = config->readFontEntry( "SpecialFont", &defaultFont );
editing_UseSpecialFont = config->readBoolEntry( "UseSpecialFont", FALSE ); editing_UseSpecialFont = config->readBoolEntry( "UseSpecialFont", FALSE );
editing_FirstNameFirst = config->readBoolEntry( "FirstNameFirst", FALSE ); editing_FirstNameFirst = config->readBoolEntry( "FirstNameFirst", FALSE );
@ -224,7 +224,7 @@ namespace KBibTeX
#endif // HAVE_YAZ #endif // HAVE_YAZ
} }
void Settings::save( KConfig * config ) void Settings::save( TDEConfig * config )
{ {
config->setGroup( "FileIO" ); config->setGroup( "FileIO" );
config->writeEntry( "Encoding", fileIO_Encoding ); config->writeEntry( "Encoding", fileIO_Encoding );
@ -479,7 +479,7 @@ namespace KBibTeX
} }
} }
KCompletion *Settings::completion( BibTeX::EntryField::FieldType fieldType ) TDECompletion *Settings::completion( BibTeX::EntryField::FieldType fieldType )
{ {
return m_completion[ completionFieldTypeToIndex( fieldType )]; return m_completion[ completionFieldTypeToIndex( fieldType )];
} }
@ -779,14 +779,14 @@ namespace KBibTeX
if ( _filename.contains( "~/" ) && !userHome.isEmpty() ) _filename = _filename.replace( "~/", userHome.append( "/" ) ); if ( _filename.contains( "~/" ) && !userHome.isEmpty() ) _filename = _filename.replace( "~/", userHome.append( "/" ) );
KURL url( _filename ); KURL url( _filename );
if ( url.isValid() && ( !url.isLocalFile() || KIO::NetAccess::exists( url, TRUE, window ) ) ) if ( url.isValid() && ( !url.isLocalFile() || TDEIO::NetAccess::exists( url, TRUE, window ) ) )
return url; return url;
if ( bibTeXFileName != TQString::null ) if ( bibTeXFileName != TQString::null )
{ {
TQString path = KURL( bibTeXFileName ).directory( FALSE, FALSE ); TQString path = KURL( bibTeXFileName ).directory( FALSE, FALSE );
url = KURL( path + "/" + _filename ); url = KURL( path + "/" + _filename );
if ( url.isValid() && KIO::NetAccess::exists( url, TRUE, window ) ) if ( url.isValid() && TDEIO::NetAccess::exists( url, TRUE, window ) )
return url; return url;
} }
@ -794,7 +794,7 @@ namespace KBibTeX
for ( TQStringList::Iterator it = settings->editing_DocumentSearchPaths.begin(); it != settings->editing_DocumentSearchPaths.end(); ++it ) for ( TQStringList::Iterator it = settings->editing_DocumentSearchPaths.begin(); it != settings->editing_DocumentSearchPaths.end(); ++it )
{ {
url = KURL( *it + "/" + _filename ); url = KURL( *it + "/" + _filename );
if ( url.isValid() && KIO::NetAccess::exists( url, TRUE, window ) ) if ( url.isValid() && TDEIO::NetAccess::exists( url, TRUE, window ) )
return url; return url;
} }
@ -835,7 +835,7 @@ namespace KBibTeX
TQString z3950serverConfigFile = locate( "appdata", "z3950-servers.cfg" ); TQString z3950serverConfigFile = locate( "appdata", "z3950-servers.cfg" );
if ( !z3950serverConfigFile.isEmpty() ) if ( !z3950serverConfigFile.isEmpty() )
{ {
KConfig z3950serverConfig( z3950serverConfigFile, true, false ); TDEConfig z3950serverConfig( z3950serverConfigFile, true, false );
TQStringList serverList = z3950serverConfig.groupList(); TQStringList serverList = z3950serverConfig.groupList();
for ( TQStringList::ConstIterator it = serverList.begin(); it != serverList.end(); ++it ) for ( TQStringList::ConstIterator it = serverList.begin(); it != serverList.end(); ++it )
if ( !z3950_ServerList.contains( *it ) ) if ( !z3950_ServerList.contains( *it ) )
@ -858,7 +858,7 @@ namespace KBibTeX
} }
} }
void Settings::z3950loadUser( KConfig * config ) void Settings::z3950loadUser( TDEConfig * config )
{ {
config->setGroup( "Z3950Server" ); config->setGroup( "Z3950Server" );
int i = 0; int i = 0;
@ -882,7 +882,7 @@ namespace KBibTeX
} }
} }
void Settings::z3950saveUser( KConfig *config ) void Settings::z3950saveUser( TDEConfig *config )
{ {
config->deleteGroup( "Z3950Server" ); config->deleteGroup( "Z3950Server" );
config->setGroup( "Z3950Server" ); config->setGroup( "Z3950Server" );
@ -891,7 +891,7 @@ namespace KBibTeX
TQString z3950serverConfigFile = locate( "appdata", "z3950-servers.cfg" ); TQString z3950serverConfigFile = locate( "appdata", "z3950-servers.cfg" );
if ( !z3950serverConfigFile.isEmpty() ) if ( !z3950serverConfigFile.isEmpty() )
{ {
KConfig z3950serverConfig( z3950serverConfigFile, true, false ); TDEConfig z3950serverConfig( z3950serverConfigFile, true, false );
for ( TQMap<TQString, Z3950Server>::Iterator it = z3950_ServerList.begin(); it != z3950_ServerList.end(); ++it ) for ( TQMap<TQString, Z3950Server>::Iterator it = z3950_ServerList.begin(); it != z3950_ServerList.end(); ++it )
{ {
bool notInDefault = !z3950serverConfig.hasGroup( it.key() ); bool notInDefault = !z3950serverConfig.hasGroup( it.key() );
@ -932,9 +932,9 @@ namespace KBibTeX
{ {
KURL backupN( basename + "~" + TQString::number( i ) ); KURL backupN( basename + "~" + TQString::number( i ) );
KURL backupNmm( basename + "~" + TQString::number( i - 1 ) ); KURL backupNmm( basename + "~" + TQString::number( i - 1 ) );
if ( KIO::NetAccess::exists( backupNmm, true, window ) ) if ( TDEIO::NetAccess::exists( backupNmm, true, window ) )
{ {
if ( !KIO::NetAccess::file_copy( backupNmm, backupN, -1, true, false, false ) ) if ( !TDEIO::NetAccess::file_copy( backupNmm, backupN, -1, true, false, false ) )
return false; return false;
} }
} }
@ -943,9 +943,9 @@ namespace KBibTeX
{ {
KURL backupN( basename + "~2" ); KURL backupN( basename + "~2" );
KURL backupNmm( basename + "~" ); KURL backupNmm( basename + "~" );
if ( KIO::NetAccess::exists( backupNmm, true, window ) ) if ( TDEIO::NetAccess::exists( backupNmm, true, window ) )
{ {
if ( !KIO::NetAccess::file_copy( backupNmm, backupN, -1, true, false, false ) ) if ( !TDEIO::NetAccess::file_copy( backupNmm, backupN, -1, true, false, false ) )
return false; return false;
} }
} }
@ -953,9 +953,9 @@ namespace KBibTeX
{ {
KURL backupN( basename + "~" ); KURL backupN( basename + "~" );
KURL backupNmm( basename ); KURL backupNmm( basename );
if ( KIO::NetAccess::exists( backupNmm, true, window ) ) if ( TDEIO::NetAccess::exists( backupNmm, true, window ) )
{ {
if ( !KIO::NetAccess::file_copy( backupNmm, backupN, -1, true, false, false ) ) if ( !TDEIO::NetAccess::file_copy( backupNmm, backupN, -1, true, false, false ) )
return false; return false;
} }
} }

18
src/settings.h
Unescape View File

@ -35,8 +35,8 @@
#include <entryfield.h> #include <entryfield.h>
#include <entry.h> #include <entry.h>
class KConfig; class TDEConfig;
class KStandardDirs; class TDEStandardDirs;
class KURL; class KURL;
class TQString; class TQString;
class TQRegExp; class TQRegExp;
@ -64,8 +64,8 @@ namespace KBibTeX
static Settings* self( BibTeX::File *bibtexFile = NULL ); static Settings* self( BibTeX::File *bibtexFile = NULL );
void load( KConfig * config ); void load( TDEConfig * config );
void save( KConfig * config ); void save( TDEConfig * config );
static TQString fieldTypeToI18NString( const BibTeX::EntryField::FieldType fieldType ); static TQString fieldTypeToI18NString( const BibTeX::EntryField::FieldType fieldType );
static TQString entryTypeToI18NString( const BibTeX::Entry::EntryType entryType ); static TQString entryTypeToI18NString( const BibTeX::Entry::EntryType entryType );
@ -80,8 +80,8 @@ namespace KBibTeX
#ifdef HAVE_YAZ #ifdef HAVE_YAZ
void z3950clearAll(); void z3950clearAll();
void z3950loadDefault(); void z3950loadDefault();
void z3950loadUser( KConfig * config ); void z3950loadUser( TDEConfig * config );
void z3950saveUser( KConfig *config ); void z3950saveUser( TDEConfig *config );
typedef struct Z3950Server_ typedef struct Z3950Server_
{ {
TQString charset, database, host, locale, name, syntax, user, password; TQString charset, database, host, locale, name, syntax, user, password;
@ -155,8 +155,8 @@ namespace KBibTeX
void addToCompletion( BibTeX::File *file ); void addToCompletion( BibTeX::File *file );
void addToCompletion( BibTeX::Element *element ); void addToCompletion( BibTeX::Element *element );
void addToCompletion( BibTeX::Value *value, BibTeX::EntryField::FieldType fieldType ); void addToCompletion( BibTeX::Value *value, BibTeX::EntryField::FieldType fieldType );
KCompletion* completion( BibTeX::EntryField::FieldType fieldType ); TDECompletion* completion( BibTeX::EntryField::FieldType fieldType );
KCompletion* completionMacro; TDECompletion* completionMacro;
// Keyword list // Keyword list
TQStringList keyword_GlobalList; TQStringList keyword_GlobalList;
@ -187,7 +187,7 @@ namespace KBibTeX
private: private:
static Settings* staticSettings; static Settings* staticSettings;
KCompletion **m_completion; TDECompletion **m_completion;
static TQStringList m_lyxRcFileNames; static TQStringList m_lyxRcFileNames;
TQMap<TQString, TQString> m_webQueryDefaults; TQMap<TQString, TQString> m_webQueryDefaults;

2
src/settingsdlg.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <ntqlayout.h> #include <ntqlayout.h>
#include <klocale.h> #include <tdelocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <settingsfileio.h> #include <settingsfileio.h>

14
src/settingsediting.cpp
Unescape View File

@ -32,12 +32,12 @@
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kdirselectdialog.h> #include <kdirselectdialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <tdelocale.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <klineedit.h> #include <klineedit.h>
#include <kdialog.h> #include <kdialog.h>
#include <kfontdialog.h> #include <tdefontdialog.h>
#include <kurlcompletion.h> #include <kurlcompletion.h>
#include <documentlistview.h> #include <documentlistview.h>
@ -69,7 +69,7 @@ namespace KBibTeX
label = new TQLabel( i18n( "List of paths:" ), this ); label = new TQLabel( i18n( "List of paths:" ), this );
layout->addWidget( label, 2, 0 ); layout->addWidget( label, 2, 0 );
m_listViewPathList = new KListView( this ); m_listViewPathList = new TDEListView( this );
m_listViewPathList->addColumn( i18n( "Path" ) ); m_listViewPathList->addColumn( i18n( "Path" ) );
m_listViewPathList->header()->setClickEnabled( false ); m_listViewPathList->header()->setClickEnabled( false );
m_listViewPathList->setFullWidth( true ); m_listViewPathList->setFullWidth( true );
@ -131,7 +131,7 @@ namespace KBibTeX
TQDir pathObj( path ); TQDir pathObj( path );
if ( pathObj.exists() && pathObj.isReadable() ) if ( pathObj.exists() && pathObj.isReadable() )
{ {
TQListViewItem *item = new KListViewItem( m_listViewPathList, path ); TQListViewItem *item = new TDEListViewItem( m_listViewPathList, path );
m_listViewPathList->ensureItemVisible( item ); m_listViewPathList->ensureItemVisible( item );
m_listViewPathList->setSelected( item, TRUE ); m_listViewPathList->setSelected( item, TRUE );
slotSelectionChanged(); slotSelectionChanged();
@ -302,8 +302,8 @@ namespace KBibTeX
void SettingsEditing::slotSelectSpecialFont() void SettingsEditing::slotSelectSpecialFont()
{ {
int result = KFontDialog::getFont( m_specialFont ); int result = TDEFontDialog::getFont( m_specialFont );
if ( result == KFontDialog::Accepted ) if ( result == TDEFontDialog::Accepted )
{ {
updateFontData(); updateFontData();
emit configChanged(); emit configChanged();

4
src/settingsediting.h
Unescape View File

@ -29,7 +29,7 @@ class TQSlider;
class KPushButton; class KPushButton;
class KURLRequester; class KURLRequester;
class KListView; class TDEListView;
namespace KBibTeX namespace KBibTeX
{ {
@ -53,7 +53,7 @@ namespace KBibTeX
TQStringList &m_pathList; TQStringList &m_pathList;
KURLRequester *m_urlRequesterNewPath; KURLRequester *m_urlRequesterNewPath;
KPushButton *m_pushButtonAddDir; KPushButton *m_pushButtonAddDir;
KListView *m_listViewPathList; TDEListView *m_listViewPathList;
KPushButton *m_pushButtonDelDir; KPushButton *m_pushButtonDelDir;
}; };

6
src/settingsfileio.cpp
Unescape View File

@ -30,10 +30,10 @@
#include <ntqradiobutton.h> #include <ntqradiobutton.h>
#include <ntqspinbox.h> #include <ntqspinbox.h>
#include <klocale.h> #include <tdelocale.h>
#include <kurl.h> #include <kurl.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klineedit.h> #include <klineedit.h>
#include <kdialog.h> #include <kdialog.h>
#include <kdirselectdialog.h> #include <kdirselectdialog.h>

28
src/settingsidsuggestions.cpp
Unescape View File

@ -25,10 +25,10 @@
#include <ntqlabel.h> #include <ntqlabel.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <klistview.h> #include <tdelistview.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <klocale.h> #include <tdelocale.h>
#include <kdialog.h> #include <kdialog.h>
#include <klineedit.h> #include <klineedit.h>
@ -43,24 +43,24 @@ namespace KBibTeX
{ {
TQString SettingsIdSuggestions::exampleBibTeXEntry = "@Article{ dijkstra1983terminationdetect,\nauthor = {Edsger W. Dijkstra and W. H. J. Feijen and A. J. M. {van Gasteren}},\ntitle = {{Derivation of a Termination Detection Algorithm for Distributed Computations}},\njournal = {Information Processing Letters},\nvolume = 16,\nnumber = 5,\npages = {217--219},\nmonth = jun,\nyear = 1983\n}"; TQString SettingsIdSuggestions::exampleBibTeXEntry = "@Article{ dijkstra1983terminationdetect,\nauthor = {Edsger W. Dijkstra and W. H. J. Feijen and A. J. M. {van Gasteren}},\ntitle = {{Derivation of a Termination Detection Algorithm for Distributed Computations}},\njournal = {Information Processing Letters},\nvolume = 16,\nnumber = 5,\npages = {217--219},\nmonth = jun,\nyear = 1983\n}";
IdSuggestionsListViewItem::IdSuggestionsListViewItem( KListView *list, const TQString& plainText, BibTeX::Entry *example ): KListViewItem( list ), m_original( plainText ), m_example( example ) IdSuggestionsListViewItem::IdSuggestionsListViewItem( TDEListView *list, const TQString& plainText, BibTeX::Entry *example ): TDEListViewItem( list ), m_original( plainText ), m_example( example )
{ {
KListViewItem::setText( 0, parse( plainText ) ); TDEListViewItem::setText( 0, parse( plainText ) );
KListViewItem::setMultiLinesEnabled( TRUE ); TDEListViewItem::setMultiLinesEnabled( TRUE );
} }
IdSuggestionsListViewItem::IdSuggestionsListViewItem( KListView *list, KListViewItem *prev, const TQString& plainText, BibTeX::Entry *example ): KListViewItem( list, prev ), m_original( plainText ), m_example( example ) IdSuggestionsListViewItem::IdSuggestionsListViewItem( TDEListView *list, TDEListViewItem *prev, const TQString& plainText, BibTeX::Entry *example ): TDEListViewItem( list, prev ), m_original( plainText ), m_example( example )
{ {
KListViewItem::setText( 0, parse( plainText ) ); TDEListViewItem::setText( 0, parse( plainText ) );
KListViewItem::setMultiLinesEnabled( TRUE ); TDEListViewItem::setMultiLinesEnabled( TRUE );
} }
void IdSuggestionsListViewItem::setText( int col, const TQString& text ) void IdSuggestionsListViewItem::setText( int col, const TQString& text )
{ {
if ( col == 0 ) if ( col == 0 )
KListViewItem::setText( 0, parse( text ) ); TDEListViewItem::setText( 0, parse( text ) );
else else
KListViewItem::setText( col, text ); TDEListViewItem::setText( col, text );
} }
int IdSuggestionsListViewItem::width( const TQFontMetrics & fm, const TQListView *, int c ) const int IdSuggestionsListViewItem::width( const TQFontMetrics & fm, const TQListView *, int c ) const
@ -154,7 +154,7 @@ namespace KBibTeX
m_listSmallWords->clear(); m_listSmallWords->clear();
for ( TQStringList::ConstIterator it = settings->idSuggestions_smallWords.begin(); it != settings->idSuggestions_smallWords.end(); ++it ) for ( TQStringList::ConstIterator it = settings->idSuggestions_smallWords.begin(); it != settings->idSuggestions_smallWords.end(); ++it )
new KListViewItem( m_listSmallWords, *it ); new TDEListViewItem( m_listSmallWords, *it );
m_lineEditSmallWords->setText( "" ); m_lineEditSmallWords->setText( "" );
slotListSmallWordsChanged(); slotListSmallWordsChanged();
@ -286,7 +286,7 @@ namespace KBibTeX
void SettingsIdSuggestions::slotAddSmallWord() void SettingsIdSuggestions::slotAddSmallWord()
{ {
new KListViewItem( m_listSmallWords, m_lineEditSmallWords->text() ); new TDEListViewItem( m_listSmallWords, m_lineEditSmallWords->text() );
m_lineEditSmallWords->setText( "" ); m_lineEditSmallWords->setText( "" );
emit configChanged(); emit configChanged();
} }
@ -332,7 +332,7 @@ namespace KBibTeX
gridLayout->setRowStretch( 12, 1 ); gridLayout->setRowStretch( 12, 1 );
gridLayout->setColStretch( 0, 1 ); gridLayout->setColStretch( 0, 1 );
m_listIdSuggestions = new KListView( this ); m_listIdSuggestions = new TDEListView( this );
m_listIdSuggestions->setSorting( -1, FALSE ); m_listIdSuggestions->setSorting( -1, FALSE );
m_listIdSuggestions->addColumn( i18n( "Id Suggestions" ) ); m_listIdSuggestions->addColumn( i18n( "Id Suggestions" ) );
m_listIdSuggestions->header()->setClickEnabled( FALSE ); m_listIdSuggestions->header()->setClickEnabled( FALSE );
@ -382,7 +382,7 @@ namespace KBibTeX
gridLayout->addWidget( m_buttonAddSmallWord, 10, 1 ); gridLayout->addWidget( m_buttonAddSmallWord, 10, 1 );
connect( m_buttonAddSmallWord, SIGNAL( clicked() ), this, SLOT( slotAddSmallWord() ) ); connect( m_buttonAddSmallWord, SIGNAL( clicked() ), this, SLOT( slotAddSmallWord() ) );
m_listSmallWords = new KListView( this ); m_listSmallWords = new TDEListView( this );
m_listSmallWords->addColumn( i18n( "Small Words" ) ); m_listSmallWords->addColumn( i18n( "Small Words" ) );
m_listSmallWords->header()->setClickEnabled( true ); m_listSmallWords->header()->setClickEnabled( true );
m_listSmallWords->setFullWidth( true ); m_listSmallWords->setFullWidth( true );

12
src/settingsidsuggestions.h
Unescape View File

@ -22,7 +22,7 @@
#include <ntqwidget.h> #include <ntqwidget.h>
#include <klistview.h> #include <tdelistview.h>
#include <entry.h> #include <entry.h>
@ -35,11 +35,11 @@ class KLineEdit;
namespace KBibTeX namespace KBibTeX
{ {
class IdSuggestionsListViewItem: public KListViewItem class IdSuggestionsListViewItem: public TDEListViewItem
{ {
public: public:
IdSuggestionsListViewItem( KListView *, const TQString&, BibTeX::Entry *example ); IdSuggestionsListViewItem( TDEListView *, const TQString&, BibTeX::Entry *example );
IdSuggestionsListViewItem( KListView *, KListViewItem *, const TQString&, BibTeX::Entry *example ); IdSuggestionsListViewItem( TDEListView *, TDEListViewItem *, const TQString&, BibTeX::Entry *example );
void setText( int, const TQString& ); void setText( int, const TQString& );
TQString originalText() const; TQString originalText() const;
int width( const TQFontMetrics &, const TQListView *, int ) const; int width( const TQFontMetrics &, const TQListView *, int ) const;
@ -83,7 +83,7 @@ namespace KBibTeX
void updateGUI(); void updateGUI();
private: private:
KListView *m_listIdSuggestions; TDEListView *m_listIdSuggestions;
KPushButton *m_buttonNewIdSuggestion; KPushButton *m_buttonNewIdSuggestion;
KPushButton *m_buttonEditIdSuggestion; KPushButton *m_buttonEditIdSuggestion;
KPushButton *m_buttonDeleteIdSuggestion; KPushButton *m_buttonDeleteIdSuggestion;
@ -91,7 +91,7 @@ namespace KBibTeX
KPushButton *m_buttonMoveDownIdSuggestion; KPushButton *m_buttonMoveDownIdSuggestion;
KPushButton *m_buttonToggleDefault; KPushButton *m_buttonToggleDefault;
TQCheckBox *m_checkBoxForceDefault; TQCheckBox *m_checkBoxForceDefault;
KListView *m_listSmallWords; TDEListView *m_listSmallWords;
KLineEdit *m_lineEditSmallWords; KLineEdit *m_lineEditSmallWords;
KPushButton *m_buttonAddSmallWord; KPushButton *m_buttonAddSmallWord;
KPushButton *m_buttonDeleteSmallWord; KPushButton *m_buttonDeleteSmallWord;

18
src/settingskeyword.cpp
Unescape View File

@ -23,11 +23,11 @@
#include <ntqtimer.h> #include <ntqtimer.h>
#include <ntqtooltip.h> #include <ntqtooltip.h>
#include <klistview.h> #include <tdelistview.h>
#include <kdialog.h> #include <kdialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <klocale.h> #include <tdelocale.h>
#include <file.h> #include <file.h>
#include <entryfield.h> #include <entryfield.h>
@ -64,7 +64,7 @@ namespace KBibTeX
m_listKeywords->clear(); m_listKeywords->clear();
for ( TQStringList::Iterator it = settings->keyword_GlobalList.begin(); it != settings->keyword_GlobalList.end(); ++it ) for ( TQStringList::Iterator it = settings->keyword_GlobalList.begin(); it != settings->keyword_GlobalList.end(); ++it )
{ {
KListViewItem *item = new KListViewItem( m_listKeywords, *it ); TDEListViewItem *item = new TDEListViewItem( m_listKeywords, *it );
item->setPixmap( 0, SmallIcon( "package" ) ); item->setPixmap( 0, SmallIcon( "package" ) );
} }
@ -80,7 +80,7 @@ namespace KBibTeX
void SettingsKeyword::slotNewKeyword() void SettingsKeyword::slotNewKeyword()
{ {
KListViewItem * item = new KListViewItem( m_listKeywords, i18n( "New Keyword" ) ); TDEListViewItem * item = new TDEListViewItem( m_listKeywords, i18n( "New Keyword" ) );
item->setPixmap( 0, SmallIcon( "package" ) ); item->setPixmap( 0, SmallIcon( "package" ) );
m_listKeywords->setSelected( item, TRUE ); m_listKeywords->setSelected( item, TRUE );
m_listKeywords->ensureItemVisible( item ); m_listKeywords->ensureItemVisible( item );
@ -89,7 +89,7 @@ namespace KBibTeX
void SettingsKeyword::slotEditKeyword() void SettingsKeyword::slotEditKeyword()
{ {
KListViewItem * item = static_cast<KListViewItem*>( m_listKeywords->selectedItem() ); TDEListViewItem * item = static_cast<TDEListViewItem*>( m_listKeywords->selectedItem() );
if ( item != NULL ) if ( item != NULL )
{ {
m_oldText = item->text( 0 ); m_oldText = item->text( 0 );
@ -99,7 +99,7 @@ namespace KBibTeX
void SettingsKeyword::slotDeleteKeyword() void SettingsKeyword::slotDeleteKeyword()
{ {
KListViewItem * item = static_cast<KListViewItem*>( m_listKeywords->selectedItem() ); TDEListViewItem * item = static_cast<TDEListViewItem*>( m_listKeywords->selectedItem() );
if ( item != NULL ) if ( item != NULL )
{ {
delete item; delete item;
@ -124,7 +124,7 @@ namespace KBibTeX
m_listKeywords->clear(); m_listKeywords->clear();
for ( TQStringList::Iterator it = m_keywordsFromFile.begin(); it != m_keywordsFromFile.end(); ++it ) for ( TQStringList::Iterator it = m_keywordsFromFile.begin(); it != m_keywordsFromFile.end(); ++it )
{ {
KListViewItem *item = new KListViewItem( m_listKeywords, *it ); TDEListViewItem *item = new TDEListViewItem( m_listKeywords, *it );
item->setPixmap( 0, SmallIcon( "package" ) ); item->setPixmap( 0, SmallIcon( "package" ) );
} }
@ -157,7 +157,7 @@ namespace KBibTeX
{ {
TQGridLayout * gridLayout = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint(), "gridLayout" ); TQGridLayout * gridLayout = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint(), "gridLayout" );
m_listKeywords = new KListView( this ); m_listKeywords = new TDEListView( this );
m_listKeywords->addColumn( i18n( "Keywords" ) ); m_listKeywords->addColumn( i18n( "Keywords" ) );
m_listKeywords->header()->setClickEnabled( FALSE ); m_listKeywords->header()->setClickEnabled( FALSE );
m_listKeywords->setFullWidth( true ); m_listKeywords->setFullWidth( true );

4
src/settingskeyword.h
Unescape View File

@ -22,7 +22,7 @@
#include <ntqwidget.h> #include <ntqwidget.h>
class KListView; class TDEListView;
class TQPushButton; class TQPushButton;
namespace KBibTeX namespace KBibTeX
@ -55,7 +55,7 @@ namespace KBibTeX
private: private:
TQStringList *m_keywords; TQStringList *m_keywords;
TQStringList m_keywordsFromFile; TQStringList m_keywordsFromFile;
KListView *m_listKeywords; TDEListView *m_listKeywords;
TQPushButton *m_buttonNewKeyword; TQPushButton *m_buttonNewKeyword;
TQPushButton *m_buttonEditKeyword; TQPushButton *m_buttonEditKeyword;
TQPushButton *m_buttonDeleteKeyword; TQPushButton *m_buttonDeleteKeyword;

12
src/settingssearchurl.cpp
Unescape View File

@ -25,11 +25,11 @@
#include <ntqcombobox.h> #include <ntqcombobox.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klistview.h> #include <tdelistview.h>
#include <klocale.h> #include <tdelocale.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <settings.h> #include <settings.h>
#include "settingssearchurl.h" #include "settingssearchurl.h"
@ -69,7 +69,7 @@ namespace KBibTeX
m_listviewSearchURLs->clear(); m_listviewSearchURLs->clear();
for ( TQValueList<Settings::SearchURL*>::ConstIterator it = settings->searchURLs.begin(); it != settings->searchURLs.end(); ++it ) for ( TQValueList<Settings::SearchURL*>::ConstIterator it = settings->searchURLs.begin(); it != settings->searchURLs.end(); ++it )
{ {
KListViewItem *item = new KListViewItem( m_listviewSearchURLs, ( *it ) ->description, ( *it ) ->includeAuthor ? i18n( "Yes" ) : i18n( "No" ), ( *it ) ->url ); TDEListViewItem *item = new TDEListViewItem( m_listviewSearchURLs, ( *it ) ->description, ( *it ) ->includeAuthor ? i18n( "Yes" ) : i18n( "No" ), ( *it ) ->url );
item->setPixmap( 0, SmallIcon( "html" ) ); item->setPixmap( 0, SmallIcon( "html" ) );
} }
} }
@ -127,7 +127,7 @@ namespace KBibTeX
layout->setRowStretch( 3, 1 ); layout->setRowStretch( 3, 1 );
layout->setColStretch( 0, 1 ); layout->setColStretch( 0, 1 );
m_listviewSearchURLs = new KListView( this ); m_listviewSearchURLs = new TDEListView( this );
layout->addMultiCellWidget( m_listviewSearchURLs, 0, 4, 0, 0 ); layout->addMultiCellWidget( m_listviewSearchURLs, 0, 4, 0, 0 );
m_listviewSearchURLs->setAllColumnsShowFocus( TRUE ); m_listviewSearchURLs->setAllColumnsShowFocus( TRUE );
m_listviewSearchURLs->addColumn( i18n( "Description" ) ); m_listviewSearchURLs->addColumn( i18n( "Description" ) );
@ -203,7 +203,7 @@ namespace KBibTeX
{ {
if ( item == NULL ) if ( item == NULL )
{ {
KListViewItem *item = new KListViewItem( m_listviewSearchURLs, descr->text(), cbIncludeAuthor->currentItem() == 0 ? i18n( "Yes" ) : i18n( "No" ), url->text() ); TDEListViewItem *item = new TDEListViewItem( m_listviewSearchURLs, descr->text(), cbIncludeAuthor->currentItem() == 0 ? i18n( "Yes" ) : i18n( "No" ), url->text() );
item->setPixmap( 0, SmallIcon( "html" ) ); item->setPixmap( 0, SmallIcon( "html" ) );
} }
else else

4
src/settingssearchurl.h
Unescape View File

@ -24,7 +24,7 @@
class TQLineEdit; class TQLineEdit;
class KPushButton; class KPushButton;
class KListView; class TDEListView;
class TQListViewItem; class TQListViewItem;
namespace KBibTeX namespace KBibTeX
@ -53,7 +53,7 @@ namespace KBibTeX
KPushButton *m_pushbuttonNew; KPushButton *m_pushbuttonNew;
KPushButton *m_pushbuttonEdit; KPushButton *m_pushbuttonEdit;
KPushButton *m_pushbuttonDelete; KPushButton *m_pushbuttonDelete;
KListView *m_listviewSearchURLs; TDEListView *m_listviewSearchURLs;
KPushButton *m_pushbuttonReset; KPushButton *m_pushbuttonReset;
int m_counter; int m_counter;

16
src/settingsuserdefinedinput.cpp
Unescape View File

@ -26,12 +26,12 @@
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klineedit.h> #include <klineedit.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <klistview.h> #include <tdelistview.h>
#include <kdialog.h> #include <kdialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <klocale.h> #include <tdelocale.h>
#include <settings.h> #include <settings.h>
#include <fieldlineedit.h> #include <fieldlineedit.h>
@ -68,10 +68,10 @@ namespace KBibTeX
{ {
m_listFields->clear(); m_listFields->clear();
Settings *settings = Settings::self( NULL ); Settings *settings = Settings::self( NULL );
KListViewItem *prev = NULL; TDEListViewItem *prev = NULL;
for ( TQValueList<Settings::UserDefinedInputFields*>::iterator it = settings->userDefinedInputFields.begin(); it != settings->userDefinedInputFields.end(); ++it ) for ( TQValueList<Settings::UserDefinedInputFields*>::iterator it = settings->userDefinedInputFields.begin(); it != settings->userDefinedInputFields.end(); ++it )
{ {
prev = new KListViewItem( m_listFields, prev, ( *it )->name, ( *it )->label, ( *it )->inputType == FieldLineEdit::itMultiLine ? i18n( "Multiple lines" ) : i18n( "Single line" ) ); prev = new TDEListViewItem( m_listFields, prev, ( *it )->name, ( *it )->label, ( *it )->inputType == FieldLineEdit::itMultiLine ? i18n( "Multiple lines" ) : i18n( "Single line" ) );
} }
} }
@ -163,7 +163,7 @@ namespace KBibTeX
gridLayout->setRowStretch( 5, 1 ); gridLayout->setRowStretch( 5, 1 );
gridLayout->setColStretch( 0, 1 ); gridLayout->setColStretch( 0, 1 );
m_listFields = new KListView( this ); m_listFields = new TDEListView( this );
m_listFields->setSorting( -1, FALSE ); m_listFields->setSorting( -1, FALSE );
m_listFields->addColumn( i18n( "Name" ) ); m_listFields->addColumn( i18n( "Name" ) );
m_listFields->header()->setClickEnabled( FALSE ); m_listFields->header()->setClickEnabled( FALSE );
@ -247,8 +247,8 @@ namespace KBibTeX
{ {
if ( item == NULL ) if ( item == NULL )
{ {
/*KListViewItem *item = */ /*TDEListViewItem *item = */
new KListViewItem( m_listFields, m_lineEditName->text(), m_lineEditLabel->text(), comboBoxInputType->currentItem() == 0 ? i18n( "Single line" ) : i18n( "Multiple lines" ) ); new TDEListViewItem( m_listFields, m_lineEditName->text(), m_lineEditLabel->text(), comboBoxInputType->currentItem() == 0 ? i18n( "Single line" ) : i18n( "Multiple lines" ) );
} }
else else
{ {

4
src/settingsuserdefinedinput.h
Unescape View File

@ -22,7 +22,7 @@
#include <ntqwidget.h> #include <ntqwidget.h>
class KListView; class TDEListView;
class KPushButton; class KPushButton;
class KDialogBase; class KDialogBase;
@ -55,7 +55,7 @@ namespace KBibTeX
void updateDialogGUI(); void updateDialogGUI();
private: private:
KListView *m_listFields; TDEListView *m_listFields;
KPushButton *m_buttonNewField; KPushButton *m_buttonNewField;
KPushButton *m_buttonEditField; KPushButton *m_buttonEditField;
KPushButton *m_buttonDeleteField; KPushButton *m_buttonDeleteField;

16
src/settingsz3950.cpp
Unescape View File

@ -30,12 +30,12 @@
#include <ntqspinbox.h> #include <ntqspinbox.h>
#include <ntqregexp.h> #include <ntqregexp.h>
#include <klistview.h> #include <tdelistview.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <klocale.h> #include <tdelocale.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <klineedit.h> #include <klineedit.h>
@ -44,14 +44,14 @@
namespace KBibTeX namespace KBibTeX
{ {
ServerListViewItem::ServerListViewItem( KListView *list, const TQString &_id, Settings::Z3950Server& _server, bool _newItem ) ServerListViewItem::ServerListViewItem( TDEListView *list, const TQString &_id, Settings::Z3950Server& _server, bool _newItem )
: KListViewItem( list, _server.name, _server.database ), server( _server ), id( _id ), newItem( _newItem ) : TDEListViewItem( list, _server.name, _server.database ), server( _server ), id( _id ), newItem( _newItem )
{ {
// nothing // nothing
} }
ServerListViewItem::ServerListViewItem( KListViewItem *item, const TQString &_id, Settings::Z3950Server& _server, bool _newItem ) ServerListViewItem::ServerListViewItem( TDEListViewItem *item, const TQString &_id, Settings::Z3950Server& _server, bool _newItem )
: KListViewItem( item, _server.name, _server.database ), server( _server ), id( _id ), newItem( _newItem ) : TDEListViewItem( item, _server.name, _server.database ), server( _server ), id( _id ), newItem( _newItem )
{ {
// nothing // nothing
} }
@ -319,7 +319,7 @@ namespace KBibTeX
gridLayout->setRowStretch( 5, 1 ); gridLayout->setRowStretch( 5, 1 );
gridLayout->setColStretch( 0, 1 ); gridLayout->setColStretch( 0, 1 );
m_listServers = new KListView( this ); m_listServers = new TDEListView( this );
m_listServers->setSorting( -1, FALSE ); m_listServers->setSorting( -1, FALSE );
m_listServers->addColumn( i18n( "z3950 server", "Name" ) ); m_listServers->addColumn( i18n( "z3950 server", "Name" ) );
m_listServers->addColumn( i18n( "z3950 server", "Database" ) ); m_listServers->addColumn( i18n( "z3950 server", "Database" ) );

10
src/settingsz3950.h
Unescape View File

@ -32,17 +32,17 @@
class TQSpinBox; class TQSpinBox;
class KPushButton; class KPushButton;
class KListView; class TDEListView;
class KLineEdit; class KLineEdit;
class KComboBox; class KComboBox;
namespace KBibTeX namespace KBibTeX
{ {
class ServerListViewItem: public KListViewItem class ServerListViewItem: public TDEListViewItem
{ {
public: public:
ServerListViewItem( KListView *, const TQString &, Settings::Z3950Server& server, bool newItem ); ServerListViewItem( TDEListView *, const TQString &, Settings::Z3950Server& server, bool newItem );
ServerListViewItem( KListViewItem *, const TQString &, Settings::Z3950Server& server, bool newItem ); ServerListViewItem( TDEListViewItem *, const TQString &, Settings::Z3950Server& server, bool newItem );
void refresh(); void refresh();
@ -110,7 +110,7 @@ namespace KBibTeX
void updateGUI(); void updateGUI();
private: private:
KListView *m_listServers; TDEListView *m_listServers;
KPushButton *m_buttonNewServer; KPushButton *m_buttonNewServer;
KPushButton *m_buttonEditServer; KPushButton *m_buttonEditServer;
KPushButton *m_buttonDeleteServer; KPushButton *m_buttonDeleteServer;

18
src/sidebar.cpp
Unescape View File

@ -26,10 +26,10 @@
#include <ntqtoolbutton.h> #include <ntqtoolbutton.h>
#include <kdebug.h> #include <kdebug.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <klistview.h> #include <tdelistview.h>
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <settings.h> #include <settings.h>
@ -61,8 +61,8 @@ namespace KBibTeX
if ( settings->editing_UseSpecialFont ) if ( settings->editing_UseSpecialFont )
m_listAvailableItems->setFont( settings->editing_SpecialFont ); m_listAvailableItems->setFont( settings->editing_SpecialFont );
else else
m_listAvailableItems->setFont( KGlobalSettings::generalFont() ); m_listAvailableItems->setFont( TDEGlobalSettings::generalFont() );
m_listAvailableItems->header() ->setFont( KGlobalSettings::generalFont() ); m_listAvailableItems->header() ->setFont( TDEGlobalSettings::generalFont() );
} }
void SideBar::refreshLists( BibTeX::File *bibtexFile ) void SideBar::refreshLists( BibTeX::File *bibtexFile )
@ -107,7 +107,7 @@ namespace KBibTeX
m_buttonToggleShowAll = new TQToolButton( this ); m_buttonToggleShowAll = new TQToolButton( this );
layout->addWidget( m_buttonToggleShowAll, 0, 0 ); layout->addWidget( m_buttonToggleShowAll, 0, 0 );
TQIconSet showAllPixmap = KGlobal::iconLoader() ->loadIconSet( "taskbar", KIcon::Small ); TQIconSet showAllPixmap = TDEGlobal::iconLoader() ->loadIconSet( "taskbar", TDEIcon::Small );
m_buttonToggleShowAll->setIconSet( showAllPixmap ); m_buttonToggleShowAll->setIconSet( showAllPixmap );
m_buttonToggleShowAll->setToggleButton( TRUE ); m_buttonToggleShowAll->setToggleButton( TRUE );
TQToolTip::add( m_buttonToggleShowAll, i18n( "Toggle between showing all fields or only important fields" ) ); TQToolTip::add( m_buttonToggleShowAll, i18n( "Toggle between showing all fields or only important fields" ) );
@ -118,12 +118,12 @@ namespace KBibTeX
m_buttonToggleMultiSelect = new TQToolButton( this ); m_buttonToggleMultiSelect = new TQToolButton( this );
layout->addWidget( m_buttonToggleMultiSelect, 0, 2 ); layout->addWidget( m_buttonToggleMultiSelect, 0, 2 );
showAllPixmap = KGlobal::iconLoader() ->loadIconSet( "planner", KIcon::Small ); showAllPixmap = TDEGlobal::iconLoader() ->loadIconSet( "planner", TDEIcon::Small );
m_buttonToggleMultiSelect->setIconSet( showAllPixmap ); m_buttonToggleMultiSelect->setIconSet( showAllPixmap );
m_buttonToggleMultiSelect->setToggleButton( TRUE ); m_buttonToggleMultiSelect->setToggleButton( TRUE );
TQToolTip::add( m_buttonToggleMultiSelect, i18n( "Toggle between selecting only one item or multiple items (AND-connected in search)" ) ); TQToolTip::add( m_buttonToggleMultiSelect, i18n( "Toggle between selecting only one item or multiple items (AND-connected in search)" ) );
m_listAvailableItems = new KListView( this ); m_listAvailableItems = new TDEListView( this );
m_listAvailableItems->addColumn( i18n( "#" ) ); m_listAvailableItems->addColumn( i18n( "#" ) );
m_listAvailableItems->addColumn( i18n( "Items" ) ); m_listAvailableItems->addColumn( i18n( "Items" ) );
m_listAvailableItems->setAllColumnsShowFocus( TRUE ); m_listAvailableItems->setAllColumnsShowFocus( TRUE );
@ -131,7 +131,7 @@ namespace KBibTeX
m_listAvailableItems->setSorting( 1 ); m_listAvailableItems->setSorting( 1 );
layout->addMultiCellWidget( m_listAvailableItems, 1, 1, 0, 2 ); layout->addMultiCellWidget( m_listAvailableItems, 1, 1, 0, 2 );
m_popupMenu = new KPopupMenu( m_listAvailableItems ); m_popupMenu = new TDEPopupMenu( m_listAvailableItems );
m_popupMenu->insertItem( i18n( "Rename all occurrences" ), this, SLOT( startRenaming() ) ); m_popupMenu->insertItem( i18n( "Rename all occurrences" ), this, SLOT( startRenaming() ) );
connect( m_listAvailableItems, SIGNAL( selectionChanged() ), this, SLOT( prepareSearch() ) ); connect( m_listAvailableItems, SIGNAL( selectionChanged() ), this, SLOT( prepareSearch() ) );

8
src/sidebar.h
Unescape View File

@ -28,9 +28,9 @@
class TQComboBox; class TQComboBox;
class TQToolButton; class TQToolButton;
class KListView; class TDEListView;
class TQListViewItem; class TQListViewItem;
class KPopupMenu; class TDEPopupMenu;
namespace KBibTeX namespace KBibTeX
{ {
@ -59,10 +59,10 @@ namespace KBibTeX
TQToolButton *m_buttonToggleShowAll; TQToolButton *m_buttonToggleShowAll;
TQToolButton *m_buttonToggleMultiSelect; TQToolButton *m_buttonToggleMultiSelect;
TQComboBox *m_listTypeList; TQComboBox *m_listTypeList;
KListView *m_listAvailableItems; TDEListView *m_listAvailableItems;
static const BibTeX::EntryField::FieldType importantFields[ 6 ]; static const BibTeX::EntryField::FieldType importantFields[ 6 ];
bool m_isReadOnly; bool m_isReadOnly;
KPopupMenu *m_popupMenu; TDEPopupMenu *m_popupMenu;
TQString m_oldText; TQString m_oldText;
void setupGUI(); void setupGUI();

2
src/valuewidget.cpp
Unescape View File

@ -24,7 +24,7 @@
#include <ntqpushbutton.h> #include <ntqpushbutton.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klocale.h> #include <tdelocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <value.h> #include <value.h>

48
src/webquery.cpp
Unescape View File

@ -31,19 +31,19 @@
#include <ntqeventloop.h> #include <ntqeventloop.h>
#include <ntqbuffer.h> #include <ntqbuffer.h>
#include <klocale.h> #include <tdelocale.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdebug.h> #include <kdebug.h>
#include <kurllabel.h> #include <kurllabel.h>
#include <klineedit.h> #include <klineedit.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kprogress.h> #include <kprogress.h>
#include <kcompletion.h> #include <kcompletion.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kwin.h> #include <twin.h>
#include <settings.h> #include <settings.h>
#include <idsuggestions.h> #include <idsuggestions.h>
@ -100,7 +100,7 @@ namespace KBibTeX
connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) );
connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) );
hLayout->setStretchFactor( lineEditQuery, 4 ); hLayout->setStretchFactor( lineEditQuery, 4 );
KCompletion *completionQuery = lineEditQuery->completionObject(); TDECompletion *completionQuery = lineEditQuery->completionObject();
label = new TQLabel( i18n( "&Number of results:" ), this ); label = new TQLabel( i18n( "&Number of results:" ), this );
hLayout->addWidget( label ); hLayout->addWidget( label );
@ -215,11 +215,11 @@ namespace KBibTeX
m_incomingData = ""; m_incomingData = "";
m_currentJobTotalSize = -1; m_currentJobTotalSize = -1;
m_currentJob = KIO::get( url, false, false ); m_currentJob = TDEIO::get( url, false, false );
connect( m_currentJob, SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ), this, SLOT( slotSetJobTotalSize( KIO::Job*, KIO::filesize_t ) ) ); connect( m_currentJob, SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), this, SLOT( slotSetJobTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
connect( m_currentJob, SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ), this, SLOT( slotSetJobProcessedSize( KIO::Job*, KIO::filesize_t ) ) ); connect( m_currentJob, SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), this, SLOT( slotSetJobProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
connect( m_currentJob, SIGNAL( data( KIO::Job*, const TQByteArray & ) ), this, SLOT( slotJobData( KIO::Job*, const TQByteArray & ) ) ); connect( m_currentJob, SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, SLOT( slotJobData( TDEIO::Job*, const TQByteArray & ) ) );
connect( m_currentJob, SIGNAL( result( KIO::Job* ) ), this, SLOT( slotJobFinished( KIO::Job* ) ) ); connect( m_currentJob, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotJobFinished( TDEIO::Job* ) ) );
tqApp->eventLoop()->enterLoop(); tqApp->eventLoop()->enterLoop();
@ -249,20 +249,20 @@ namespace KBibTeX
return result; return result;
} }
void WebQuery::slotSetJobTotalSize( KIO::Job *job, KIO::filesize_t size ) void WebQuery::slotSetJobTotalSize( TDEIO::Job *job, TDEIO::filesize_t size )
{ {
if ( job != m_currentJob ) return; if ( job != m_currentJob ) return;
m_currentJobTotalSize = size; m_currentJobTotalSize = size;
} }
void WebQuery::slotSetJobProcessedSize( KIO::Job *job, KIO::filesize_t size ) void WebQuery::slotSetJobProcessedSize( TDEIO::Job *job, TDEIO::filesize_t size )
{ {
if ( job != m_currentJob ) return; if ( job != m_currentJob ) return;
if ( m_currentJobTotalSize <= 0 ) m_currentJobTotalSize = size; if ( m_currentJobTotalSize <= 0 ) m_currentJobTotalSize = size;
m_progressDialog->progressBar()->setProgress( m_currentStage * 100 + min( 100, size * 100 / m_currentJobTotalSize ) ); m_progressDialog->progressBar()->setProgress( m_currentStage * 100 + min( 100, size * 100 / m_currentJobTotalSize ) );
} }
void WebQuery::slotJobData( KIO::Job *job, const TQByteArray &data ) void WebQuery::slotJobData( TDEIO::Job *job, const TQByteArray &data )
{ {
if ( job != m_currentJob ) return; if ( job != m_currentJob ) return;
TQCString dataStr = TQCString( data, data.size() + 1 ); TQCString dataStr = TQCString( data, data.size() + 1 );
@ -270,7 +270,7 @@ namespace KBibTeX
m_incomingData.append( dataStr ); m_incomingData.append( dataStr );
} }
void WebQuery::slotJobFinished( KIO::Job *job ) void WebQuery::slotJobFinished( TDEIO::Job *job )
{ {
if ( job != m_currentJob ) return; if ( job != m_currentJob ) return;
m_currentJob = NULL; m_currentJob = NULL;
@ -296,14 +296,14 @@ namespace KBibTeX
WebQueryWizard::~WebQueryWizard() WebQueryWizard::~WebQueryWizard()
{ {
KConfig * config = kapp->config(); TDEConfig * config = kapp->config();
config->setGroup( "WebQueryWizard" ); config->setGroup( "WebQueryWizard" );
saveWindowSize( config ); saveWindowSize( config );
} }
void WebQueryWizard::showEvent( TQShowEvent * ) void WebQueryWizard::showEvent( TQShowEvent * )
{ {
KConfig * config = kapp->config(); TDEConfig * config = kapp->config();
config->setGroup( "WebQueryWizard" ); config->setGroup( "WebQueryWizard" );
restoreWindowSize( config ); restoreWindowSize( config );
} }
@ -444,15 +444,15 @@ namespace KBibTeX
m_pushButtonSearch->setIconSet( TQIconSet( SmallIcon( "find" ) ) ); m_pushButtonSearch->setIconSet( TQIconSet( SmallIcon( "find" ) ) );
m_pushButtonSearch->setEnabled( FALSE ); m_pushButtonSearch->setEnabled( FALSE );
m_listViewResults = new KListView( this ); m_listViewResults = new TDEListView( this );
m_listViewResults->addColumn( i18n( "Year" ), 64 ); m_listViewResults->addColumn( i18n( "Year" ), 64 );
m_listViewResults->addColumn( i18n( "Author" ), 128 ); m_listViewResults->addColumn( i18n( "Author" ), 128 );
m_listViewResults->addColumn( i18n( "Title" ), 512 ); m_listViewResults->addColumn( i18n( "Title" ), 512 );
if ( settings->editing_UseSpecialFont ) if ( settings->editing_UseSpecialFont )
m_listViewResults->setFont( settings->editing_SpecialFont ); m_listViewResults->setFont( settings->editing_SpecialFont );
else else
m_listViewResults->setFont( KGlobalSettings::generalFont() ); m_listViewResults->setFont( TDEGlobalSettings::generalFont() );
m_listViewResults->header() ->setFont( KGlobalSettings::generalFont() ); m_listViewResults->header() ->setFont( TDEGlobalSettings::generalFont() );
m_listViewResults->setAllColumnsShowFocus( TRUE ); m_listViewResults->setAllColumnsShowFocus( TRUE );
m_listViewResults->setFullWidth( true ); m_listViewResults->setFullWidth( true );
m_listViewResults->setSelectionMode( TQListView::Extended ); m_listViewResults->setSelectionMode( TQListView::Extended );
@ -520,8 +520,8 @@ namespace KBibTeX
} }
} }
/* This function was taken form KMainWindow of KDE 3.5 and modified to fit KBibTeX */ /* This function was taken form TDEMainWindow of KDE 3.5 and modified to fit KBibTeX */
void WebQueryWizard::saveWindowSize( KConfig *config ) const void WebQueryWizard::saveWindowSize( TDEConfig *config ) const
{ {
int scnum = TQApplication::desktop()->screenNumber( parentWidget() ); int scnum = TQApplication::desktop()->screenNumber( parentWidget() );
TQRect desk = TQApplication::desktop()->screenGeometry( scnum ); TQRect desk = TQApplication::desktop()->screenGeometry( scnum );
@ -554,8 +554,8 @@ namespace KBibTeX
config->writeEntry( heightString, h ); config->writeEntry( heightString, h );
} }
/* This function was taken form KMainWindow of KDE 3.5 and modified to fit KBibTeX */ /* This function was taken form TDEMainWindow of KDE 3.5 and modified to fit KBibTeX */
void WebQueryWizard::restoreWindowSize( KConfig *config ) void WebQueryWizard::restoreWindowSize( TDEConfig *config )
{ {
// restore the size // restore the size
int scnum = TQApplication::desktop()->screenNumber( parentWidget() ); int scnum = TQApplication::desktop()->screenNumber( parentWidget() );

22
src/webquery.h
Unescape View File

@ -24,9 +24,9 @@
#include <ntqstring.h> #include <ntqstring.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klistview.h> #include <tdelistview.h>
#include <klineedit.h> #include <klineedit.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include <kprogress.h> #include <kprogress.h>
#include "entry.h" #include "entry.h"
@ -36,7 +36,7 @@ class TQFrame;
class TQCheckBox; class TQCheckBox;
class TQSpinBox; class TQSpinBox;
class KComboBox; class KComboBox;
class KListView; class TDEListView;
class KPushButton; class KPushButton;
namespace KBibTeX namespace KBibTeX
@ -110,16 +110,16 @@ namespace KBibTeX
private: private:
int m_currentStage; int m_currentStage;
int m_numStages; int m_numStages;
KIO::TransferJob *m_currentJob; TDEIO::TransferJob *m_currentJob;
int m_currentJobTotalSize; int m_currentJobTotalSize;
TQString m_incomingData; TQString m_incomingData;
private slots: private slots:
void slotCancelQuery(); void slotCancelQuery();
void slotSetJobTotalSize( KIO::Job *job, KIO::filesize_t size ); void slotSetJobTotalSize( TDEIO::Job *job, TDEIO::filesize_t size );
void slotSetJobProcessedSize( KIO::Job *job, KIO::filesize_t size ); void slotSetJobProcessedSize( TDEIO::Job *job, TDEIO::filesize_t size );
void slotJobData( KIO::Job *job, const TQByteArray &data ); void slotJobData( TDEIO::Job *job, const TQByteArray &data );
void slotJobFinished( KIO::Job *job ); void slotJobFinished( TDEIO::Job *job );
}; };
class WebQueryWizard: public TQWidget class WebQueryWizard: public TQWidget
@ -134,7 +134,7 @@ namespace KBibTeX
void changeButtonOK( bool state ); void changeButtonOK( bool state );
protected: protected:
KListView *m_listViewResults; TDEListView *m_listViewResults;
KComboBox *m_comboBoxEngines; KComboBox *m_comboBoxEngines;
TQWidgetStack *m_widgetStackQueries; TQWidgetStack *m_widgetStackQueries;
KURLLabel *m_disclaimerLabel; KURLLabel *m_disclaimerLabel;
@ -160,8 +160,8 @@ namespace KBibTeX
void setupGUI( ); void setupGUI( );
void setupQueries(); void setupQueries();
void restoreWindowSize( KConfig *config ); void restoreWindowSize( TDEConfig *config );
void saveWindowSize( KConfig *config ) const; void saveWindowSize( TDEConfig *config ) const;
}; };
class ResultsListViewItem: public TQListViewItem class ResultsListViewItem: public TQListViewItem

8
src/webqueryamatex.cpp
Unescape View File

@ -24,9 +24,9 @@
#include <ntqspinbox.h> #include <ntqspinbox.h>
#include <klineedit.h> #include <klineedit.h>
#include <klocale.h> #include <tdelocale.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kurl.h> #include <kurl.h>
#include <fileimporterbibtex.h> #include <fileimporterbibtex.h>
@ -105,7 +105,7 @@ namespace KBibTeX
} }
else if ( !m_aborted ) else if ( !m_aborted )
{ {
TQString message = KIO::NetAccess::lastErrorString(); TQString message = TDEIO::NetAccess::lastErrorString();
if ( message.isEmpty() ) if ( message.isEmpty() )
message.prepend( '\n' ); message.prepend( '\n' );
message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) ); message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) );

32
src/webqueryarxiv.cpp
Unescape View File

@ -21,9 +21,9 @@
#include <ntqbuffer.h> #include <ntqbuffer.h>
#include <ntqspinbox.h> #include <ntqspinbox.h>
#include <klocale.h> #include <tdelocale.h>
#include <klineedit.h> #include <klineedit.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kurl.h> #include <kurl.h>
#include <fileimporterbibtex.h> #include <fileimporterbibtex.h>
@ -169,17 +169,17 @@ namespace KBibTeX
KURL url = KURL( TQString( "http://www.arxiv.org/find/all/1/all:+%2/0/1/0/all/0/1?per_page=%1" ).arg( m_numberOfResults ).arg( query.replace( "%", "%25" ).replace( "+", "%2B" ).replace( " ", "%20" ).replace( "#", "%23" ).replace( "&", "%26" ).replace( "?", "%3F" ) ) ); KURL url = KURL( TQString( "http://www.arxiv.org/find/all/1/all:+%2/0/1/0/all/0/1?per_page=%1" ).arg( m_numberOfResults ).arg( query.replace( "%", "%25" ).replace( "+", "%2B" ).replace( " ", "%20" ).replace( "#", "%23" ).replace( "&", "%26" ).replace( "?", "%3F" ) ) );
m_currentJobMutex.lock(); m_currentJobMutex.lock();
KIO::Job *job = KIO::storedGet( url, FALSE, FALSE ); TDEIO::Job *job = TDEIO::storedGet( url, FALSE, FALSE );
connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( unlockJob( KIO::Job * ) ) ); connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( unlockJob( TDEIO::Job * ) ) );
connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( arXivResult( KIO::Job * ) ) ); connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( arXivResult( TDEIO::Job * ) ) );
} }
void WebQueryArXiv::unlockJob( KIO::Job * ) void WebQueryArXiv::unlockJob( TDEIO::Job * )
{ {
m_currentJobMutex.unlock(); m_currentJobMutex.unlock();
} }
void WebQueryArXiv::arXivResult( KIO::Job *job ) void WebQueryArXiv::arXivResult( TDEIO::Job *job )
{ {
if ( job->error() == 0 && !m_aborted ) if ( job->error() == 0 && !m_aborted )
{ {
@ -187,7 +187,7 @@ namespace KBibTeX
TQBuffer data; TQBuffer data;
data.open( IO_WriteOnly ); data.open( IO_WriteOnly );
data.writeBlock( dynamic_cast<KIO::StoredTransferJob*>( job )->data() ); data.writeBlock( dynamic_cast<TDEIO::StoredTransferJob*>( job )->data() );
data.close(); data.close();
data.open( IO_ReadOnly ); data.open( IO_ReadOnly );
TQTextStream ts( &data ); TQTextStream ts( &data );
@ -226,12 +226,12 @@ namespace KBibTeX
{ {
m_aborted = false; m_aborted = false;
m_currentJobMutex.lock(); m_currentJobMutex.lock();
KIO::Job *job = KIO::storedGet( abstractURL, FALSE, FALSE ); TDEIO::Job *job = TDEIO::storedGet( abstractURL, FALSE, FALSE );
connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( unlockJob( KIO::Job * ) ) ); connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( unlockJob( TDEIO::Job * ) ) );
connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( arXivAbstractResult( KIO::Job * ) ) ); connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( arXivAbstractResult( TDEIO::Job * ) ) );
} }
void WebQueryArXiv::arXivAbstractResult( KIO::Job *job ) void WebQueryArXiv::arXivAbstractResult( TDEIO::Job *job )
{ {
if ( job->error() == 0 && !m_aborted ) if ( job->error() == 0 && !m_aborted )
{ {
@ -240,7 +240,7 @@ namespace KBibTeX
TQBuffer data; TQBuffer data;
data.open( IO_WriteOnly ); data.open( IO_WriteOnly );
data.writeBlock( dynamic_cast<KIO::StoredTransferJob*>( job )->data() ); data.writeBlock( dynamic_cast<TDEIO::StoredTransferJob*>( job )->data() );
data.close(); data.close();
data.open( IO_ReadOnly ); data.open( IO_ReadOnly );
TQTextStream ts( &data ); TQTextStream ts( &data );
@ -553,9 +553,9 @@ namespace KBibTeX
KURL url = m_urls.first(); KURL url = m_urls.first();
m_urls.remove( url ); m_urls.remove( url );
m_currentJobMutex.lock(); m_currentJobMutex.lock();
KIO::Job *job = KIO::storedGet( url, FALSE, FALSE ); TDEIO::Job *job = TDEIO::storedGet( url, FALSE, FALSE );
connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( unlockJob( KIO::Job * ) ) ); connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( unlockJob( TDEIO::Job * ) ) );
connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( arXivAbstractResult( KIO::Job * ) ) ); connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( arXivAbstractResult( TDEIO::Job * ) ) );
} }
else else
setEndSearch( WebQuery::statusSuccess ); setEndSearch( WebQuery::statusSuccess );

8
src/webqueryarxiv.h
Unescape View File

@ -24,7 +24,7 @@
#include <ntqstringlist.h> #include <ntqstringlist.h>
#include <ntqregexp.h> #include <ntqregexp.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <fileimporterbibtex.h> #include <fileimporterbibtex.h>
#include <webquery.h> #include <webquery.h>
@ -67,9 +67,9 @@ namespace KBibTeX
void cancelQuery(); void cancelQuery();
private slots: private slots:
void arXivResult( KIO::Job *job ); void arXivResult( TDEIO::Job *job );
void unlockJob( KIO::Job *job ); void unlockJob( TDEIO::Job *job );
void arXivAbstractResult( KIO::Job *job ); void arXivAbstractResult( TDEIO::Job *job );
private: private:
TQString m_lastHit; TQString m_lastHit;

8
src/webquerybibsonomy.cpp
Unescape View File

@ -23,10 +23,10 @@
#include <ntqstring.h> #include <ntqstring.h>
#include <ntqspinbox.h> #include <ntqspinbox.h>
#include <klocale.h> #include <tdelocale.h>
#include <klineedit.h> #include <klineedit.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kurl.h> #include <kurl.h>
#include <settings.h> #include <settings.h>
@ -110,7 +110,7 @@ namespace KBibTeX
} }
else if ( !m_aborted ) else if ( !m_aborted )
{ {
TQString message = KIO::NetAccess::lastErrorString(); TQString message = TDEIO::NetAccess::lastErrorString();
if ( message.isEmpty() ) if ( message.isEmpty() )
message.prepend( '\n' ); message.prepend( '\n' );
message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) ); message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) );

8
src/webquerycitebase.cpp
Unescape View File

@ -23,9 +23,9 @@
#include <ntqspinbox.h> #include <ntqspinbox.h>
#include <klineedit.h> #include <klineedit.h>
#include <klocale.h> #include <tdelocale.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kurl.h> #include <kurl.h>
#include <settings.h> #include <settings.h>
@ -112,7 +112,7 @@ namespace KBibTeX
} }
else if ( !m_aborted ) else if ( !m_aborted )
{ {
TQString message = KIO::NetAccess::lastErrorString(); TQString message = TDEIO::NetAccess::lastErrorString();
if ( message.isEmpty() ) if ( message.isEmpty() )
message.prepend( '\n' ); message.prepend( '\n' );
message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) ); message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) );

12
src/webqueryciteseerx.cpp
Unescape View File

@ -22,9 +22,9 @@
#include <ntqbuffer.h> #include <ntqbuffer.h>
#include <ntqspinbox.h> #include <ntqspinbox.h>
#include <klocale.h> #include <tdelocale.h>
#include <klineedit.h> #include <klineedit.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kurl.h> #include <kurl.h>
#include <kdebug.h> #include <kdebug.h>
@ -265,7 +265,7 @@ namespace KBibTeX
//_______________________________________________________________________________________________________________ //_______________________________________________________________________________________________________________
// read data from the job and start the current parser // read data from the job and start the current parser
void WebQueryCiteSeerX::getData( KIO::Job *job ) void WebQueryCiteSeerX::getData( TDEIO::Job *job )
{ {
// advance GUI progress bar // advance GUI progress bar
enterNextStage(); enterNextStage();
@ -276,7 +276,7 @@ namespace KBibTeX
// read data // read data
TQBuffer data; TQBuffer data;
data.open( IO_WriteOnly ); data.open( IO_WriteOnly );
data.writeBlock( dynamic_cast<KIO::StoredTransferJob*>( job )->data() ); data.writeBlock( dynamic_cast<TDEIO::StoredTransferJob*>( job )->data() );
data.close(); data.close();
data.open( IO_ReadOnly ); data.open( IO_ReadOnly );
TQTextStream ts( &data ); TQTextStream ts( &data );
@ -307,9 +307,9 @@ namespace KBibTeX
else if ( !m_aborted ) else if ( !m_aborted )
{ {
m_currentParser = m_queryQueue.front().parser; m_currentParser = m_queryQueue.front().parser;
KIO::Job *job = KIO::storedGet( m_queryQueue.front().url, FALSE, FALSE ); TDEIO::Job *job = TDEIO::storedGet( m_queryQueue.front().url, FALSE, FALSE );
m_queryQueue.pop_front(); m_queryQueue.pop_front();
connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( getData( KIO::Job * ) ) ); connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( getData( TDEIO::Job * ) ) );
} }
} }

4
src/webqueryciteseerx.h
Unescape View File

@ -23,7 +23,7 @@
#include <ntqstring.h> #include <ntqstring.h>
#include <ntqstringlist.h> #include <ntqstringlist.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <fileimporterbibtex.h> #include <fileimporterbibtex.h>
#include <webquery.h> #include <webquery.h>
@ -97,7 +97,7 @@ namespace KBibTeX
/// Callback when the job is finished. /// Callback when the job is finished.
/**Reads the data from the job, and hands it over to the currently set parser. */ /**Reads the data from the job, and hands it over to the currently set parser. */
void getData( KIO::Job *job ); void getData( TDEIO::Job *job );
private: private:

10
src/webquerycsb.cpp
Unescape View File

@ -28,9 +28,9 @@
#include <ntqfile.h> #include <ntqfile.h>
#include <ntqdatetime.h> #include <ntqdatetime.h>
#include <klocale.h> #include <tdelocale.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <klineedit.h> #include <klineedit.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kpushbutton.h> #include <kpushbutton.h>
@ -83,7 +83,7 @@ namespace KBibTeX
TQLabel *label = new TQLabel( i18n( "Search &term:" ), this ); TQLabel *label = new TQLabel( i18n( "Search &term:" ), this );
hLayout->addWidget( label ); hLayout->addWidget( label );
lineEditQuery = new KLineEdit( this ); lineEditQuery = new KLineEdit( this );
KCompletion *completionQuery = lineEditQuery->completionObject(); TDECompletion *completionQuery = lineEditQuery->completionObject();
hLayout->addWidget( lineEditQuery ); hLayout->addWidget( lineEditQuery );
label->setBuddy( lineEditQuery ); label->setBuddy( lineEditQuery );
hLayout->addSpacing( KDialog::spacingHint() * 2 ); hLayout->addSpacing( KDialog::spacingHint() * 2 );
@ -274,7 +274,7 @@ namespace KBibTeX
} }
else if ( !m_aborted ) else if ( !m_aborted )
{ {
TQString message = KIO::NetAccess::lastErrorString(); TQString message = TDEIO::NetAccess::lastErrorString();
if ( message.isEmpty() ) if ( message.isEmpty() )
message.prepend( '\n' ); message.prepend( '\n' );
message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) ); message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) );

2
src/webquerycsb.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef KBIBTEXWEBQUERYCSB_H #ifndef KBIBTEXWEBQUERYCSB_H
#define KBIBTEXWEBQUERYCSB_H #define KBIBTEXWEBQUERYCSB_H
#include <kio/job.h> #include <tdeio/job.h>
#include <fileimporterbibtex.h> #include <fileimporterbibtex.h>
#include <webquery.h> #include <webquery.h>

10
src/webquerydblp.cpp
Unescape View File

@ -25,13 +25,13 @@
#include <ntqlabel.h> #include <ntqlabel.h>
#include <ntqlayout.h> #include <ntqlayout.h>
#include <klocale.h> #include <tdelocale.h>
#include <klineedit.h> #include <klineedit.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kurl.h> #include <kurl.h>
#include <settings.h> #include <settings.h>
@ -74,7 +74,7 @@ namespace KBibTeX
connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) );
connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) );
hLayout->setStretchFactor( lineEditQuery, 4 ); hLayout->setStretchFactor( lineEditQuery, 4 );
KCompletion *completionQuery = lineEditQuery->completionObject(); TDECompletion *completionQuery = lineEditQuery->completionObject();
label = new TQLabel( i18n( "&Number of results:" ), this ); label = new TQLabel( i18n( "&Number of results:" ), this );
hLayout->addWidget( label ); hLayout->addWidget( label );
@ -198,7 +198,7 @@ namespace KBibTeX
} }
else if ( !m_aborted ) else if ( !m_aborted )
{ {
TQString message = KIO::NetAccess::lastErrorString(); TQString message = TDEIO::NetAccess::lastErrorString();
if ( message.isEmpty() ) if ( message.isEmpty() )
message.prepend( '\n' ); message.prepend( '\n' );
message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) ); message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) );

44
src/webquerygooglescholar.cpp
Unescape View File

@ -23,13 +23,13 @@
#include <ntqtimer.h> #include <ntqtimer.h>
#include <ntqmap.h> #include <ntqmap.h>
#include <ntqspinbox.h> #include <ntqspinbox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klineedit.h> #include <klineedit.h>
#include <klocale.h> #include <tdelocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <dcopref.h> #include <dcopref.h>
@ -112,9 +112,9 @@ namespace KBibTeX
/** prepare HTTP request (buffer, signals, job) */ /** prepare HTTP request (buffer, signals, job) */
m_transferJobBuffer = new TQBuffer(); m_transferJobBuffer = new TQBuffer();
m_transferJobBuffer->open( IO_WriteOnly ); m_transferJobBuffer->open( IO_WriteOnly );
KIO::TransferJob* m_transferJob = KIO::get( KURL( "http://scholar.google.com/scholar_ncr" ), false, false ); TDEIO::TransferJob* m_transferJob = TDEIO::get( KURL( "http://scholar.google.com/scholar_ncr" ), false, false );
connect( m_transferJob, SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( KIO::Job *, const TQByteArray & ) ) ); connect( m_transferJob, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
connect( m_transferJob, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotFinishedStartpage( KIO::Job * ) ) ); connect( m_transferJob, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotFinishedStartpage( TDEIO::Job * ) ) );
} }
void WebQueryGoogleScholar::cancelQuery() void WebQueryGoogleScholar::cancelQuery()
@ -125,7 +125,7 @@ namespace KBibTeX
setEndSearch( WebQuery::statusError ); setEndSearch( WebQuery::statusError );
} }
void WebQueryGoogleScholar::slotFinishedStartpage( KIO::Job *job ) void WebQueryGoogleScholar::slotFinishedStartpage( TDEIO::Job *job )
{ {
/** close and delete buffer (content does not matter) */ /** close and delete buffer (content does not matter) */
m_transferJobBuffer->close(); m_transferJobBuffer->close();
@ -153,13 +153,13 @@ namespace KBibTeX
/** prepare next HTTP request for preferences page (buffer, signals, job) */ /** prepare next HTTP request for preferences page (buffer, signals, job) */
m_transferJobBuffer = new TQBuffer(); m_transferJobBuffer = new TQBuffer();
m_transferJobBuffer->open( IO_WriteOnly ); m_transferJobBuffer->open( IO_WriteOnly );
KIO::TransferJob* m_transferJob = KIO::get( KURL( "http://scholar.google.com/scholar_preferences?hl=en" ), false, false ); TDEIO::TransferJob* m_transferJob = TDEIO::get( KURL( "http://scholar.google.com/scholar_preferences?hl=en" ), false, false );
connect( m_transferJob, SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( KIO::Job *, const TQByteArray & ) ) ); connect( m_transferJob, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
connect( m_transferJob, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotFinishedLoadingSettings( KIO::Job * ) ) ); connect( m_transferJob, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotFinishedLoadingSettings( TDEIO::Job * ) ) );
} }
void WebQueryGoogleScholar::slotFinishedLoadingSettings( KIO::Job *job ) void WebQueryGoogleScholar::slotFinishedLoadingSettings( TDEIO::Job *job )
{ {
/** close and delete buffer (content does not matter) */ /** close and delete buffer (content does not matter) */
m_transferJobBuffer->close(); m_transferJobBuffer->close();
@ -197,12 +197,12 @@ namespace KBibTeX
KURL nextUrl( formFieldsToUrl( "http://scholar.google.com/scholar_setprefs", keyValues ) ); KURL nextUrl( formFieldsToUrl( "http://scholar.google.com/scholar_setprefs", keyValues ) );
m_transferJobBuffer = new TQBuffer(); m_transferJobBuffer = new TQBuffer();
m_transferJobBuffer->open( IO_WriteOnly ); m_transferJobBuffer->open( IO_WriteOnly );
KIO::TransferJob* m_transferJob = KIO::get( nextUrl, false, false ); TDEIO::TransferJob* m_transferJob = TDEIO::get( nextUrl, false, false );
connect( m_transferJob, SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( KIO::Job *, const TQByteArray & ) ) ); connect( m_transferJob, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
connect( m_transferJob, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotFinishedSavingSettings( KIO::Job * ) ) ); connect( m_transferJob, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotFinishedSavingSettings( TDEIO::Job * ) ) );
} }
void WebQueryGoogleScholar::slotFinishedSavingSettings( KIO::Job *job ) void WebQueryGoogleScholar::slotFinishedSavingSettings( TDEIO::Job *job )
{ {
/** close and delete buffer (content does not matter) */ /** close and delete buffer (content does not matter) */
m_transferJobBuffer->close(); m_transferJobBuffer->close();
@ -238,12 +238,12 @@ namespace KBibTeX
KURL nextUrl( formFieldsToUrl( "http://scholar.google.com/scholar", keyValues ) ); KURL nextUrl( formFieldsToUrl( "http://scholar.google.com/scholar", keyValues ) );
m_transferJobBuffer = new TQBuffer(); m_transferJobBuffer = new TQBuffer();
m_transferJobBuffer->open( IO_WriteOnly ); m_transferJobBuffer->open( IO_WriteOnly );
KIO::TransferJob* m_transferJob = KIO::get( nextUrl, false, false ); TDEIO::TransferJob* m_transferJob = TDEIO::get( nextUrl, false, false );
connect( m_transferJob, SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( KIO::Job *, const TQByteArray & ) ) ); connect( m_transferJob, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
connect( m_transferJob, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotFinishedReceivingResultOverview( KIO::Job * ) ) ); connect( m_transferJob, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotFinishedReceivingResultOverview( TDEIO::Job * ) ) );
} }
void WebQueryGoogleScholar::slotFinishedReceivingResultOverview( KIO::Job *job ) void WebQueryGoogleScholar::slotFinishedReceivingResultOverview( TDEIO::Job *job )
{ {
/** close and delete buffer (content does not matter) */ /** close and delete buffer (content does not matter) */
m_transferJobBuffer->close(); m_transferJobBuffer->close();
@ -307,7 +307,7 @@ namespace KBibTeX
void WebQueryGoogleScholar::readAndChangeConfig() void WebQueryGoogleScholar::readAndChangeConfig()
{ {
KConfig cfg( "kcookiejarrc" ); TDEConfig cfg( "kcookiejarrc" );
cfg.setGroup( "Cookie Policy" ); cfg.setGroup( "Cookie Policy" );
m_originalEnableCookies = cfg.readBoolEntry( "Cookies", true ); m_originalEnableCookies = cfg.readBoolEntry( "Cookies", true );
m_originalSessionCookies = cfg.readBoolEntry( "AcceptSessionCookies", true ); m_originalSessionCookies = cfg.readBoolEntry( "AcceptSessionCookies", true );
@ -340,7 +340,7 @@ namespace KBibTeX
void WebQueryGoogleScholar::restoreConfig() void WebQueryGoogleScholar::restoreConfig()
{ {
KConfig cfg( "kcookiejarrc" ); TDEConfig cfg( "kcookiejarrc" );
cfg.setGroup( "Cookie Policy" ); cfg.setGroup( "Cookie Policy" );
cfg.writeEntry( "CookieGlobalAdvice", m_originalCookieGlobalAdvice ); cfg.writeEntry( "CookieGlobalAdvice", m_originalCookieGlobalAdvice );
cfg.writeEntry( "Cookies", m_originalEnableCookies ); cfg.writeEntry( "Cookies", m_originalEnableCookies );

12
src/webquerygooglescholar.h
Unescape View File

@ -62,19 +62,19 @@ namespace KBibTeX
void cancelQuery(); void cancelQuery();
private slots: private slots:
void slotData( KIO::Job *, const TQByteArray &data ) void slotData( TDEIO::Job *, const TQByteArray &data )
{ {
m_transferJobBuffer->writeBlock( data.data(), data.size() ); m_transferJobBuffer->writeBlock( data.data(), data.size() );
}; };
/** Google Scholar's start page has been loaded */ /** Google Scholar's start page has been loaded */
void slotFinishedStartpage( KIO::Job *job ); void slotFinishedStartpage( TDEIO::Job *job );
/** Settings page has been loaded */ /** Settings page has been loaded */
void slotFinishedLoadingSettings( KIO::Job *job ); void slotFinishedLoadingSettings( TDEIO::Job *job );
/** Settings page upload and search mask loaded */ /** Settings page upload and search mask loaded */
void slotFinishedSavingSettings( KIO::Job *job ); void slotFinishedSavingSettings( TDEIO::Job *job );
/** page with results loaded */ /** page with results loaded */
void slotFinishedReceivingResultOverview( KIO::Job *job ); void slotFinishedReceivingResultOverview( TDEIO::Job *job );
private: private:
WebQueryGoogleScholarWidget *m_widget; WebQueryGoogleScholarWidget *m_widget;
@ -88,7 +88,7 @@ namespace KBibTeX
TQMap <TQString, TQString> m_originalCookieMap; TQMap <TQString, TQString> m_originalCookieMap;
TQString m_originalCookieGlobalAdvice; TQString m_originalCookieGlobalAdvice;
KIO::TransferJob *m_transferJob; TDEIO::TransferJob *m_transferJob;
TQBuffer *m_transferJobBuffer; TQBuffer *m_transferJobBuffer;
/** load KDE's cookie configuration, store values, and reset with Google-friendly values */ /** load KDE's cookie configuration, store values, and reset with Google-friendly values */

22
src/webqueryieeexplore.cpp
Unescape View File

@ -20,13 +20,13 @@
#include <ntqspinbox.h> #include <ntqspinbox.h>
#include <ntqfile.h> #include <ntqfile.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <klineedit.h> #include <klineedit.h>
#include <kurl.h> #include <kurl.h>
#include <klocale.h> #include <tdelocale.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <settings.h> #include <settings.h>
#include <entryfield.h> #include <entryfield.h>
@ -150,7 +150,7 @@ namespace KBibTeX
} }
else if ( !m_aborted ) else if ( !m_aborted )
{ {
TQString message = KIO::NetAccess::lastErrorString(); TQString message = TDEIO::NetAccess::lastErrorString();
if ( message.isEmpty() ) if ( message.isEmpty() )
message.prepend( '\n' ); message.prepend( '\n' );
message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) ); message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) );
@ -173,19 +173,19 @@ namespace KBibTeX
m_incomingData = ""; m_incomingData = "";
TQString data = "dlSelect=cite&fileFormate=BibTex&arnumber=%3Carnumber%3E" + TQString::number( arnum ) + "%3C%2Farnumber%3E&Submit=Download"; TQString data = "dlSelect=cite&fileFormate=BibTex&arnumber=%3Carnumber%3E" + TQString::number( arnum ) + "%3C%2Farnumber%3E&Submit=Download";
KIO::TransferJob *job = KIO::http_post( m_risURL, data.utf8(), false ); TDEIO::TransferJob *job = TDEIO::http_post( m_risURL, data.utf8(), false );
job->addMetaData( "content-type", "Content-Type: application/x-www-form-urlencoded" ); job->addMetaData( "content-type", "Content-Type: application/x-www-form-urlencoded" );
connect( job, SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( KIO::Job *, const TQByteArray & ) ) ); connect( job, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotResult( TDEIO::Job * ) ) );
} }
void WebQueryIEEExplore::slotData( KIO::Job *, const TQByteArray &data ) void WebQueryIEEExplore::slotData( TDEIO::Job *, const TQByteArray &data )
{ {
if ( data.size() > 0 ) if ( data.size() > 0 )
m_incomingData.append( TQCString( data, data.size() + 1 ) ); m_incomingData.append( TQCString( data, data.size() + 1 ) );
} }
void WebQueryIEEExplore::slotResult( KIO::Job *job ) void WebQueryIEEExplore::slotResult( TDEIO::Job *job )
{ {
TQRegExp m_date( "^(((\\d{1,2}(-\\d{1,2}))\\s+)?(([A-Z][a-z]{2,3})(/([A-Z][a-z]{2,3}))?)\\.?\\s+)?(\\d{4})$" ); TQRegExp m_date( "^(((\\d{1,2}(-\\d{1,2}))\\s+)?(([A-Z][a-z]{2,3})(/([A-Z][a-z]{2,3}))?)\\.?\\s+)?(\\d{4})$" );
if ( job->error() ) if ( job->error() )

4
src/webqueryieeexplore.h
Unescape View File

@ -75,8 +75,8 @@ namespace KBibTeX
TQString parseMonth( const TQString &month ); TQString parseMonth( const TQString &month );
private slots: private slots:
void slotData( KIO::Job *job, const TQByteArray &data ); void slotData( TDEIO::Job *job, const TQByteArray &data );
void slotResult( KIO::Job *job ); void slotResult( TDEIO::Job *job );
}; };
} }

10
src/webquerymathscinet.cpp
Unescape View File

@ -25,12 +25,12 @@
#include <ntqspinbox.h> #include <ntqspinbox.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <klocale.h> #include <tdelocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kurl.h> #include <kurl.h>
#include <kdebug.h> #include <kdebug.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <settings.h> #include <settings.h>
@ -67,7 +67,7 @@ namespace KBibTeX
connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) );
connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) );
hLayout->setStretchFactor( lineEditQuery, 4 ); hLayout->setStretchFactor( lineEditQuery, 4 );
KCompletion *completionQuery = lineEditQuery->completionObject(); TDECompletion *completionQuery = lineEditQuery->completionObject();
/* /*
label = new TQLabel( i18n( "&Number of results:" ), this ); label = new TQLabel( i18n( "&Number of results:" ), this );
@ -170,7 +170,7 @@ namespace KBibTeX
} }
else if ( !m_aborted ) else if ( !m_aborted )
{ {
TQString message = KIO::NetAccess::lastErrorString(); TQString message = TDEIO::NetAccess::lastErrorString();
if ( message.isEmpty() ) if ( message.isEmpty() )
message.prepend( '\n' ); message.prepend( '\n' );
message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) ); message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) );

10
src/webquerypubmed.cpp
Unescape View File

@ -28,10 +28,10 @@
#include <klineedit.h> #include <klineedit.h>
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <kurl.h> #include <kurl.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <entryfield.h> #include <entryfield.h>
#include <value.h> #include <value.h>
@ -155,7 +155,7 @@ namespace KBibTeX
} }
else if ( !m_aborted ) else if ( !m_aborted )
{ {
TQString message = KIO::NetAccess::lastErrorString(); TQString message = TDEIO::NetAccess::lastErrorString();
message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) ); message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) );
KMessageBox::error( m_parent, message ); KMessageBox::error( m_parent, message );
setEndSearch( WebQuery::statusError ); setEndSearch( WebQuery::statusError );
@ -165,7 +165,7 @@ namespace KBibTeX
} }
else if ( !m_aborted ) else if ( !m_aborted )
{ {
TQString message = KIO::NetAccess::lastErrorString(); TQString message = TDEIO::NetAccess::lastErrorString();
if ( message.isEmpty() ) if ( message.isEmpty() )
message.prepend( '\n' ); message.prepend( '\n' );
message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) ); message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) );

20
src/webquerysciencedirect.cpp
Unescape View File

@ -24,12 +24,12 @@
#include <ntqfile.h> #include <ntqfile.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <klocale.h> #include <tdelocale.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <settings.h> #include <settings.h>
#include <fileimporterris.h> #include <fileimporterris.h>
@ -84,7 +84,7 @@ namespace KBibTeX
TQLabel *label = new TQLabel( i18n( "Title, abstract, keywords:" ), this ); TQLabel *label = new TQLabel( i18n( "Title, abstract, keywords:" ), this );
hLayout->addWidget( label ); hLayout->addWidget( label );
lineEditQuery = new KLineEdit( this ); lineEditQuery = new KLineEdit( this );
KCompletion *completionQuery = lineEditQuery->completionObject(); TDECompletion *completionQuery = lineEditQuery->completionObject();
hLayout->addWidget( lineEditQuery ); hLayout->addWidget( lineEditQuery );
label->setBuddy( lineEditQuery ); label->setBuddy( lineEditQuery );
connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) );
@ -363,21 +363,21 @@ namespace KBibTeX
m_incomingData = ""; m_incomingData = "";
TQString data = TQString( "_ob=DownloadURL&_method=finish&_acct=%1&_userid=%2&_ArticleListID=%3&count=10&md5=%4&JAVASCRIPT_ON=&format=cite&citation-type=RIS&RETURN_URL=http://www.sciencedirect.com/science/home" ).arg( m_account ).arg( m_userid ).arg( m_articleListID ).arg( m_md5 ); TQString data = TQString( "_ob=DownloadURL&_method=finish&_acct=%1&_userid=%2&_ArticleListID=%3&count=10&md5=%4&JAVASCRIPT_ON=&format=cite&citation-type=RIS&RETURN_URL=http://www.sciencedirect.com/science/home" ).arg( m_account ).arg( m_userid ).arg( m_articleListID ).arg( m_md5 );
KURL url = KURL( "http://www.sciencedirect.com/science" ); KURL url = KURL( "http://www.sciencedirect.com/science" );
KIO::TransferJob *job = KIO::http_post( url, data.utf8(), false ); TDEIO::TransferJob *job = TDEIO::http_post( url, data.utf8(), false );
job->addMetaData( "content-type", "Content-Type: application/x-www-form-urlencoded" ); job->addMetaData( "content-type", "Content-Type: application/x-www-form-urlencoded" );
connect( job, SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( KIO::Job *, const TQByteArray & ) ) ); connect( job, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotResult( TDEIO::Job * ) ) );
return true; return true;
} }
void WebQueryScienceDirect::slotData( KIO::Job *, const TQByteArray &data ) void WebQueryScienceDirect::slotData( TDEIO::Job *, const TQByteArray &data )
{ {
if ( data.size() > 0 ) if ( data.size() > 0 )
m_incomingData.append( TQCString( data, data.size() + 1 ) ); m_incomingData.append( TQCString( data, data.size() + 1 ) );
} }
void WebQueryScienceDirect::slotResult( KIO::Job *job ) void WebQueryScienceDirect::slotResult( TDEIO::Job *job )
{ {
if ( job->error() ) if ( job->error() )
{ {

4
src/webquerysciencedirect.h
Unescape View File

@ -81,8 +81,8 @@ namespace KBibTeX
bool getRISFile(); bool getRISFile();
private slots: private slots:
void slotData( KIO::Job *job, const TQByteArray &data ); void slotData( TDEIO::Job *job, const TQByteArray &data );
void slotResult( KIO::Job *job ); void slotResult( TDEIO::Job *job );
}; };
} }

10
src/webqueryspireshep.cpp
Unescape View File

@ -26,10 +26,10 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <klocale.h> #include <tdelocale.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <klineedit.h> #include <klineedit.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kurl.h> #include <kurl.h>
#include <settings.h> #include <settings.h>
@ -104,7 +104,7 @@ namespace KBibTeX
connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) );
connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) );
hLayout->setStretchFactor( lineEditQuery, 4 ); hLayout->setStretchFactor( lineEditQuery, 4 );
KCompletion *completionQuery = lineEditQuery->completionObject(); TDECompletion *completionQuery = lineEditQuery->completionObject();
m_checkBoxFetchAbstracts = new TQCheckBox( i18n( "Include abstracts from arxiv.org if available" ), this ); m_checkBoxFetchAbstracts = new TQCheckBox( i18n( "Include abstracts from arxiv.org if available" ), this );
vLayout->addWidget( m_checkBoxFetchAbstracts ); vLayout->addWidget( m_checkBoxFetchAbstracts );
@ -200,7 +200,7 @@ namespace KBibTeX
} }
else if ( !m_aborted ) else if ( !m_aborted )
{ {
TQString message = KIO::NetAccess::lastErrorString(); TQString message = TDEIO::NetAccess::lastErrorString();
if ( message.isEmpty() ) if ( message.isEmpty() )
message.prepend( '\n' ); message.prepend( '\n' );
message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) ); message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) );

14
src/webqueryz3950.cpp
Unescape View File

@ -38,15 +38,15 @@
#include <ntqlayout.h> #include <ntqlayout.h>
#include <ntqlabel.h> #include <ntqlabel.h>
#include <klocale.h> #include <tdelocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <klineedit.h> #include <klineedit.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <kurl.h> #include <kurl.h>
@ -120,7 +120,7 @@ namespace KBibTeX
label->setBuddy( lineEditQuery ); label->setBuddy( lineEditQuery );
connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) );
connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) );
KCompletion *completionQuery = lineEditQuery->completionObject(); TDECompletion *completionQuery = lineEditQuery->completionObject();
connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) );
connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) );
label = new TQLabel( i18n( "Search in:" ), this ); label = new TQLabel( i18n( "Search in:" ), this );
@ -354,12 +354,12 @@ namespace KBibTeX
convertedResultText = resultText; convertedResultText = resultText;
else if ( syntax == "usmarc" || syntax == "marc21" ) else if ( syntax == "usmarc" || syntax == "marc21" )
{ {
if ( m_marc21transformer == NULL ) m_marc21transformer = new BibTeX::XSLTransform( KGlobal::dirs()->findResource( "data", "kbibtexpart/xslt/MARC21slim2MODS3.xsl" ) ); if ( m_marc21transformer == NULL ) m_marc21transformer = new BibTeX::XSLTransform( TDEGlobal::dirs()->findResource( "data", "kbibtexpart/xslt/MARC21slim2MODS3.xsl" ) );
convertedResultText = m_marc21transformer->transform( resultText ); convertedResultText = m_marc21transformer->transform( resultText );
} }
else if ( syntax == "unimarc" ) else if ( syntax == "unimarc" )
{ {
if ( m_unimarctransformer == NULL ) m_unimarctransformer = new BibTeX::XSLTransform( KGlobal::dirs()->findResource( "data", "kbibtexpart/xslt/UNIMARC2MODS3.xsl" ) ); if ( m_unimarctransformer == NULL ) m_unimarctransformer = new BibTeX::XSLTransform( TDEGlobal::dirs()->findResource( "data", "kbibtexpart/xslt/UNIMARC2MODS3.xsl" ) );
convertedResultText = m_unimarctransformer->transform( resultText ); convertedResultText = m_unimarctransformer->transform( resultText );
} }

8
src/webqueryzmath.cpp
Unescape View File

@ -21,11 +21,11 @@
#include <ntqapplication.h> #include <ntqapplication.h>
#include <ntqspinbox.h> #include <ntqspinbox.h>
#include <klocale.h> #include <tdelocale.h>
#include <klineedit.h> #include <klineedit.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kurl.h> #include <kurl.h>
#include <settings.h> #include <settings.h>
@ -107,7 +107,7 @@ namespace KBibTeX
} }
else if ( !m_aborted ) else if ( !m_aborted )
{ {
TQString message = KIO::NetAccess::lastErrorString(); TQString message = TDEIO::NetAccess::lastErrorString();
if ( message.isEmpty() ) if ( message.isEmpty() )
message.prepend( '\n' ); message.prepend( '\n' );
message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) ); message.prepend( TQString( i18n( "Querying database '%1' failed." ) ).arg( title() ) );

2
src/z3950connection.cpp
Unescape View File

@ -41,7 +41,7 @@ extern "C"
} }
#endif #endif
#include <klocale.h> #include <tdelocale.h>
#include <ntqfile.h> #include <ntqfile.h>

Write Preview
Loading…
Cancel
Save