Browse Source

Initial TDE conversion

pull/1/head
Slávek Banko 9 years ago
parent
commit
f2d4b48ad7
  1. 10
      ChangeLog
  2. 2
      Doxyfile
  3. 270
      acinclude.m4
  4. 4
      configure.in
  5. 2
      doc/en/Makefile.am
  6. 4
      kbibtex.kdevelop
  7. 2
      po/it.po
  8. 4
      src/Makefile.am
  9. 8
      src/commentwidget.cpp
  10. 46
      src/documentlistview.cpp
  11. 18
      src/documentlistview.h
  12. 8
      src/documentlistviewitem.cpp
  13. 4
      src/documentlistviewitem.h
  14. 24
      src/documentsourceview.cpp
  15. 6
      src/documentsourceview.h
  16. 44
      src/documentwidget.cpp
  17. 26
      src/documentwidget.h
  18. 24
      src/entrywidget.cpp
  19. 6
      src/entrywidget.h
  20. 2
      src/entrywidgetauthor.cpp
  21. 8
      src/entrywidgetexternal.cpp
  22. 10
      src/entrywidgetkeyword.cpp
  23. 6
      src/entrywidgetkeyword.h
  24. 2
      src/entrywidgetmisc.cpp
  25. 10
      src/entrywidgetother.cpp
  26. 4
      src/entrywidgetother.h
  27. 2
      src/entrywidgetpublication.cpp
  28. 6
      src/entrywidgetsource.cpp
  29. 2
      src/entrywidgettab.cpp
  30. 2
      src/entrywidgettitle.cpp
  31. 2
      src/entrywidgetuserdefined.cpp
  32. 10
      src/entrywidgetwarningsitem.cpp
  33. 2
      src/fieldlineedit.cpp
  34. 4
      src/fieldlineedit.h
  35. 14
      src/fieldlistview.cpp
  36. 4
      src/fieldlistview.h
  37. 4
      src/findduplicates.cpp
  38. 2
      src/idsuggestions.cpp
  39. 24
      src/idsuggestionswidget.cpp
  40. 4
      src/kbibtex.desktop
  41. 142
      src/kbibtex_part.cpp
  42. 2
      src/kbibtex_part.desktop
  43. 82
      src/kbibtex_part.h
  44. 2
      src/kbibtex_part.rc
  45. 50
      src/kbibtexshell.cpp
  46. 22
      src/kbibtexshell.h
  47. 2
      src/macrowidget.cpp
  48. 30
      src/main.cpp
  49. 28
      src/mergeelements.cpp
  50. 10
      src/mergeelements.h
  51. 2
      src/messagehandler.cpp
  52. 2
      src/preamblewidget.cpp
  53. 10
      src/searchbar.cpp
  54. 2
      src/searchbar.h
  55. 50
      src/settings.cpp
  56. 18
      src/settings.h
  57. 2
      src/settingsdlg.cpp
  58. 14
      src/settingsediting.cpp
  59. 4
      src/settingsediting.h
  60. 6
      src/settingsfileio.cpp
  61. 28
      src/settingsidsuggestions.cpp
  62. 12
      src/settingsidsuggestions.h
  63. 18
      src/settingskeyword.cpp
  64. 4
      src/settingskeyword.h
  65. 12
      src/settingssearchurl.cpp
  66. 4
      src/settingssearchurl.h
  67. 16
      src/settingsuserdefinedinput.cpp
  68. 4
      src/settingsuserdefinedinput.h
  69. 16
      src/settingsz3950.cpp
  70. 10
      src/settingsz3950.h
  71. 18
      src/sidebar.cpp
  72. 8
      src/sidebar.h
  73. 2
      src/valuewidget.cpp
  74. 48
      src/webquery.cpp
  75. 22
      src/webquery.h
  76. 8
      src/webqueryamatex.cpp
  77. 32
      src/webqueryarxiv.cpp
  78. 8
      src/webqueryarxiv.h
  79. 8
      src/webquerybibsonomy.cpp
  80. 8
      src/webquerycitebase.cpp
  81. 12
      src/webqueryciteseerx.cpp
  82. 4
      src/webqueryciteseerx.h
  83. 10
      src/webquerycsb.cpp
  84. 2
      src/webquerycsb.h
  85. 10
      src/webquerydblp.cpp
  86. 44
      src/webquerygooglescholar.cpp
  87. 12
      src/webquerygooglescholar.h
  88. 22
      src/webqueryieeexplore.cpp
  89. 4
      src/webqueryieeexplore.h
  90. 10
      src/webquerymathscinet.cpp
  91. 10
      src/webquerypubmed.cpp
  92. 20
      src/webquerysciencedirect.cpp
  93. 4
      src/webquerysciencedirect.h
  94. 10
      src/webqueryspireshep.cpp
  95. 14
      src/webqueryz3950.cpp
  96. 8
      src/webqueryzmath.cpp
  97. 2
      src/z3950connection.cpp

