Compare commits

...

108 Commits

Author SHA1 Message Date
  TDE Gitea 915ddfe762 Reset submodule main/applications/koffice/cmake to latest HEAD 1 week ago
  TDE Gitea f5a0ed81c2 Reset submodule main/applications/koffice/admin to latest HEAD 1 week ago
  TDE Gitea 7efed39937 Reset submodule main/applications/koffice/cmake to latest HEAD 1 week ago
  TDE Gitea 6fb6b7a5d1 Reset submodule main/applications/koffice/admin to latest HEAD 1 week ago
  TDE Gitea 4bdc914d54 Reset submodule main/applications/koffice/cmake to latest HEAD 2 months ago
  TDE Gitea 43db1ee811 Reset submodule main/applications/koffice/cmake to latest HEAD 3 months ago
  TDE Gitea 71f1b5f0eb Reset submodule main/applications/koffice/cmake to latest HEAD 3 months ago
  TDE Gitea 3a7dadfe45 Reset submodule main/applications/koffice/admin to latest HEAD 3 months ago
  TDE Gitea 209c0afd4d Reset submodule main/applications/koffice/cmake to latest HEAD 3 months ago
  TDE Gitea e38dee852f Reset submodule main/applications/koffice/cmake to latest HEAD 3 months ago
  TDE Gitea f9e4c1da00 Reset submodule main/applications/koffice/cmake to latest HEAD 3 months ago
  TDE Gitea 77d57f6c99 Reset submodule main/applications/koffice/cmake to latest HEAD 3 months ago
  TDE Gitea 2dd765a03e Reset submodule main/applications/koffice/admin to latest HEAD 3 months ago
  TDE Gitea 6a0e35164a Reset submodule main/applications/koffice/cmake to latest HEAD 4 months ago
  TDE Gitea f43070ac45 Reset submodule main/applications/koffice/cmake to latest HEAD 4 months ago
  TDE Gitea e2ad8aa22d Reset submodule main/applications/koffice/cmake to latest HEAD 4 months ago
  TDE Gitea 69b7d47441 Reset submodule main/applications/koffice/cmake to latest HEAD 4 months ago
  TDE Gitea 1086705644 Reset submodule main/applications/koffice/cmake to latest HEAD 4 months ago
  TDE Gitea e61436c3f4 Reset submodule main/applications/koffice/cmake to latest HEAD 5 months ago
  TDE Gitea 150a4e898b Reset submodule main/applications/koffice/cmake to latest HEAD 5 months ago
  TDE Gitea 732e6b0b46 Reset submodule main/applications/koffice/cmake to latest HEAD 6 months ago
  TDE Gitea 36cf7f8ddf Reset submodule main/applications/koffice/cmake to latest HEAD 9 months ago
  Slávek Banko 542d8d6999
Switch all submodules to https. 9 months ago
  TDE Gitea a08e3b9246 Reset submodule main/applications/koffice/cmake to latest HEAD 1 year ago
  TDE Gitea ef1ef58274 Reset submodule main/applications/koffice/cmake to latest HEAD 1 year ago
  TDE Gitea d34b0f95b8 Reset submodule main/applications/koffice/cmake to latest HEAD 1 year ago
  TDE Gitea 4309ef916d Reset submodule main/applications/koffice/cmake to latest HEAD 1 year ago
  TDE Gitea be00b23253 Reset submodule main/applications/koffice/admin to latest HEAD 1 year ago
  TDE Gitea 47df0ac70b Reset submodule main/applications/koffice/cmake to latest HEAD 1 year ago
  TDE Gitea 7843274383 Reset submodule main/applications/koffice/cmake to latest HEAD 1 year ago
  TDE Gitea bf48185f63 Reset submodule main/applications/koffice/cmake to latest HEAD 1 year ago
  TDE Gitea 2afd686adb Reset submodule main/applications/koffice/cmake to latest HEAD 1 year ago
  TDE Gitea 0f113597dc Reset submodule main/applications/koffice/cmake to latest HEAD 1 year ago
  TDE Gitea 1d8134224e Reset submodule main/applications/koffice/cmake to latest HEAD 1 year ago
  TDE Gitea b9520576a6 Reset submodule main/applications/koffice/admin to latest HEAD 1 year ago
  TDE Gitea edd4158043 Reset submodule main/applications/koffice/cmake to latest HEAD 1 year ago
  TDE Gitea 07252b4019 Reset submodule main/applications/koffice/cmake to latest HEAD 1 year ago
  TDE Gitea 3033a6f73b Reset submodule main/applications/koffice/admin to latest HEAD 2 years ago
  Slávek Banko b43e12400a Reset submodule main/applications/koffice/admin to latest HEAD 2 years ago
  Slávek Banko a540a3852d Reset submodule main/applications/koffice/admin to latest HEAD 2 years ago
  Slávek Banko 7f557cb184 Reset submodule main/applications/koffice/admin to latest HEAD 2 years ago
  Slávek Banko 7a5670e693 Reset submodule main/applications/koffice/cmake to latest HEAD 3 years ago
  Slávek Banko f407f2013d Reset submodule main/applications/koffice/admin to latest HEAD 4 years ago
  Slávek Banko 8e19033bdb Reset submodule main/applications/koffice/cmake to latest HEAD 4 years ago
  Slávek Banko 64c895f49e Reset submodule main/applications/koffice/admin to latest HEAD 4 years ago
  Slávek Banko 61761067a8 Fix FTBFS on armel 7 years ago
  Slávek Banko 6db6fb8d7c Fix FTBFS due to missing flags for libxml 7 years ago
  Slávek Banko 1181c18070 Reset submodule main/applications/koffice/admin to latest HEAD 7 years ago
  Darrell Anderson 845addb942 Cleanup output clutter. 7 years ago
  Francois Andriot 45dc519463 Fix redefinition problems with previous patch 7 years ago
  Timothy Pearson ee243bbd2b Fix FTBFS with libwpd 0.9 and above 7 years ago
  Slávek Banko af4b864fd8 Reset submodule main/applications/koffice/admin to latest HEAD 7 years ago
  Slávek Banko 313a7b906b Reset submodule main/applications/koffice/cmake to latest HEAD 7 years ago
  Slávek Banko b1597ea7f9 Reset submodule main/applications/koffice/cmake to latest HEAD 7 years ago
  Slávek Banko bab760c4dd Fix kross Ruby 1.9.x FTBFS on armel 7 years ago
  Timothy Pearson a4acae651a Fix kross Ruby FTBFS 7 years ago
  Darrell Anderson e416159718 Fix references to user profile directory. 8 years ago
  Darrell Anderson 5e29c1ee4f Fix some "is not defined" warnings. 8 years ago
  Slávek Banko 804a7f96a4 Reset submodule main/applications/koffice/cmake to latest HEAD 7 years ago
  Slávek Banko a48aff48f3 Reset submodule main/applications/koffice/cmake to latest HEAD 7 years ago
  Slávek Banko 27b706726d Reset submodule main/applications/koffice/admin to latest HEAD 7 years ago
  Slávek Banko e9ce2c838b Fix Ruby 1.9.x shared library test without pkgconfig file 8 years ago
  Darrell Anderson c338c66a23 Fix koffice FTBFS on 64-bit. 8 years ago
  Darrell Anderson 4673bc2026 Fix inadvertent tq changes. 8 years ago
  Darrell Anderson 8710466ca4 Fix inadvertent tq changes. 8 years ago
  Darrell Anderson 504f75b811 Fix inadvertent tqt changes. 8 years ago
  Darrell Anderson e8a23514c3 Remove unnecessary language. 8 years ago
  Darrell Anderson df0e4776ec Remove unnecessary language. 8 years ago
  Darrell Anderson 891aac4128 Fix inadvertent tqt changes. 8 years ago
  Darrell Anderson ae381385cb Fix inadvertent tq changes. 8 years ago
  Darrell Anderson 94b9741ab2 Fix build on Ruby 1.9.x without pkgconfig file 8 years ago
  Darrell Anderson 91993677f4 Fix building with Ruby 1.9.1 or 1.9.3. 8 years ago
  Timothy Pearson 619fa66f7e Add missing file 8 years ago
  Timothy Pearson ec490c4d14 Fix FTBFS 8 years ago
  Timothy Pearson cb9ff1eaba Attempt to make kross compile with Ruby 1.9.x 8 years ago
  Slávek Banko 61f95d9e70 Reset submodule main/applications/koffice/cmake to latest HEAD 8 years ago
  Slávek Banko e5ac223d9d Reset submodule main/applications/koffice/cmake to latest HEAD 8 years ago
  Slávek Banko 3f1f13897a Reset submodule main/applications/koffice/admin to latest HEAD 8 years ago
  Slávek Banko 80f5854c79 Update final HTML install path so all modules are consistent. 8 years ago
  Darrell Anderson fe029f52dd Update HTML install path references. 8 years ago
  Darrell Anderson c62214b1e4 Add missing icons. 8 years ago
  Slávek Banko 447e8e3d92 Fix lcms detection 8 years ago
  Slávek Banko 81a325f3d2 Update autotools for new DSO linkage style 8 years ago
  Slávek Banko 6bbeed5afb Fix accidental conversions of binary files 8 years ago
  Timothy Pearson 82bb8ce433 Fix poppler pdf build stuck on 8 years ago
  Timothy Pearson 65752f8bd9 Fix last commit 8 years ago
  Timothy Pearson 016953f7bf Look for poppler-tqt 8 years ago
  Slávek Banko fe721dcc7f Fix FTBFS due to missing libraries 8 years ago
  Timothy Pearson 9d273d8b09 Fix format string error 8 years ago
  Timothy Pearson 5a3d18a6d6 Fix 'format not a string literal' error 8 years ago
  Timothy Pearson 2d30d19f88 Fix FTBFS on newer pqxx versions 8 years ago
  Timothy Pearson 4b5525c13b Fix FTBFS 8 years ago
  Timothy Pearson eb699de2dc Fix FTBFS 8 years ago
  Timothy Pearson 198e3c0270 Fix FTBFS when wv2-config libs is broken 8 years ago
  Darrell Anderson 88e687493a Libpng 1.5 fixes. 8 years ago
  Darrell Anderson a8285dc16a GCC 4.7 fixes. 8 years ago
  Darrell Anderson 1fe62fd22a Remove "More Applications" from KDE menu. 8 years ago
  Timothy Pearson ed0624a9da Fix linear alphabet string errors 8 years ago
  Timothy Pearson 7d1d9ab2f3 Fix inadvertent TQt string conversions 8 years ago
  Timothy Pearson 93ac1cd93c Fix koffice FTBFS due to png code 8 years ago
  Timothy Pearson eed2080a40 Fix chalk graphicsmagick filter FTBFS 8 years ago
  Timothy Pearson 03348aae69 Apply a number of kexi patches 8 years ago
  Timothy Pearson a0302e6ddd Fix koffice python syntax errors 8 years ago
  Timothy Pearson 906ce3c7fa Rename a few stragglers 8 years ago
  Timothy Pearson 26bd16cdc7 Rename obsolete tq methods to standard names 8 years ago
  Timothy Pearson 081186aa08 Remove additional unneeded tq method conversions 8 years ago
  Timothy Pearson dad397ab62 Rename old tq methods that no longer need a unique name 8 years ago
  Slávek Banko b89001017b Add common directories 8 years ago
