Browse Source

Initial TDE conversion

tags/r14.0.0
Slávek Banko 7 years ago
parent
commit
a915aa74dc
79 changed files with 777 additions and 777 deletions
  1. +1
    -1
      ChangeLog
  2. +1
    -1
      Doxyfile
  3. +8
    -8
      TODO
  4. +132
    -132
      acinclude.m4
  5. +10
    -10
      configure.in
  6. +8
    -8
      configure.in.in
  7. +3
    -3
      doc/en/index.docbook
  8. +1
    -1
      src/Makefile.am
  9. +1
    -1
      src/arkollon/Makefile.am
  10. +1
    -1
      src/arkollon/torkarkollon.cpp
  11. +2
    -2
      src/arkollon/wizard.cpp
  12. +11
    -11
      src/configdialog.cpp
  13. +3
    -3
      src/configdialog.h
  14. +5
    -5
      src/crashhandler.cpp
  15. +1
    -1
      src/dndlistview.cpp
  16. +5
    -5
      src/firewallsproxies.ui.h
  17. +6
    -6
      src/functions.cpp
  18. +1
    -1
      src/hiddensrvs.ui
  19. +6
    -6
      src/hiddensrvs.ui.h
  20. +1
    -1
      src/hidsrvwizard.ui.h
  21. +6
    -6
      src/hitwidget.cpp
  22. +3
    -3
      src/kerrylabel.cpp
  23. +6
    -6
      src/konqplugin/Makefile.am
  24. +28
    -28
      src/konqplugin/tork_plug_in.cpp
  25. +11
    -11
      src/konqplugin/tork_plug_in.desktop
  26. +4
    -4
      src/konqplugin/tork_plug_in.h
  27. +1
    -1
      src/konqplugin/tork_plug_in.rc
  28. +7
    -7
      src/kwidgetlistbox.cpp
  29. +38
    -38
      src/likeback.cpp
  30. +18
    -18
      src/likeback.h
  31. +3
    -3
      src/likeback_private.h
  32. +12
    -12
      src/main.cpp
  33. +2
    -2
      src/maxmin.ui.h
  34. +2
    -2
      src/mixminion.ui
  35. +4
    -4
      src/mixminion.ui.h
  36. +16
    -16
      src/newfirstrunwizard.ui.h
  37. +9
    -9
      src/newstreamosd.cpp
  38. +3
    -3
      src/newstreamosd.h
  39. +1
    -1
      src/paranoia.ui.h
  40. +4
    -4
      src/quickconfig.ui.h
  41. +1
    -1
      src/running.ui.h
  42. +1
    -1
      src/server.ui.h
  43. +2
    -2
      src/serverwizard.ui.h
  44. +1
    -1
      src/testprivacyproxy.cpp
  45. +1
    -1
      src/testprivacyproxy.h
  46. +5
    -5
      src/tor_ioslave/Makefile.am
  47. +16
    -16
      src/tor_ioslave/torioslave.cpp
  48. +5
    -5
      src/tor_ioslave/torioslave.h
  49. +13
    -13
      src/tor_ioslave/torioslave.protocol
  50. +6
    -6
      src/torclient.cpp
  51. +5
    -5
      src/torclient.h
  52. +153
    -153
      src/tork.cpp
  53. +1
    -1
      src/tork.desktop
  54. +75
    -75
      src/tork.h
  55. +1
    -1
      src/tork.kcfgc
  56. +1
    -1
      src/tork_downloadwithfirefox.desktop
  57. +1
    -1
      src/tork_downloadwithkonqueror.desktop
  58. +1
    -1
      src/tork_downloadwithopera.desktop
  59. +1
    -1
      src/torkactivelabel.cpp
  60. +1
    -1
      src/torkapplet/Makefile.am
  61. +6
    -6
      src/torkapplet/tork_mnu.cpp
  62. +2
    -2
      src/torkapplet/torkmenu.desktop
  63. +1
    -1
      src/torkconfig.kcfgc
  64. +24
    -24
      src/torkview.cpp
  65. +1
    -1
      src/torkview_base.ui
  66. +8
    -8
      src/torkview_base.ui.h
  67. +1
    -1
      src/torservers.ui.h
  68. +4
    -4
      src/trayicon.cpp
  69. +2
    -2
      src/trayicon.h
  70. +15
    -15
      src/update.cpp
  71. +7
    -7
      src/update.h
  72. +3
    -3
      src/upnp/exitoperation.cpp
  73. +4
    -4
      src/upnp/exitoperation.h
  74. +2
    -2
      src/upnp/upnpmcastsocket.cpp
  75. +12
    -12
      src/upnp/upnprouter.cpp
  76. +4
    -4
      src/upnp/upnprouter.h
  77. +2
    -2
      src/upnpmanager.cpp
  78. +1
    -1
      src/usability.ui.h
  79. +2
    -2
      tork.kdevelop

+ 1
- 1
ChangeLog View File

@@ -111,7 +111,7 @@
in some situations.
o The non-anonymous settings (e.g. cookies,javascript) were not getting
restored properly in some cases. This was due to an eccentricity in
KConfig.
TDEConfig.
o Be a little more aggressive with UPnP. Silently re-apply port
forwarding to the UPnP router when (i) Tor tells us it has failed
reachability tests, (ii) whenever the user presses play.


+ 1
- 1
Doxyfile View File

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


+ 8
- 8
TODO View File

@@ -35,12 +35,12 @@ make it easier to spot and add servers like these to the enemy server list.
selected in drop-down?)
- Leave 'server' grayed-out and unapplied until settings are applied?

- kdesudo is fucked. need to use the API.
- tdesudo is fucked. need to use the API.

- Add a 'monitor' option - tork does not do any setconf'ing.


- Ability to import blocklists. - khotnewstuff?
- Ability to import blocklists. - tdehotnewstuff?

