summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeL10n.txt3
-rw-r--r--CMakeLists.txt23
m---------admin0
-rw-r--r--config.h.cmake4
-rw-r--r--doc/CMakeLists.txt29
-rw-r--r--doc/man/CMakeLists.txt18
-rw-r--r--doc/man/kcoloredit/CMakeLists.txt7
-rw-r--r--doc/man/kcoloredit/kcolorchooser.154
-rw-r--r--doc/man/kcoloredit/kcoloredit.167
-rw-r--r--doc/man/kdvi/CMakeLists.txt7
-rw-r--r--doc/man/kdvi/kdvi.199
-rw-r--r--doc/man/kfax/CMakeLists.txt7
-rw-r--r--doc/man/kfax/kfax.1102
-rw-r--r--doc/man/kfaxview/CMakeLists.txt7
-rw-r--r--doc/man/kfaxview/kfaxview.166
-rw-r--r--doc/man/kghostview/CMakeLists.txt7
-rw-r--r--doc/man/kghostview/kghostview.189
-rw-r--r--doc/man/kolourpaint/CMakeLists.txt7
-rw-r--r--doc/man/kolourpaint/kolourpaint.175
-rw-r--r--doc/man/kooka/CMakeLists.txt7
-rw-r--r--doc/man/kooka/kooka.189
-rw-r--r--doc/man/kpdf/CMakeLists.txt7
-rw-r--r--doc/man/kpdf/kpdf.1168
-rw-r--r--doc/man/kpovmodeler/CMakeLists.txt7
-rw-r--r--doc/man/kpovmodeler/kpovmodeler.182
-rw-r--r--doc/man/kruler/CMakeLists.txt7
-rw-r--r--doc/man/kruler/kruler.181
-rw-r--r--doc/man/ksnapshot/CMakeLists.txt7
-rw-r--r--doc/man/ksnapshot/ksnapshot.171
-rw-r--r--doc/man/kuickshow/CMakeLists.txt7
-rw-r--r--doc/man/kuickshow/kuickshow.199
-rw-r--r--doc/man/kview/CMakeLists.txt7
-rw-r--r--doc/man/kview/kview.178
-rw-r--r--doc/man/kviewshell/CMakeLists.txt7
-rw-r--r--doc/man/kviewshell/kviewshell.175
-rw-r--r--doc/man/tdeiconedit/CMakeLists.txt7
-rw-r--r--doc/man/tdeiconedit/tdeiconedit.189
-rw-r--r--kghostview/dscparse/dscparse_adapter.cpp16
-rw-r--r--kghostview/dscparse/dscparse_adapter.h54
-rw-r--r--kghostview/kgvdocument.cpp2
-rw-r--r--kpovmodeler/CMakeLists.txt4
-rw-r--r--kpovmodeler/ConfigureChecks.cmake9
-rw-r--r--kpovmodeler/pmrendermode.cpp8
-rw-r--r--kpovmodeler/pmrendermode.h4
-rw-r--r--kpovmodeler/pmrendermodesdialog.cpp19
-rw-r--r--kpovmodeler/pmrendermodesdialog.h1
-rw-r--r--ksvg/core/KSVGCanvas.h4
-rw-r--r--ksvg/impl/libs/libtext2path/src/CMakeLists.txt2
-rw-r--r--ksvg/impl/libs/libtext2path/src/Cache.h5
-rw-r--r--ksvg/impl/libs/libtext2path/src/Converter.cpp1
-rw-r--r--ksvg/impl/libs/libtext2path/src/Converter.h4
-rw-r--r--ksvg/impl/libs/libtext2path/src/myboost/assert.h24
-rw-r--r--ksvg/impl/libs/libtext2path/src/myboost/checked_delete.h61
-rw-r--r--ksvg/impl/libs/libtext2path/src/myboost/lightweight_mutex.h74
-rw-r--r--ksvg/impl/libs/libtext2path/src/myboost/shared_count.h367
-rw-r--r--ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.h395
-rw-r--r--ksvg/impl/libs/libtext2path/src/myboost/throw_exception.h30
-rw-r--r--ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.c1
-rw-r--r--kview/kviewviewer/printimagesettings.ui4
-rw-r--r--kview/modules/presenter/imagelistdialog.ui19
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt7
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake6
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp18
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp6
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/poppler-private.h4
-rw-r--r--tdefile-plugins/ps/gscreator.cpp2
-rw-r--r--translations/desktop_files/kcoloredit-desktops/pt.po19
-rw-r--r--translations/desktop_files/kdvi-desktops/pt.po17
-rw-r--r--translations/desktop_files/kfaxview-desktops/pt.po20
-rw-r--r--translations/desktop_files/kghostview-desktops/pt.po15
-rw-r--r--translations/desktop_files/kolourpaint.desktop/pt.po15
-rw-r--r--translations/desktop_files/kpdf-desktops/pt.po15
-rw-r--r--translations/desktop_files/ksnapshot.desktop/pt.po15
-rw-r--r--translations/desktop_files/kuickshow.desktop/pt.po15
-rw-r--r--translations/desktop_files/kviewshell-desktops/pt.po17
-rw-r--r--translations/desktop_files/tdeiconedit.desktop/pt.po16
76 files changed, 1708 insertions, 1173 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index 7fbe8207..aa98c1fe 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -9,12 +9,11 @@
#
#################################################
-cmake_minimum_required( VERSION 2.8 )
+cmake_minimum_required( VERSION 3.1 )
##### include our cmake modules #################
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEL10n )
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7123455a..6156ee3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,13 +9,12 @@
#
#################################################
-cmake_minimum_required( VERSION 2.8.12 )
+cmake_minimum_required( VERSION 3.1 )
##### general package setup #####################
project( tdegraphics )
-set( VERSION R14.0.11 )
##### include essential cmake modules ###########
@@ -31,10 +30,14 @@ include( CheckSymbolExists )
##### include our cmake modules #################
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )
+##### set version number ########################
+
+tde_set_project_version( )
+
+
##### setup install paths #######################
include( TDESetupPaths )
@@ -43,11 +46,13 @@ tde_setup_paths( )
##### optional stuff ############################
+OPTION( WITH_ALL_OPTIONS "Enable all optional support" OFF )
+
option( WITH_T1LIB "Enable t1lib support" OFF )
-option( WITH_PAPER "Enable libpaper support" OFF )
-OPTION( WITH_TIFF "Enable tiff support (tdefile-plugins)" OFF )
-OPTION( WITH_OPENEXR "Enable openexr support (tdefile-plugins)" OFF )
-OPTION( WITH_PDF "Enable pdf support (tdefile-plugins)" OFF )
+option( WITH_PAPER "Enable libpaper support" ${WITH_ALL_OPTIONS} )
+OPTION( WITH_TIFF "Enable tiff support (tdefile-plugins)" ${WITH_ALL_OPTIONS} )
+OPTION( WITH_OPENEXR "Enable openexr support (tdefile-plugins)" ${WITH_ALL_OPTIONS} )
+OPTION( WITH_PDF "Enable pdf support (tdefile-plugins)" ${WITH_ALL_OPTIONS} )
##### options comments ##########################
@@ -131,10 +136,8 @@ tde_conditional_add_subdirectory( BUILD_KCOLOREDIT kcoloredit )
tde_conditional_add_subdirectory( BUILD_KDVI kdvi )
tde_conditional_add_subdirectory( BUILD_KFAX kfax )
tde_conditional_add_subdirectory( BUILD_KFAXVIEW kfaxview )
-tde_conditional_add_subdirectory( BUILD_TDEFILE_PLUGINS tdefile-plugins )
tde_conditional_add_subdirectory( BUILD_KGAMMA kgamma )
tde_conditional_add_subdirectory( BUILD_KGHOSTVIEW kghostview )
-tde_conditional_add_subdirectory( BUILD_TDEICONEDIT tdeiconedit )
tde_conditional_add_subdirectory( BUILD_KMRML kmrml )
tde_conditional_add_subdirectory( BUILD_KOLOURPAINT kolourpaint )
tde_conditional_add_subdirectory( BUILD_KOOKA kooka )
@@ -146,6 +149,8 @@ tde_conditional_add_subdirectory( BUILD_KSVG ksvg )
tde_conditional_add_subdirectory( BUILD_KUICKSHOW kuickshow )
tde_conditional_add_subdirectory( BUILD_KVIEW kview )
tde_conditional_add_subdirectory( BUILD_LIBKSCAN libkscan )
+tde_conditional_add_subdirectory( BUILD_TDEFILE_PLUGINS tdefile-plugins )
+tde_conditional_add_subdirectory( BUILD_TDEICONEDIT tdeiconedit )
##### write configure files #####################
diff --git a/admin b/admin
-Subproject 709ea75c2c6bc299ad0469b9f5e0fb27dd300f8
+Subproject a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3
diff --git a/config.h.cmake b/config.h.cmake
index 5b88585c..fea46aaf 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,6 +1,10 @@
#cmakedefine VERSION "@VERSION@"
// poppler-tqt
+#cmakedefine HAVE_POPPLER_2203
+#cmakedefine HAVE_POPPLER_2112
+#cmakedefine HAVE_POPPLER_2111
+#cmakedefine HAVE_POPPLER_2108
#cmakedefine HAVE_POPPLER_086
#cmakedefine HAVE_POPPLER_083
#cmakedefine HAVE_POPPLER_082
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index df842e47..753dd0b7 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,12 +1,19 @@
-#################################################
-#
-# (C) 2010-2011 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
+add_subdirectory( man )
-tde_auto_add_subdirectories( )
+tde_conditional_add_subdirectory( BUILD_KAMERA kamera )
+tde_conditional_add_subdirectory( BUILD_KCOLOREDIT kcoloredit )
+tde_conditional_add_subdirectory( BUILD_KDVI kdvi )
+tde_conditional_add_subdirectory( BUILD_KFAX kfax )
+tde_conditional_add_subdirectory( BUILD_KFAXVIEW kfaxview )
+tde_conditional_add_subdirectory( BUILD_KGAMMA kgamma )
+tde_conditional_add_subdirectory( BUILD_KGHOSTVIEW kghostview )
+tde_conditional_add_subdirectory( BUILD_KOLOURPAINT kolourpaint )
+tde_conditional_add_subdirectory( BUILD_KOOKA kooka )
+tde_conditional_add_subdirectory( BUILD_KPDF kpdf )
+tde_conditional_add_subdirectory( BUILD_KPOVMODELER kpovmodeler )
+tde_conditional_add_subdirectory( BUILD_KRULER kruler )
+tde_conditional_add_subdirectory( BUILD_KSNAPSHOT ksnapshot )
+tde_conditional_add_subdirectory( BUILD_KUICKSHOW kuickshow )
+tde_conditional_add_subdirectory( BUILD_KVIEW kview )
+tde_conditional_add_subdirectory( BUILD_TDEICONEDIT tdeiconedit )
+tde_conditional_add_subdirectory( BUILD_KAMERA tdeioslave )
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
new file mode 100644
index 00000000..5a2be20d
--- /dev/null
+++ b/doc/man/CMakeLists.txt
@@ -0,0 +1,18 @@
+if( BUILD_KVIEWSHELL OR BUILD_KDVI OR BUILD_KFAX )
+ add_subdirectory( kviewshell )
+endif( )
+
+tde_conditional_add_subdirectory( BUILD_KCOLOREDIT kcoloredit )
+tde_conditional_add_subdirectory( BUILD_KDVI kdvi )
+tde_conditional_add_subdirectory( BUILD_KFAX kfax )
+tde_conditional_add_subdirectory( BUILD_KFAXVIEW kfaxview )
+tde_conditional_add_subdirectory( BUILD_KGHOSTVIEW kghostview )
+tde_conditional_add_subdirectory( BUILD_KOLOURPAINT kolourpaint )
+tde_conditional_add_subdirectory( BUILD_KOOKA kooka )
+tde_conditional_add_subdirectory( BUILD_KPDF kpdf )
+tde_conditional_add_subdirectory( BUILD_KPOVMODELER kpovmodeler )
+tde_conditional_add_subdirectory( BUILD_KRULER kruler )
+tde_conditional_add_subdirectory( BUILD_KSNAPSHOT ksnapshot )
+tde_conditional_add_subdirectory( BUILD_KUICKSHOW kuickshow )
+tde_conditional_add_subdirectory( BUILD_KVIEW kview )
+tde_conditional_add_subdirectory( BUILD_TDEICONEDIT tdeiconedit )
diff --git a/doc/man/kcoloredit/CMakeLists.txt b/doc/man/kcoloredit/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/kcoloredit/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kcoloredit/kcolorchooser.1 b/doc/man/kcoloredit/kcolorchooser.1
new file mode 100644
index 00000000..d0fd9cfb
--- /dev/null
+++ b/doc/man/kcoloredit/kcolorchooser.1
@@ -0,0 +1,54 @@
+.TH KCOLORCHOOSER "1" "September 2002" TDE "TDE Application"
+.SH NAME
+kcolorchooser \- TDE Color Chooser
+.SH SYNOPSIS
+.B kcolorchooser
+[\fIQt-options\fR] [\fITDE-options\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kcolorchooser
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+TDE Color Chooser
+.P
+This program is part of the official TDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH AUTHOR
+KColorChooser was written by
+.nh
+Waldo Bastian <bastian@kde.org>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kcoloredit/kcoloredit.1 b/doc/man/kcoloredit/kcoloredit.1
new file mode 100644
index 00000000..3318864e
--- /dev/null
+++ b/doc/man/kcoloredit/kcoloredit.1
@@ -0,0 +1,67 @@
+.TH KCOLOREDIT "1" "September 2002" TDE "TDE Application"
+.SH NAME
+kcoloredit \- TDE Color Palette Editor
+.SH SYNOPSIS
+.B kcoloredit
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIFile\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kcoloredit
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B KColorEdit
+is a palette files editor. It can be used for editing color palettes and for color choosing and naming.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+File
+file to open
+.SH "SEE ALSO"
+The full documentation for
+.B kcoloredit
+is maintained as a docbook manual. If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kcoloredit
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KColorEdit was written by
+.nh
+Artur Rataj <art@zeus.polsl.gliwice.pl>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kdvi/CMakeLists.txt b/doc/man/kdvi/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/kdvi/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kdvi/kdvi.1 b/doc/man/kdvi/kdvi.1
new file mode 100644
index 00000000..f1df971a
--- /dev/null
+++ b/doc/man/kdvi/kdvi.1
@@ -0,0 +1,99 @@
+.TH KDVI "1" "September 2002" TDE "TDE Application"
+.SH NAME
+kdvi \- TDE DVI Viewer
+.SH SYNOPSIS
+.B kviewshell
+[\fIQt-options\fR] [\fITDE-options\fR] \fIpart file(s)\fR
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kdvi
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B KDVI
+is a plugin for the KViewshell program which allows KViewshell to
+display DVI-files (.dvi) which are produced by the TeX typesetting
+system. KDVI supports many extensions of the DVI standard, for
+instance the inclusion of PostScript graphics or hyperlinks. More
+details, examples and all the technical specifications can be found in
+the file KDVI-features.dvi (or see KDVI-features.tex for the TeX
+source of that file).
+.P
+For up-to-date information, consult KDVI's home page.
+.P
+TeX is a high-end typesetting system geared towards scientific, and in
+particular mathematical typesetting. More information about TeX and
+DVI can be found on the homepage of the TeX user group or the German
+German DANTE e.V..
+.P
+This program is part of the official TDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+part
+The part to use
+.SH OPTIONS
+.TP
+\fB\-\-unique\fR
+Check if the file is loaded in another kviewshell. If it is, bring up the other kviewshell. Otherwise, load the file.
+.TP
+\fB\-\-paper\fR
+Sets paper size (not implemented at the moment, only for compatibility with lyx)
+.TP
+file(s)
+Files to load
+.SH "SEE ALSO"
+The full documentation for
+.B kdvi
+is maintained as a docbook manual. If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kdvi
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KViewShell was written by
+.nh
+Matthias Hoelzer-Kluepfel <mhk@caldera.de>,
+David Sweet <dsweet@kde.org>,
+Mark Donohoe,
+Markku Hihnala,
+David Faure,
+Daniel Duley,
+Espen Sand and
+Stefan Kebekus <kebekus@kde.org>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kfax/CMakeLists.txt b/doc/man/kfax/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/kfax/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kfax/kfax.1 b/doc/man/kfax/kfax.1
new file mode 100644
index 00000000..ac7583cc
--- /dev/null
+++ b/doc/man/kfax/kfax.1
@@ -0,0 +1,102 @@
+.TH KFAX "1" "September 2002" TDE "TDE Application"
+.SH NAME
+kfax \- TDE Fax Viewer
+.SH SYNOPSIS
+.B kfax
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile(s)\fR
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kfax
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+A program to display raw and tiffed fax images (g3, g3-2d, g4).
+.P
+This program is part of the official TDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH OPTIONS
+.TP
+\fB\-f\fR, \fB\-\-fine\fR
+Fine resolution
+.TP
+\fB\-n\fR, \fB\-\-normal\fR
+Normal resolution
+.TP
+\fB\-\-height\fR
+Height (number of fax lines)
+.TP
+\fB\-w\fR, \fB\-\-width\fR
+Width (dots per fax line)
+.TP
+\fB\-l\fR, \fB\-\-landscape\fR
+Turn image 90 degrees (landscape mode)
+.TP
+\fB\-u\fR, \fB\-\-upsidedown\fR
+Turn image upside down
+.TP
+\fB\-i\fR, \fB\-\-invert\fR
+Invert black and white.
+.TP
+\fB\-m\fR, \fB\-\-mem\fR <bytes>
+Limit memory use to 'bytes'. [8M]
+.TP
+\fB\-r\fR, \fB\-\-reverse\fR
+Fax data is packed lsb first
+.TP
+\fB\-2\fR
+Raw files are g3-2d
+.TP
+\fB\-4\fR
+Raw files are g4
+.SS "Arguments:"
+.TP
+file(s)
+Fax file(s) to show
+.SH "SEE ALSO"
+The full documentation for
+.B kfax
+is maintained as a docbook manual. If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kfax
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KFax was written by
+.nh
+Bernd Johannes Wuebben <wuebben@kde.org>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kfaxview/CMakeLists.txt b/doc/man/kfaxview/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/kfaxview/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kfaxview/kfaxview.1 b/doc/man/kfaxview/kfaxview.1
new file mode 100644
index 00000000..592c64c0
--- /dev/null
+++ b/doc/man/kfaxview/kfaxview.1
@@ -0,0 +1,66 @@
+.TH KFAXVIEWER "1" "October 2007" TDE "TDE Application"
+.SH NAME
+kfaxviewer \- TDE fax viewer using kviewshell
+.SH SYNOPSIS
+.B kfaxview
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile(s)\fR
+.SH DESCRIPTION
+This manual page briefly documents the
+.B kfaxview
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program doesn't have a manual page.
+.PP
+A fax viewer for TDE using kviewshell.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH OPTIONS
+.TP
+\fB\-\-unique\fR
+Check if the file is loaded in another KFaxView instance.
+If it is, bring up the other KFaxView. Otherwise, load the file.
+.TP
+\fB\-g\fR, \fB\-\-goto\fR <pagenumber>
+Navigate to this page
+.TP
+.SS "Arguments:"
+.TP
+file(s)
+Files to load
+.SH AUTHOR
+KFaxview was written by
+.nh
+Stefan Kebekus <kebekus@kde.org>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Francesco Pedrini<francesco.pedrini@gmail.com>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
+
diff --git a/doc/man/kghostview/CMakeLists.txt b/doc/man/kghostview/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/kghostview/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kghostview/kghostview.1 b/doc/man/kghostview/kghostview.1
new file mode 100644
index 00000000..be63ba0f
--- /dev/null
+++ b/doc/man/kghostview/kghostview.1
@@ -0,0 +1,89 @@
+.TH KGHOSTVIEW "1" "September 2002" TDE "TDE Application"
+.SH NAME
+kghostview \- TDE PS/PDF Viewer
+.SH SYNOPSIS
+.B kghostview
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B KGhostView
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B KGhostView
+displays and prints PostScript (.ps, .eps) and Portable
+Document Format (.pdf) files. It a port to TDE of Tim Theisen's
+Ghostview program which uses Alladin Ghostscript to view documents
+prepared in Adobe's PostScript page description
+language. PostScript is the major page description language for
+printing on UNIX(rg systems and this application can be used to preview
+material intended for printing or for reading documents online.
+.P
+You can use KGhostView with all recent versions of Ghostscript. Newer
+versions offer much improved performance which you can take advantage
+of with KGhostView.
+.P
+If a document does not conform to the Adobe document structuring
+convention the functionality of the viewer is limited. For example, if
+there is no table of contents, skipping around the document and
+marking pages is not possible.
+.P
+This program is part of the official TDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+URL
+Location to open
+.SH "SEE ALSO"
+The full documentation for
+.B KGhostView
+is maintained as a docbook manual. If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kghostview
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KGhostView was written by
+.nh
+Wilco Greven <greven@kde.org>,
+David Sweet <dsweet@kde.org>,
+Mark Donohoe <donohoe@kde.org>,
+David Faure <faure@kde.org>,
+Daniel Duley <mosfet@kde.org> and
+Espen Sand <espen@kde.org>
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kolourpaint/CMakeLists.txt b/doc/man/kolourpaint/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/kolourpaint/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kolourpaint/kolourpaint.1 b/doc/man/kolourpaint/kolourpaint.1
new file mode 100644
index 00000000..42a126a8
--- /dev/null
+++ b/doc/man/kolourpaint/kolourpaint.1
@@ -0,0 +1,75 @@
+.TH KPAINT "1" "September 2002" TDE "TDE Application"
+.SH NAME
+kolourpaint \- TDE Paint Program
+.SH SYNOPSIS
+.B kolourpaint
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B KPaint
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B KPaint
+is a simple bitmap drawing program that can also be used to modify
+existing image files and convert between image file formats.
+.P
+This program is part of the official TDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+file
+File or URL to open
+.SH "SEE ALSO"
+The full documentation for
+.B KPaint
+is maintained as a docbook manual. If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kolourpaint
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KPaint was written by
+.nh
+Richard J. Moore <rich@kde.org>,
+Robert Williams <rwilliams@jrcmaui.com>,
+Mario Weilguni <mweilguni@kde.org>,
+Christian Oppel <uzs84g@uni-bonn.de>,
+John Califf <jcaliff@compuzone.net> and
+Laurent Montel <lmontel@mandrakesoft.com>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kooka/CMakeLists.txt b/doc/man/kooka/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/kooka/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kooka/kooka.1 b/doc/man/kooka/kooka.1
new file mode 100644
index 00000000..a8f34e41
--- /dev/null
+++ b/doc/man/kooka/kooka.1
@@ -0,0 +1,89 @@
+.TH KOOKA "1" "September 2002" TDE "TDE Application"
+.SH NAME
+kooka \- TDE Scan & OCR Program
+.SH SYNOPSIS
+.B kooka
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B Kooka
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B Kooka
+is a TDE application which provides access to scanner
+hardware using the SANE library.
+.P
+Kooka helps you scan, save your
+image in the correct image format and perform \fBO\fRptical
+\fBC\fRharacter \fBR\fRecognition on it,using \fIgocr\fR, Joerg
+Schulenburg's and friends' Open Source ocr program.
+.P
+Kooka is a TDE application that enables easy scanning using SANE
+libraries. Therefore, SANE the package must be installed to use
+Kooka. Clear and concise use was the focus of its development.
+.P
+Character recognition is also provided by the built-in text
+recognition program gocr. Install gocr to use this
+functionality. After character recognition is complete, the recognized
+material can be opened in the text editor Kate with just one click,
+where you can edit the contents.
+.P
+This program is part of the official TDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH OPTIONS
+.TP
+\fB\-d\fR
+the SANE compatible device specification (e.g. umax:/dev/sg0) []
+.TP
+\fB\-g\fR
+gallery mode - do not connect to scanner []
+.SH "SEE ALSO"
+The full documentation for
+.B Kooka
+is maintained as a docbook manual. If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kooka
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+Kooka was written by
+.nh
+Klaas Freitag <freitag@suse.de> and
+Mat Colton <mat@colton.de>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kpdf/CMakeLists.txt b/doc/man/kpdf/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/kpdf/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kpdf/kpdf.1 b/doc/man/kpdf/kpdf.1
new file mode 100644
index 00000000..fc0c5953
--- /dev/null
+++ b/doc/man/kpdf/kpdf.1
@@ -0,0 +1,168 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KPDF 1 "June 2006" "Trinity Desktop Environment" "pdf viewer"
+.SH NAME
+kpdf
+\- a TDE pdf viewer based on xpdf
+.SH SYNOPSIS
+\fBkpdf\fP [Qt\-options] [TDE\-options] [URL]
+.SH DESCRIPTION
+\fBkpdf\fP is a TDE PDF viewer based on \fBxpdf\fP code. Although being based on \fBxpdf\fP code, \fBkpdf\fP has some unique features like continuous mode and presentation support.
+.sp 1
+The PDF format is widely used for publishing documents that are mostly not meant to be edited again. \fBkpdf\fP is only a viewer for these files and therefore it doesn't provide any functionality to edit or create PDF documents.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B URL
+Document to open
+.SS Generic options:
+.TP
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-tde
+Show TDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v, \-\-version
+Show version information
+.TP
+.B \-\-license
+Show license information
+.TP
+.B \-\-
+End of options
+.SS
+.SS Qt options:
+.TP
+.B \-\-display <displayname>
+Use the X-server display 'displayname'
+.TP
+.B \-\-session <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B \-\-cmap
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B \-\-ncols <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B \-\-nograb
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B \-\-dograb
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B \-\-sync
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn, \-\-font <fontname>
+defines the application font
+.TP
+.B \-\-bg, \-\-background <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg, \-\-foreground <color>
+sets the default foreground color
+.TP
+.B \-\-btn, \-\-button <color>
+sets the default button color
+.TP
+.B \-\-name <name>
+sets the application name
+.TP
+.B \-\-title <title>
+sets the application title (caption)
+.TP
+.B \-\-visual TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B \-\-inputstyle <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B \-\-im <XIM server>
+set XIM server
+.TP
+.B \-\-noxim
+disable XIM
+.TP
+.B \-\-reverse
+mirrors the whole layout of widgets
+.SS
+.SS TDE options:
+.TP
+.B \-\-caption <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B \-\-icon <icon>
+Use 'icon' as the application icon
+.TP
+.B \-\-miniicon <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B \-\-config <filename>
+Use alternative configuration file
+.TP
+.B \-\-dcopserver <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager
+.TP
+.B \-\-style <style>
+sets the application GUI style
+.TP
+.B \-\-geometry <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS
+
+.SH SEE ALSO
+\fBxpdf\fP(1)
+.sp 1
+Full user documentation is available through the TDE Help Center. You can also enter the URL
+.BR help:/kpdf/
+directly into konqueror or you can run
+.BR "khelpcenter help:/kpdf/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Wilco Greven <greven@kde.org>
+.br
+Christophe Devriese <oelewapperke@oelewapperke.org>
+.br
+Laurent Montel <montel@kde.org>
+.br
+Albert Astals Cid <astals11@terra.es>
+.br
+Enrico Ros <eros.kde@email.it>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
+.PP
+This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/kpovmodeler/CMakeLists.txt b/doc/man/kpovmodeler/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/kpovmodeler/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kpovmodeler/kpovmodeler.1 b/doc/man/kpovmodeler/kpovmodeler.1
new file mode 100644
index 00000000..3d536d26
--- /dev/null
+++ b/doc/man/kpovmodeler/kpovmodeler.1
@@ -0,0 +1,82 @@
+.TH KPOVMODELER "1" "September 2002" TDE "TDE Application"
+.SH NAME
+kpovmodeler \- TDE Povray Modeler
+.SH SYNOPSIS
+.B kpovmodeler
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B Povray Modeler
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B KPovModeler
+is a 3D modeling application to generate POV-Ray scenes.
+.P
+While it is not necessary to fully understand the POV-Ray application
+in order to make good use of KPovModeler, it is highly recommended
+that you read and try to understand the POV-Ray documentation.
+.P
+To find out more about POV-Ray go to www.povray.org.
+.P
+This program is part of the official TDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+file
+File to open
+.SH OPTIONS
+.TP
+\fB\-\-no\-opengl\fR
+Disables OpenGL rendering
+.SH "SEE ALSO"
+The full documentation for
+.B Povray Modeler
+is maintained as a docbook manual. If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kpovmodeler
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KPovModeler was written by
+.nh
+Andreas Zehender <zehender@kde.org>,
+Luis Passos Carvalho <lpassos@mail.telepac.pt>,
+Philippe Van Hecke <lephiloux@tiscalinet.be> and
+.hy
+Leonardo Skorianez <skorianez@bol.com.br>.
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kruler/CMakeLists.txt b/doc/man/kruler/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/kruler/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kruler/kruler.1 b/doc/man/kruler/kruler.1
new file mode 100644
index 00000000..9e32021c
--- /dev/null
+++ b/doc/man/kruler/kruler.1
@@ -0,0 +1,81 @@
+.TH KRULER "1" "September 2002" TDE "TDE Application"
+.SH NAME
+kruler \- TDE Screen Ruler
+.SH SYNOPSIS
+.B kruler
+[\fIQt-options\fR] [\fITDE-options\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B KRuler
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B KRuler
+is a very simple application, with only one aim in life. To
+measure distances on your screen.
+.P
+To start KRuler, choose Graphics->TDE Screen Ruler from your T menu.
+.P
+left mouse button clicking on the KRuler will turn the cursor into a
+hand icon, and enable you to drag KRuler around the screen.
+.P
+When you move the mouse over KRuler, your cursor will turn into an
+elongated arrow, with a circle at one end. As you move the cursor,
+KRuler will display how far from the point marked 0 the circle on the
+end of the cursor currently is. KRuler will also display the HTML
+color code of the color currently under the circle. This is very
+useful for picking out colors from an image. If you move the mouse far
+enough that the arrow cursor is no longer touching KRuler, the cursor
+will revert to normal, allowing you to carry on working with your
+other applications.
+.P
+This program is part of the official TDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH "SEE ALSO"
+The full documentation for
+.B KRuler
+is maintained as a docbook manual. If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kruler
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+TDE Screen Ruler was written by
+.nh
+Till Krech <till@snafu.de>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/ksnapshot/CMakeLists.txt b/doc/man/ksnapshot/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/ksnapshot/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/ksnapshot/ksnapshot.1 b/doc/man/ksnapshot/ksnapshot.1
new file mode 100644
index 00000000..250ca0ef
--- /dev/null
+++ b/doc/man/ksnapshot/ksnapshot.1
@@ -0,0 +1,71 @@
+.TH KSNAPSHOT "1" "September 2002" TDE "TDE Application"
+.SH NAME
+ksnapshot \- TDE Screen Capture Program
+.SH SYNOPSIS
+.B ksnapshot
+[\fIQt-options\fR] [\fITDE-options\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B KSnapshot
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B KSnapshot
+is a simple applet for taking screenshots. It is capable of
+capturing images of either the whole desktop or just a single
+window. The images can then be saved in a variety of formats.
+.PP
+TDE Screenshot utility
+.P
+This program is part of the official TDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH "SEE ALSO"
+The full documentation for
+.B KSnapshot
+is maintained as a docbook manual. If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/ksnapshot
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KSnapshot was written by
+.nh
+Richard J. Moore <rich@kde.org>,
+Matthias Ettrich <ettrich@kde.org> and
+Aaron J. Seigo <aseigo@olympusproject.org>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kuickshow/CMakeLists.txt b/doc/man/kuickshow/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/kuickshow/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kuickshow/kuickshow.1 b/doc/man/kuickshow/kuickshow.1
new file mode 100644
index 00000000..bf5caf30
--- /dev/null
+++ b/doc/man/kuickshow/kuickshow.1
@@ -0,0 +1,99 @@
+.TH KUICKSHOW "1" "September 2002" TDE "TDE Application"
+.SH NAME
+kuickshow \- TDE Image Viewer
+.SH SYNOPSIS
+.B kuickshow
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIfiles\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B Kuickshow
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B KuickShow
+is a comfortable image browser/viewer. It displays a
+filebrowser where you can select images which are then shown.
+.P
+The following image formats are supported:
+.P
+.RS
+\(bu jpg
+.br
+\(bu gif
+.br
+\(bu tiff
+.br
+\(bu png
+.br
+\(bu bmp
+.br
+\(bu psd
+.br
+\(bu xmp
+.br
+\(bu xbm
+.br
+\(bu eim
+.RE
+.P
+Images can be displayed either in their own window, as large as the
+image, or fullscreen.
+.P
+This program is part of the official TDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH OPTIONS
+.TP
+\fB\-\-lastdir\fR
+Start in the last visited directory, not the current working directory
+.SS "Arguments:"
+.TP
+files
+Optional image filenames/urls to show
+.SH "SEE ALSO"
+The full documentation for
+.B Kuickshow
+is maintained as a docbook manual. If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kuickshow
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KuickShow was written by
+.nh
+Carsten Pfeiffer <pfeiffer@kde.org>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kview/CMakeLists.txt b/doc/man/kview/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/kview/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kview/kview.1 b/doc/man/kview/kview.1
new file mode 100644
index 00000000..64a2b692
--- /dev/null
+++ b/doc/man/kview/kview.1
@@ -0,0 +1,78 @@
+.TH KVIEW "1" "September 2002" TDE "TDE Application"
+.SH NAME
+kview \- TDE Image Viewer
+.SH SYNOPSIS
+.B kview
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B KView
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B KView
+is an image viewer for the Trinity desktop. You can view graphics of
+many different formats such as PostScript, TIFF etc. By saving your
+files in a different format than the original you can easily convert
+images to other graphics formats. In addition, KView provides some
+nice little features for doing simple image processing, like
+stretching/shrinking, rotation and filtering. You can tile your images
+directly onto the desktop as a background picture, or arrange them in
+a little slideshow.
+.P
+This program is part of the official TDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+URL
+Image to open
+.SH "SEE ALSO"
+The full documentation for
+.B KView
+is maintained as a docbook manual. If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kview
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KView was written by
+.nh
+Matthias Kretz <kretz@kde.org>,
+Sirtaj Singh Kang <taj@kde.org>
+and Simon Hausmann <hausmann@kde.org>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/kviewshell/CMakeLists.txt b/doc/man/kviewshell/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/kviewshell/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kviewshell/kviewshell.1 b/doc/man/kviewshell/kviewshell.1
new file mode 100644
index 00000000..83d0e24d
--- /dev/null
+++ b/doc/man/kviewshell/kviewshell.1
@@ -0,0 +1,75 @@
+.TH KVIEWSHELL "1" "September 2002" TDE "TDE Application"
+.SH NAME
+kviewshell \- Generic framework for viewer applications
+.SH SYNOPSIS
+.B kviewshell
+[\fIQt-options\fR] [\fITDE-options\fR] \fIpart file(s)\fR
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kviewshell
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+Generic framework for viewer applications.
+.P
+This program is part of the official TDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+part
+The part to use
+.SH OPTIONS
+.TP
+\fB\-\-unique\fR
+Check if the file is loaded in another kviewshell. If it is, bring up the other kviewshell. Otherwise, load the file.
+.TP
+\fB\-\-paper\fR
+Sets paper size (not implemented at the moment, only for compatibility with lyx)
+.TP
+file(s)
+Files to load
+.SH AUTHOR
+KViewShell was written by
+.nh
+Matthias Hoelzer-Kluepfel <mhk@caldera.de>,
+David Sweet <dsweet@kde.org>,
+Mark Donohoe,
+Markku Hihnala,
+David Faure,
+Daniel Duley,
+Espen Sand,
+and Stefan Kebekus <kebekus@kde.org>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/tdeiconedit/CMakeLists.txt b/doc/man/tdeiconedit/CMakeLists.txt
new file mode 100644
index 00000000..24ccd704
--- /dev/null
+++ b/doc/man/tdeiconedit/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+INSTALL(
+ FILES ${_man_files}
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/tdeiconedit/tdeiconedit.1 b/doc/man/tdeiconedit/tdeiconedit.1
new file mode 100644
index 00000000..70bcb510
--- /dev/null
+++ b/doc/man/tdeiconedit/tdeiconedit.1
@@ -0,0 +1,89 @@
+.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
+.SH NAME
+tdeiconedit \- TDE Icon Editor
+.SH SYNOPSIS
+.B tdeiconedit
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile(s)\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B TDEIconEdit
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B TDEIconEdit
+is designed to help create icons for TDE using the standard
+icon palette.
+.PP
+TDE Icon Editor
+.SH AUTHOR
+TDEIconEdit was written by
+.nh
+Thomas Tanghus <tanghus@kde.org>,
+John Califf <jcaliff@compuzone.net>,
+Laurent Montel <lmontel@mandrakesoft.com> and
+Aaron J. Seigo <aseigo@olympusproject.org>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+file(s)
+Icon file(s) to open
+.SH "SEE ALSO"
+The full documentation for
+.B TDEIconEdit
+is maintained as a docbook manual. If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/tdeiconedit
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+TDEIconEdit was written by
+.nh
+Thomas Tanghus <tanghus@kde.org>,
+John Califf <jcaliff@compuzone.net>,
+Laurent Montel <lmontel@mandrakesoft.com>
+and Aaron J. Seigo <aseigo@olympusproject.org>.
+.hy
+.br
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/kghostview/dscparse/dscparse_adapter.cpp b/kghostview/dscparse/dscparse_adapter.cpp
index 11596c63..5aae47b8 100644
--- a/kghostview/dscparse/dscparse_adapter.cpp
+++ b/kghostview/dscparse/dscparse_adapter.cpp
@@ -282,20 +282,20 @@ const CDSCMEDIA* KDSC::page_media() const
return _cdsc->page_media;
}
-auto_ptr<KDSCBBOX> KDSC::bbox() const
+unique_ptr<KDSCBBOX> KDSC::bbox() const
{
- if( _cdsc->bbox == 0 )
- return auto_ptr<KDSCBBOX>( 0 );
+ if( _cdsc->bbox == nullptr )
+ return unique_ptr<KDSCBBOX>( nullptr );
else
- return auto_ptr<KDSCBBOX>( new KDSCBBOX( *_cdsc->bbox ) );
+ return unique_ptr<KDSCBBOX>( new KDSCBBOX( *_cdsc->bbox ) );
}
-auto_ptr<KDSCBBOX> KDSC::page_bbox() const
+unique_ptr<KDSCBBOX> KDSC::page_bbox() const
{
- if( _cdsc->page_bbox == 0 )
- return auto_ptr<KDSCBBOX>( 0 );
+ if( _cdsc->page_bbox == nullptr )
+ return unique_ptr<KDSCBBOX>( nullptr );
else
- return auto_ptr<KDSCBBOX>( new KDSCBBOX( *_cdsc->page_bbox ) );
+ return unique_ptr<KDSCBBOX>( new KDSCBBOX( *_cdsc->page_bbox ) );
}
TQString KDSC::dsc_title() const
diff --git a/kghostview/dscparse/dscparse_adapter.h b/kghostview/dscparse/dscparse_adapter.h
index 05b7e637..77855972 100644
--- a/kghostview/dscparse/dscparse_adapter.h
+++ b/kghostview/dscparse/dscparse_adapter.h
@@ -28,51 +28,6 @@
#include "dscparse.h"
-#if defined(__GNUC__)
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93)
-/*
- * We add a quick 'n' dirty inline implementation of auto_ptr for older
- * releases of GCC, which don't include an auto_ptr implementation in
- * <memory>.
- */
-
-template <class T> class auto_ptr {
-private:
- T* _ptr;
-
-public:
- typedef T element_type;
- explicit auto_ptr(T* p = 0) : _ptr(p) {}
- auto_ptr(auto_ptr& a) : _ptr(a.release()) {}
- template <class T1> auto_ptr(auto_ptr<T1>& a) : _ptr(a.release()) {}
- auto_ptr& operator=(auto_ptr& a) {
- if (&a != this) {
- delete _ptr;
- _ptr = a.release();
- }
- return *this;
- }
- template <class T1>
- auto_ptr& operator=(auto_ptr<T1>& a) {
- if (a.get() != this->get()) {
- delete _ptr;
- _ptr = a.release();
- }
- return *this;
- }
- ~auto_ptr() { delete _ptr; }
-
- T& operator*() const { return *_ptr; }
- T* operator->() const { return _ptr; }
- T* get() const { return _ptr; }
- T* release() { T* tmp = _ptr; _ptr = 0; return tmp; }
- void reset(T* p = 0) { delete _ptr; _ptr = p; }
-};
-
-#endif
-#endif
-
-
class KDSCBBOX
{
public:
@@ -304,13 +259,8 @@ public:
CDSCMEDIA** media() const;
const CDSCMEDIA* page_media() const;
-#if defined(__GNUC__) && (__GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93))
- auto_ptr<KDSCBBOX> bbox() const;
- auto_ptr<KDSCBBOX> page_bbox() const;
-#else
- std::auto_ptr<KDSCBBOX> bbox() const;
- std::auto_ptr<KDSCBBOX> page_bbox() const;
-#endif
+ std::unique_ptr<KDSCBBOX> bbox() const;
+ std::unique_ptr<KDSCBBOX> page_bbox() const;
// CDSCDOSEPS *doseps;
diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp
index 3d9dad26..ae0742da 100644
--- a/kghostview/kgvdocument.cpp
+++ b/kghostview/kgvdocument.cpp
@@ -171,7 +171,7 @@ bool KGVDocument::uncompressFile()
// If the file is gzipped, gunzip it to the temporary file _tmpUnzipped.
kdDebug(4500) << "KGVDocument::uncompressFile()" << endl;
- auto_ptr<TQIODevice> filterDev( KFilterDev::deviceForFile( _fileName, _mimetype, true ) );
+ unique_ptr<TQIODevice> filterDev( KFilterDev::deviceForFile( _fileName, _mimetype, true ) );
if ( !filterDev.get() ) {
KMimeType::Ptr mt = KMimeType::mimeType(_mimetype);
if ( (_fileName.right( 3 ) == ".gz") || mt->is("application/x-gzip") ) {
diff --git a/kpovmodeler/CMakeLists.txt b/kpovmodeler/CMakeLists.txt
index 6ec98ae4..b589117f 100644
--- a/kpovmodeler/CMakeLists.txt
+++ b/kpovmodeler/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
- ${GLU_INCLUDE_DIRS}
+ ${OPENGL_INCLUDE_DIRS}
${FREETYPE_INCLUDE_DIRS}
)
@@ -112,7 +112,7 @@ tde_add_library( kpovmodeler SHARED AUTOMOC
pmlibraryiconview.cpp pmlibraryobjectsearch.cpp pmpluginmanager.cpp
pmpartiface.skel
VERSION 0.0.0
- LINK tdeparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
+ LINK tdeparts-shared ${OPENGL_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kpovmodeler/ConfigureChecks.cmake b/kpovmodeler/ConfigureChecks.cmake
index f4fdd1c0..a55045d4 100644
--- a/kpovmodeler/ConfigureChecks.cmake
+++ b/kpovmodeler/ConfigureChecks.cmake
@@ -10,13 +10,14 @@
#################################################
# glu
-pkg_search_module( GLU glu )
-if( NOT GLU_FOUND )
+set( OpenGL_GL_PREFERENCE LEGACY )
+find_package( OpenGL )
+if( NOT OPENGL_FOUND )
check_include_file ( GL/glu.h HAVE_GLU )
if( NOT HAVE_GLU )
- tde_message_fatal( "glu is required, but was not found on your system" )
+ tde_message_fatal( "OpenGL (glu) is required, but was not found on your system" )
endif ( )
- set( GLU_LIBRARIES "-lGL -lGLU" )
+ set( OPENGL_LIBRARIES "-lGL -lGLU" )
endif( )
diff --git a/kpovmodeler/pmrendermode.cpp b/kpovmodeler/pmrendermode.cpp
index b2a752f8..9da4f2ac 100644
--- a/kpovmodeler/pmrendermode.cpp
+++ b/kpovmodeler/pmrendermode.cpp
@@ -39,8 +39,6 @@ void PMRenderMode::init( )
m_quality = 9;
- m_radiosity = false;
-
m_antialiasing = false;
m_samplingMethod = AntialiasingNonRecursive;
m_antialiasThreshold = 0.3;
@@ -67,7 +65,6 @@ PMRenderMode::PMRenderMode( const TQDomElement& e )
m_startRow = hlp.doubleAttribute( "start_row", m_startRow );
m_endRow = hlp.doubleAttribute( "end_row", m_endRow );
m_quality = hlp.intAttribute( "quality", m_quality );
- m_radiosity = hlp.boolAttribute( "radiosity", m_radiosity );
m_antialiasing = hlp.boolAttribute( "antialiasing", m_antialiasing );
m_samplingMethod = hlp.intAttribute( "sampling_method", m_samplingMethod );
m_antialiasThreshold = hlp.doubleAttribute( "aa_threshold", m_antialiasThreshold );
@@ -88,7 +85,6 @@ void PMRenderMode::serialize( TQDomElement& e ) const
e.setAttribute( "start_column", m_startColumn );
e.setAttribute( "end_column", m_endColumn );
e.setAttribute( "quality", m_quality );
- e.setAttribute( "radiosity", m_radiosity );
e.setAttribute( "antialiasing", m_antialiasing );
e.setAttribute( "sampling_method", m_samplingMethod );
e.setAttribute( "aa_threshold", m_antialiasThreshold );
@@ -187,10 +183,6 @@ TQStringList PMRenderMode::commandLineSwitches( ) const
cl.append( tmp );
}
cl.append( TQString( "+Q%1" ).arg( m_quality ) );
- if( m_radiosity )
- cl.append( TQString( "+QR" ) );
- else
- cl.append( TQString( "-QR" ) );
if( m_antialiasing )
{
diff --git a/kpovmodeler/pmrendermode.h b/kpovmodeler/pmrendermode.h
index ffd233aa..aa819a7f 100644
--- a/kpovmodeler/pmrendermode.h
+++ b/kpovmodeler/pmrendermode.h
@@ -71,9 +71,6 @@ public:
void setQuality( int quality );
int quality( ) const { return m_quality; }
-
- void setRadiosity( bool on ) { m_radiosity = on; }
- bool radiosity( ) const { return m_radiosity; }
void setAntialiasing( bool on ) { m_antialiasing = on; }
bool antialiasing( ) const { return m_antialiasing; }
@@ -110,7 +107,6 @@ private:
double m_startRow, m_endRow, m_startColumn, m_endColumn;
int m_quality;
- bool m_radiosity;
bool m_antialiasing;
int m_samplingMethod;
double m_antialiasThreshold;
diff --git a/kpovmodeler/pmrendermodesdialog.cpp b/kpovmodeler/pmrendermodesdialog.cpp
index 1452e606..f81cb7ee 100644
--- a/kpovmodeler/pmrendermodesdialog.cpp
+++ b/kpovmodeler/pmrendermodesdialog.cpp
@@ -222,22 +222,21 @@ void PMRenderModesDialog::slotOk( )
TQSize PMRenderModeDialog::s_size = TQSize( 300, 200 );
-const int numQuality = 9;
+const int numQuality = 7;
const char* qualityString[numQuality] =
{
I18N_NOOP( "0, 1: Quick colors, full ambient lighting only" ),
I18N_NOOP( "2, 3: Show specified diffuse and ambient light" ),
I18N_NOOP( "4: Render shadows, but no extended lights" ),
I18N_NOOP( "5: Render shadows, including extended lights" ),
- I18N_NOOP( "6, 7: Compute texture patterns" ),
+ I18N_NOOP( "6, 7: Compute texture patterns, compute photons" ),
I18N_NOOP( "8: Compute reflected, refracted, and transmitted rays" ),
- I18N_NOOP( "9: Compute media" ),
- I18N_NOOP( "10: Compute radiosity but no media" ),
- I18N_NOOP( "11: Compute radiosity and media" )
+ I18N_NOOP( "9, 10, 11: Compute media, radiosity and subsurface light transport" )
+
};
-const int c_qualityToIndex[12] = { 0, 0, 1, 1, 2, 3, 4, 4, 5, 6, 7, 8 };
-const int c_indexToQuality[numQuality] = { 0, 2, 4, 5, 6, 8, 9, 10, 11 };
+const int c_qualityToIndex[12] = { 0, 0, 1, 1, 2, 3, 4, 4, 5, 6, 6, 6 };
+const int c_indexToQuality[numQuality] = { 0, 2, 4, 5, 6, 8, 9};
PMRenderModeDialog::PMRenderModeDialog( PMRenderMode* mode, TQWidget* parent, const char* name )
: KDialogBase( parent, name, true, i18n( "Render Modes" ),
@@ -347,9 +346,6 @@ PMRenderModeDialog::PMRenderModeDialog( PMRenderMode* mode, TQWidget* parent, co
aaHelpLayout->addStretch( 1 );
- m_pRadiosityBox = new TQCheckBox( i18n( "Radiosity" ), tab );
- tabLayout->addWidget( m_pRadiosityBox );
-
tabLayout->addStretch( 1 );
// output options tab
@@ -380,7 +376,6 @@ PMRenderModeDialog::PMRenderModeDialog( PMRenderMode* mode, TQWidget* parent, co
connect( m_pStartColumnEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) );
connect( m_pEndColumnEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) );
connect( m_pQualityCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotActivated( int ) ) );
- connect( m_pRadiosityBox, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotChanged( ) ) );
connect( m_pAntialiasingBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotAntialiasingToggled( bool ) ) );
connect( m_pSamplingCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotActivated( int ) ) );
connect( m_pThresholdEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotChanged( ) ) );
@@ -425,7 +420,6 @@ bool PMRenderModeDialog::saveChanges( )
m_pMode->setEndColumn( m_pEndColumnEdit->value( ) );
}
m_pMode->setQuality( indexToQuality( m_pQualityCombo->currentItem( ) ) );
- m_pMode->setRadiosity( m_pRadiosityBox->isChecked( ) );
m_pMode->setAntialiasing( m_pAntialiasingBox->isChecked( ) );
if( m_pAntialiasingBox->isChecked( ) )
{
@@ -509,7 +503,6 @@ void PMRenderModeDialog::displayMode( )
m_pStartColumnEdit->setValue( m_pMode->startColumn( ) );
m_pEndColumnEdit->setValue( m_pMode->endColumn( ) );
m_pQualityCombo->setCurrentItem( qualityToIndex( m_pMode->quality( ) ) );
- m_pRadiosityBox->setChecked( m_pMode->radiosity( ) );
m_pAntialiasingBox->setChecked( m_pMode->antialiasing( ) );
enableAntialiasing( m_pMode->antialiasing( ) );
m_pSamplingCombo->setCurrentItem( m_pMode->samplingMethod( ) );
diff --git a/kpovmodeler/pmrendermodesdialog.h b/kpovmodeler/pmrendermodesdialog.h
index b2ce7abe..5adbefaf 100644
--- a/kpovmodeler/pmrendermodesdialog.h
+++ b/kpovmodeler/pmrendermodesdialog.h
@@ -164,7 +164,6 @@ private:
PMFloatEdit* m_pEndColumnEdit;
// quality
TQComboBox* m_pQualityCombo;
- TQCheckBox* m_pRadiosityBox;
TQCheckBox* m_pAntialiasingBox;
TQComboBox* m_pSamplingCombo;
PMFloatEdit* m_pThresholdEdit;
diff --git a/ksvg/core/KSVGCanvas.h b/ksvg/core/KSVGCanvas.h
index d758fdb9..70704ec1 100644
--- a/ksvg/core/KSVGCanvas.h
+++ b/ksvg/core/KSVGCanvas.h
@@ -30,6 +30,8 @@
#include <Converter.h>
+#include <CanvasItem.h>
+
namespace KSVG
{
@@ -49,8 +51,6 @@ class SVGPolygonElementImpl;
class SVGPolylineElementImpl;
class SVGClipPathElementImpl;
-class CanvasItem;
-class CanvasChunk;
class CanvasItemList;
class CanvasClipPath;
class CanvasPaintServer;
diff --git a/ksvg/impl/libs/libtext2path/src/CMakeLists.txt b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt
index 098f836d..29ab129e 100644
--- a/ksvg/impl/libs/libtext2path/src/CMakeLists.txt
+++ b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt
@@ -46,4 +46,4 @@ tde_add_library( text2path SHARED
VERSION 0.0.0
LINK ${FREETYPE_LIBRARIES} ${FRIBIDI_LIBRARIES} ${FONTCONFIG_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
-) \ No newline at end of file
+)
diff --git a/ksvg/impl/libs/libtext2path/src/Cache.h b/ksvg/impl/libs/libtext2path/src/Cache.h
index 6f6ca705..531135e0 100644
--- a/ksvg/impl/libs/libtext2path/src/Cache.h
+++ b/ksvg/impl/libs/libtext2path/src/Cache.h
@@ -25,8 +25,7 @@
#include <string>
#include <vector>
#include <iostream>
-
-#include "myboost/shared_ptr.h"
+#include <memory>
namespace T2P
{
@@ -50,7 +49,7 @@ namespace T2P
class Cache
{
public:
- typedef myboost::shared_ptr<T> SharedT;
+ typedef std::shared_ptr<T> SharedT;
Cache(int maxSize = 10) : m_size(0), m_maxSize(maxSize) { }
~Cache() { clear(); }
diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp
index 88af02ae..6434798e 100644
--- a/ksvg/impl/libs/libtext2path/src/Converter.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp
@@ -22,7 +22,6 @@
#include <math.h>
-#include "myboost/shared_ptr.h"
#include <fontconfig/fontconfig.h>
#include <fribidi/fribidi.h>
diff --git a/ksvg/impl/libs/libtext2path/src/Converter.h b/ksvg/impl/libs/libtext2path/src/Converter.h
index 864812be..7f76533f 100644
--- a/ksvg/impl/libs/libtext2path/src/Converter.h
+++ b/ksvg/impl/libs/libtext2path/src/Converter.h
@@ -44,8 +44,8 @@ namespace T2P
class GlyphLayoutParams;
class GlyphRenderParams;
- typedef myboost::shared_ptr<Font> SharedFont;
- typedef myboost::shared_ptr<Glyph> SharedGlyph;
+ typedef std::shared_ptr<Font> SharedFont;
+ typedef std::shared_ptr<Glyph> SharedGlyph;
class Converter
{
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/assert.h b/ksvg/impl/libs/libtext2path/src/myboost/assert.h
deleted file mode 100644
index ebedcd32..00000000
--- a/ksvg/impl/libs/libtext2path/src/myboost/assert.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// boost/assert.h - BOOST_ASSERT(expr)
-//
-// Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
-//
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
-// This software is provided "as is" without express or implied
-// warranty, and with no claim as to its suitability for any purpose.
-//
-// Note: There are no include guards. This is intentional.
-//
-// See http://www.boost.org/libs/utility/assert.html for documentation.
-//
-
-#ifndef ASSERT_H
-#define ASSERT_H
-
-#undef BOOST_ASSERT
-
-# include <assert.h>
-# define BOOST_ASSERT(expr) assert(expr)
-
-#endif
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/checked_delete.h b/ksvg/impl/libs/libtext2path/src/myboost/checked_delete.h
deleted file mode 100644
index ba5b534c..00000000
--- a/ksvg/impl/libs/libtext2path/src/myboost/checked_delete.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef BOOST_CHECKED_DELETE_H_INCLUDED
-#define BOOST_CHECKED_DELETE_H_INCLUDED
-
-//
-// boost/checked_delete.h
-//
-// Copyright (c) 1999, 2000, 2001, 2002 boost.org
-// Copyright (c) 2002, 2003 Peter Dimov
-//
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
-// This software is provided "as is" without express or implied
-// warranty, and with no claim as to its suitability for any purpose.
-//
-// See http://www.boost.org/libs/utility/checked_delete.html for documentation.
-//
-
-namespace myboost
-{
-
-// verify that types are complete for increased safety
-
-template<class T> inline void checked_delete(T * x)
-{
- // Intel 7 accepts sizeof(incomplete) as 0 in system headers
- typedef char type_must_be_complete[ sizeof(T)? 1: -1 ];
- delete x;
-}
-
-template<class T> inline void checked_array_delete(T * x)
-{
- typedef char type_must_be_complete[ sizeof(T)? 1: -1 ];
- delete [] x;
-}
-
-template<class T> struct checked_deleter
-{
- typedef void result_type;
- typedef T * argument_type;
-
- void operator()(T * x) const
- {
- // boost:: disables ADL
- myboost::checked_delete(x);
- }
-};
-
-template<class T> struct checked_array_deleter
-{
- typedef void result_type;
- typedef T * argument_type;
-
- void operator()(T * x) const
- {
- myboost::checked_array_delete(x);
- }
-};
-
-} // namespace myboost
-
-#endif // #ifndef BOOST_CHECKED_DELETE_H_INCLUDED
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/lightweight_mutex.h b/ksvg/impl/libs/libtext2path/src/myboost/lightweight_mutex.h
deleted file mode 100644
index 2c09ca8b..00000000
--- a/ksvg/impl/libs/libtext2path/src/myboost/lightweight_mutex.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef BOOST_DETAIL_LWM_PTHREADS_H_INCLUDED
-#define BOOST_DETAIL_LWM_PTHREADS_H_INCLUDED
-
-//
-// boost/detail/lwm_pthreads.h
-//
-// Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
-//
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
-// This software is provided "as is" without express or implied
-// warranty, and with no claim as to its suitability for any purpose.
-//
-
-#include <pthread.h>
-
-namespace myboost
-{
-
-namespace detail
-{
-
-class lightweight_mutex
-{
-private:
-
- pthread_mutex_t m_;
-
- lightweight_mutex(lightweight_mutex const &);
- lightweight_mutex & operator=(lightweight_mutex const &);
-
-public:
-
- lightweight_mutex()
- {
- pthread_mutex_init(&m_, 0);
- }
-
- ~lightweight_mutex()
- {
- pthread_mutex_destroy(&m_);
- }
-
- class scoped_lock;
- friend class scoped_lock;
-
- class scoped_lock
- {
- private:
-
- pthread_mutex_t & m_;
-
- scoped_lock(scoped_lock const &);
- scoped_lock & operator=(scoped_lock const &);
-
- public:
-
- scoped_lock(lightweight_mutex & m): m_(m.m_)
- {
- pthread_mutex_lock(&m_);
- }
-
- ~scoped_lock()
- {
- pthread_mutex_unlock(&m_);
- }
- };
-};
-
-} // namespace detail
-
-} // namespace myboost
-
-#endif // #ifndef BOOST_DETAIL_LWM_PTHREADS_H_INCLUDED
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/shared_count.h b/ksvg/impl/libs/libtext2path/src/myboost/shared_count.h
deleted file mode 100644
index b240ff8f..00000000
--- a/ksvg/impl/libs/libtext2path/src/myboost/shared_count.h
+++ /dev/null
@@ -1,367 +0,0 @@
-#ifndef BOOST_DETAIL_SHARED_COUNT_H_INCLUDED
-#define BOOST_DETAIL_SHARED_COUNT_H_INCLUDED
-
-//
-// detail/shared_count.h
-//
-// Copyright (c) 2001, 2002, 2003 Peter Dimov and Multi Media Ltd.
-//
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
-// This software is provided "as is" without express or implied
-// warranty, and with no claim as to its suitability for any purpose.
-//
-
-#include "myboost/checked_delete.h"
-#include "myboost/throw_exception.h"
-#include "myboost/lightweight_mutex.h"
-
-#include <memory> // std::auto_ptr, std::allocator
-#include <functional> // std::less
-#include <exception> // std::exception
-#include <new> // std::bad_alloc
-#include <typeinfo> // std::type_info in get_deleter
-#include <cstddef> // std::size_t
-
-namespace myboost
-{
-
-class bad_weak_ptr: public std::exception
-{
-public:
-
- virtual char const * what() const throw()
- {
- return "myboost::bad_weak_ptr";
- }
-};
-
-namespace detail
-{
-
-class sp_counted_base
-{
-private:
-
- typedef detail::lightweight_mutex mutex_type;
-
-public:
-
- sp_counted_base(): use_count_(1), weak_count_(1)
- {
- }
-
- virtual ~sp_counted_base() // nothrow
- {
- }
-
- // dispose() is called when use_count_ drops to zero, to release
- // the resources managed by *this.
-
- virtual void dispose() = 0; // nothrow
-
- // destruct() is called when weak_count_ drops to zero.
-
- virtual void destruct() // nothrow
- {
- delete this;
- }
-
- virtual void * get_deleter(std::type_info const & ti) = 0;
-
- void add_ref_copy()
- {
- mutex_type::scoped_lock lock(mtx_);
- ++use_count_;
- }
-
- void add_ref_lock()
- {
- mutex_type::scoped_lock lock(mtx_);
- if(use_count_ == 0) myboost::throw_exception(myboost::bad_weak_ptr());
- ++use_count_;
- }
-
- void release() // nothrow
- {
- {
- mutex_type::scoped_lock lock(mtx_);
- long new_use_count = --use_count_;
-
- if(new_use_count != 0) return;
- }
-
- dispose();
- weak_release();
- }
-
- void weak_add_ref() // nothrow
- {
- mutex_type::scoped_lock lock(mtx_);
- ++weak_count_;
- }
-
- void weak_release() // nothrow
- {
- long new_weak_count;
-
- {
- mutex_type::scoped_lock lock(mtx_);
- new_weak_count = --weak_count_;
- }
-
- if(new_weak_count == 0)
- {
- destruct();
- }
- }
-
- long use_count() const // nothrow
- {
- mutex_type::scoped_lock lock(mtx_);
- return use_count_;
- }
-
-private:
-
- sp_counted_base(sp_counted_base const &);
- sp_counted_base & operator= (sp_counted_base const &);
-
- long use_count_; // #shared
- long weak_count_; // #weak + (#shared != 0)
-
- mutable mutex_type mtx_;
-};
-
-template<class P, class D> class sp_counted_base_impl: public sp_counted_base
-{
-private:
-
- P ptr; // copy constructor must not throw
- D del; // copy constructor must not throw
-
- sp_counted_base_impl(sp_counted_base_impl const &);
- sp_counted_base_impl & operator= (sp_counted_base_impl const &);
-
- typedef sp_counted_base_impl<P, D> this_type;
-
-public:
-
- // pre: initial_use_count <= initial_weak_count, d(p) must not throw
-
- sp_counted_base_impl(P p, D d): ptr(p), del(d)
- {
- }
-
- virtual void dispose() // nothrow
- {
- del(ptr);
- }
-
- virtual void * get_deleter(std::type_info const & ti)
- {
- return ti == typeid(D)? &del: 0;
- }
-
- void * operator new(std::size_t)
- {
- return std::allocator<this_type>().allocate(1, static_cast<this_type *>(0));
- }
-
- void operator delete(void * p)
- {
- std::allocator<this_type>().deallocate(static_cast<this_type *>(p), 1);
- }
-};
-
-class weak_count;
-
-class shared_count
-{
-private:
-
- sp_counted_base * pi_;
-
- friend class weak_count;
-
-public:
-
- shared_count(): pi_(0) // nothrow
- {
- }
-
- template<class P, class D> shared_count(P p, D d): pi_(0)
- {
-
- try
- {
- pi_ = new sp_counted_base_impl<P, D>(p, d);
- }
- catch(...)
- {
- d(p); // delete p
- throw;
- }
-
-
- pi_ = new sp_counted_base_impl<P, D>(p, d);
-
- if(pi_ == 0)
- {
- d(p); // delete p
- myboost::throw_exception(std::bad_alloc());
- }
- }
-
- // auto_ptr<Y> is special cased to provide the strong guarantee
-
- template<class Y>
- explicit shared_count(std::auto_ptr<Y> & r): pi_(new sp_counted_base_impl< Y *, checked_deleter<Y> >(r.get(), checked_deleter<Y>()))
- {
- r.release();
- }
-
- ~shared_count() // nothrow
- {
- if(pi_ != 0) pi_->release();
- }
-
- shared_count(shared_count const & r): pi_(r.pi_) // nothrow
- {
- if(pi_ != 0) pi_->add_ref_copy();
- }
-
- explicit shared_count(weak_count const & r); // throws bad_weak_ptr when r.use_count() == 0
-
- shared_count & operator= (shared_count const & r) // nothrow
- {
- sp_counted_base * tmp = r.pi_;
- if(tmp != 0) tmp->add_ref_copy();
- if(pi_ != 0) pi_->release();
- pi_ = tmp;
-
- return *this;
- }
-
- void swap(shared_count & r) // nothrow
- {
- sp_counted_base * tmp = r.pi_;
- r.pi_ = pi_;
- pi_ = tmp;
- }
-
- long use_count() const // nothrow
- {
- return pi_ != 0? pi_->use_count(): 0;
- }
-
- bool unique() const // nothrow
- {
- return use_count() == 1;
- }
-
- friend inline bool operator==(shared_count const & a, shared_count const & b)
- {
- return a.pi_ == b.pi_;
- }
-
- friend inline bool operator<(shared_count const & a, shared_count const & b)
- {
- return std::less<sp_counted_base *>()(a.pi_, b.pi_);
- }
-
- void * get_deleter(std::type_info const & ti) const
- {
- return pi_? pi_->get_deleter(ti): 0;
- }
-};
-
-class weak_count
-{
-private:
-
- sp_counted_base * pi_;
-
- friend class shared_count;
-
-public:
-
- weak_count(): pi_(0) // nothrow
- {
- }
-
- weak_count(shared_count const & r): pi_(r.pi_) // nothrow
- {
- if(pi_ != 0) pi_->weak_add_ref();
- }
-
- weak_count(weak_count const & r): pi_(r.pi_) // nothrow
- {
- if(pi_ != 0) pi_->weak_add_ref();
- }
-
- ~weak_count() // nothrow
- {
- if(pi_ != 0) pi_->weak_release();
- }
-
- weak_count & operator= (shared_count const & r) // nothrow
- {
- sp_counted_base * tmp = r.pi_;
- if(tmp != 0) tmp->weak_add_ref();
- if(pi_ != 0) pi_->weak_release();
- pi_ = tmp;
-
- return *this;
- }
-
- weak_count & operator= (weak_count const & r) // nothrow
- {
- sp_counted_base * tmp = r.pi_;
- if(tmp != 0) tmp->weak_add_ref();
- if(pi_ != 0) pi_->weak_release();
- pi_ = tmp;
-
- return *this;
- }
-
- void swap(weak_count & r) // nothrow
- {
- sp_counted_base * tmp = r.pi_;
- r.pi_ = pi_;
- pi_ = tmp;
- }
-
- long use_count() const // nothrow
- {
- return pi_ != 0? pi_->use_count(): 0;
- }
-
- friend inline bool operator==(weak_count const & a, weak_count const & b)
- {
- return a.pi_ == b.pi_;
- }
-
- friend inline bool operator<(weak_count const & a, weak_count const & b)
- {
- return std::less<sp_counted_base *>()(a.pi_, b.pi_);
- }
-};
-
-inline shared_count::shared_count(weak_count const & r): pi_(r.pi_)
-{
- if(pi_ != 0)
- {
- pi_->add_ref_lock();
- }
- else
- {
- myboost::throw_exception(myboost::bad_weak_ptr());
- }
-}
-
-} // namespace detail
-
-} // namespace myboost
-
-#endif // #ifndef BOOST_DETAIL_SHARED_COUNT_H_INCLUDED
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.h b/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.h
deleted file mode 100644
index 435be678..00000000
--- a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.h
+++ /dev/null
@@ -1,395 +0,0 @@
-#ifndef BOOST_SHARED_PTR_H_INCLUDED
-#define BOOST_SHARED_PTR_H_INCLUDED
-
-// shared_ptr.h
-//
-// (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
-// Copyright (c) 2001, 2002, 2003 Peter Dimov
-//
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
-// This software is provided "as is" without express or implied
-// warranty, and with no claim as to its suitability for any purpose.
-//
-// See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation.
-//
-
-#include "myboost/assert.h"
-#include "myboost/checked_delete.h"
-#include "myboost/throw_exception.h"
-#include "myboost/shared_count.h"
-
-#include <memory> // for std::auto_ptr
-#include <algorithm> // for std::swap
-#include <functional> // for std::less
-#include <typeinfo> // for std::bad_cast
-#include <iosfwd> // for std::basic_ostream
-
-namespace myboost
-{
-
-template<class T> class weak_ptr;
-template<class T> class enable_shared_from_this;
-
-namespace detail
-{
-
-struct static_cast_tag {};
-struct const_cast_tag {};
-struct dynamic_cast_tag {};
-struct polymorphic_cast_tag {};
-
-template<class T> struct shared_ptr_traits
-{
- typedef T & reference;
-};
-
-template<> struct shared_ptr_traits<void>
-{
- typedef void reference;
-};
-
-template<> struct shared_ptr_traits<void const>
-{
- typedef void reference;
-};
-
-template<> struct shared_ptr_traits<void volatile>
-{
- typedef void reference;
-};
-
-template<> struct shared_ptr_traits<void const volatile>
-{
- typedef void reference;
-};
-
-// enable_shared_from_this support
-
-template<class T, class Y> void sp_enable_shared_from_this(myboost::enable_shared_from_this<T> * pe, Y * px, shared_count const & pn)
-{
- if(pe != 0) pe->_internal_weak_this._internal_assign(px, pn);
-}
-
-inline void sp_enable_shared_from_this(void const *, void const *, shared_count const &)
-{
-}
-
-} // namespace detail
-
-
-//
-// shared_ptr
-//
-// An enhanced relative of scoped_ptr with reference counted copy semantics.
-// The object pointed to is deleted when the last shared_ptr pointing to it
-// is destroyed or reset.
-//
-
-template<class T> class shared_ptr
-{
-private:
-
- // Borland 5.5.1 specific workaround
- typedef shared_ptr<T> this_type;
-
-public:
-
- typedef T element_type;
- typedef T value_type;
- typedef T * pointer;
- typedef typename detail::shared_ptr_traits<T>::reference reference;
-
- shared_ptr(): px(0), pn() // never throws in 1.30+
- {
- }
-
- template<class Y>
- explicit shared_ptr(Y * p): px(p), pn(p, checked_deleter<Y>()) // Y must be complete
- {
- detail::sp_enable_shared_from_this(p, p, pn);
- }
-
- //
- // Requirements: D's copy constructor must not throw
- //
- // shared_ptr will release p by calling d(p)
- //
-
- template<class Y, class D> shared_ptr(Y * p, D d): px(p), pn(p, d)
- {
- detail::sp_enable_shared_from_this(p, p, pn);
- }
-
-// generated copy constructor, assignment, destructor are fine...
-// except that Borland C++ has a bug, and g++ with -Wsynth warns
- shared_ptr & operator=(shared_ptr const & r) // never throws
- {
- px = r.px;
- pn = r.pn; // shared_count::op= doesn't throw
- return *this;
- }
-
- template<class Y>
- explicit shared_ptr(weak_ptr<Y> const & r): pn(r.pn) // may throw
- {
- // it is now safe to copy r.px, as pn(r.pn) did not throw
- px = r.px;
- }
-
- template<class Y>
- shared_ptr(shared_ptr<Y> const & r): px(r.px), pn(r.pn) // never throws
- {
- }
-
- template<class Y>
- shared_ptr(shared_ptr<Y> const & r, detail::static_cast_tag): px(static_cast<element_type *>(r.px)), pn(r.pn)
- {
- }
-
- template<class Y>
- shared_ptr(shared_ptr<Y> const & r, detail::const_cast_tag): px(const_cast<element_type *>(r.px)), pn(r.pn)
- {
- }
-
- template<class Y>
- shared_ptr(shared_ptr<Y> const & r, detail::dynamic_cast_tag): px(dynamic_cast<element_type *>(r.px)), pn(r.pn)
- {
- if(px == 0) // need to allocate new counter -- the cast failed
- {
- pn = detail::shared_count();
- }
- }
-
- template<class Y>
- shared_ptr(shared_ptr<Y> const & r, detail::polymorphic_cast_tag): px(dynamic_cast<element_type *>(r.px)), pn(r.pn)
- {
- if(px == 0)
- {
- myboost::throw_exception(std::bad_cast());
- }
- }
-
- template<class Y>
- explicit shared_ptr(std::auto_ptr<Y> & r): px(r.get()), pn()
- {
- Y * tmp = r.get();
- pn = detail::shared_count(r);
- detail::sp_enable_shared_from_this(tmp, tmp, pn);
- }
-
- template<class Y>
- shared_ptr & operator=(shared_ptr<Y> const & r) // never throws
- {
- px = r.px;
- pn = r.pn; // shared_count::op= doesn't throw
- return *this;
- }
-
- template<class Y>
- shared_ptr & operator=(std::auto_ptr<Y> & r)
- {
- this_type(r).swap(*this);
- return *this;
- }
-
- void reset() // never throws in 1.30+
- {
- this_type().swap(*this);
- }
-
- template<class Y> void reset(Y * p) // Y must be complete
- {
- BOOST_ASSERT(p == 0 || p != px); // catch self-reset errors
- this_type(p).swap(*this);
- }
-
- template<class Y, class D> void reset(Y * p, D d)
- {
- this_type(p, d).swap(*this);
- }
-
- reference operator* () const // never throws
- {
- BOOST_ASSERT(px != 0);
- return *px;
- }
-
- T * operator-> () const // never throws
- {
- BOOST_ASSERT(px != 0);
- return px;
- }
-
- T * get() const // never throws
- {
- return px;
- }
-
- typedef T * (this_type::*unspecified_bool_type)() const;
-
- operator unspecified_bool_type() const // never throws
- {
- return px == 0? 0: &this_type::get;
- }
-
- // operator! is redundant, but some compilers need it
-
- bool operator! () const // never throws
- {
- return px == 0;
- }
-
- bool unique() const // never throws
- {
- return pn.unique();
- }
-
- long use_count() const // never throws
- {
- return pn.use_count();
- }
-
- void swap(shared_ptr<T> & other) // never throws
- {
- std::swap(px, other.px);
- pn.swap(other.pn);
- }
-
- template<class Y> bool _internal_less(shared_ptr<Y> const & rhs) const
- {
- return pn < rhs.pn;
- }
-
- void * _internal_get_deleter(std::type_info const & ti) const
- {
- return pn.get_deleter(ti);
- }
-
-// Tasteless as this may seem, making all members public allows member templates
-// to work in the absence of member template friends. (Matthew Langston)
-
-# if __GNUC__ >= 2 && __GNUC_MINOR__ >= 97
-private:
-
- template<class Y> friend class shared_ptr;
- template<class Y> friend class weak_ptr;
-#endif
-
- T * px; // contained pointer
- detail::shared_count pn; // reference counter
-
-}; // shared_ptr
-
-template<class T, class U> inline bool operator==(shared_ptr<T> const & a, shared_ptr<U> const & b)
-{
- return a.get() == b.get();
-}
-
-template<class T, class U> inline bool operator!=(shared_ptr<T> const & a, shared_ptr<U> const & b)
-{
- return a.get() != b.get();
-}
-
-#if __GNUC__ == 2 && __GNUC_MINOR__ <= 96
-
-// Resolve the ambiguity between our op!= and the one in rel_ops
-
-template<class T> inline bool operator!=(shared_ptr<T> const & a, shared_ptr<T> const & b)
-{
- return a.get() != b.get();
-}
-
-#endif
-
-template<class T, class U> inline bool operator<(shared_ptr<T> const & a, shared_ptr<U> const & b)
-{
- return a._internal_less(b);
-}
-
-template<class T> inline void swap(shared_ptr<T> & a, shared_ptr<T> & b)
-{
- a.swap(b);
-}
-
-template<class T, class U> shared_ptr<T> static_pointer_cast(shared_ptr<U> const & r)
-{
- return shared_ptr<T>(r, detail::static_cast_tag());
-}
-
-template<class T, class U> shared_ptr<T> const_pointer_cast(shared_ptr<U> const & r)
-{
- return shared_ptr<T>(r, detail::const_cast_tag());
-}
-
-template<class T, class U> shared_ptr<T> dynamic_pointer_cast(shared_ptr<U> const & r)
-{
- return shared_ptr<T>(r, detail::dynamic_cast_tag());
-}
-
-// shared_*_cast names are deprecated. Use *_pointer_cast instead.
-
-template<class T, class U> shared_ptr<T> shared_static_cast(shared_ptr<U> const & r)
-{
- return shared_ptr<T>(r, detail::static_cast_tag());
-}
-
-template<class T, class U> shared_ptr<T> shared_dynamic_cast(shared_ptr<U> const & r)
-{
- return shared_ptr<T>(r, detail::dynamic_cast_tag());
-}
-
-template<class T, class U> shared_ptr<T> shared_polymorphic_cast(shared_ptr<U> const & r)
-{
- return shared_ptr<T>(r, detail::polymorphic_cast_tag());
-}
-
-template<class T, class U> shared_ptr<T> shared_polymorphic_downcast(shared_ptr<U> const & r)
-{
- BOOST_ASSERT(dynamic_cast<T *>(r.get()) == r.get());
- return shared_static_cast<T>(r);
-}
-
-// get_pointer() enables boost::mem_fn to recognize shared_ptr
-
-template<class T> inline T * get_pointer(shared_ptr<T> const & p)
-{
- return p.get();
-}
-
-// operator<<
-
-
-template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p)
-{
- os << p.get();
- return os;
-}
-
-
-// get_deleter (experimental)
-
-#if (defined(__GNUC__) && (__GNUC__ < 3)) || (defined(__EDG_VERSION__) && (__EDG_VERSION__ <= 238))
-
-// g++ 2.9x doesn't allow static_cast<X const *>(void *)
-// apparently EDG 2.38 also doesn't accept it
-
-template<class D, class T> D * get_deleter(shared_ptr<T> const & p)
-{
- void const * q = p._internal_get_deleter(typeid(D));
- return const_cast<D *>(static_cast<D const *>(q));
-}
-
-#else
-
-template<class D, class T> D * get_deleter(shared_ptr<T> const & p)
-{
- return static_cast<D *>(p._internal_get_deleter(typeid(D)));
-}
-
-#endif
-
-} // namespace boost
-
-
-#endif // #ifndef BOOST_SHARED_PTR_H_INCLUDED
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/throw_exception.h b/ksvg/impl/libs/libtext2path/src/myboost/throw_exception.h
deleted file mode 100644
index 3223b564..00000000
--- a/ksvg/impl/libs/libtext2path/src/myboost/throw_exception.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef BOOST_THROW_EXCEPTION_H_INCLUDED
-#define BOOST_THROW_EXCEPTION_H_INCLUDED
-
-
-//
-// boost/throw_exception.h
-//
-// Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
-//
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
-// This software is provided "as is" without express or implied
-// warranty, and with no claim as to its suitability for any purpose.
-//
-// http://www.boost.org/libs/utility/throw_exception.html
-//
-
-# include <exception>
-
-namespace myboost
-{
-
-template<class E> void throw_exception(E const & e)
-{
- throw e;
-}
-
-} // namespace myboost
-
-#endif // #ifndef BOOST_THROW_EXCEPTION_H_INCLUDED
diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.c
index 8383246b..99ff4fdf 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.c
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.c
@@ -22,6 +22,7 @@
#include <X11/Xlib.h>
/*#include <gdk-pixbuf/gdk-pixbuf-private.h>*/
#include "gdk-pixbuf-xlib-private.h"
+#include "gdk-pixbuf-xlibrgb.h"
Display *gdk_pixbuf_dpy = NULL;
int gdk_pixbuf_screen = -1;
diff --git a/kview/kviewviewer/printimagesettings.ui b/kview/kviewviewer/printimagesettings.ui
index b33b7798..36f07649 100644
--- a/kview/kviewviewer/printimagesettings.ui
+++ b/kview/kviewviewer/printimagesettings.ui
@@ -180,10 +180,8 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in implementation">knuminput.h</include>
+ <include location="global" impldecl="in implementation">tqwidget.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>tqwidget.h</includehint>
-</includehints>
</UI>
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index 547c0cf0..26e03b01 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -254,15 +254,18 @@
</connections>
<includes>
<include location="global" impldecl="in declaration">kdialog.h</include>
+ <include location="local" impldecl="in implementation">imagelistdialog.ui.h</include>
+ <include location="local" impldecl="in implementation">imagelistitem.h</include>
<include location="global" impldecl="in implementation">kdebug.h</include>
<include location="global" impldecl="in implementation">kimageviewer/viewer.h</include>
- <include location="global" impldecl="in implementation">tdeio/netaccess.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
<include location="global" impldecl="in implementation">kurl.h</include>
<include location="global" impldecl="in implementation">tdefiledialog.h</include>
- <include location="global" impldecl="in implementation">tqstring.h</include>
+ <include location="global" impldecl="in implementation">tdeio/netaccess.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
<include location="global" impldecl="in implementation">tdemessagebox.h</include>
- <include location="local" impldecl="in implementation">imagelistitem.h</include>
- <include location="local" impldecl="in implementation">imagelistdialog.ui.h</include>
+ <include location="global" impldecl="in implementation">tqstring.h</include>
</includes>
<forwards>
<forward>class KURL</forward>
@@ -273,12 +276,4 @@
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includes>
- <include location="global" impldecl="in implementation">knuminput.h</include>
- <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
-<includehints>
- <includehint>kdialog.h</includehint>
- <includehint>tdelistview.h</includehint>
-</includehints>
</UI>
diff --git a/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt b/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt
index 28be343b..d95dc846 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt
+++ b/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt
@@ -41,6 +41,7 @@ install( FILES
poppler-qt.h poppler-page-transition.h poppler-link-qt3.h
DESTINATION ${INCLUDE_INSTALL_DIR} )
+
##### poppler-tqt (shared) ############################
tde_add_library( poppler-tqt SHARED AUTOMOC
@@ -50,6 +51,12 @@ tde_add_library( poppler-tqt SHARED AUTOMOC
poppler-page-transition.cpp poppler-page-transition-private.h
poppler-private.cpp poppler-private.h
VERSION 0.0.0
+ CXX_FEATURES ${POPPLER_CXX_FEATURES}
LINK ${POPPLER_LIBRARIES} ${TQT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
+
+
+##### install cmake export file #################
+
+tde_install_export( )
diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
index 09ee6878..b6e0fbdd 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
+++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
@@ -24,7 +24,7 @@ check_cxx_source_compiles("
HAVE_POPPLER_030 )
tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 )
+foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 21.12 22.03 )
string( REPLACE "." "" _poppler_str "${_poppler_ver}" )
if( NOT DEFINED HAVE_POPPLER_${_poppler_str} )
message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str}" )
@@ -37,3 +37,7 @@ foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 )
endif( )
endif( )
endforeach( )
+
+if( HAVE_POPPLER_2112 )
+ set( POPPLER_CXX_FEATURES cxx_std_17 CACHE INTERNAL "C++ standard required by Poppler" )
+endif()
diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp
index fac02a4b..86e831ee 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp
+++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp
@@ -50,7 +50,11 @@ Document *Document::load(const TQString &filePath)
#endif
}
+# if defined(HAVE_POPPLER_2203)
+ DocumentData *doc = new DocumentData(std::make_unique<GooString>(TQFile::encodeName(filePath)), {});
+# else
DocumentData *doc = new DocumentData(new GooString(TQFile::encodeName(filePath)), NULL);
+# endif
Document *pdoc;
if (doc->doc.isOk() || doc->doc.getErrorCode() == errEncrypted) {
pdoc = new Document(doc);
@@ -84,10 +88,15 @@ bool Document::unlock(const TQCString &password)
{
if (data->locked) {
/* racier then it needs to be */
+# if defined(HAVE_POPPLER_2203)
+ DocumentData *doc2 = new DocumentData(std::make_unique<GooString>(data->doc.getFileName()),
+ GooString(password.data()));
+# else
GooString *filename = new GooString(data->doc.getFileName());
GooString *pwd = new GooString(password.data());
DocumentData *doc2 = new DocumentData(filename, pwd);
delete pwd;
+# endif
if (!doc2->doc.isOk()) {
delete doc2;
} else {
@@ -278,9 +287,14 @@ TQDateTime Document::getDate( const TQString & type ) const
#endif
if (!obj.isNull() && obj.isString())
{
- TQString s = UnicodeParsedString(obj.getString());
+# if defined(HAVE_POPPLER_2108)
+ const GooString *s = obj.getString();
+# else
+ TQString tqs = UnicodeParsedString(obj.getString());
+ const char *s = tqs.latin1();
+# endif
// TODO do something with the timezone information
- if ( parseDateString( s.latin1(), &year, &mon, &day, &hour, &min, &sec, &tz, &tz_hour, &tz_minute ) )
+ if (parseDateString(s, &year, &mon, &day, &hour, &min, &sec, &tz, &tz_hour, &tz_minute))
{
TQDate d( year, mon, day ); //CHECK: it was mon-1, Jan->0 (??)
TQTime t( hour, min, sec );
diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp
index 426b750f..9b4f6208 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp
+++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp
@@ -173,7 +173,11 @@ TQValueList<TextBox*> Page::textList() const
data->doc->data->doc.displayPageSlice(output_dev, data->index + 1, 72, 72,
0, false, false, false, -1, -1, -1, -1);
+# if defined(HAVE_POPPLER_2111)
+ std::unique_ptr<TextWordList> word_list = output_dev->makeWordList();
+# else
TextWordList *word_list = output_dev->makeWordList();
+# endif
if (!word_list) {
delete output_dev;
@@ -193,7 +197,9 @@ TQValueList<TextBox*> Page::textList() const
output_list.append(text_box);
}
+# if !defined(HAVE_POPPLER_2111)
delete word_list;
+# endif
delete output_dev;
return output_list;
diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
index c98d02b8..f1096ceb 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
+++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
@@ -104,7 +104,11 @@ class LinkDestinationData {
class DocumentData {
public:
+# if defined(HAVE_POPPLER_2203)
+ DocumentData(std::unique_ptr<GooString> &&filePath, const std::optional<GooString> &password) : doc(std::move(filePath), password), m_fontInfoScanner(0), m_outputDev(0) {}
+# else
DocumentData(GooString *filePath, GooString *password) : doc(filePath,password), m_fontInfoScanner(0), m_outputDev(0) {}
+# endif
~DocumentData()
{
diff --git a/tdefile-plugins/ps/gscreator.cpp b/tdefile-plugins/ps/gscreator.cpp
index c664947b..88601a4c 100644
--- a/tdefile-plugins/ps/gscreator.cpp
+++ b/tdefile-plugins/ps/gscreator.cpp
@@ -241,7 +241,7 @@ bool GSCreator::create(const TQString &path, int width, int height, TQImage &img
char translation[64] = "";
char pagesize[32] = "";
char resopt[32] = "";
- std::auto_ptr<KDSCBBOX> bbox = dsc.bbox();
+ std::unique_ptr<KDSCBBOX> bbox = dsc.bbox();
if (is_encapsulated) {
// GhostScript's rendering at the extremely low resolutions
// required for thumbnails leaves something to be desired. To
diff --git a/translations/desktop_files/kcoloredit-desktops/pt.po b/translations/desktop_files/kcoloredit-desktops/pt.po
index 25828cb5..4f42ec95 100644
--- a/translations/desktop_files/kcoloredit-desktops/pt.po
+++ b/translations/desktop_files/kcoloredit-desktops/pt.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-08 22:52+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2021-12-02 19:03+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdegraphics/kcoloredit-desktop-files/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.9.1\n"
#. GenericName
#: kcolorchooser.desktop:8
@@ -23,9 +24,8 @@ msgstr "Selector de Cores"
#. Name
#: kcolorchooser.desktop:9
-#, fuzzy
msgid "KColorChooser"
-msgstr "Selector de Cores"
+msgstr "KColorChooser"
#. GenericName
#: kcoloredit.desktop:8
@@ -34,6 +34,5 @@ msgstr "Editor de Paletas de Cores"
#. Name
#: kcoloredit.desktop:9
-#, fuzzy
msgid "KColorEdit"
-msgstr "Editor de Paletas de Cores"
+msgstr "KColorEdit"
diff --git a/translations/desktop_files/kdvi-desktops/pt.po b/translations/desktop_files/kdvi-desktops/pt.po
index 7dd47bb1..f09efed2 100644
--- a/translations/desktop_files/kdvi-desktops/pt.po
+++ b/translations/desktop_files/kdvi-desktops/pt.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-08 23:05+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2021-12-02 19:03+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdegraphics/kdvi-desktop-files/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.9.1\n"
#. GenericName
#: kdvi.desktop:2
@@ -24,12 +25,12 @@ msgstr "Visualizador de DVIs"
#. Name
#: kdvi.desktop:3
msgid "KDVI"
-msgstr ""
+msgstr "KDVI"
#. Comment
#: kdvimultipage.desktop:3
msgid "DVI"
-msgstr ""
+msgstr "DVI"
#. Name
#: kdvimultipage.desktop:4
diff --git a/translations/desktop_files/kfaxview-desktops/pt.po b/translations/desktop_files/kfaxview-desktops/pt.po
index 36202637..48aea1c6 100644
--- a/translations/desktop_files/kfaxview-desktops/pt.po
+++ b/translations/desktop_files/kfaxview-desktops/pt.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-08 23:16+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2021-12-02 19:03+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdegraphics/kfaxview-desktop-files/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.9.1\n"
#. Name
#: kfaxmultipage.desktop:2
msgid "kfaxview"
-msgstr ""
+msgstr "kfaxview"
#. Comment
#: kfaxmultipage.desktop:5 kfaxmultipage_tiff.desktop:5
@@ -29,7 +30,7 @@ msgstr "'Plugin' do KViewShell para ficheiros de Fax"
#. Name
#: kfaxmultipage_tiff.desktop:2
msgid "kfaxview_tiff"
-msgstr ""
+msgstr "kfaxview_tiff"
#. GenericName
#: kfaxview.desktop:2
@@ -38,6 +39,5 @@ msgstr "Visualizador de Faxes"
#. Name
#: kfaxview.desktop:3
-#, fuzzy
msgid "KFaxView"
-msgstr "Visualizador de Faxes"
+msgstr "KFaxView"
diff --git a/translations/desktop_files/kghostview-desktops/pt.po b/translations/desktop_files/kghostview-desktops/pt.po
index 3c6d4684..10384202 100644
--- a/translations/desktop_files/kghostview-desktops/pt.po
+++ b/translations/desktop_files/kghostview-desktops/pt.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-08 23:22+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-04-03 18:21+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdegraphics/kghostview-desktop-files/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.11.2\n"
#. Name
#: kghostview.desktop:2 kghostview_part.desktop:2
msgid "KGhostView"
-msgstr ""
+msgstr "KGhostView"
#. GenericName
#: kghostview.desktop:3
diff --git a/translations/desktop_files/kolourpaint.desktop/pt.po b/translations/desktop_files/kolourpaint.desktop/pt.po
index 209e2f38..a117d168 100644
--- a/translations/desktop_files/kolourpaint.desktop/pt.po
+++ b/translations/desktop_files/kolourpaint.desktop/pt.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-08 23:31+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-05-20 14:22+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdegraphics/kolourpaint-kolourpaintdesktop/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.12.2\n"
#. Name
#: kolourpaint.desktop:3
msgid "KolourPaint"
-msgstr ""
+msgstr "KolourPaint"
#. GenericName
#: kolourpaint.desktop:4
diff --git a/translations/desktop_files/kpdf-desktops/pt.po b/translations/desktop_files/kpdf-desktops/pt.po
index c56398f9..a129f8e6 100644
--- a/translations/desktop_files/kpdf-desktops/pt.po
+++ b/translations/desktop_files/kpdf-desktops/pt.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-08 23:35+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-05-20 14:22+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdegraphics/kpdf-desktop-files/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.12.2\n"
#. Name
#: kpdf_part.desktop:3 shell/kpdf.desktop:4
msgid "KPDF"
-msgstr ""
+msgstr "KPDF"
#. GenericName
#: shell/kpdf.desktop:5
diff --git a/translations/desktop_files/ksnapshot.desktop/pt.po b/translations/desktop_files/ksnapshot.desktop/pt.po
index 589b68b6..636faf97 100644
--- a/translations/desktop_files/ksnapshot.desktop/pt.po
+++ b/translations/desktop_files/ksnapshot.desktop/pt.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-08 23:46+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2021-12-02 19:03+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdegraphics/ksnapshot-ksnapshotdesktop/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.9.1\n"
#. GenericName
#: ksnapshot.desktop:2
@@ -24,4 +25,4 @@ msgstr "Programa de Captura do Ecrã"
#. Name
#: ksnapshot.desktop:4
msgid "KSnapshot"
-msgstr ""
+msgstr "KSnapshot"
diff --git a/translations/desktop_files/kuickshow.desktop/pt.po b/translations/desktop_files/kuickshow.desktop/pt.po
index 39e54467..58fb3486 100644
--- a/translations/desktop_files/kuickshow.desktop/pt.po
+++ b/translations/desktop_files/kuickshow.desktop/pt.po
@@ -1,25 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-09 00:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2021-12-02 19:03+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdegraphics/kuickshow-kuickshowdesktop/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.9.1\n"
#. Name
#: kuickshow.desktop:2
msgid "Kuickshow"
-msgstr ""
+msgstr "Kuickshow"
#. GenericName
#: kuickshow.desktop:11
diff --git a/translations/desktop_files/kviewshell-desktops/pt.po b/translations/desktop_files/kviewshell-desktops/pt.po
index fe34bbc8..dc006e2c 100644
--- a/translations/desktop_files/kviewshell-desktops/pt.po
+++ b/translations/desktop_files/kviewshell-desktops/pt.po
@@ -1,30 +1,31 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-09 15:25+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2021-12-02 19:03+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdegraphics/kviewshell-desktop-files/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.9.1\n"
#. Name
#: emptymultipage.desktop:3
msgid "EmptyMultiPage"
-msgstr ""
+msgstr "EmptyMultiPage"
#. Name
#: plugins/djvu/djvumultipage.desktop:2
msgid "kdjview"
-msgstr ""
+msgstr "kdjview"
#. Comment
#: plugins/djvu/djvumultipage.desktop:5
diff --git a/translations/desktop_files/tdeiconedit.desktop/pt.po b/translations/desktop_files/tdeiconedit.desktop/pt.po
index 03ce4d5f..9be428ee 100644
--- a/translations/desktop_files/tdeiconedit.desktop/pt.po
+++ b/translations/desktop_files/tdeiconedit.desktop/pt.po
@@ -1,20 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-09 16:51+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2021-12-02 19:03+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdegraphics/tdeiconedit-tdeiconeditdesktop/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.9.1\n"
#. GenericName
#: tdeiconedit.desktop:2
@@ -23,6 +24,5 @@ msgstr "Editor de Ícones"
#. Name
#: tdeiconedit.desktop:3
-#, fuzzy
msgid "TDEIconEdit"
-msgstr "Editor de Ícones"
+msgstr "TDEIconEdit"