100 changed files with 371 additions and 13622 deletions
Split View
  1. +6
    -0
      .gitmodules
  2. +0
    -12406
      acinclude.m4
  3. +0
    -892
      aclocal.m4
  4. +1
    -0
      admin
  5. +1
    -1
      chalk/HACKING
  6. +1
    -1
      chalk/IMAGE_LIBRARIES
  7. +2
    -2
      chalk/Makefile.am
  8. +6
    -6
      chalk/chalkcolor/kis_basic_histogram_producers.cc
  9. +1
    -1
      chalk/chalkcolor/kis_basic_histogram_producers.h
  10. +2
    -2
      chalk/chalkcolor/kis_colorspace_factory_registry.cc
  11. +1
    -1
      chalk/chalkcolor/kis_profile.cc
  12. +5
    -3
      chalk/colorspaces/wet/Makefile.am
  13. +1
    -1
      chalk/colorspaces/wet/kis_wet_palette_widget.cc
  14. +3
    -3
      chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc
  15. +12
    -12
      chalk/colorspaces/wetsticky/ws/canvas.c
  16. +2
    -2
      chalk/colorspaces/wetsticky/ws/canvas.h
  17. +1
    -1
      chalk/colorspaces/wetsticky/ws/engine.c
  18. +1
    -1
      chalk/colorspaces/wetsticky/ws/engine3.c
  19. +1
    -1
      chalk/colorspaces/wetsticky/ws/ogl_interface.c
  20. +1
    -1
      chalk/colorspaces/wetsticky/ws/x_interface.c
  21. +1
    -1
      chalk/configure.in.in
  22. +2
    -2
      chalk/core/kis_brush.cc
  23. +37
    -37
      chalk/core/kis_exif_value.cc
  24. +3
    -3
      chalk/core/kis_fill_painter.cc
  25. +2
    -2
      chalk/core/kis_filter_registry.cc
  26. +13
    -13
      chalk/core/kis_gradient_painter.cc
  27. +1
    -1
      chalk/core/kis_gradient_painter.h
  28. +2
    -2
      chalk/core/kis_group_layer.cc
  29. +1
    -1
      chalk/core/kis_group_layer.h
  30. +1
    -1
      chalk/core/kis_nameserver.cc
  31. +2
    -2
      chalk/core/kis_paintop_registry.cc
  32. +1
    -1
      chalk/core/kis_selection.cc
  33. +1
    -1
      chalk/core/tiles/kis_tileddatamanager.cc
  34. BIN
      chalk/data/brushes/feltpen.gih
  35. BIN
      chalk/data/brushes/galaxy.gbr
  36. BIN
      chalk/data/brushes/galaxy_big.gbr
  37. +1
    -1
      chalk/data/palettes/Named_Colors.gpl
  38. BIN
      chalk/data/patterns/bark.pat
  39. BIN
      chalk/data/patterns/brick.pat
  40. BIN
      chalk/data/patterns/burlap.pat
  41. BIN
      chalk/data/patterns/choc_swirl.pat
  42. BIN
      chalk/data/patterns/java.pat
  43. BIN
      chalk/data/patterns/leopard.pat
  44. BIN
      chalk/data/patterns/lightning.pat
  45. BIN
      chalk/data/patterns/nops.pat
  46. BIN
      chalk/data/patterns/redcube.pat
  47. BIN
      chalk/data/patterns/starfield.pat
  48. BIN
      chalk/data/patterns/stone33.pat
  49. BIN
      chalk/data/profiles/cmyk.icm
  50. BIN
      chalk/data/profiles/fogra27l.icm
  51. +1
    -1
      chalk/doc/DESIGN.obsolete
  52. +1
    -1
      chalk/doc/background_paper.txt
  53. +3
    -3
      chalk/doc/chalk-features
  54. BIN
      chalk/doc/chalk.kpr
  55. BIN
      chalk/doc/chalk.pdf
  56. +32
    -32
      chalk/doc/chalk.xmi
  57. +22
    -22
      chalk/doc/controller.xmi
  58. +2
    -2
      chalk/doc/doc-outline
  59. BIN
      chalk/doc/manual/chalk.kwd
  60. +1
    -1
      chalk/doc/selections
  61. +1
    -1
      eview
  62. +5
    -3
      chalk/plugins/filters/blur/Makefile.am
  63. +3
    -3
      chalk/plugins/filters/blur/kis_blur_filter.cc
  64. +1
    -1
      chalk/plugins/filters/blur/kis_wdg_blur.cc
  65. +5
    -5
      chalk/plugins/filters/blur/wdgblur.ui
  66. +5
    -3
      chalk/plugins/filters/bumpmap/Makefile.am
  67. +3
    -3
      chalk/plugins/filters/bumpmap/wdgbumpmap.ui
  68. +13
    -13
      chalk/plugins/filters/cimg/CImg.h
  69. +5
    -3
      chalk/plugins/filters/cimg/Makefile.am
  70. +2
    -2
      chalk/plugins/filters/cimg/kis_cimg_filter.cc
  71. +1
    -1
      chalk/plugins/filters/cimg/wdg_cimg.ui
  72. +5
    -3
      chalk/plugins/filters/colorify/Makefile.am
  73. +3
    -3
      chalk/plugins/filters/colorify/WdgColorifyBase.ui
  74. +5
    -3
      chalk/plugins/filters/colors/Makefile.am
  75. +3
    -3
      chalk/plugins/filters/colors/wdgcolortoalphabase.ui
  76. +5
    -3
      chalk/plugins/filters/colorsfilters/Makefile.am
  77. +1
    -1
      chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
  78. +13
    -13
      chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
  79. +6
    -6
      chalk/plugins/filters/colorsfilters/wdg_perchannel.ui
  80. +5
    -3
      chalk/plugins/filters/convolutionfilters/Makefile.am
  81. +7
    -7
      chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui
  82. +5
    -3
      chalk/plugins/filters/embossfilter/Makefile.am
  83. +5
    -3
      chalk/plugins/filters/example/Makefile.am
  84. +5
    -3
      chalk/plugins/filters/fastcolortransfer/Makefile.am
  85. +2
    -2
      chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
  86. +5
    -3
      chalk/plugins/filters/imageenhancement/Makefile.am
  87. +5
    -3
      chalk/plugins/filters/lenscorrectionfilter/Makefile.am
  88. +4
    -4
      chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui
  89. +5
    -3
      chalk/plugins/filters/levelfilter/Makefile.am
  90. +8
    -8
      chalk/plugins/filters/levelfilter/kgradientslider.cc
  91. +17
    -17
      chalk/plugins/filters/levelfilter/wdg_level.ui
  92. +5
    -3
      chalk/plugins/filters/noisefilter/Makefile.am
  93. +2
    -2
      chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui
  94. +5
    -3
      chalk/plugins/filters/oilpaintfilter/Makefile.am
  95. +5
    -3
      chalk/plugins/filters/pixelizefilter/Makefile.am
  96. +5
    -3
      chalk/plugins/filters/raindropsfilter/Makefile.am
  97. +1
    -1
      chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
  98. +5
    -3
      chalk/plugins/filters/randompickfilter/Makefile.am
  99. +2
    -2
      chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui
  100. +5
    -3
      chalk/plugins/filters/roundcorners/Makefile.am