* customized pktstat to report all non-tor traffic
- non-tor traffic osd
@@ -68,8 +68,8 @@ TorkConfig::self()->config()->copyTo("profilename",TorkConfig::self()->config()


//Load a profile
KConfig *tmpconfig;
tmpconfig = new KConfig("torkspecialrc", false, false);
TDEConfig *tmpconfig;
tmpconfig = new TDEConfig("torkspecialrc", false, false);
tmpconfig->copyTo("torkspecialrctmp",TorkConfig::self()->config());
now delete torkspecialrctmp

@@ -122,7 +122,7 @@ For 0.32:

Sometime:

* use kpaaworddialog and kdesuclient for password requests
* use kpaaworddialog and tdesuclient for password requests

- Re-tool kicker applet

@@ -298,7 +298,7 @@ options manually and on the fly.
* Check torkify installation when launching torkify

Minor
* use kpaaworddialog and kdesuclient for password requests
* use kpaaworddialog and tdesuclient for password requests
* Toggle javascript and cookies from control button in konqueror
* rename 'my network view'
* Use RelayBandwidthRate
@@ -329,7 +329,7 @@ TODO SOMETIME
* Re-write controller logic.
* use kompile instead of arkollon
* Split out tork.cpp a bit, at least a vagure gesture towards cleaner code
* Find and squash as many bugs as possible in kconfig and elsewhere.
* Find and squash as many bugs as possible in tdeconfig and elsewhere.
* 'Configure KMail' wizard for Mixminion
* filter log with right-click
* Full-refresh-of-server-list button
@@ -417,7 +417,7 @@ if it is more than'. but that option is for clients, not servers.
simultaneous connections allowed'. my maxconn doesn't actually perform this
function. nothing does.
* remove ASSERT: "(mode & KFile::Files) == 0"
in/tmp/buildd/kdelibs-3.5.5a.dfsg.1/./kio/kfile/kurlrequester.cpp (311)
in/tmp/buildd/tdelibs-3.5.5a.dfsg.1/./tdeio/tdefile/kurlrequester.cpp (311)


In 0.19:


+ 132
- 132
acinclude.m4 View File

@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository.
dnl
dnl Single-module modifications are best placed in configure.in for kdelibs
dnl and kdebase or configure.in.in if present.
dnl Single-module modifications are best placed in configure.in for tdelibs
dnl and tdebase or configure.in.in if present.

# KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${tdelibsuff} \
\
/usr/lib${kdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \
/usr/lib${tdelibsuff}/X11 \
/usr/lib${tdelibsuff}/X11R6 \
/usr/lib${tdelibsuff}/X11R5 \
/usr/lib${tdelibsuff}/X11R4 \
\
/usr/local/X11/lib${kdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \
/usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${tdelibsuff} \
\
/usr/local/lib${kdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \
/usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${tdelibsuff}/X11R4 \
\
/usr/X386/lib${kdelibsuff} \
/usr/x386/lib${kdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \
/usr/X386/lib${tdelibsuff} \
/usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${tdelibsuff}/X11 \
\
/usr/lib${kdelibsuff} \
/usr/local/lib${kdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \
/usr/athena/lib${kdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \
/usr/lib${tdelibsuff} \
/usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${tdelibsuff}/X11 \
\
/usr/openwin/lib${kdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \
/usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${tdelibsuff} \
; \
do
dnl Don't even attempt the hair of trying to link an X program!
@@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi

AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'

if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes)
else
AC_MSG_ERROR([your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now.
same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.])
fi

if eval `KDEDIR= ./conftest 2>&5`; then
if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done
else
kde_result=problems
fi

KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes

KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then
test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS
IFS=:
for dir in $KDEDIRS; do
for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs "
done
IFS=$kde_save_IFS
@@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi

if test -n "$kde32ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$kde33ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS)
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])

if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET=""
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)')
AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then
@@ -937,7 +937,7 @@ mips-sgi-irix6*)
ac_x_includes="."
fi
if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${kdelibsuff}"
ac_x_libraries="/usr/lib${tdelibsuff}"
fi
esac
#from now on we use our own again
@@ -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
@@ -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])


+ 10
- 10
configure.in View File

@@ -76,13 +76,13 @@ AC_MSG_CHECKING([for KDE version])

AC_LANG_SAVE
AC_LANG_CPLUSPLUS
kdeversion_save_CXXFLAGS="$CXXFLAGS"
kdeversion_safe_LIBS="$LIBS"
tdeversion_save_CXXFLAGS="$CXXFLAGS"
tdeversion_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
CXXFLAGS="$CXXFLAGS $all_includes"

AC_COMPILE_IFELSE([
#include <kdeversion.h>
#include <tdeversion.h>
#if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
#error KDE 3.2
#endif
@@ -93,7 +93,7 @@ AC_COMPILE_IFELSE([
)

AC_COMPILE_IFELSE([
#include <kdeversion.h>
#include <tdeversion.h>
#if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
#error KDE 3.3
#endif
@@ -104,7 +104,7 @@ AC_COMPILE_IFELSE([
)

AC_COMPILE_IFELSE([
#include <kdeversion.h>
#include <tdeversion.h>
#if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
#error KDE 3.4
#endif
@@ -115,7 +115,7 @@ AC_COMPILE_IFELSE([
)

AC_COMPILE_IFELSE([
#include <kdeversion.h>
#include <tdeversion.h>
#if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
#error KDE 3.5.x (x < 2)
#endif
@@ -124,8 +124,8 @@ AC_COMPILE_IFELSE([
,
need_kde351_compat="yes"
)
CXXFLAGS="$kdeversion_save_CXXFLAGS"
LIBS="$kdeversion_safe_LIBS"
CXXFLAGS="$tdeversion_save_CXXFLAGS"
LIBS="$tdeversion_safe_LIBS"
AC_LANG_RESTORE

if test "$need_kde32_compat" = "yes"; then
@@ -649,13 +649,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
# And if so, warn when they don't match
if test "$kde_libs_prefix" != "$given_prefix"; then
# And if kde doesn't know about the prefix yet
echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
if test $? -ne 0; then
echo ""
echo "Warning: you chose to install this package in $given_prefix,"
echo "but KDE was found in $kde_libs_prefix."
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
echo "Then restart KDE."
echo ""
fi


+ 8
- 8
configure.in.in View File

@@ -11,13 +11,13 @@ AC_MSG_CHECKING([for KDE version])

AC_LANG_SAVE
AC_LANG_CPLUSPLUS
kdeversion_save_CXXFLAGS="$CXXFLAGS"
kdeversion_safe_LIBS="$LIBS"
tdeversion_save_CXXFLAGS="$CXXFLAGS"
tdeversion_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
CXXFLAGS="$CXXFLAGS $all_includes"

AC_COMPILE_IFELSE([
#include <kdeversion.h>
#include <tdeversion.h>
#if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
#error KDE 3.2
#endif
@@ -28,7 +28,7 @@ AC_COMPILE_IFELSE([
)

AC_COMPILE_IFELSE([
#include <kdeversion.h>
#include <tdeversion.h>
#if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
#error KDE 3.3
#endif
@@ -39,7 +39,7 @@ AC_COMPILE_IFELSE([
)

AC_COMPILE_IFELSE([
#include <kdeversion.h>
#include <tdeversion.h>
#if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
#error KDE 3.4
#endif
@@ -50,7 +50,7 @@ AC_COMPILE_IFELSE([
)

AC_COMPILE_IFELSE([
#include <kdeversion.h>
#include <tdeversion.h>
#if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
#error KDE 3.5.x (x < 2)
#endif
@@ -59,8 +59,8 @@ AC_COMPILE_IFELSE([
,
need_kde351_compat="yes"
)
CXXFLAGS="$kdeversion_save_CXXFLAGS"
LIBS="$kdeversion_safe_LIBS"
CXXFLAGS="$tdeversion_save_CXXFLAGS"
LIBS="$tdeversion_safe_LIBS"
AC_LANG_RESTORE

if test "$need_kde32_compat" = "yes"; then


+ 3
- 3
doc/en/index.docbook View File

@@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY tork "<application>tork 0.1</application>">
<!ENTITY kappname "&tork;"><!-- Do *not* replace kappname-->
<!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
<!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE"><!-- change language only here -->
@@ -488,8 +488,8 @@ application -->

<!--
List any special requirements for your application here. This should include:
.Libraries or other software that is not included in kdesupport,
kdelibs, or kdebase.
.Libraries or other software that is not included in tdesupport,
tdelibs, or tdebase.
.Hardware requirements like amount of RAM, disk space, graphics card
capabilities, screen resolution, special expansion cards, etc.
.Operating systems the app will run on. If your app is designed only for a


+ 1
- 1
src/Makefile.am View File

@@ -28,7 +28,7 @@ METASOURCES = AUTO
tork_LDFLAGS = $(KDE_RPATH) $(all_libraries)

# the libraries to link against.
tork_LDADD = $(LIB_KIO) $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) $(LIB_KDEUI) $(LIB_KDECORE) -lDCOP $(LIB_QT) \
tork_LDADD = $(LIB_KIO) $(LIB_KFILE) $(LIB_TDEHTML) $(geoiplib) $(LIB_TDEUI) $(LIB_TDECORE) -lDCOP $(LIB_QT) \
upnp/libktupnp.la $(CRYPTO_LIBS)

# which sources should be compiled for tork


+ 1
- 1
src/arkollon/Makefile.am View File

@@ -26,7 +26,7 @@ torkarkollon_LDFLAGS = $(all_libraries)
LIBS =
#torkarkollon_LDFLAGS =
#torkarkollon_LDADD = $(LIB_QT) $(LIB_KFILE)
torkarkollon_LDADD = $(LIB_KFILE) $(LIB_QT) $(LIB_KDECORE)
torkarkollon_LDADD = $(LIB_KFILE) $(LIB_QT) $(LIB_TDECORE)

# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO


+ 1
- 1
src/arkollon/torkarkollon.cpp View File

@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
// Check if we're root
if (getuid() != 0)
{
TQString command = "kdesu -t -i tork -n -c \"";
TQString command = "tdesu -t -i tork -n -c \"";
for (int i=0 ; i<app.argc() ; i++)
{
if (TQString(app.argv()[i]).contains(" "))


+ 2
- 2
src/arkollon/wizard.cpp View File

@@ -114,7 +114,7 @@ Wizard::Wizard(TQWidget *parent, const char *name)
kdeDirProcess = new TQProcess(this);
connect(kdeDirProcess, SIGNAL(readyReadStdout()), SLOT(kdeDirReady()));
connect(kdeDirProcess, SIGNAL(processExited()), SLOT(getInstalledComponents()));
kdeDirProcess->addArgument("kde-config");
kdeDirProcess->addArgument("tde-config");
kdeDirProcess->addArgument("--prefix");
if (!kdeDirProcess->start())
getInstalledComponents();
@@ -923,7 +923,7 @@ void Wizard::errorOccured()
TQString Wizard::sub(TQString s)
{
TQString tmp = s;
tmp.replace(TQRegExp("\\$KDEDIR"), kdeDir);
tmp.replace(TQRegExp("\\$TDEDIR"), kdeDir);
tmp.replace(TQRegExp("\\$HOMEDIR"), TQDir::homeDirPath());
tmp.replace(TQRegExp("~"), TQDir::homeDirPath());
tmp.replace(TQRegExp("\\$PREFIX"), "/usr/local");


+ 11
- 11
src/configdialog.cpp View File

@@ -67,23 +67,23 @@ email : markey@web.de
#include <ntqlistview.h>
#include <ntqcheckbox.h>

#include <kapplication.h> //kapp
#include <tdeapplication.h> //kapp
#include <kcombobox.h>
#include <kiconloader.h>
#include <klineedit.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <dcopref.h>
#include <kconfig.h>
#include <kmessagebox.h>
#include <tdeconfig.h>
#include <tdemessagebox.h>

//////////////////////////////////////////////////////////////////////////////////////////
// PUBLIC
//////////////////////////////////////////////////////////////////////////////////////////

TorkConfigDialog::TorkConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config )
: KConfigDialog( parent, name, config ),m_parent(parent)
TorkConfigDialog::TorkConfigDialog( TQWidget *parent, const char* name, TDEConfigSkeleton *config )
: TDEConfigDialog( parent, name, config ),m_parent(parent)
{
setWFlags( WDestructiveClose );

@@ -137,7 +137,7 @@ TorkConfigDialog::TorkConfigDialog( TQWidget *parent, const char* name, KConfigS
static_cast<TQLabel*>(label)->setPixmap( TQMessageBox::standardIcon( TQMessageBox::Information ) );
delete list;

//stop KFont Requesters getting stupidly large
//stop TDEFont Requesters getting stupidly large
list = queryList( "TQLabel", "m_sampleLabel" );
for( TQObject *label = list->first(); label; label = list->next() )
static_cast<TQLabel*>(label)->setMaximumWidth( 250 );
@@ -229,19 +229,19 @@ void TorkConfigDialog::showPage( const TQCString& page )
{
for( uint index = 0; index < m_pageList.count(); index++ ) {
if ( m_pageList[index]->name() == page ) {
KConfigDialog::showPage( index );
TDEConfigDialog::showPage( index );
return;
}
}
}

/** Reimplemented from KConfigDialog */
/** Reimplemented from TDEConfigDialog */
void TorkConfigDialog::addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName, const TQString &header, bool manage )
{
// Add the widget pointer to our list, for later reference
m_pageList << page;

KConfigDialog::addPage( page, itemName, pixmapName, header, manage );
TDEConfigDialog::addPage( page, itemName, pixmapName, header, manage );
}


@@ -258,7 +258,7 @@ void TorkConfigDialog::updateCustomSettings()
//When settings are changed in the config dialog, this is called
//to update all possibly changed values and apply them to Tor.

//TQListViews need to be handled outside of kconfigxt
//TQListViews need to be handled outside of tdeconfigxt
TorkConfig::setQuickConfigure( m_quickconfig->QuickConfigure->currentItem() );

TorkConfig::setAccountingStart(m_myserver->AccountingStart->currentText());


+ 3
- 3
src/configdialog.h View File

@@ -21,18 +21,18 @@ email : markey@web.de

#include <ntqmap.h>
#include <ntqvaluelist.h>
#include <kconfigdialog.h>
#include <tdeconfigdialog.h>

class TQComboBox;
class TQGroupBox;
class TQVBox;

class TorkConfigDialog : public KConfigDialog
class TorkConfigDialog : public TDEConfigDialog
{
Q_OBJECT

public:
TorkConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config );
TorkConfigDialog( TQWidget *parent, const char* name, TDEConfigSkeleton *config );
~TorkConfigDialog();

void addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName,


+ 5
- 5
src/crashhandler.cpp View File

@@ -14,11 +14,11 @@
#include "torkconfig.h"
#include "crashhandler.h"

#include <kapplication.h> //invokeMailer()
#include <tdeapplication.h> //invokeMailer()
#include <kdebug.h> //kdBacktrace()
#include <kdeversion.h>
#include <klocale.h>
#include <ktempfile.h>
#include <tdeversion.h>
#include <tdelocale.h>
#include <tdetempfile.h>

#include <ntqfile.h>
#include <ntqregexp.h>
@@ -95,7 +95,7 @@ namespace torK
"Version: " TORK_VERSION "\n"
"Build date: " __DATE__ "\n"
"CC version: " __VERSION__ "\n" //assuming we're using GCC
"KDElibs: " KDE_VERSION_STRING "\n"
"KDElibs: " TDE_VERSION_STRING "\n"
"TQt: %2\n"
"CPU count: %6\n";



+ 1
- 1
src/dndlistview.cpp View File

@@ -24,7 +24,7 @@
#include <ntqapplication.h>
#include <ntqheader.h>
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kstandarddirs.h>

#include <ntqsimplerichtext.h>


+ 5
- 5
src/firewallsproxies.ui.h View File

@@ -19,20 +19,20 @@
***************************************************************************/

#include "torkconfig.h"
#include <klocale.h>
#include <tdelocale.h>
#include <ntqtooltip.h>
#include <ntqpopupmenu.h>
#include <kdebug.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <dom/html_misc.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>

KHTMLPart *filelist;
TDEHTMLPart *filelist;

void FirewallsProxies::init()
{

filelist = new KHTMLPart();
filelist = new TDEHTMLPart();

TQStringList existingMaps = TorkConfig::reachableAddresses();
TQListViewItem *tm;


+ 6
- 6
src/functions.cpp View File

@@ -21,8 +21,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <ntqdatetime.h>
#include <klocale.h>
#include <kglobal.h>
#include <tdelocale.h>
#include <tdeglobal.h>
#include <kdebug.h>
#include <sys/time.h>
#include <ntqdir.h>
@@ -39,7 +39,7 @@ namespace tk
TQString BytesToString(Uint64 bytes,int precision)
{
KLocale* loc = KGlobal::locale();
TDELocale* loc = TDEGlobal::locale();
if (bytes >= 1024 * 1024 * 1024)
return i18n("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
else if (bytes >= 1024*1024)
@@ -52,7 +52,7 @@ namespace tk

TQString BytesPerSecToString(double bytes,int precision)
{
KLocale* loc = KGlobal::locale();
TDELocale* loc = TDEGlobal::locale();
if (bytes >= 1024 * 1024 * 1024)
return i18n("%1 GB/s").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
else if (bytes >= 1024*1024)
@@ -65,14 +65,14 @@ namespace tk

TQString KBytesPerSecToString(double speed,int precision)
{
KLocale* loc = KGlobal::locale();
TDELocale* loc = TDEGlobal::locale();
return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision));
}


TQString DurationToString(Uint32 nsecs)
{
KLocale* loc = KGlobal::locale();
TDELocale* loc = TDEGlobal::locale();
TQTime t;
int ndays = nsecs / 86400;
t = t.addSecs(nsecs % 86400);


+ 1
- 1
src/hiddensrvs.ui View File

@@ -226,7 +226,7 @@
<slot>addService( const TQString &amp; nick, const TQString &amp; publicport, const TQString &amp; actualaddress, const TQString &amp; toraddress, const TQString &amp; folder, const TQString &amp; servicefolder )</slot>
<slot>deleteService_clicked()</slot>
<slot>startService_clicked()</slot>
<slot>thttpdprocExited(KProcess *proc)</slot>
<slot>thttpdprocExited(TDEProcess *proc)</slot>
<slot>servicesList_selectionChanged()</slot>
<slot>startAllServices_clicked()</slot>
<slot>testService_clicked()</slot>


+ 6
- 6
src/hiddensrvs.ui.h View File

@@ -20,14 +20,14 @@
#include "torkconfig.h"
#include "tork.h"
#include "hidsrvwizard.h"
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <ntqtooltip.h>
#include <ntqpopupmenu.h>
#include <kurl.h>
#include <kapplication.h>
#include <tdeapplication.h>
#include <kprocio.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <cstdlib>

void MyHidden::init()
@@ -125,14 +125,14 @@ void MyHidden::startService_clicked()
<< "-h " << servicesList->currentItem()->text(3).section(":",0,0)
<< "-d " << servicesList->currentItem()->text(4);

connect( thttpdproc, SIGNAL(processExited(KProcess *)),
SLOT(thttpdprocExited(KProcess *)) );
connect( thttpdproc, SIGNAL(processExited(TDEProcess *)),
SLOT(thttpdprocExited(TDEProcess *)) );

thttpdproc->start(KProcIO::NotifyOnExit) ;

}

void MyHidden::thttpdprocExited(KProcess *proc)
void MyHidden::thttpdprocExited(TDEProcess *proc)
{
TQString caption;
TQString message;


+ 1
- 1
src/hidsrvwizard.ui.h View File

@@ -21,7 +21,7 @@
#include "tork.h"
#include "functions.h"
#include <ntqtimer.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <cstdlib>

bool local;


+ 6
- 6
src/hitwidget.cpp View File

@@ -24,9 +24,9 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <ntqtoolbutton.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kurllabel.h>
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>
#include <ntqlayout.h>
/*#include <konq_filetip.h>*/
#include <ntqscrollview.h>
@@ -59,9 +59,9 @@ void HitWidget::setIcon(const TQString name)
{
m_icon = name;
if (m_collapsed)
icon->setPixmap(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeSmall));
icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeSmall));
else
icon->setPixmap(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeLarge));
icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeLarge));
}

void HitWidget::toggleCollapsed()
@@ -77,7 +77,7 @@ void HitWidget::setCollapsed(bool collapsed)
if (collapsed) {
toolButton1->setEnabled(true);
m_was_collapsed = true;
icon->setPixmap(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeSmall));
icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeSmall));
#if 0
i18n("Expand");
i18n("Collapse");
@@ -94,7 +94,7 @@ void HitWidget::setCollapsed(bool collapsed)
m_collapsed = collapsed;
}
else {
icon->setPixmap(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeLarge));
icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeLarge));
toolButton1->setIconSet(SmallIconSet("2uparrow"));
description->setHidden(false);
properties->setHidden(false);


+ 3
- 3
src/kerrylabel.cpp View File

@@ -22,7 +22,7 @@
#include "hitwidget.h"

#include <ntqdragobject.h>
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>
#include <kurl.h>
#include <krun.h>
/*
@@ -59,7 +59,7 @@ void KerryLabel::mousePressEvent(TQMouseEvent* ev)
void KerryLabel::mouseMoveEvent(TQMouseEvent* ev)
{
if (dragInfo.state == diPending) {
int distance = KGlobalSettings::dndEventDelay();
int distance = TDEGlobalSettings::dndEventDelay();
if ( ev->x() > dragInfo.start.x() + distance || ev->x() < dragInfo.start.x() - distance ||
ev->y() > dragInfo.start.y() + distance || ev->y() < dragInfo.start.y() - distance) {
doDrag();
@@ -94,7 +94,7 @@ void KerryLabel::doDrag()
// _items.append( &item );
//
// const KURL kurl(url());
// KActionCollection act(this);
// TDEActionCollection act(this);
//
// KonqPopupMenu * popupMenu = new KonqPopupMenu( KonqBookmarkManager::self(), _items,
// kurl, act, (KNewMenu*)NULL, this,


+ 6
- 6
src/konqplugin/Makefile.am View File

@@ -1,14 +1,14 @@
INCLUDES = $(all_includes)

kde_module_LTLIBRARIES = khtml_tork.la
kde_module_LTLIBRARIES = tdehtml_tork.la

khtml_tork_la_METASOURCES = AUTO
khtml_tork_la_SOURCES = tork_plug_in.cpp
khtml_tork_la_LIBADD = $(LIB_KHTML)
khtml_tork_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
tdehtml_tork_la_METASOURCES = AUTO
tdehtml_tork_la_SOURCES = tork_plug_in.cpp
tdehtml_tork_la_LIBADD = $(LIB_TDEHTML)
tdehtml_tork_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module

KDE_ICON = AUTO

part_DATA = tork_plug_in.rc tork_plug_in.desktop
partdir = $(kde_datadir)/khtml/kpartplugins
partdir = $(kde_datadir)/tdehtml/kpartplugins


+ 28
- 28
src/konqplugin/tork_plug_in.cpp View File

@@ -40,21 +40,21 @@
#include <dcopref.h>
#include <kdatastream.h>
#include <kdebug.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <kiconloader.h>
#include <kglobal.h>
#include <kaction.h>
#include <tdeglobal.h>
#include <tdeaction.h>
#include <kinstance.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <krun.h>

#include <dom/html_document.h>
#include <dom/html_misc.h>
#include <dom/dom_element.h>

#include <kparts/partmanager.h>
#include <tdeparts/partmanager.h>

#include <set>

@@ -62,32 +62,32 @@
Tork_plug_in::Tork_plug_in( TQObject* parent, const char* name )
: Plugin( parent, name )
{
TQPixmap pix = KGlobal::iconLoader()->loadIcon("tork",
KIcon::MainToolbar);
KActionMenu *menu = new KActionMenu( i18n("Anonymity Manager"), pix,
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("tork",
TDEIcon::MainToolbar);
TDEActionMenu *menu = new TDEActionMenu( i18n("Anonymity Manager"), pix,
actionCollection(), "tork_menu" );
menu->setDelayed( false );
connect( menu->popupMenu(), SIGNAL( aboutToShow() ), SLOT( showPopup() ));

m_paToggleKDE=new KAction(i18n("Anonymize KDE"),
KGlobal::iconLoader()->loadIconSet("tork_konqueroroff", KIcon::Small),
KShortcut(),
m_paToggleKDE=new TDEAction(i18n("Anonymize KDE"),
TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff", TDEIcon::Small),
TDEShortcut(),
this, SLOT(toggleKDE()),
actionCollection(), "tork_konqueroron" );

menu->insert( m_paToggleKDE );


KAction *m_firefox=new KAction(i18n("Re-Open Anonymously with Firefox"),
KGlobal::iconLoader()->loadIconSet("tork_firefox", KIcon::Small),
KShortcut(),
TDEAction *m_firefox=new TDEAction(i18n("Re-Open Anonymously with Firefox"),
TDEGlobal::iconLoader()->loadIconSet("tork_firefox", TDEIcon::Small),
TDEShortcut(),
this, SLOT(openWithFirefox()),
actionCollection(), "tork_firefox" );
menu->insert( m_firefox );

KAction *m_opera=new KAction(i18n("Re-Open Anonymously with Opera"),
KGlobal::iconLoader()->loadIconSet("tork_opera", KIcon::Small),
KShortcut(),
TDEAction *m_opera=new TDEAction(i18n("Re-Open Anonymously with Opera"),
TDEGlobal::iconLoader()->loadIconSet("tork_opera", TDEIcon::Small),
TDEShortcut(),
this, SLOT(openWithOpera()),
actionCollection(), "tork_opera" );
menu->insert( m_opera );
@@ -115,12 +115,12 @@ void Tork_plug_in::showPopup()
}

if (anonymized){
m_paToggleKDE->setIconSet( KGlobal::iconLoader()->loadIconSet("tork_konqueroroff",
KIcon::Small) );
m_paToggleKDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff",
TDEIcon::Small) );
m_paToggleKDE->setText( "De-Anonymize KDE" );
}else{
m_paToggleKDE->setIconSet( KGlobal::iconLoader()->loadIconSet("tork_konqueroron",
KIcon::Small) );
m_paToggleKDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroron",
TDEIcon::Small) );
m_paToggleKDE->setText( "Anonymize KDE" );
}
}
@@ -141,7 +141,7 @@ void Tork_plug_in::openWithOpera()

void Tork_plug_in::openWithBrowser(const TQString &browser)
{
KHTMLPart *htmlPart = static_cast<KHTMLPart*>( parent() );
TDEHTMLPart *htmlPart = static_cast<TDEHTMLPart*>( parent() );
TQString url = htmlPart->toplevelURL().url();

if (p_dcopServer->isApplicationRegistered ("tork")){
@@ -168,7 +168,7 @@ void Tork_plug_in::toggleKDE()
KPluginFactory::KPluginFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name )
{
s_instance = new KInstance("KPluginFactory");
s_instance = new TDEInstance("KPluginFactory");
}

TQObject* KPluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & )
@@ -184,14 +184,14 @@ KPluginFactory::~KPluginFactory()

extern "C"
{
KDE_EXPORT void* init_khtml_tork()
KDE_EXPORT void* init_tdehtml_tork()
{
KGlobal::locale()->insertCatalogue("tork");
TDEGlobal::locale()->insertCatalogue("tork");
return new KPluginFactory;
}

}

KInstance* KPluginFactory::s_instance = 0L;
TDEInstance* KPluginFactory::s_instance = 0L;

#include "tork_plug_in.moc"

+ 11
- 11
src/konqplugin/tork_plug_in.desktop View File

@@ -1,15 +1,15 @@
[Desktop Entry]
X-KDE-Library=khtml_tork
X-KDE-PluginInfo-Author=Robert Hogan
X-KDE-PluginInfo-Email=robert@roberthogan.net
X-KDE-PluginInfo-Name=tork
X-KDE-PluginInfo-Version=3.4
X-KDE-PluginInfo-Website=http://tork.sourceforge.net
X-KDE-PluginInfo-Category=Tools
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
X-KDE-PluginInfo-EnabledByDefault=true
X-TDE-Library=tdehtml_tork
X-TDE-PluginInfo-Author=Robert Hogan
X-TDE-PluginInfo-Email=robert@roberthogan.net
X-TDE-PluginInfo-Name=tork
X-TDE-PluginInfo-Version=3.4
X-TDE-PluginInfo-Website=http://tork.sourceforge.net
X-TDE-PluginInfo-Category=Tools
X-TDE-PluginInfo-Depends=
X-TDE-PluginInfo-License=GPL
X-TDE-PluginInfo-EnabledByDefault=true
Name=TorK
Type=Application
Comment=Anonymity Manager
Icon=khtml_tork
Icon=tdehtml_tork

+ 4
- 4
src/konqplugin/tork_plug_in.h View File

@@ -38,19 +38,19 @@
#ifndef __plugin_tork_plug_in_h
#define __plugin_tork_plug_in_h

#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
#include <klibloader.h>
#include <dcopclient.h>
#include <kurl.h>

class KInstance;
class TDEInstance;

class Tork_plug_in : public KParts::Plugin
{
Q_OBJECT
public:
Tork_plug_in( TQObject* parent = 0, const char* name = 0 );
KAction *m_paToggleKDE ;
TDEAction *m_paToggleKDE ;
DCOPClient* p_dcopServer;
virtual ~Tork_plug_in();

@@ -75,7 +75,7 @@ public:
const TQStringList &args = TQStringList() );

private:
static KInstance* s_instance;
static TDEInstance* s_instance;
};

#endif

+ 1
- 1
src/konqplugin/tork_plug_in.rc View File

@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
<kpartgui library="khtml_tork" name="khtml_tork" version="3" >
<kpartgui library="tdehtml_tork" name="tdehtml_tork" version="3" >
<MenuBar>
<Menu name="tools"><Text>&amp;Tools</Text>
<Action name="tork_menu"/>


+ 7
- 7
src/kwidgetlistbox.cpp View File

@@ -19,7 +19,7 @@

#include "kwidgetlistbox.h"
#include <kdebug.h>
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>
#include <hitwidget.h>

KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name)
@@ -177,19 +177,19 @@ void KWidgetListbox::setItemColors(int index, bool even)

if(index == selected())
{
itm->setPaletteBackgroundColor(KGlobalSettings::highlightColor());
itm->setPaletteForegroundColor(KGlobalSettings::highlightedTextColor());
itm->setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
itm->setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor());
}
else if(even)
{
itm->setPaletteBackgroundColor(KGlobalSettings::baseColor());
itm->setPaletteForegroundColor(KGlobalSettings::textColor());
itm->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
itm->setPaletteForegroundColor(TDEGlobalSettings::textColor());
}
else
{
itm->setPaletteBackgroundColor(
KGlobalSettings::alternateBackgroundColor());
itm->setPaletteForegroundColor(KGlobalSettings::textColor());
TDEGlobalSettings::alternateBackgroundColor());
itm->setPaletteForegroundColor(TDEGlobalSettings::textColor());
}
}



+ 38
- 38
src/likeback.cpp View File

@@ -18,15 +18,15 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/

#include <kapplication.h>
#include <kaboutdata.h>
#include <kconfig.h>
#include <kaction.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdeconfig.h>
#include <tdeaction.h>
#include <kiconloader.h>
#include <kaboutdata.h>
#include <klocale.h>
#include <tdeaboutdata.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <ntqlayout.h>
#include <ntqtoolbutton.h>
#include <kpushbutton.h>
@@ -65,10 +65,10 @@ LikeBackBar::LikeBackBar(LikeBack *likeBack)
{
TQHBoxLayout *layout = new TQHBoxLayout(this);

TQIconSet likeIconSet = kapp->iconLoader()->loadIconSet("likeback_like_tork", KIcon::Small);
TQIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike_tork", KIcon::Small);
TQIconSet bugIconSet = kapp->iconLoader()->loadIconSet("likeback_bug_tork", KIcon::Small);
TQIconSet featureIconSet = kapp->iconLoader()->loadIconSet("likeback_feature_tork", KIcon::Small);
TQIconSet likeIconSet = kapp->iconLoader()->loadIconSet("likeback_like_tork", TDEIcon::Small);
TQIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike_tork", TDEIcon::Small);
TQIconSet bugIconSet = kapp->iconLoader()->loadIconSet("likeback_bug_tork", TDEIcon::Small);
TQIconSet featureIconSet = kapp->iconLoader()->loadIconSet("likeback_feature_tork", TDEIcon::Small);

m_likeButton = new TQToolButton(this, "likeback_like_tork");
m_likeButton->setIconSet(likeIconSet);
@@ -208,7 +208,7 @@ LikeBackPrivate::~LikeBackPrivate()
/********** class LikeBack: **********/
/*************************************/

LikeBack::LikeBack(Button buttons, bool showBarByDefault, KConfig *config, const KAboutData *aboutData)
LikeBack::LikeBack(Button buttons, bool showBarByDefault, TDEConfig *config, const TDEAboutData *aboutData)
: TQObject()
{
// Initialize properties (1/2):
@@ -218,7 +218,7 @@ LikeBack::LikeBack(Button buttons, bool showBarByDefault, KConfig *config, const
d->aboutData = aboutData;
d->showBarByDefault = showBarByDefault;

// Use default KApplication config and aboutData if not provided:
// Use default TDEApplication config and aboutData if not provided:
if (d->config == 0)
d->config = kapp->config();
if (d->aboutData == 0)
@@ -364,20 +364,20 @@ LikeBack::Button LikeBack::buttons()
return d->buttons;
}

const KAboutData* LikeBack::aboutData()
const TDEAboutData* LikeBack::aboutData()
{
return d->aboutData;
}

KConfig* LikeBack::config()
TDEConfig* LikeBack::config()
{
return d->config;
}

KAction* LikeBack::sendACommentAction(KActionCollection *parent)
TDEAction* LikeBack::sendACommentAction(TDEActionCollection *parent)
{
if (d->action == 0)
d->action = new KAction(
d->action = new TDEAction(
i18n("&Send a Comment to Developers"), /*icon=*/"mail_new", /*shortcut=*/"",
this, SLOT(execCommentDialog()),
parent, "likeback_send_a_comment"
@@ -412,10 +412,10 @@ void LikeBack::setUserWantsToShowBar(bool showBar)
void LikeBack::showInformationMessage()
{
// Load and register the images needed by the message:
TQPixmap likeIcon = kapp->iconLoader()->loadIcon("likeback_like_tork", KIcon::Small);
TQPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike_tork", KIcon::Small);
TQPixmap bugIcon = kapp->iconLoader()->loadIcon("likeback_bug_tork", KIcon::Small);
TQPixmap featureIcon = kapp->iconLoader()->loadIcon("likeback_feature_tork", KIcon::Small);
TQPixmap likeIcon = kapp->iconLoader()->loadIcon("likeback_like_tork", TDEIcon::Small);
TQPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike_tork", TDEIcon::Small);
TQPixmap bugIcon = kapp->iconLoader()->loadIcon("likeback_bug_tork", TDEIcon::Small);
TQPixmap featureIcon = kapp->iconLoader()->loadIcon("likeback_feature_tork", TDEIcon::Small);
TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_like", likeIcon);
TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon);
TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug", bugIcon);
@@ -566,7 +566,7 @@ void LikeBack::askEmailAddress()
setEmailAddress(email);
}

// FIXME: Should be moved to KAboutData? Cigogne will also need it.
// FIXME: Should be moved to TDEAboutData? Cigogne will also need it.
bool LikeBack::isDevelopmentVersion(const TQString &version)
{
return version.find("alpha", /*index=*/0, /*caseSensitive=*/false) != -1 ||
@@ -577,17 +577,17 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
}

/**
* Code from KBugReport::slotConfigureEmail() in kdeui/kbugreport.cpp:
* Code from KBugReport::slotConfigureEmail() in tdeui/kbugreport.cpp:
*/
/*void LikeBack::beginFetchingEmail()
{
if (m_process)
return;
m_process = new KProcess();
*m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
connect( m_process, SIGNAL(processExited(KProcess*)), SLOT(fetchUserEmail()) );
m_process = new TDEProcess();
*m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount");
connect( m_process, SIGNAL(processExited(TDEProcess*)), SLOT(fetchUserEmail()) );
if (!m_process->start()) {
kdDebug() << "Couldn't start kcmshell.." << endl;
kdDebug() << "Couldn't start tdecmshell.." << endl;
delete m_process;
m_process = 0;
return;
@@ -596,7 +596,7 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
}*/

/**
* Code from KBugReport::slotSetFrom() in kdeui/kbugreport.cpp:
* Code from KBugReport::slotSetFrom() in tdeui/kbugreport.cpp:
*/
void LikeBack::fetchUserEmail()
{
@@ -604,8 +604,8 @@ void LikeBack::fetchUserEmail()
// m_process = 0;
// m_configureEmail->setEnabled(true);

// ### KDE4: why oh why is KEmailSettings in kio?
KConfig emailConf( TQString::fromLatin1("emaildefaults") );
// ### KDE4: why oh why is KEmailSettings in tdeio?
TDEConfig emailConf( TQString::fromLatin1("emaildefaults") );

// find out the default profile
emailConf.setGroup(TQString::fromLatin1("Defaults"));
@@ -668,7 +668,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
TQWidget *buttons = new TQWidget(box);
TQGridLayout *buttonsGrid = new TQGridLayout(buttons, /*nbRows=*/4, /*nbColumns=*/2, /*margin=*/0, spacingHint());
if (m_likeBack->buttons() & LikeBack::Like) {
TQPixmap likePixmap = kapp->iconLoader()->loadIcon("likeback_like_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
TQPixmap likePixmap = kapp->iconLoader()->loadIcon("likeback_like_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
TQLabel *likeIcon = new TQLabel(buttons);
likeIcon->setPixmap(likePixmap);
likeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -678,7 +678,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
m_group->insert(likeButton, LikeBack::Like);
}
if (m_likeBack->buttons() & LikeBack::Dislike) {
TQPixmap dislikePixmap = kapp->iconLoader()->loadIcon("likeback_dislike_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
TQPixmap dislikePixmap = kapp->iconLoader()->loadIcon("likeback_dislike_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
TQLabel *dislikeIcon = new TQLabel(buttons);
dislikeIcon->setPixmap(dislikePixmap);
dislikeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -688,7 +688,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
m_group->insert(dislikeButton, LikeBack::Dislike);
}
if (m_likeBack->buttons() & LikeBack::Bug) {
TQPixmap bugPixmap = kapp->iconLoader()->loadIcon("likeback_bug_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
TQPixmap bugPixmap = kapp->iconLoader()->loadIcon("likeback_bug_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
TQLabel *bugIcon = new TQLabel(buttons);
bugIcon->setPixmap(bugPixmap);
bugIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -698,7 +698,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
m_group->insert(bugButton, LikeBack::Bug);
}
if (m_likeBack->buttons() & LikeBack::Feature) {
TQPixmap featurePixmap = kapp->iconLoader()->loadIcon("likeback_feature_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
TQPixmap featurePixmap = kapp->iconLoader()->loadIcon("likeback_feature_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
TQLabel *featureIcon = new TQLabel(buttons);
featureIcon->setPixmap(featurePixmap);
featureIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -749,11 +749,11 @@ TQString LikeBackDialog::introductionText()
TQStringList locales = m_likeBack->acceptedLocales();
for (TQStringList::Iterator it = locales.begin(); it != locales.end(); ++it) {
TQString locale = *it;
if (KGlobal::locale()->language().startsWith(locale))
if (TDEGlobal::locale()->language().startsWith(locale))
languagesMessage = "";
}
} else {
if (!KGlobal::locale()->language().startsWith("en"))
if (!TDEGlobal::locale()->language().startsWith("en"))
languagesMessage = i18n("Please write in English.");
}

@@ -761,7 +761,7 @@ TQString LikeBackDialog::introductionText()
// TODO: Replace the URL with a localized one:
text += languagesMessage + " " +
i18n("You may be able to use an <a href=\"%1\">online translation tool</a>.")
.arg("http://www.google.com/language_tools?hl=" + KGlobal::locale()->language())
.arg("http://www.google.com/language_tools?hl=" + TDEGlobal::locale()->language())
+ " ";

// If both "I Like" and "I Dislike" buttons are shown and one is clicked:
@@ -811,7 +811,7 @@ void LikeBackDialog::send()
"protocol=" + KURL::encode_string("1.0") + '&' +
"type=" + KURL::encode_string(type) + '&' +
"version=" + KURL::encode_string(m_likeBack->aboutData()->version()) + '&' +
"locale=" + KURL::encode_string(KGlobal::locale()->language()) + '&' +
"locale=" + KURL::encode_string(TDEGlobal::locale()->language()) + '&' +
"window=" + KURL::encode_string(m_windowPath) + '&' +
"context=" + KURL::encode_string(m_context) + '&' +
"comment=" + KURL::encode_string(m_comment->text()) + '&' +


+ 18
- 18
src/likeback.h View File

@@ -23,10 +23,10 @@

#include <ntqobject.h>

class KConfig;
class KAboutData;
class KAction;
class KActionCollection;
class TDEConfig;
class TDEAboutData;
class TDEAction;
class TDEActionCollection;

class LikeBackPrivate;
class LikeBackBar;
@@ -48,7 +48,7 @@ class LikeBackDialog;
*
* The LikeBack system has 5 components:
* @li In the application: The comment dialog, where the user write a comment, select a type of comment, etc.
* @li In the application: The KAction to plug in the Help menu. This action displays the comment dialog.
* @li In the application: The TDEAction to plug in the Help menu. This action displays the comment dialog.
* @li In the application: The button-bar, that floats bellow titlebar of every windows of the application, and let the user to quickly show the comment dialog.
* The button-bar can be hidden.
* @li On the server: A PHP script that collects every comments that users send. The LikeBack object should be configured to contact that server.
@@ -64,7 +64,7 @@ class LikeBackDialog;
* // Comment the following line once you are sure all your windows have a name:
* likeBack->setWindowNamesListing(LikeBack::WarnUnnamedWindows);
*
* // This line should be called early in your KMainWindow constructor because it references actionCollection().
* // This line should be called early in your TDEMainWindow constructor because it references actionCollection().
* // It should be called before createGUI() for the action to be plugged in the Help menu:
* likeBack->sendACommentAction(actionCollection());
* @endcode
@@ -117,18 +117,18 @@ class LikeBack : public TQObject
* The button-bar display is stored by version. On a new version, your default value will take effect again.
* This allow you to disable the button-bar once the version is stable enought to be released as final.
* @param config Set the configuration file where to store the user email address and if the button-bar should be shown.
* By default (null), the KApplication configuration object is used.
* @param aboutData Set the KAboutData instance used to get the application name and version. By default (null), the KApplication about data object is used.
* By default (null), the TDEApplication configuration object is used.
* @param aboutData Set the TDEAboutData instance used to get the application name and version. By default (null), the TDEApplication about data object is used.
* The application name is only used in the first-use information message.
* The version is used to store the button-bar visibility per version (can be shown in a development version but not in a final one...)
* and to send with the comment, so you can filter per version and know if a comment refers the latest version of the application or not.
*/
LikeBack(Button buttons = DefaultButtons, bool showBarByDefault = false, KConfig *config = 0, const KAboutData *aboutData = 0);
LikeBack(Button buttons = DefaultButtons, bool showBarByDefault = false, TDEConfig *config = 0, const TDEAboutData *aboutData = 0);

/**
* Destructor.
* Also hide the button-bar, if it was shown.
* Be careful, the KAction is deleted. Do not use it afterward, and take care to unplug it before destroying this LikeBack instance.
* Be careful, the TDEAction is deleted. Do not use it afterward, and take care to unplug it before destroying this LikeBack instance.
*/
~LikeBack();

@@ -209,7 +209,7 @@ class LikeBack : public TQObject
TQ_UINT16 hostPort();

/**
* Get the KAction letting user to show the comment dialog.
* Get the TDEAction letting user to show the comment dialog.
* You should plug it in your Help menu, just bellow the "Report a Bug" action, or replace it.
* Adding the action below "Report a Bug" or replacing "Report a Bug" depends on your application and if you have a Bugzilla account.
* If you do not have a Bugzilla account, LikeBack is a good way for your small application to get bug reports: remove "Report a Bug".
@@ -219,7 +219,7 @@ class LikeBack : public TQObject
* <Action name="likeback_send_a_comment" />
* @endcode
*/
KAction* sendACommentAction(KActionCollection *parent = 0);
TDEAction* sendACommentAction(TDEActionCollection *parent = 0);

/**
* @Returns The path of the currently active window. Each windows are separated with "~~".
@@ -280,7 +280,7 @@ class LikeBack : public TQObject
* @param windowPath The window path to send with the comment. If empty (the default), the current window path is took.
* Separate window names with "~~". For instance "MainWindow~~NewFile~~FileOpen".
* If you popup the dialog after an error occurred, you can put the error name in that field (if the window path has no sense in that context).
* When the dialog is popuped up from the sendACommentAction() KAction, this value is "HelpMenu", because there is no way to know if the user
* When the dialog is popuped up from the sendACommentAction() TDEAction, this value is "HelpMenu", because there is no way to know if the user
* is commenting a thing he found/thinked about in a sub-dialog.
* @param context Not used for the moment. Will allow more fine-grained application status report.
*/
@@ -302,7 +302,7 @@ class LikeBack : public TQObject

private slots:
/**
* Slot triggered by the "Help -> Send a Comment to Developers" KAction.
* Slot triggered by the "Help -> Send a Comment to Developers" TDEAction.