10
ChangeLog

@ -264,7 +264,7 @@
* ValueWidget, WebQueryZ3950, SettingsSearchURL, FieldListView,
SettingsUserDefinedInput: Minor UI fixes
* 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:
Adding Z39.50 files from Tellico
* FileImporterBibTeX: Checking for duplicate fields
@ -974,7 +974,7 @@
PersonContainer, Person, KeywordContainer, Keyword,
ValueItem: Completely new/rewritten classes to handle
BibTeX data
* WebQueryPubMed: Switching to KIO::NetAccess, but still
* WebQueryPubMed: Switching to TDEIO::NetAccess, but still
work in progress
* WebQuerySRU: Work in progress
@ -1248,7 +1248,7 @@
2006-07-05 Thomas Fischer <fischer@unix-ag.uni-kl.de>
* 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
2006-07-02 Thomas Fischer <fischer@unix-ag.uni-kl.de>
@ -1487,7 +1487,7 @@
* KBibTeXPart: Progress bar when opening, importing or saving files
improved
* 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
* Going to release 0.1.2
@ -1508,7 +1508,7 @@
drops now
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.
* admin/libtool.m4.in, admin/acinclude.m4.in: Various unnecessary tests
(Fortran, audio libraries, ...) removed from configure script

2
Doxyfile

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

270
acinclude.m4

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

4
configure.in

@ -97,13 +97,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
# And if so, warn when they don't match
if test "$kde_libs_prefix" != "$given_prefix"; then
# And if kde doesn't know about the prefix yet
echo ":"`kde-config --path exe`":" | grep --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
echo ""
echo "Warning: you chose to install this package in $given_prefix,"
echo "but KDE was found in $kde_libs_prefix."
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
echo "Then restart KDE."
echo ""
fi

2
doc/en/Makefile.am

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

4
kbibtex.kdevelop

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

2
po/it.po

@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2010-07-01 13:55+0200\n"
"PO-Revision-Date: 2009-01-04 19:45+0100\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"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

4
src/Makefile.am

@ -43,7 +43,7 @@ bin_PROGRAMS = kbibtex
# the application source, library search path, and link libraries
kbibtex_SOURCES = kbibtexshell.cpp main.cpp
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
shelldesktopdir = $(xdg_appsdir)
@ -75,7 +75,7 @@ libkbibtexpart_la_SOURCES = comment.cpp fileexporterdocbook5.cpp commentwidget.c
xsltransform.cpp webquerysciencedirect.cpp findduplicates.cpp settingsz3950.cpp \
messagehandler.cpp iso6937converter.cpp iso5426converter.cpp webquerymathscinet.cpp
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
partdesktopdir = $(kde_servicesdir)

8
src/commentwidget.cpp

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

46
src/documentlistview.cpp