+ 6
- 0
.gitmodules View File

@@ -0,0 +1,6 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
[submodule "cmake"]
path = cmake
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake

+ 0
- 12406
acinclude.m4
File diff suppressed because it is too large
View File


+ 0
- 892
aclocal.m4 View File

@@ -1,892 +0,0 @@
# generated automatically by aclocal 1.9.6 -*- Autoconf -*-

# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.

# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])

# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.9.6])])

# AM_AUX_DIR_EXPAND -*- Autoconf -*-

# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
#
# Of course, Automake must honor this variable whenever it calls a
# tool from the auxiliary directory. The problem is that $srcdir (and
# therefore $ac_aux_dir as well) can be either absolute or relative,
# depending on how configure is run. This is pretty annoying, since
# it makes $ac_aux_dir quite unusable in subdirectories: in the top
# source directory, any form will work fine, but in subdirectories a
# relative path needs to be adjusted first.
#
# $ac_aux_dir/missing
# fails when called from a subdirectory if $ac_aux_dir is relative
# $top_srcdir/$ac_aux_dir/missing
# fails if $ac_aux_dir is absolute,
# fails when called from a subdirectory in a VPATH build with
# a relative $ac_aux_dir
#
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
# are both prefixed by $srcdir. In an in-source build this is usually
# harmless because $srcdir is `.', but things will broke when you
# start a VPATH build or use an absolute $srcdir.
#
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
# and then we would define $MISSING as
# MISSING="\${SHELL} $am_aux_dir/missing"
# This will work as long as MISSING is not called from configure, because
# unfortunately $(top_srcdir) has no meaning in configure.
# However there are other variables, like CC, which are often used in
# configure, and could therefore not use this "fixed" $ac_aux_dir.
#
# Another solution, used here, is to always expand $ac_aux_dir to an
# absolute PATH. The drawback is that using absolute paths prevent a
# configured tree to be moved without reconfiguration.

AC_DEFUN([AM_AUX_DIR_EXPAND],
[dnl Rely on autoconf to set up CDPATH properly.
AC_PREREQ([2.50])dnl
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
])

# AM_CONDITIONAL -*- Autoconf -*-

# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# serial 7

# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])
AC_SUBST([$1_FALSE])
if $2; then
$1_TRUE=
$1_FALSE='#'
else
$1_TRUE='#'
$1_FALSE=
fi
AC_CONFIG_COMMANDS_PRE(
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
AC_MSG_ERROR([[conditional "$1" was never defined.
Usually this means the macro was only invoked conditionally.]])
fi])])


# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# serial 8

# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...


# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
# NAME is "CC", "CXX", "GCJ", or "OBJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
# dependency, and given that the user is not expected to run this macro,
# just rely on AC_PROG_CC.
AC_DEFUN([_AM_DEPENDENCIES],
[AC_REQUIRE([AM_SET_DEPDIR])dnl
AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl

ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])

AC_CACHE_CHECK([dependency style of $depcc],
[am_cv_$1_dependencies_compiler_type],
[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
cp "$am_depcomp" conftest.dir
cd conftest.dir
# We will build objects and dependencies in a subdirectory because
# it helps to detect inapplicable dependency modes. For instance
# both Tru64's cc and ICC support -MD to output dependencies as a
# side effect of compilation, but ICC will put the dependencies in
# the current directory while Tru64 will put them in the object
# directory.
mkdir sub

am_cv_$1_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
# we should not choose a depcomp mode which is confused by this.
#
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
# Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
# Solaris 8's {/usr,}/bin/sh.
touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

case $depmode in
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
if test "x$enable_dependency_tracking" = xyes; then
continue
else
break
fi
;;
none) break ;;
esac
# We check with `-c' and `-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
# When given -MP, icc 7.0 and 7.1 complain thusly:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
if (grep 'ignoring option' conftest.err ||
grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
am_cv_$1_dependencies_compiler_type=$depmode
break
fi
fi
done

cd ..
rm -rf conftest.dir
else
am_cv_$1_dependencies_compiler_type=none
fi
])
AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
AM_CONDITIONAL([am__fastdep$1], [
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_$1_dependencies_compiler_type" = gcc3])
])


# AM_SET_DEPDIR
# -------------
# Choose a directory name for dependency files.
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
])


# AM_DEP_TRACK
# ------------
AC_DEFUN([AM_DEP_TRACK],
[AC_ARG_ENABLE(dependency-tracking,
[ --disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])
])

# Generate code to set up dependency tracking. -*- Autoconf -*-

# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

#serial 3

# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[for mf in $CONFIG_FILES; do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
# We used to match only the files named `Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
# So let's grep whole file.
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
# from the Makefile without running `make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
test -z "am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# When using ansi2knr, U may be empty or an underscore; expand it
U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
AS_MKDIR_P([$dirpart/$fdir])
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
done
])# _AM_OUTPUT_DEPENDENCY_COMMANDS


# AM_OUTPUT_DEPENDENCY_COMMANDS
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
# is enabled. FIXME. This creates each `.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])

# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# serial 8

# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])

# Do all the work for Automake. -*- Autoconf -*-

# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# serial 12

# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.

# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
# -----------------------------------------------
# The call with PACKAGE and VERSION arguments is the old style
# call (pre autoconf-2.50), which is being phased out. PACKAGE
# and VERSION should now be passed to AC_INIT and removed from
# the call to AM_INIT_AUTOMAKE.
# We support both call styles for the transition. After
# the next Automake release, Autoconf can make the AC_INIT
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_PREREQ([2.58])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
# test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi

# test whether we have cygpath
if test -z "$CYGPATH_W"; then
if (cygpath --version) >/dev/null 2>/dev/null; then
CYGPATH_W='cygpath -w'
else
CYGPATH_W=echo
fi
fi
AC_SUBST([CYGPATH_W])

# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl

_AM_IF_OPTION([no-define],,
[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl

# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
AM_MISSING_PROG(AUTOCONF, autoconf)
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
AM_PROG_INSTALL_SH
AM_PROG_INSTALL_STRIP
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
[_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
[_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
[_AM_DEPENDENCIES(CC)],
[define([AC_PROG_CC],
defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
])
])


# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. The stamp files are numbered to have different names.

# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
# loop where config.status creates the headers, so we can generate
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
$1 | $1:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])

# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
install_sh=${install_sh-"$am_aux_dir/install-sh"}
AC_SUBST(install_sh)])

# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# serial 2

# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
[rm -rf .tst 2>/dev/null
mkdir .tst 2>/dev/null
if test -d .tst; then
am__leading_dot=.
else
am__leading_dot=_
fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])

# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering

# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# serial 4

AC_DEFUN([AM_MAINTAINER_MODE],
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode is disabled by default
AC_ARG_ENABLE(maintainer-mode,
[ --enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer],
USE_MAINTAINER_MODE=$enableval,
USE_MAINTAINER_MODE=no)
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
MAINT=$MAINTAINER_MODE_TRUE
AC_SUBST(MAINT)dnl
]
)

AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])

# Check to see how 'make' treats includes. -*- Autoconf -*-

# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# serial 3

# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
@echo done
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
# We grep out `Entering directory' and `Leaving directory'
# messages which can occur if `w' ends up in MAKEFLAGS.
# In particular we don't look at `^make:' because GNU make might
# be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'.
if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
am__include=include
am__quote=
_am_result=GNU
fi
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
am__include=.include
am__quote="\""
_am_result=BSD
fi
fi
AC_SUBST([am__include])
AC_SUBST([am__quote])
AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])

# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-

# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# serial 4

# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
[AC_REQUIRE([AM_MISSING_HAS_RUN])
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])


# AM_MISSING_HAS_RUN
# ------------------
# Define MISSING if not defined so far and test if it supports --run.
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
AC_MSG_WARN([`missing' script is too old or missing])
fi
])

# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# AM_PROG_MKDIR_P
# ---------------
# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
#
# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
# created by `make install' are always world readable, even if the
# installer happens to have an overly restrictive umask (e.g. 077).
# This was a mistake. There are at least two reasons why we must not
# use `-m 0755':
# - it causes special bits like SGID to be ignored,
# - it may be too restrictive (some setups expect 775 directories).
#
# Do not use -m 0755 and let people choose whatever they expect by
# setting umask.
#
# We cannot accept any implementation of `mkdir' that recognizes `-p'.
# Some implementations (such as Solaris 8's) are not thread-safe: if a
# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
# concurrently, both version can detect that a/ is missing, but only
# one can create it and the other will error out. Consequently we
# restrict ourselves to GNU make (using the --version option ensures
# this.)
AC_DEFUN([AM_PROG_MKDIR_P],
[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
# We used to keeping the `.' as first argument, in order to
# allow $(mkdir_p) to be used without argument. As in
# $(mkdir_p) $(somedir)
# where $(somedir) is conditionally defined. However this is wrong
# for two reasons:
# 1. if the package is installed by a user who cannot write `.'
# make install will fail,
# 2. the above comment should most certainly read
# $(mkdir_p) $(DESTDIR)$(somedir)
# so it does not work when $(somedir) is undefined and
# $(DESTDIR) is not.
# To support the latter case, we have to write
# test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
# so the `.' trick is pointless.
mkdir_p='mkdir -p --'
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
for d in ./-p ./--version;
do
test -d $d && rmdir $d
done
# $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
if test -f "$ac_aux_dir/mkinstalldirs"; then
mkdir_p='$(mkinstalldirs)'
else
mkdir_p='$(install_sh) -d'
fi
fi
AC_SUBST([mkdir_p])])

# Helper functions for option handling. -*- Autoconf -*-

# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# serial 3

# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])

# _AM_SET_OPTION(NAME)
# ------------------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])

# _AM_SET_OPTIONS(OPTIONS)
# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])

# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

# Check to make sure that the build environment is sane. -*- Autoconf -*-

# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# serial 4

# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
echo timestamp > conftest.file
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
if test "$[*]" = "X"; then
# -L didn't work.
set X `ls -t $srcdir/configure conftest.file`
fi
rm -f conftest.file
if test "$[*]" != "X $srcdir/configure conftest.file" \
&& test "$[*]" != "X conftest.file $srcdir/configure"; then

# If neither matched, then we have a broken ls. This can happen
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
alias in your environment])
fi