@ -33,16 +33,16 @@
#include <ntqtextstream.h>
#include <ntqtimer.h>
#include <kapplication.h>
#include <kio/netaccess.h>
#include <ktempfile.h>
#include <klocale.h>
#include <tdeapplication.h>
#include <tdeio/netaccess.h>
#include <tdetempfile.h>
#include <tdelocale.h>
#include <kurl.h>
#include <kurldrag.h>
#include <kactionclasses.h>
#include <kaction.h>
#include <kpopupmenu.h>
#include <kmessagebox.h>
#include <tdeactionclasses.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>
#include <tdemessagebox.h>
#include <kprogress.h>
#include <kiconloader.h>
@ -70,7 +70,7 @@
namespace KBibTeX
{
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 );
setShowSortIndicator( true );
@ -85,7 +85,7 @@ namespace KBibTeX
setDropVisualizer( TRUE );
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( dropped( TQDropEvent*, TQListViewItem* ) ), this, SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) );
}
@ -97,7 +97,7 @@ namespace KBibTeX
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 )
@ -237,15 +237,15 @@ namespace KBibTeX
if ( settings->editing_UseSpecialFont )
setFont( settings->editing_SpecialFont );
else
setFont( KGlobalSettings::generalFont() );
header() ->setFont( KGlobalSettings::generalFont() );
setFont( TDEGlobalSettings::generalFont() );
header() ->setFont( TDEGlobalSettings::generalFont() );
restoreColumnIndex();
restoreColumnWidths();
restoreSortingColumn();
}
void DocumentListView::setViewShowColumnsMenu( KActionMenu *actionMenu )
void DocumentListView::setViewShowColumnsMenu( TDEActionMenu *actionMenu )
{
if ( m_headerMenu == NULL )
{
@ -446,7 +446,7 @@ namespace KBibTeX
return FALSE;
// build popup menu
KPopupMenu * popup = new KPopupMenu( this, "pastePopup" );
TDEPopupMenu * popup = new TDEPopupMenu( this, "pastePopup" );
popup->insertTitle( i18n( "Paste text as..." ) );
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->insertSeparator();
TQIconSet cancelPixmap = KGlobal::iconLoader() ->loadIconSet( "cancel", KIcon::Small );
TQIconSet cancelPixmap = TDEGlobal::iconLoader() ->loadIconSet( "cancel", TDEIcon::Small );
int cancelId = popup->insertItem( cancelPixmap, i18n( "Cancel" ) );
// 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 )
{
@ -665,22 +665,22 @@ namespace KBibTeX
{
TQString url = urlList.at( 0 );
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 ;
}
TQFile f( tmpFile );
if ( ! f.open( IO_ReadOnly ) )
{
KMessageBox::error( this, f.errorString() );
KIO::NetAccess::removeTempFile( tmpFile );
TDEIO::NetAccess::removeTempFile( tmpFile );
return ;
}
TQByteArray ba = f.readAll();
text = TQString( ba );
f.close();
KIO::NetAccess::removeTempFile( tmpFile );
TDEIO::NetAccess::removeTempFile( tmpFile );
}
else if ( !TQTextDrag::decode( event, text ) )
return;
@ -710,7 +710,7 @@ namespace KBibTeX
}
}
return KListView::eventFilter( watched, e );
return TDEListView::eventFilter( watched, e );
}
void DocumentListView::keyPressEvent( TQKeyEvent *e )
@ -724,7 +724,7 @@ namespace KBibTeX
emit executed( item );
}
else
KListView::keyPressEvent( e );
TDEListView::keyPressEvent( e );
}
void DocumentListView::showColumn( int col, int colWidth )

18
src/documentlistview.h

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

8
src/documentlistviewitem.cpp

@ -21,7 +21,7 @@
#include <ntqpainter.h>
#include <ntqpen.h>
#include <klocale.h>
#include <tdelocale.h>
#include "documentlistviewitem.h"
#include "entry.h"
@ -31,12 +31,12 @@
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();
}
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();
}
@ -74,7 +74,7 @@ namespace KBibTeX
p->setFont( f );
}
KListViewItem::paintCell( p, cg, column, width, align );
TDEListViewItem::paintCell( p, cg, column, width, align );
}

4
src/documentlistviewitem.h

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

24
src/documentsourceview.cpp

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

6
src/documentsourceview.h

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

44
src/documentwidget.cpp

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

26
src/documentwidget.h

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

24
src/entrywidget.cpp

@ -31,13 +31,13 @@
#include <ntqtimer.h>
#include <ntqlineedit.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kapplication.h>
#include <kconfig.h>
#include <kwin.h>
#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <twin.h>
#include <entry.h>
#include <entryfield.h>
@ -113,7 +113,7 @@ namespace KBibTeX
delete m_wqa;
KConfig * config = kapp->config();
TDEConfig * config = kapp->config();
config->setGroup( "EntryWidget" );
saveWindowSize( config );
}
@ -125,7 +125,7 @@ namespace KBibTeX
if ( ewt != NULL )
ewt->m_fieldLineEditTitle->setFocus();
KConfig * config = kapp->config();
TDEConfig * config = kapp->config();
config->setGroup( "EntryWidget" );
restoreWindowSize( config );
}
@ -350,7 +350,7 @@ namespace KBibTeX
m_checkBoxEnableAll = new TQCheckBox( i18n( "Enable all &fields for editing" ), this );