test "$[2]" = conftest.file
)
then
# Ok.
:
else
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
AC_MSG_RESULT(yes)])

# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
# is unlikely to handle the host's binaries.
# Fortunately install-sh will honor a STRIPPROG variable, so we
# always use install-sh in `make install-strip', and initialize
# STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
# will honor the `STRIP' environment variable to overrule this program.
dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])

# Check how to create a tarball. -*- Autoconf -*-

# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# serial 2

# _AM_PROG_TAR(FORMAT)
# --------------------
# Check how to create a tarball in format FORMAT.
# FORMAT should be one of `v7', `ustar', or `pax'.
#
# Substitute a variable $(am__tar) that is a command
# writing to stdout a FORMAT-tarball containing the directory
# $tardir.
# tardir=directory && $(am__tar) > result.tar
#
# Substitute a variable $(am__untar) that extract such
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
[# Always define AMTAR for backward compatibility.
AM_MISSING_PROG([AMTAR], [tar])
m4_if([$1], [v7],
[am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
_am_tools=${am_cv_prog_tar_$1-$_am_tools}
# Do not fold the above two line into one, because Tru64 sh and
# Solaris sh will not grok spaces in the rhs of `-'.
for _am_tool in $_am_tools
do
case $_am_tool in
gnutar)
for _am_tar in tar gnutar gtar;
do
AM_RUN_LOG([$_am_tar --version]) && break
done
am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
am__untar="$_am_tar -xf -"
;;
plaintar)
# Must skip GNU tar: if it does not support --format= it doesn't create
# ustar tarball either.
(tar --version) >/dev/null 2>&1 && continue
am__tar='tar chf - "$$tardir"'
am__tar_='tar chf - "$tardir"'
am__untar='tar xf -'
;;
pax)
am__tar='pax -L -x $1 -w "$$tardir"'
am__tar_='pax -L -x $1 -w "$tardir"'
am__untar='pax -r'
;;
cpio)
am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
am__untar='cpio -i -H $1 -d'
;;
none)
am__tar=false
am__tar_=false
am__untar=false
;;
esac

# If the value was cached, stop now. We just wanted to have am__tar
# and am__untar set.
test -n "${am_cv_prog_tar_$1}" && break

# tar/untar a dummy directory, and stop if the command works
rm -rf conftest.dir
mkdir conftest.dir
echo GrepMe > conftest.dir/file
AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
rm -rf conftest.dir
if test -s conftest.tar; then
AM_RUN_LOG([$am__untar <conftest.tar])
grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
fi
done
rm -rf conftest.dir

AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
AC_MSG_RESULT([$am_cv_prog_tar_$1])])
AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR

m4_include([acinclude.m4])

+ 1
- 0
admin

@@ -0,0 +1 @@
Subproject commit 9c3a708c04ab11ee9bc511e7fb90b59db5eecf22

+ 1
- 1
chalk/HACKING View File

@@ -62,7 +62,7 @@ Variable/Parameter names

Designer

Chalk has started to use designer. All dialogs and all widgets that have a tqlayout
Chalk has started to use designer. All dialogs and all widgets that have a layout
manager must be done in designer. We don't add code nor add signal/slot connections
in designer



+ 1
- 1
chalk/IMAGE_LIBRARIES View File

@@ -153,7 +153,7 @@ Disadvantages:

Libart isn't really an image library, but rather a canvas that can be
used to paint images on. It is optimized for vector graphics, and is
used by Karbon to render tqshapes before display.
used by Karbon to render shapes before display.

Advantages:



+ 2
- 2
chalk/Makefile.am View File

@@ -9,8 +9,8 @@ libchalkcommon_la_LIBADD = sdk/libchalksdk.la core/libchalkimage.la ui/libchalku
## The part
kde_module_LTLIBRARIES = libchalkpart.la
libchalkpart_la_SOURCES = chalk_part_init.cc
libchalkpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore -L../chalk/ui/.libs -lchalkui -module $(KDE_PLUGIN)
libchalkpart_la_LIBADD = libchalkcommon.la
libchalkpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) -module $(KDE_PLUGIN)
libchalkpart_la_LIBADD = $(KOFFICE_LIBS) libchalkcommon.la ../chalk/ui/libchalkui.la

METASOURCES = AUTO



+ 6
- 6
chalk/chalkcolor/kis_basic_histogram_producers.cc View File

@@ -89,7 +89,7 @@ KisBasicU8HistogramProducer::KisBasicU8HistogramProducer(const KisID& id, KisCol
}

TQString KisBasicU8HistogramProducer::positionToString(double pos) const {
return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
}

void KisBasicU8HistogramProducer::addRegionToBin(TQ_UINT8 * pixels, TQ_UINT8 * selectionMask, TQ_UINT32 nPixels, KisColorSpace *cs)
@@ -142,7 +142,7 @@ KisBasicU16HistogramProducer::KisBasicU16HistogramProducer(const KisID& id, KisC

TQString KisBasicU16HistogramProducer::positionToString(double pos) const
{
return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
}

double KisBasicU16HistogramProducer::maximalZoom() const
@@ -210,7 +210,7 @@ KisBasicF32HistogramProducer::KisBasicF32HistogramProducer(const KisID& id, KisC
}

TQString KisBasicF32HistogramProducer::positionToString(double pos) const {
return TQString("%1").tqarg(static_cast<float>(pos)); // XXX I doubt this is correct!
return TQString("%1").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
}

double KisBasicF32HistogramProducer::maximalZoom() const {
@@ -282,7 +282,7 @@ KisBasicF16HalfHistogramProducer::KisBasicF16HalfHistogramProducer(const KisID&
}

TQString KisBasicF16HalfHistogramProducer::positionToString(double pos) const {
return TQString("%1").tqarg(static_cast<float>(pos)); // XXX I doubt this is correct!
return TQString("%1").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
}

double KisBasicF16HalfHistogramProducer::maximalZoom() const {
@@ -356,7 +356,7 @@ TQValueVector<KisChannelInfo *> KisGenericRGBHistogramProducer::channels() {
}

TQString KisGenericRGBHistogramProducer::positionToString(double pos) const {
return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
}

double KisGenericRGBHistogramProducer::maximalZoom() const {
@@ -433,7 +433,7 @@ TQValueVector<KisChannelInfo *> KisGenericLabHistogramProducer::channels() {
}

TQString KisGenericLabHistogramProducer::positionToString(double pos) const {
return TQString("%1").tqarg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
return TQString("%1").arg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
}

double KisGenericLabHistogramProducer::maximalZoom() const {


+ 1
- 1
chalk/chalkcolor/kis_basic_histogram_producers.h View File

@@ -60,7 +60,7 @@ protected:
/**
* The order in which channels() returns is not the same as the internal representation,
* that of the pixel internally. This method converts external usage to internal usage.
* This method uses some basic assumtpions about the tqlayout of the pixel, so _extremely_
* This method uses some basic assumtpions about the layout of the pixel, so _extremely_
* exotic spaces might want to override this (see makeExternalToInternal source for
* those assumptions)
**/


+ 2
- 2
chalk/chalkcolor/kis_colorspace_factory_registry.cc View File

@@ -62,8 +62,8 @@ KisColorSpaceFactoryRegistry::KisColorSpaceFactoryRegistry(TQStringList profileF
*/

// Load all colorspace modules
KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ColorSpace"),
TQString::tqfromLatin1("(Type == 'Service') and "
KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ColorSpace"),
TQString::fromLatin1("(Type == 'Service') and "
"([X-Chalk-Version] == 2)"));

if (offers.empty()) {


+ 1
- 1
chalk/chalkcolor/kis_profile.cc View File

@@ -65,7 +65,7 @@ KisProfile::KisProfile(const cmsHPROFILE profile)

// Make a raw data image ready for saving
_cmsSaveProfileToMem(m_profile, 0, &bytesNeeded); // calc size
if(m_rawData.tqresize(bytesNeeded))
if(m_rawData.resize(bytesNeeded))
{
_cmsSaveProfileToMem(m_profile, m_rawData.data(), &bytesNeeded); // fill buffer
cmsHPROFILE newprofile = cmsOpenProfileFromMem(m_rawData.data(), (DWORD) bytesNeeded);


+ 5
- 3
chalk/colorspaces/wet/Makefile.am View File

@@ -20,9 +20,11 @@ kde_module_LTLIBRARIES = chalkwetplugin.la
chalkwetplugin_la_SOURCES = kis_wet_colorspace.cc wet_plugin.cc kis_wetop.cc kis_wet_palette_widget.cc kis_wetness_visualisation_filter.cc kis_texture_painter.cc kis_texture_filter.cc wetphysicsfilter.cc wdgpressure.ui
noinst_HEADERS = kis_wet_colorspace.h wet_plugin.h wetphysicsfilter.h kis_wetop.cc kis_wet_palette_widget.h kis_texture_painter.h kis_wetness_visualisation_filter.h kis_texture_filter.h wetphysicsfilter.h

chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms -L../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../chalk/core/.libs -lchalkimage \
-L../../../chalk/ui/.libs -lchalkui
chalkwetplugin_la_LIBADD = ../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE)
chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms
chalkwetplugin_la_LIBADD = ../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \
../../../chalk/chalkcolor/libchalkcolor.la \
../../../chalk/core/libchalkimage.la \
../../../chalk/ui/libchalkui.la

chalkwetplugin_la_METASOURCES = AUTO


+ 1
- 1
chalk/colorspaces/wet/kis_wet_palette_widget.cc View File

@@ -50,7 +50,7 @@ KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : s
{
m_subject = 0;

TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main tqlayout");
TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main layout");

TQGridLayout * l = new TQGridLayout(vl, 2, 8, 2, "color wells grid");



+ 3
- 3
chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc View File

@@ -48,7 +48,7 @@ enum WetStickyChannelIndex {
HUE_CHANNEL_INDEX,
SATURATION_CHANNEL_INDEX,
LIGHTNESS_CHANNEL_INDEX,
LITQUID_CONTENT_CHANNEL_INDEX,
LIQUID_CONTENT_CHANNEL_INDEX,
DRYING_RATE_CHANNEL_INDEX,
MISCIBILITY_CHANNEL_INDEX,
GRAVITATIONAL_DIRECTION_INDEX,
@@ -513,7 +513,7 @@ TQString KisWetStickyColorSpace::channelValueText(const TQ_UINT8 *U8_pixel, TQ_U
return TQString().setNum(pixel -> saturation);
case LIGHTNESS_CHANNEL_INDEX:
return TQString().setNum(pixel -> lightness);
case LITQUID_CONTENT_CHANNEL_INDEX:
case LIQUID_CONTENT_CHANNEL_INDEX:
return TQString().setNum(pixel -> liquid_content);
case DRYING_RATE_CHANNEL_INDEX:
return TQString().setNum(pixel -> drying_rate);
@@ -569,7 +569,7 @@ TQString KisWetStickyColorSpace::normalisedChannelValueText(const TQ_UINT8 *U8_p
return TQString().setNum(pixel -> saturation);
case LIGHTNESS_CHANNEL_INDEX:
return TQString().setNum(pixel -> lightness);
case LITQUID_CONTENT_CHANNEL_INDEX:
case LIQUID_CONTENT_CHANNEL_INDEX:
return TQString().setNum(static_cast<float>(pixel -> liquid_content) / UINT8_MAX);
case DRYING_RATE_CHANNEL_INDEX:
return TQString().setNum(static_cast<float>(pixel -> drying_rate) / UINT8_MAX);


+ 12
- 12
chalk/colorspaces/wetsticky/ws/canvas.c View File

@@ -31,13 +31,13 @@ CELL canvas[CANVAS_WIDTH][CANVAS_HEIGHT];

/* This module maintains a list of the addresses of cells that have
been modified since the last redraw and therefore need updating.
Points are added to this list by the need_to_tqrepaint() routine
and are removed by the next_cell_for_tqrepaint() function. The
Points are added to this list by the need_to_repaint() routine
and are removed by the next_cell_for_repaint() function. The
pointer to the current tail of the list is updated by side-effect. */

static POINT need_repainting[REDRAW_LIMIT];
static int next_free = 0;
static int next_to_tqrepaint = 0;
static int next_to_repaint = 0;

/* *********************************************************************** */

@@ -50,7 +50,7 @@ int number_of_repaints_needed()

/* *********************************************************************** */

void need_to_tqrepaint(point)
void need_to_repaint(point)
/* The cell at this location needs to be redrawn since it has
been altered. Scan the list to see if it is already
scheduled for a repainting operation and only add it if
@@ -62,7 +62,7 @@ POINT point;
int k;


/* If the list is already full then simply ignore the tqrepaint
/* If the list is already full then simply ignore the repaint
request - it will get done eventually anyway. */

if (next_free == REDRAW_LIMIT) return;
@@ -85,7 +85,7 @@ POINT point;

/* *********************************************************************** */

void next_cell_for_tqrepaint(cell, locus)
void next_cell_for_repaint(cell, locus)
/* This routine returns the next cell to be repainted, together with its
location on the canvas. This is determined by taking the next point
from the need_repainting list and accessing its cell. If the list is
@@ -97,16 +97,16 @@ void next_cell_for_tqrepaint(cell, locus)
POINT_PTR locus;

{
if (next_to_tqrepaint >= next_free) {
next_to_tqrepaint = next_free = 0;
if (next_to_repaint >= next_free) {
next_to_repaint = next_free = 0;
*(cell) = NIL;
return;
}

*(cell) = get_cell(need_repainting[next_to_tqrepaint]);
locus->x = need_repainting[next_to_tqrepaint].x;
locus->y = need_repainting[next_to_tqrepaint].y;
next_to_tqrepaint++;
*(cell) = get_cell(need_repainting[next_to_repaint]);
locus->x = need_repainting[next_to_repaint].x;
locus->y = need_repainting[next_to_repaint].y;
next_to_repaint++;
}

/* *********************************************************************** */


+ 2
- 2
chalk/colorspaces/wetsticky/ws/canvas.h View File

@@ -22,11 +22,11 @@ Wet and Sticky is free software; you can redistribute it and/or modify it under
extern int number_of_repaints_needed();
/* Returns the number of cells needing to repainted. */

extern void need_to_tqrepaint (/* POINT */);
extern void need_to_repaint (/* POINT */);
/* Requests that the cell at the given point be repainted
at the next update as it has been modified. */

extern void next_cell_for_tqrepaint (/* *CELL_PTR, POINT_PTR */);
extern void next_cell_for_repaint (/* *CELL_PTR, POINT_PTR */);
/* Returns a pointer to a cell that needs to be updated as well
as the location of that cell on the canvas. If there are
no more cells to be redrawn then the pointer will be NIL. */


+ 1
- 1
chalk/colorspaces/wetsticky/ws/engine.c View File

@@ -192,7 +192,7 @@ int amount;

}

need_to_tqrepaint(destLocus);
need_to_repaint(destLocus);
}

/* *********************************************************************** */


+ 1
- 1
chalk/colorspaces/wetsticky/ws/engine3.c View File

@@ -191,7 +191,7 @@ int amount;

}

need_to_tqrepaint(destLocus);
need_to_repaint(destLocus);
}

/* *********************************************************************** */


+ 1
- 1
chalk/colorspaces/wetsticky/ws/ogl_interface.c View File

@@ -255,7 +255,7 @@ void evolve_paint()

for (k=0; k < STEP_LIMIT; k++) single_step();
while (TRUE) {
next_cell_for_tqrepaint(&cell, &p);
next_cell_for_repaint(&cell, &p);
if (cell == NIL) return;
paint_cell(cell, p.x, p.y);
glFlush();


+ 1
- 1
chalk/colorspaces/wetsticky/ws/x_interface.c View File

@@ -700,7 +700,7 @@ void evolve_paint()

for (k=0; k < STEP_LIMIT; k++) single_step();
while (TRUE) {
next_cell_for_tqrepaint(&cell, &p);
next_cell_for_repaint(&cell, &p);
if (cell == NIL) return;
paint_cell(cell, p.x, p.y);
}


+ 1
- 1
chalk/configure.in.in View File

@@ -48,7 +48,7 @@ else
fi


ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries -ltqt conftest.$ac_ext -llcms 1>&5'
ac_link='$LIBTOOL_SHELL --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries -ltqt conftest.$ac_ext -llcms 1>&5'

if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes)


+ 2
- 2
chalk/core/kis_brush.cc View File

@@ -816,7 +816,7 @@ TQImage KisBrush::scaleImage(const TQImage& srcImage, int width, int height)
// or scaling it to less than half size.
scaledImage = srcImage.smoothScale(width, height);

//filename = TQString("smoothScale_%1x%2.png").tqarg(width).tqarg(height);
//filename = TQString("smoothScale_%1x%2.png").arg(width).arg(height);
}
else {
scaledImage.create(width, height, 32);
@@ -936,7 +936,7 @@ TQImage KisBrush::scaleImage(const TQImage& srcImage, int width, int height)
}
}

//filename = TQString("bilinear_%1x%2.png").tqarg(width).tqarg(height);
//filename = TQString("bilinear_%1x%2.png").arg(width).arg(height);
}

//scaledImage.save(filename, "PNG");


+ 37
- 37
chalk/core/kis_exif_value.cc View File

@@ -157,7 +157,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_BYTE:
for(uint i = 0; i < components(); i++)
{
if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (TQ_UINT8)0);
} else {
@@ -171,7 +171,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_SHORT:
for(uint i = 0; i < components(); i++)
{
if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (TQ_UINT16)0);
} else {
@@ -182,7 +182,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_LONG:
for(uint i = 0; i < components(); i++)
{
if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (TQ_UINT32)0);
} else {
@@ -194,13 +194,13 @@ bool ExifValue::load(const TQDomElement& elmt)
for(uint i = 0; i < components(); i++)
{
KisExifRational r;
if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("numerator%1").arg(i) ) ).isNull() )
{
r.numerator = (TQ_UINT32)0;
} else {
r.numerator = (TQ_UINT32) attr.toUInt();
}
if( (attr = elmt.attribute(TQString("denominator%1").tqarg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() )
{
r.denominator = (TQ_UINT32)0;
} else {
@@ -212,7 +212,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_SBYTE:
for(uint i = 0; i < components(); i++)
{
if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (TQ_INT8)0);
} else {
@@ -233,7 +233,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_SSHORT:
for(uint i = 0; i < components(); i++)
{
if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (TQ_INT16)0);
} else {
@@ -244,7 +244,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_SLONG:
for(uint i = 0; i < components(); i++)
{
if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (TQ_INT32)0);
} else {
@@ -256,13 +256,13 @@ bool ExifValue::load(const TQDomElement& elmt)
for(uint i = 0; i < components(); i++)
{
KisExifSRational r;
if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("numerator%1").arg(i) ) ).isNull() )
{
r.numerator = (TQ_INT32)0;
} else {
r.numerator = (TQ_INT32) attr.toInt();
}
if( (attr = elmt.attribute(TQString("denominator%1").tqarg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() )
{
r.denominator = (TQ_UINT32)0;
} else {
@@ -274,7 +274,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_FLOAT:
for(uint i = 0; i < components(); i++)
{
if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (float)0);
} else {
@@ -285,7 +285,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_DOUBLE:
for(uint i = 0; i < components(); i++)
{
if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (double)0);
} else {
@@ -310,65 +310,65 @@ TQDomElement ExifValue::save(TQDomDocument& doc)
{
case EXIF_TYPE_BYTE:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").tqarg(i), asByte( i ) );
elmt.setAttribute(TQString("value%1").arg(i), asByte( i ) );
break;
case EXIF_TYPE_ASCII:
elmt.setAttribute("value", asAscii() );
break;
case EXIF_TYPE_SHORT:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").tqarg(i), asShort( i ) );
elmt.setAttribute(TQString("value%1").arg(i), asShort( i ) );
break;
case EXIF_TYPE_LONG:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").tqarg(i), asLong( i ) );
elmt.setAttribute(TQString("value%1").arg(i), asLong( i ) );
break;
case EXIF_TYPE_RATIONAL:
for(uint i = 0; i < components(); i++)
{
KisExifRational r = asRational(i);
elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator );
elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator );
elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator );
elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator );
}
break;
case EXIF_TYPE_SBYTE:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").tqarg(i), asSByte( i ) );
elmt.setAttribute(TQString("value%1").arg(i), asSByte( i ) );
break;
case EXIF_TYPE_UNDEFINED:
{
UByteArray value = asUndefined();
TQByteArray data;
data.setRawData((char*)value.data(), value.size());
TQByteArray tqencodedData;
KCodecs::base64Encode( data, tqencodedData );
TQByteArray encodedData;
KCodecs::base64Encode( data, encodedData );
data.resetRawData( (char*)value.data(), value.size());
elmt.setAttribute("value", TQString(tqencodedData));
elmt.setAttribute("value", TQString(encodedData));
}
break;
case EXIF_TYPE_SSHORT:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").tqarg(i), asSShort( i ) );
elmt.setAttribute(TQString("value%1").arg(i), asSShort( i ) );
break;
case EXIF_TYPE_SLONG:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").tqarg(i), asSLong( i ) );
elmt.setAttribute(TQString("value%1").arg(i), asSLong( i ) );
break;
case EXIF_TYPE_SRATIONAL:
for(uint i = 0; i < components(); i++)
{
KisExifSRational r = asSRational(i);
elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator );
elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator );
elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator );
elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator );
}
break;
case EXIF_TYPE_FLOAT:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").tqarg(i), asFloat( i ) );
elmt.setAttribute(TQString("value%1").arg(i), asFloat( i ) );
break;
case EXIF_TYPE_DOUBLE:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").tqarg(i), asDouble( i ) );
elmt.setAttribute(TQString("value%1").arg(i), asDouble( i ) );
break;
case EXIF_TYPE_UNKNOW:
break;
@@ -660,25 +660,25 @@ TQString ExifValue::toString(uint i)
switch(type())
{
case EXIF_TYPE_BYTE:
return TQString("%1 ").tqarg( asExifNumber( i ).m_byte );
return TQString("%1 ").arg( asExifNumber( i ).m_byte );
case EXIF_TYPE_SHORT:
return TQString("%1 ").tqarg( asExifNumber( i ).m_short );
return TQString("%1 ").arg( asExifNumber( i ).m_short );
case EXIF_TYPE_LONG:
return TQString("%1 ").tqarg( asExifNumber( i ).m_long );
return TQString("%1 ").arg( asExifNumber( i ).m_long );
case EXIF_TYPE_RATIONAL:
return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_rational.numerator ).tqarg( asExifNumber( i ).m_rational.denominator );
return TQString("%1 / %2 ").arg( asExifNumber( i ).m_rational.numerator ).arg( asExifNumber( i ).m_rational.denominator );
case EXIF_TYPE_SBYTE:
return TQString("%1 ").tqarg( asExifNumber( i ).m_sbyte );
return TQString("%1 ").arg( asExifNumber( i ).m_sbyte );
case EXIF_TYPE_SSHORT:
return TQString("%1 ").tqarg( asExifNumber( i ).m_sshort );
return TQString("%1 ").arg( asExifNumber( i ).m_sshort );
case EXIF_TYPE_SLONG:
return TQString("%1 ").tqarg( asExifNumber( i ).m_slong );
return TQString("%1 ").arg( asExifNumber( i ).m_slong );
case EXIF_TYPE_SRATIONAL:
return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_srational.numerator ).tqarg( asExifNumber( i ).m_srational.denominator );
return TQString("%1 / %2 ").arg( asExifNumber( i ).m_srational.numerator ).arg( asExifNumber( i ).m_srational.denominator );
case EXIF_TYPE_FLOAT:
return TQString("%1 ").tqarg( asExifNumber( i ).m_float );
return TQString("%1 ").arg( asExifNumber( i ).m_float );
case EXIF_TYPE_DOUBLE:
return TQString("%1 ").tqarg( asExifNumber( i ).m_double );
return TQString("%1 ").arg( asExifNumber( i ).m_double );
default:
return "unknow ";
}


+ 3
- 3
chalk/core/kis_fill_painter.cc View File

@@ -209,7 +209,7 @@ struct FillSegment {
// FillSegment* parent;
};

typedef enum { None = 0, Added = 1, Checked = 2 } tqStatus;
typedef enum { None = 0, Added = 1, Checked = 2 } Status;

KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) {
if (m_width < 0 || m_height < 0) {
@@ -260,9 +260,9 @@ KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) {

stack.push(new FillSegment(startX, startY/*, 0*/));

tqStatus* map = new tqStatus[m_size];
Status* map = new Status[m_size];

memset(map, None, m_size * sizeof(tqStatus));
memset(map, None, m_size * sizeof(Status));

int progressPercent = 0; int pixelsDone = 0; int currentPercent = 0;
emit notifyProgressStage(i18n("Making fill outline..."), 0);


+ 2
- 2
chalk/core/kis_filter_registry.cc View File

@@ -40,8 +40,8 @@ KisFilterRegistry::KisFilterRegistry()
Q_ASSERT(KisFilterRegistry::m_singleton == 0);
KisFilterRegistry::m_singleton = this;

KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Filter"),
TQString::tqfromLatin1("(Type == 'Service') and "
KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Filter"),
TQString::fromLatin1("(Type == 'Service') and "
"([X-Chalk-Version] == 2)"));

KTrader::OfferList::ConstIterator iter;


+ 13
- 13
chalk/core/kis_gradient_painter.cc View File

@@ -483,7 +483,7 @@ KisGradientPainter::KisGradientPainter(KisPaintDeviceSP device) : super(device),

bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
const KisPoint& gradientVectorEnd,
enumGradientShape tqshape,
enumGradientShape shape,
enumGradientRepeat repeat,
double antiAliasThreshold,
bool reverseGradient,
@@ -496,29 +496,29 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,

if (!m_gradient) return false;

GradientShapeStrategy *tqshapeStrategy = 0;
GradientShapeStrategy *shapeStrategy = 0;

switch (tqshape) {
switch (shape) {
case GradientShapeLinear:
tqshapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
shapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeBiLinear:
tqshapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
shapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeRadial:
tqshapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd);
shapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeSquare:
tqshapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd);
shapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeConical:
tqshapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd);
shapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeConicalSymetric:
tqshapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd);
shapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
}
Q_CHECK_PTR(tqshapeStrategy);
Q_CHECK_PTR(shapeStrategy);

GradientRepeatStrategy *repeatStrategy = 0;

@@ -566,7 +566,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
for (int y = starty; y <= endy; y++) {
for (int x = startx; x <= endx; x++) {

double t = tqshapeStrategy->valueAt( x, y);
double t = shapeStrategy->valueAt( x, y);
t = repeatStrategy->valueAt(t);

if (reverseGradient) {
@@ -662,7 +662,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
double sampleX = x - 0.5 + (sampleWidth / 2) + xSample * sampleWidth;
double sampleY = y - 0.5 + (sampleWidth / 2) + ySample * sampleWidth;

double t = tqshapeStrategy->valueAt(sampleX, sampleY);
double t = shapeStrategy->valueAt(sampleX, sampleY);
t = repeatStrategy->valueAt(t);

if (reverseGradient) {
@@ -715,7 +715,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
dev->writeBytes(layer.bits(), startx, starty, width, height);
bltSelection(startx, starty, m_compositeOp, dev, m_opacity, startx, starty, width, height);
}
delete tqshapeStrategy;
delete shapeStrategy;

emit notifyProgressDone();



+ 1
- 1
chalk/core/kis_gradient_painter.h View File

@@ -66,7 +66,7 @@ public:
*/
bool paintGradient(const KisPoint& gradientVectorStart,
const KisPoint& gradientVectorEnd,
enumGradientShape tqshape,
enumGradientShape shape,
enumGradientRepeat repeat,
double antiAliasThreshold,
bool reverseGradient,


+ 2
- 2
chalk/core/kis_group_layer.cc View File

@@ -207,7 +207,7 @@ bool KisGroupLayer::removeLayer(int x)
m_layers.erase(m_layers.begin() + reverseIndex(index));
setDirty(removedLayer->extent());
if (childCount() < 1) {
// No tqchildren, nothing to show for it.
// No children, nothing to show for it.
m_projection->clear();
setDirty();
}