RPM Packaging: update gwenview

17 files changed, 62 insertions, 3788 deletions

diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.1.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.1.spec
deleted file mode 100644
index c26279a74..000000000
--- a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.1.spec
+++ /dev/null
@@ -1,180 +0,0 @@
-# Default version for this component
-%define kdecomp gwenview-i18n
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Gwenview is an image viewer for KDE.
-Version:	1.4.2
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	exiv2-devel
-%endif
-
-%if "%{?tde_prefix}" == "/usr"
-Conflicts: kdegraphics
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-./configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-
-## File lists
-%find_lang gwenview
-
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> gwenview.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%files -f gwenview.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
-- Initial release for TDE 3.5.13.1
-
diff --git a/redhat/applications/gwenview/gwenview-14.0.0.spec b/redhat/applications/gwenview/gwenview-14.0.0.spec
index 773511b00..0a4dadcc0 100644
--- a/redhat/applications/gwenview/gwenview-14.0.0.spec
+++ b/redhat/applications/gwenview/gwenview-14.0.0.spec
@@ -1,54 +1,79 @@
-# Default version for this component
-%define tde_pkg gwenview
+#
+# spec file for package gwenview (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg gwenview
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
-
 
 Name:			trinity-%{tde_pkg}
-Summary:		Gwenview is an image viewer for TDE.
+Epoch:			%{tde_epoch}
 Version:		1.4.2
-Release:		%{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:		Gwenview is an image viewer for TDE.
 Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
 URL:			http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
 Prefix:			%{_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
-
 BuildRequires:	gettext
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
 # EXIV2 support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}exiv2-devel
@@ -79,10 +104,14 @@ converting, and batch processing, HTML gallery and others are provided by the
 KIPI image framework.
 
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -95,7 +124,6 @@ KIPI image framework.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -126,6 +154,11 @@ export PATH="%{tde_bindir}:${PATH}"
 # Removes useless files (-devel ?)
 %__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file gwenview RasterGraphics Viewer
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
@@ -164,7 +197,9 @@ done
 %{tde_tdelibdir}/libgvimagepart.so
 %{tde_tdeappdir}/gwenview.desktop
 %{tde_datadir}/apps/gwenview/
+%dir %{tde_datadir}/apps/gvdirpart
 %{tde_datadir}/apps/gvdirpart/gvdirpart.rc
+%dir %{tde_datadir}/apps/gvimagepart
 %{tde_datadir}/apps/gvimagepart/gvimagepart.rc
 %{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc
 %{tde_datadir}/apps/tdeconf_update/gwenview_1.4_osdformat.sh
@@ -191,5 +226,5 @@ done
 %lang(en) %{tde_tdedocdir}/HTML/en/gwenview/
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-12
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.4.2-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/gwenview/gwenview-3.5.12.spec b/redhat/applications/gwenview/gwenview-3.5.12.spec
deleted file mode 100644
index bbe7a61fe..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.12.spec
+++ /dev/null
@@ -1,153 +0,0 @@
-# Default version for this component
-%define kdecomp gwenview
-%define version 1.4.2
-%define release 3
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Gwenview is an image viewer for KDE.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: exiv2-devel
-
-%if "%{?_prefix}" == "/usr"
-Conflicts: kdegraphics
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for KDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{_bindir}/*
-%{_libdir}/*.so.*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/services/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/config.kcfg/*
-%{tde_docdir}/HTML/en/*/
-%{_datadir}/icons/*/*/*/*
-%{_mandir}/man*/*
-
-%{_libdir}/libkdeinit_gwenview.so
-%exclude %{_libdir}/libgwenviewcore.so
-
-%exclude %{_libdir}/*.la
-%exclude %{_libdir}/*/*.so
-%exclude %{_libdir}/*/*.la
-
-
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2
-- Add fix for Fedora 15
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_alphabet_string_error.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_alphabet_string_error.patch
deleted file mode 100644
index 4b9f93e75..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-fix_alphabet_string_error.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 9cb99cdb5337032764d897c94a5e7c8803784d4e
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1327529624 -0600
-
-    Fix linear alphabet string errors
-
-diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp
-index a021c55..f9018b8 100644
---- a/src/gvcore/xpm.cpp
-+++ b/src/gvcore/xpm.cpp
-@@ -308,7 +308,7 @@ static const char* xpm_color_name( int cpp, int index )
- {
-     static char returnable[5];
-     static const char code[] = ".#abcdefghijklmnopqrstuvwxyzABCD"
--			       "EFGHIJKLMNOPTQRSTUVWXYZ0123456789";
-+			       "EFGHIJKLMNOPQRSTUVWXYZ0123456789";
-     // cpp is limited to 4 and index is limited to 64^cpp
-     if ( cpp > 1 ) {
- 	if ( cpp > 2 ) {
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_building_libpng15.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_building_libpng15.patch
deleted file mode 100644
index b8220bd7b..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-fix_building_libpng15.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-commit 303be4553ad5bbe79d50a8708cf1f8f0e4d220af
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1334285908 -0500
-
-    Fix building with libpng 1.5.
-
-diff --git a/src/gvcore/pngformattype.cpp b/src/gvcore/pngformattype.cpp
-index 77bf7b3..8da8089 100644
---- a/src/gvcore/pngformattype.cpp
-+++ b/src/gvcore/pngformattype.cpp
-@@ -211,7 +211,7 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
- 
-     if ( color_type == PNG_COLOR_TYPE_GRAY ) {
- 	// Black & White or 8-bit grayscale
--	if ( bit_depth == 1 && info_ptr->channels == 1 ) {
-+      if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
- 	    png_set_invert_mono( png_ptr );
- 	    png_read_update_info( png_ptr, info_ptr );
- 	    if (!image.create( width, height, 1, 2, TQImage::BigEndian ))
-@@ -246,7 +246,11 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
- 	    }
- 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
- #if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
--		const int g = info_ptr->trans_color.gray;
-+		png_bytep trans_alpha;
-+		int num_trans;
-+		png_color_16p trans_color;
-+		png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
-+		const int g = trans_color->gray;
- #else
-  		const int g = info_ptr->trans_values.gray;
- #endif
-@@ -256,9 +260,13 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
- 		}
- 	    }
- 	}
--    } else if ( color_type == PNG_COLOR_TYPE_PALETTE
-+    } else {
-+     png_colorp palette;
-+     int num_palette;
-+     png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
-+     if ( color_type == PNG_COLOR_TYPE_PALETTE
-      && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
--     && info_ptr->num_palette <= 256 )
-+     && num_palette <= 256 )
-     {
- 	// 1-bit and 8-bit color
- 	if ( bit_depth != 1 )
-@@ -266,20 +274,28 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
- 	png_read_update_info( png_ptr, info_ptr );
- 	png_get_IHDR(png_ptr, info_ptr,
- 	    &width, &height, &bit_depth, &color_type, 0, 0, 0);
--	if (!image.create(width, height, bit_depth, info_ptr->num_palette,
-+	if (!image.create(width, height, bit_depth, num_palette,
- 	    TQImage::BigEndian))
- 	    return;
- 	int i = 0;
- 	if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
-+	    png_bytep trans_alpha;
-+	    int num_trans;
-+	    png_color_16p trans_color;
-+	    png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
- 	    image.setAlphaBuffer( TRUE );
--	    while ( i < info_ptr->num_trans ) {
-+	    while ( i < num_trans ) {
- 		image.setColor(i, tqRgba(
--		    info_ptr->palette[i].red,
--		    info_ptr->palette[i].green,
--		    info_ptr->palette[i].blue,
--#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
--		    info_ptr->trans_alpha[i]
--#else
-+		    palette[i].red,
-+		    palette[i].green,
-+		    palette[i].blue,
-+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
-+		    trans_alpha[i]
-+#endif
-+#if ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR==4 )
-+        info_ptr->trans_alpha[i]
-+#endif
-+#if ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR<=3 )
-  		    info_ptr->trans[i]
- #endif
- 		    )
-@@ -287,11 +303,11 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
- 		i++;
- 	    }
- 	}
--	while ( i < info_ptr->num_palette ) {
-+	while ( i < num_palette ) {
- 	    image.setColor(i, tqRgba(
--		info_ptr->palette[i].red,
--		info_ptr->palette[i].green,
--		info_ptr->palette[i].blue,
-+		palette[i].red,
-+		palette[i].green,
-+		palette[i].blue,
- 		0xff
- 		)
- 	    );
-@@ -326,12 +342,13 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
- 	}
- 
- 	png_read_update_info(png_ptr, info_ptr);
--    }
-+      }
- 
-     // TQt==ARGB==Big(ARGB)==Little(BGRA)
-     if ( TQImage::systemByteOrder() == TQImage::LittleEndian ) {
- 	png_set_bgr(png_ptr);
-     }
-+    }
- }
- 
- 
-@@ -389,7 +406,7 @@ int PNGFormat::decode(TQImage& img, TQImageConsumer* cons,
- 	    return -1;
- 	}
- 
--	if (setjmp((png_ptr)->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 	    png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- 	    image = 0;
- 	    return -1;
-@@ -417,7 +434,7 @@ int PNGFormat::decode(TQImage& img, TQImageConsumer* cons,
- 
-     if ( !png_ptr ) return 0;
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- 	image = 0;
- 	state = MovieStart;
-@@ -484,7 +501,11 @@ void PNGFormat::end(png_structp png, png_infop info)
-     consumer->frameDone(TQPoint(offx,offy),r);
-     consumer->end();
-     state = FrameStart;
-+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
-+    unused_data = png_process_data_pause(png, 1);
-+#else
-     unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
-+#endif
- }
- 
- #ifdef PNG_USER_CHUNKS_SUPPORTED
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs.patch
deleted file mode 100644
index ade498fed..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 1ca2f7392842e9ffd76fbc5aefc51213eb9ce262
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1325190949 -0600
-
-    Fix FTBFS
-
-diff --git a/src/gvcore/imageviewconfig.kcfg b/src/gvcore/imageviewconfig.kcfg
-index d93051a..e5c1e04 100644
---- a/src/gvcore/imageviewconfig.kcfg
-+++ b/src/gvcore/imageviewconfig.kcfg
-@@ -2,7 +2,7 @@
- <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
- <kcfg> 
-   <include>tqapplication.h</include>
--  <include>palette.h</include>
-+  <include>tqpalette.h</include>
-   <kcfgfile name="gwenviewrc"/> 
-   <group name="pixmap widget">
-     <entry name="smoothAlgorithm" key="smooth scale" type="Enum"> 
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs_in_jpeg_code.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs_in_jpeg_code.patch
deleted file mode 100644
index b2935457f..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs_in_jpeg_code.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-commit ace6f27083b0acc2f30195f0d8908a9a346a5910
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326325099 -0600
-
-    Fix FTBFS in jpeg code
-
-diff --git a/src/imageutils/jpegint.h b/src/imageutils/jpegint.h
-index 9d00c59..95b00d4 100644
---- a/src/imageutils/jpegint.h
-+++ b/src/imageutils/jpegint.h
-@@ -43,9 +43,9 @@ typedef enum {			/* Operating modes for buffer controllers */
- 
- /* Master control module */
- struct jpeg_comp_master {
--  JTQT_METHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, pass_startup, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
-+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean call_pass_startup;	/* True if pass_startup must be called */
-@@ -54,16 +54,16 @@ struct jpeg_comp_master {
- 
- /* Main buffer control (downsampled-data buffer) */
- struct jpeg_c_main_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, process_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, process_data, (j_compress_ptr cinfo,
- 			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
- 			       JDIMENSION in_rows_avail));
- };
- 
- /* Compression preprocessing (downsampling input buffer control) */
- struct jpeg_c_prep_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, pre_process_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
- 				   JSAMPARRAY input_buf,
- 				   JDIMENSION *in_row_ctr,
- 				   JDIMENSION in_rows_avail,
-@@ -74,23 +74,23 @@ struct jpeg_c_prep_controller {
- 
- /* Coefficient buffer control */
- struct jpeg_c_coef_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(boolean, compress_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
- 				   JSAMPIMAGE input_buf));
- };
- 
- /* Colorspace conversion */
- struct jpeg_color_converter {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, color_convert, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
- 				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
- 				JDIMENSION output_row, int num_rows));
- };
- 
- /* Downsampling */
- struct jpeg_downsampler {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, downsample, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, downsample, (j_compress_ptr cinfo,
- 			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
- 			     JSAMPIMAGE output_buf,
- 			     JDIMENSION out_row_group_index));
-@@ -100,9 +100,9 @@ struct jpeg_downsampler {
- 
- /* Forward DCT (also controls coefficient quantization) */
- struct jpeg_forward_dct {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-   /* perhaps this should be an array??? */
--  JTQT_METHOD(void, forward_DCT, (j_compress_ptr cinfo,
-+  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
- 			      jpeg_component_info * compptr,
- 			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
- 			      JDIMENSION start_row, JDIMENSION start_col,
-@@ -111,23 +111,23 @@ struct jpeg_forward_dct {
- 
- /* Entropy encoding */
- struct jpeg_entropy_encoder {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
--  JTQT_METHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
--  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
-+  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
-+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
- };
- 
- /* Marker writing */
- struct jpeg_marker_writer {
--  JTQT_METHOD(void, write_file_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_frame_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_scan_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_file_trailer, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_tables_only, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
-   /* These routines are exported to allow insertion of extra markers */
-   /* Probably only COM and APPn markers should be written this way */
--  JTQT_METHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
-+  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
- 				      unsigned int datalen));
--  JTQT_METHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
-+  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
- };
- 
- 
-@@ -135,8 +135,8 @@ struct jpeg_marker_writer {
- 
- /* Master control module */
- struct jpeg_decomp_master {
--  JTQT_METHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
-@@ -144,10 +144,10 @@ struct jpeg_decomp_master {
- 
- /* Input control module */
- struct jpeg_input_controller {
--  JTQT_METHOD(int, consume_input, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
-+  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean has_multiple_scans;	/* True if file has multiple scans */
-@@ -156,18 +156,18 @@ struct jpeg_input_controller {
- 
- /* Main buffer control (downsampled-data buffer) */
- struct jpeg_d_main_controller {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, process_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
- 			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
- 			       JDIMENSION out_rows_avail));
- };
- 
- /* Coefficient buffer control */
- struct jpeg_d_coef_controller {
--  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(int, consume_data, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, start_output_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(int, decompress_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
- 				 JSAMPIMAGE output_buf));
-   /* Pointer to array of coefficient virtual arrays, or NULL if none */
-   jvirt_barray_ptr *coef_arrays;
-@@ -175,8 +175,8 @@ struct jpeg_d_coef_controller {
- 
- /* Decompression postprocessing (color quantization buffer control) */
- struct jpeg_d_post_controller {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, post_process_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
- 				    JSAMPIMAGE input_buf,
- 				    JDIMENSION *in_row_group_ctr,
- 				    JDIMENSION in_row_groups_avail,
-@@ -187,12 +187,12 @@ struct jpeg_d_post_controller {
- 
- /* Marker reading & parsing */
- struct jpeg_marker_reader {
--  JTQT_METHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-+  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-   /* Read markers until SOS or EOI.
-    * Returns same codes as are defined for jpeg_consume_input:
-    * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
-    */
--  JTQT_METHOD(int, read_markers, (j_decompress_ptr cinfo));
-+  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
-   /* Read a restart marker --- exported for use by entropy decoder only */
-   jpeg_marker_parser_method read_restart_marker;
- 
-@@ -207,8 +207,8 @@ struct jpeg_marker_reader {
- 
- /* Entropy decoding */
- struct jpeg_entropy_decoder {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
- 				JBLOCKROW *MCU_data));
- 
-   /* This is here to share code between baseline and progressive decoders; */
-@@ -217,21 +217,21 @@ struct jpeg_entropy_decoder {
- };
- 
- /* Inverse DCT (also performs dequantization) */
--typedef JTQT_METHOD(void, inverse_DCT_method_ptr,
-+typedef JMETHOD(void, inverse_DCT_method_ptr,
- 		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
- 		 JCOEFPTR coef_block,
- 		 JSAMPARRAY output_buf, JDIMENSION output_col));
- 
- struct jpeg_inverse_dct {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-   /* It is useful to allow each component to have a separate IDCT method. */
-   inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
- };
- 
- /* Upsampling (note that upsampler must also call color converter) */
- struct jpeg_upsampler {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, upsample, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
- 			   JSAMPIMAGE input_buf,
- 			   JDIMENSION *in_row_group_ctr,
- 			   JDIMENSION in_row_groups_avail,
-@@ -244,20 +244,20 @@ struct jpeg_upsampler {
- 
- /* Colorspace conversion */
- struct jpeg_color_deconverter {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, color_convert, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
- 				JSAMPIMAGE input_buf, JDIMENSION input_row,
- 				JSAMPARRAY output_buf, int num_rows));
- };
- 
- /* Color quantization or color precision reduction */
- struct jpeg_color_quantizer {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
--  JTQT_METHOD(void, color_quantize, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
-+  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
- 				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
- 				 int num_rows));
--  JTQT_METHOD(void, finish_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, new_color_map, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
- };
- 
- 
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_libmng_check.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_libmng_check.patch
deleted file mode 100644
index 80ea42ef7..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-fix_libmng_check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 59c7639f5e9f3ef40b06cb0e011216cc748e3f85
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1337933593 -0500
-
-    Define QT_CLEAN_NAMESPACE during libmng checks
-
-diff --git a/configure.in.in b/configure.in.in
-index f5e959c..1cdda0b 100644
---- a/configure.in.in
-+++ b/configure.in.in
-@@ -98,6 +98,8 @@ AC_SUBST(GV_ASM_DEFS)
- # libmng check (for gvmngformattype.*)
- #
- LIBMNG=
-+CXXFLAGS_SAVE="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE"
- KDE_CHECK_HEADER(libmng.h,
-     [
-     KDE_CHECK_LIB(mng, mng_initialize,
-@@ -106,6 +108,7 @@ KDE_CHECK_HEADER(libmng.h,
-         LIBMNG="-lmng $LIBZ -lm"
-         ], [], $LIBZ -lm)
-     ])
-+CXXFLAGS="$CXXFLAGS_SAVE"
- AC_SUBST(LIBMNG)
- if test -z "$LIBMNG"; then
-     AC_WARN([Can't find libmng.h, Gwenview won't be compiled with MNG support])
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_various_problems.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_various_problems.patch
deleted file mode 100644
index 4a0dbfc53..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-fix_various_problems.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-commit 1eac443e690763dd571aec664aba52f6683f9916
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1334285947 -0500
-
-    Fix inadvertent tqt changes. Part of an extensive cleanup of various problems
-    with kipi-plugins, digikam, and gwenview to resolve bug reports 241, 962, 963.
-
-diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
-index 86a0282..a8d0bee 100644
---- a/src/gvcore/fileviewcontroller.cpp
-+++ b/src/gvcore/fileviewcontroller.cpp
-@@ -309,7 +309,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
- 	mBottomThumbnailMode->setExclusiveGroup("thumbnails");
- 
- 	// Size slider
--	mSizeSlider=new TQSlider(Qt::Horizontal, d->mToolBar);
-+	mSizeSlider=new TQSlider(Horizontal, d->mToolBar);
- 	mSizeSlider->setFixedWidth(120);
- 	mSizeSlider->setRange(
- 		ThumbnailSize::MIN/SLIDER_RESOLUTION,
-diff --git a/src/gvcore/imageviewtools.cpp b/src/gvcore/imageviewtools.cpp
-index da9044a..a749ff3 100644
---- a/src/gvcore/imageviewtools.cpp
-+++ b/src/gvcore/imageviewtools.cpp
-@@ -177,7 +177,7 @@ void ImageView::ScrollTool::wheelEvent(TQWheelEvent* event) {
- 	if (ImageViewConfig::mouseWheelScroll()) {
- 		int deltaX, deltaY;
- 
--		if (event->state() & AltButton || event->orientation()==Qt::Horizontal) {
-+		if (event->state() & AltButton || event->orientation()==Horizontal) {
- 			deltaX = event->delta();
- 			deltaY = 0;
- 		} else {
-diff --git a/src/imageutils/transupp.c b/src/imageutils/transupp.c
-index 3bc6f20..e5ec564 100644
---- a/src/imageutils/transupp.c
-+++ b/src/imageutils/transupp.c
-@@ -30,7 +30,7 @@
-  * or recompression of the image.
-  * Thanks to Guido Vollbeding for the initial design and code of this feature.
-  *
-- *Qt::Horizontal flipping is done in-place, using a single top-to-bottom
-+ * Horizontal flipping is done in-place, using a single top-to-bottom
-  * pass through the virtual source array.  It will thus be much the
-  * fastest option for images larger than main memory.
-  *
-@@ -65,7 +65,7 @@
- LOCAL(void)
- do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- 	   jvirt_barray_ptr *src_coef_arrays)
--/*Qt::Horizontal flip; done in-place, so no separate dest array is required */
-+/* Horizontal flip; done in-place, so no separate dest array is required */
- {
-   JDIMENSION MCU_cols, comp_width, blk_x, blk_y;
-   int ci, k, offset_y;
-@@ -74,7 +74,7 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-   JCOEF temp1, temp2;
-   jpeg_component_info *compptr;
- 
--  /*Qt::Horizontal mirroring of DCT blocks is accomplished by swapping
-+  /* Horizontal mirroring of DCT blocks is accomplished by swapping
-    * pairs of blocks in-place.  Within a DCT block, we perform horizontal
-    * mirroring by changing the signs of odd-numbered columns.
-    * Partial iMCUs at the right edge are left untouched.
-@@ -115,7 +115,7 @@ LOCAL(void)
- do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- 	   jvirt_barray_ptr *src_coef_arrays,
- 	   jvirt_barray_ptr *dst_coef_arrays)
--/*Qt::Vertical flip */
-+/* Vertical flip */
- {
-   JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
-   int ci, i, j, offset_y;
-@@ -232,7 +232,7 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- 	   jvirt_barray_ptr *dst_coef_arrays)
- /* 90 degree rotation is equivalent to
-  *   1. Transposing the image;
-- *   2.Qt::Horizontal mirroring.
-+ *   2. Horizontal mirroring.
-  * These two steps are merged into a single processing routine.
-  */
- {
-@@ -295,7 +295,7 @@ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- 	    jvirt_barray_ptr *src_coef_arrays,
- 	    jvirt_barray_ptr *dst_coef_arrays)
- /* 270 degree rotation is equivalent to
-- *   1.Qt::Horizontal mirroring;
-+ *   1. Horizontal mirroring;
-  *   2. Transposing the image.
-  * These two steps are merged into a single processing routine.
-  */
-@@ -359,8 +359,8 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- 	    jvirt_barray_ptr *src_coef_arrays,
- 	    jvirt_barray_ptr *dst_coef_arrays)
- /* 180 degree rotation is equivalent to
-- *   1.Qt::Vertical mirroring;
-- *   2.Qt::Horizontal mirroring.
-+ *   1. Vertical mirroring;
-+ *   2. Horizontal mirroring.
-  * These two steps are merged into a single processing routine.
-  */
- {
-@@ -463,9 +463,9 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-  *   1. 180 degree rotation;
-  *   2. Transposition;
-  * or
-- *   1.Qt::Horizontal mirroring;
-+ *   1. Horizontal mirroring;
-  *   2. Transposition;
-- *   3.Qt::Horizontal mirroring.
-+ *   3. Horizontal mirroring.
-  * These steps are merged into a single processing routine.
-  */
- {
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch b/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch
deleted file mode 100644
index 0cd290983..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-diff -Nuar gwenview.ORI/src/imageutils/jpegint.h gwenview/src/imageutils/jpegint.h
---- gwenview.ORI/src/imageutils/jpegint.h	2011-05-26 23:04:57.000000000 +0200
-+++ gwenview/src/imageutils/jpegint.h	2011-11-01 20:45:15.494165195 +0100
-@@ -43,9 +43,9 @@
- 
- /* Master control module */
- struct jpeg_comp_master {
--  JTQT_METHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, pass_startup, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
-+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean call_pass_startup;	/* True if pass_startup must be called */
-@@ -54,16 +54,16 @@
- 
- /* Main buffer control (downsampled-data buffer) */
- struct jpeg_c_main_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, process_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, process_data, (j_compress_ptr cinfo,
- 			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
- 			       JDIMENSION in_rows_avail));
- };
- 
- /* Compression preprocessing (downsampling input buffer control) */
- struct jpeg_c_prep_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, pre_process_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
- 				   JSAMPARRAY input_buf,
- 				   JDIMENSION *in_row_ctr,
- 				   JDIMENSION in_rows_avail,
-@@ -74,23 +74,23 @@
- 
- /* Coefficient buffer control */
- struct jpeg_c_coef_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(boolean, compress_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
- 				   JSAMPIMAGE input_buf));
- };
- 
- /* Colorspace conversion */
- struct jpeg_color_converter {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, color_convert, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
- 				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
- 				JDIMENSION output_row, int num_rows));
- };
- 
- /* Downsampling */
- struct jpeg_downsampler {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, downsample, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, downsample, (j_compress_ptr cinfo,
- 			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
- 			     JSAMPIMAGE output_buf,
- 			     JDIMENSION out_row_group_index));
-@@ -100,9 +100,9 @@
- 
- /* Forward DCT (also controls coefficient quantization) */
- struct jpeg_forward_dct {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-   /* perhaps this should be an array??? */
--  JTQT_METHOD(void, forward_DCT, (j_compress_ptr cinfo,
-+  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
- 			      jpeg_component_info * compptr,
- 			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
- 			      JDIMENSION start_row, JDIMENSION start_col,
-@@ -111,23 +111,23 @@
- 
- /* Entropy encoding */
- struct jpeg_entropy_encoder {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
--  JTQT_METHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
--  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
-+  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
-+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
- };
- 
- /* Marker writing */
- struct jpeg_marker_writer {
--  JTQT_METHOD(void, write_file_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_frame_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_scan_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_file_trailer, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_tables_only, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
-   /* These routines are exported to allow insertion of extra markers */
-   /* Probably only COM and APPn markers should be written this way */
--  JTQT_METHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
-+  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
- 				      unsigned int datalen));
--  JTQT_METHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
-+  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
- };
- 
- 
-@@ -135,8 +135,8 @@
- 
- /* Master control module */
- struct jpeg_decomp_master {
--  JTQT_METHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
-@@ -144,10 +144,10 @@
- 
- /* Input control module */
- struct jpeg_input_controller {
--  JTQT_METHOD(int, consume_input, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
-+  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean has_multiple_scans;	/* True if file has multiple scans */
-@@ -156,18 +156,18 @@
- 
- /* Main buffer control (downsampled-data buffer) */
- struct jpeg_d_main_controller {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, process_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
- 			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
- 			       JDIMENSION out_rows_avail));
- };
- 
- /* Coefficient buffer control */
- struct jpeg_d_coef_controller {
--  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(int, consume_data, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, start_output_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(int, decompress_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
- 				 JSAMPIMAGE output_buf));
-   /* Pointer to array of coefficient virtual arrays, or NULL if none */
-   jvirt_barray_ptr *coef_arrays;
-@@ -175,8 +175,8 @@
- 
- /* Decompression postprocessing (color quantization buffer control) */
- struct jpeg_d_post_controller {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, post_process_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
- 				    JSAMPIMAGE input_buf,
- 				    JDIMENSION *in_row_group_ctr,
- 				    JDIMENSION in_row_groups_avail,
-@@ -187,12 +187,12 @@
- 
- /* Marker reading & parsing */
- struct jpeg_marker_reader {
--  JTQT_METHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-+  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-   /* Read markers until SOS or EOI.
-    * Returns same codes as are defined for jpeg_consume_input:
-    * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
-    */
--  JTQT_METHOD(int, read_markers, (j_decompress_ptr cinfo));
-+  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
-   /* Read a restart marker --- exported for use by entropy decoder only */
-   jpeg_marker_parser_method read_restart_marker;
- 
-@@ -207,8 +207,8 @@
- 
- /* Entropy decoding */
- struct jpeg_entropy_decoder {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
- 				JBLOCKROW *MCU_data));
- 
-   /* This is here to share code between baseline and progressive decoders; */
-@@ -217,21 +217,21 @@
- };
- 
- /* Inverse DCT (also performs dequantization) */
--typedef JTQT_METHOD(void, inverse_DCT_method_ptr,
-+typedef JMETHOD(void, inverse_DCT_method_ptr,
- 		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
- 		 JCOEFPTR coef_block,
- 		 JSAMPARRAY output_buf, JDIMENSION output_col));
- 
- struct jpeg_inverse_dct {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-   /* It is useful to allow each component to have a separate IDCT method. */
-   inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
- };
- 
- /* Upsampling (note that upsampler must also call color converter) */
- struct jpeg_upsampler {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, upsample, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
- 			   JSAMPIMAGE input_buf,
- 			   JDIMENSION *in_row_group_ctr,
- 			   JDIMENSION in_row_groups_avail,
-@@ -244,20 +244,20 @@
- 
- /* Colorspace conversion */
- struct jpeg_color_deconverter {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, color_convert, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
- 				JSAMPIMAGE input_buf, JDIMENSION input_row,
- 				JSAMPARRAY output_buf, int num_rows));
- };
- 
- /* Color quantization or color precision reduction */
- struct jpeg_color_quantizer {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
--  JTQT_METHOD(void, color_quantize, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
-+  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
- 				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
- 				 int num_rows));
--  JTQT_METHOD(void, finish_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, new_color_map, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
- };
- 
- 
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-missing_ldflags.patch b/redhat/applications/gwenview/gwenview-3.5.13-missing_ldflags.patch
deleted file mode 100644
index bcf206288..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gwenview/src/gvcore/Makefile.am.ORI	2012-08-04 12:50:37.306573906 +0200
-+++ gwenview/src/gvcore/Makefile.am	2012-08-04 12:50:46.112710411 +0200
-@@ -6,7 +6,7 @@
- 
- libgwenviewcore_la_LIBADD   = \
- 	$(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_QT) \
--	$(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2)\
-+	$(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2) $(LIB_KPARTS) -lkdefx \
- 	-lkmediaplayer ../imageutils/libgvimageutils.la \
- 	../tsthread/libtsthread.la
- 
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-remove_additional_tq_conversions.patch b/redhat/applications/gwenview/gwenview-3.5.13-remove_additional_tq_conversions.patch
deleted file mode 100644
index 195d89ea6..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-remove_additional_tq_conversions.patch
+++ /dev/null
@@ -1,915 +0,0 @@
-commit eba1d381626d92b860239417f21d813f02ee6394
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324316139 -0600
-
-    Remove additional unneeded tq method conversions
-
-diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp
-index 68ee9f0..d09156a 100644
---- a/src/app/bookmarkviewcontroller.cpp
-+++ b/src/app/bookmarkviewcontroller.cpp
-@@ -392,11 +392,11 @@ void BookmarkViewController::deleteCurrentBookmark() {
- 	TQString title;
- 	if (bookmark.isGroup()) {
- 		msg=i18n("Are you sure you want to delete the bookmark folder <b>%1</b>?<br>This will delete the folder and all the bookmarks in it.")
--			.tqarg(bookmark.text());
-+			.arg(bookmark.text());
- 		title=i18n("Delete Bookmark &Folder");
- 	} else {
- 		msg=i18n("Are you sure you want to delete the bookmark <b>%1</b>?")
--			.tqarg(bookmark.text());
-+			.arg(bookmark.text());
- 		title=i18n("Delete &Bookmark");
- 	}
- 
-diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
-index d274188..a429095 100644
---- a/src/app/configdialog.cpp
-+++ b/src/app/configdialog.cpp
-@@ -247,7 +247,7 @@ void ConfigDialog::calculateCacheSize() {
- 	KURL url;
- 	url.setPath(ThumbnailLoadJob::thumbnailBaseDir());
- 	unsigned long size=KDirSize::dirSize(url);
--	KMessageBox::information( this,i18n("Cache size is %1").tqarg(KIO::convertSize(size)) );
-+	KMessageBox::information( this,i18n("Cache size is %1").arg(KIO::convertSize(size)) );
- }
- 
- 
-@@ -281,7 +281,7 @@ void ConfigDialog::emptyCache() {
- 
- 	int response=KMessageBox::warningContinueCancel(this,
- 		"<qt>" + i18n("Are you sure you want to empty the thumbnail cache?"
--		" This will delete the folder <b>%1</b>.").tqarg(TQStyleSheet::escape(dir)) + "</qt>",
-+		" This will delete the folder <b>%1</b>.").arg(TQStyleSheet::escape(dir)) + "</qt>",
- 		TQString(),
- 		KStdGuiItem::del());
- 
-diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui
-index 32fb346..2f816c0 100644
---- a/src/app/configimageviewpage.ui
-+++ b/src/app/configimageviewpage.ui
-@@ -217,7 +217,7 @@
-                                 <string>Using this option, Gwenview will display the image as fast as possible, and smooth it after a short delay.
- Use this option if your computer is not very fast.</string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>WordBreak|AlignTop</set>
-                             </property>
-                             <property name="buddy" stdset="0">
-diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp
-index 9a35ef3..f95fe54 100644
---- a/src/app/kipiinterface.cpp
-+++ b/src/app/kipiinterface.cpp
-@@ -163,7 +163,7 @@ KIPI::ImageCollection KIPIInterface::currentSelection() {
- 	LOG("");
- 	KURL::List list=d->mFileView->selectedImageURLs();
- 	KURL url=d->mFileView->dirURL();
--	return KIPI::ImageCollection(new ImageCollection(url, i18n("%1 (Selected Images)").tqarg(url.fileName()), list));
-+	return KIPI::ImageCollection(new ImageCollection(url, i18n("%1 (Selected Images)").arg(url.fileName()), list));
- }
- 
- 
-@@ -189,12 +189,12 @@ int KIPIInterface::features() const {
-  * here, it is however necessary to discard caches if the plugin preserves timestamp
-  */
- bool KIPIInterface::addImage(const KURL& url, TQString&) {
--	Cache::instance()->tqinvalidate( url );
-+	Cache::instance()->invalidate( url );
- 	return true;
- }
- 
- void KIPIInterface::delImage(const KURL& url) {
--	Cache::instance()->tqinvalidate( url );
-+	Cache::instance()->invalidate( url );
- }
- 
- // TODO currently KDirWatch doesn't have watching of files in a directory
-@@ -203,7 +203,7 @@ void KIPIInterface::refreshImages( const KURL::List& urls ) {
- 	for( KURL::List::ConstIterator it = urls.begin();
- 	     it != urls.end();
- 	     ++it ) {
--		Cache::instance()->tqinvalidate( *it );
-+		Cache::instance()->invalidate( *it );
- 	}
- 	d->mFileView->refreshItems( urls );
- }
-diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
-index f9acc9b..2f2275b 100644
---- a/src/app/mainwindow.cpp
-+++ b/src/app/mainwindow.cpp
-@@ -806,7 +806,7 @@ void MainWindow::updateStatusInfo() {
- 		int pos = mFileViewController->shownFilePosition();
- 		uint count = mFileViewController->fileCount();
- 		if (count > 0) {
--			tokens << i18n("%1/%2").tqarg(pos+1).tqarg(count);
-+			tokens << i18n("%1/%2").arg(pos+1).arg(count);
- 		} else {
- 			tokens << i18n("No images");
- 		}
-@@ -816,7 +816,7 @@ void MainWindow::updateStatusInfo() {
- 
- 	TQSize size = mDocument->image().size();
- 	if (!size.isEmpty()) {
--		tokens << i18n("%1 x %2 pixels").tqarg(size.width()).tqarg(size.height());
-+		tokens << i18n("%1 x %2 pixels").arg(size.width()).arg(size.height());
- 	}
- 	
- 	mSBDetailLabel->setText(tokens.join(" - "));
-@@ -1094,9 +1094,9 @@ void MainWindow::createObjectInteractions() {
- void MainWindow::createHideShowAction(KDockWidget* dock) {
- 	TQString caption;
- 	if (dock->mayBeHide()) {
--		caption=i18n("Hide %1").tqarg(dock->caption());
-+		caption=i18n("Hide %1").arg(dock->caption());
- 	} else {
--		caption=i18n("Show %1").tqarg(dock->caption());
-+		caption=i18n("Show %1").arg(dock->caption());
- 	}
- 
- 	KAction* action=new KAction(caption, 0, TQT_TQOBJECT(dock), TQT_SLOT(changeHideShowState()), (TQObject*)0 );
-diff --git a/src/app/metaedit.cpp b/src/app/metaedit.cpp
-index 3fa9e19..7aa3ced 100644
---- a/src/app/metaedit.cpp
-+++ b/src/app/metaedit.cpp
-@@ -132,7 +132,7 @@ void MetaEdit::setComment(const TQString& comment) {
- void MetaEdit::setMessage(const TQString& msg) {
- 	mCommentEdit->setTextFormat(TQTextEdit::RichText);
- 	mCommentEdit->setReadOnly(true);
--	mCommentEdit->setText(TQString("<i>%1</i>").tqarg(msg));
-+	mCommentEdit->setText(TQString("<i>%1</i>").arg(msg));
- }
- 
- } // namespace
-diff --git a/src/gvcore/cache.cpp b/src/gvcore/cache.cpp
-index 448d8f6..8f4bfb3 100644
---- a/src/gvcore/cache.cpp
-+++ b/src/gvcore/cache.cpp
-@@ -179,7 +179,7 @@ void Cache::addThumbnail( const KURL& url, const TQPixmap& thumbnail, TQSize ima
- 	checkMaxSize();
- }
- 
--void Cache::tqinvalidate( const KURL& url ) {
-+void Cache::invalidate( const KURL& url ) {
- 	d->mImages.remove( url );
- }
- 
-diff --git a/src/gvcore/cache.h b/src/gvcore/cache.h
-index 199bc46..68591a5 100644
---- a/src/gvcore/cache.h
-+++ b/src/gvcore/cache.h
-@@ -52,7 +52,7 @@ public:
- 	void getFrames( const KURL& url, ImageFrames* frames, TQCString* format ) const;
- 	TQPixmap thumbnail( const KURL& url, TQSize& imagesize ) const;
- 	void setPriorityURL( const KURL& url, bool set );
--	void tqinvalidate( const KURL& url );
-+	void invalidate( const KURL& url );
- 	void checkThumbnailSize( int size );
- 	void readConfig(KConfig*,const TQString& group);
- 	void updateAge();
-diff --git a/src/gvcore/captionformatter.cpp b/src/gvcore/captionformatter.cpp
-index 74514f3..4b0a593 100644
---- a/src/gvcore/captionformatter.cpp
-+++ b/src/gvcore/captionformatter.cpp
-@@ -35,7 +35,7 @@ TQString CaptionFormatter::format(const TQString& format) {
- 
- 	TQString resolution;
- 	if (mImageSize.isValid()) {
--		resolution = TQString( "%1x%2" ).tqarg( mImageSize.width()).tqarg( mImageSize.height());
-+		resolution = TQString( "%1x%2" ).arg( mImageSize.width()).arg( mImageSize.height());
- 	}
- 	
- 	TQString str=format;
-diff --git a/src/gvcore/clicklineedit.cpp b/src/gvcore/clicklineedit.cpp
-index 58c09ac..dfbe3bb 100644
---- a/src/gvcore/clicklineedit.cpp
-+++ b/src/gvcore/clicklineedit.cpp
-@@ -40,14 +40,14 @@ ClickLineEdit::ClickLineEdit(TQWidget *parent, const char* name ) :
- void ClickLineEdit::setClickMessage( const TQString &msg )
- {
-     mClickMessage = msg;
--    tqrepaint();
-+    repaint();
- }
- 
- 
- void ClickLineEdit::setText( const TQString &txt )
- {
-     mDrawClickMsg = txt.isEmpty();
--    tqrepaint();
-+    repaint();
-     KLineEdit::setText( txt );
- }
- 
-@@ -86,7 +86,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev )
- {
-     if ( mDrawClickMsg == true ) {
-         mDrawClickMsg = false;
--        tqrepaint();
-+        repaint();
-     }
-     TQLineEdit::focusInEvent( ev );
- }
-@@ -96,7 +96,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev )
- {
-     if ( text().isEmpty() ) {
-         mDrawClickMsg = true;
--        tqrepaint();
-+        repaint();
-     }
-     TQLineEdit::focusOutEvent( ev );
- }
-diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui
-index 6abab10..f7d6f90 100644
---- a/src/gvcore/deletedialogbase.ui
-+++ b/src/gvcore/deletedialogbase.ui
-@@ -56,7 +56,7 @@
-                     <property name="text">
-                         <string>Deletion method placeholder, not in GUI</string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>WordBreak|AlignCenter</set>
-                     </property>
-                 </widget>
-@@ -80,7 +80,7 @@
-             <property name="text">
-                 <string>Placeholder for number of files, not in GUI</string>
-             </property>
--            <property name="tqalignment">
-+            <property name="alignment">
-                 <set>AlignVCenter|AlignRight</set>
-             </property>
-         </widget>
-diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp
-index caa93f5..b81a229 100644
---- a/src/gvcore/document.cpp
-+++ b/src/gvcore/document.cpp
-@@ -343,7 +343,7 @@ void Document::slotLoaded() {
- //
- //---------------------------------------------------------------------
- void Document::reload() {
--	Cache::instance()->tqinvalidate( url());
-+	Cache::instance()->invalidate( url());
- 	load();
- 	emit reloaded(url());
- }
-@@ -378,7 +378,7 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) {
- 	TQString t = "true";
- 	TQString f = "false";
- 
--	int tqalignment = (printer->option("app-gwenview-position").isEmpty() ?
-+	int alignment = (printer->option("app-gwenview-position").isEmpty() ?
- 		TQt::AlignCenter : printer->option("app-gwenview-position").toInt());
- 
- 	// Compute filename offset
-@@ -407,7 +407,7 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) {
- 	if (scaling==GV_FITTOPAGE /* Fit to page */) {
- 		bool enlargeToFit = printer->option( "app-gwenview-enlargeToFit" ) != f;
- 		if ((image.width() > pdWidth || image.height() > pdHeight) || enlargeToFit) {
--			size.tqscale( pdWidth, pdHeight, TQSize::ScaleMin );
-+			size.scale( pdWidth, pdHeight, TQSize::ScaleMin );
- 		}
- 	} else {
- 		if (scaling==GV_SCALE /* Scale To */) {
-@@ -452,24 +452,24 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) {
- 				printer->abort();
- 				return;
- 			} else if (resp == KMessageBox::No) { // Shrink
--				size.tqscale(pdWidth, pdHeight, TQSize::ScaleMin);
-+				size.scale(pdWidth, pdHeight, TQSize::ScaleMin);
- 			}
- 		}
- 	}
- 
- 	// Compute x and y
--	if ( tqalignment & TQt::AlignHCenter )
-+	if ( alignment & TQt::AlignHCenter )
- 		x = (pdWidth - size.width())/2;
--	else if ( tqalignment & TQt::AlignLeft )
-+	else if ( alignment & TQt::AlignLeft )
- 		x = 0;
--	else if ( tqalignment & TQt::AlignRight )
-+	else if ( alignment & TQt::AlignRight )
- 		x = pdWidth - size.width();
- 
--	if ( tqalignment & TQt::AlignVCenter )
-+	if ( alignment & TQt::AlignVCenter )
- 		y = (pdHeight - size.height())/2;
--	else if ( tqalignment & TQt::AlignTop )
-+	else if ( alignment & TQt::AlignTop )
- 		y = 0;
--	else if ( tqalignment & TQt::AlignBottom )
-+	else if ( alignment & TQt::AlignBottom )
- 		y = pdHeight - size.height();
- 
- 	// Draw, the image will be scaled to fit the given area if necessary
-@@ -532,7 +532,7 @@ void Document::saveBeforeClosing() {
- 	if (!d->mModified) return;
- 
- 	TQString msg=i18n("<qt>The image <b>%1</b> has been modified, do you want to save the changes?</qt>")
--		.tqarg(url().prettyURL());
-+		.arg(url().prettyURL());
- 
- 	int result=KMessageBox::questionYesNo(dialogParentWidget(), msg, TQString(),
- 		KStdGuiItem::save(), KStdGuiItem::discard(), CONFIG_SAVE_AUTOMATICALLY);		
-@@ -605,7 +605,7 @@ TQString Document::saveInternal(const KURL& url, const TQCString& format) {
- 	
- 	LOG("Save failed: " << msg);
- 	return TQString("<qt><b>%1</b><br/>")
--		.tqarg(i18n("Could not save the image to %1.").tqarg(url.prettyURL()))
-+		.arg(i18n("Could not save the image to %1.").arg(url.prettyURL()))
- 		+ msg + "</qt>";
- }
- 
-diff --git a/src/gvcore/documentloadedimpl.cpp b/src/gvcore/documentloadedimpl.cpp
-index aacea94..31baec0 100644
---- a/src/gvcore/documentloadedimpl.cpp
-+++ b/src/gvcore/documentloadedimpl.cpp
-@@ -134,7 +134,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con
- 			if (!parent.isWritable()) {
- 				return
- 					i18n("The %1 folder is read-only.")
--					.tqarg(parent.filePath());
-+					.arg(parent.filePath());
- 			}
- 		}
- 	}
-@@ -152,7 +152,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con
- 	if (tmp.status()!=0) {
- 		TQString reason( strerror(tmp.status()) );
- 		return i18n("Could not create a temporary file.\nReason: %1.")
--			.tqarg(reason);
-+			.arg(reason);
- 	}
- 	TQFile* file=tmp.file();
- 	msg=localSave(file, format);
-@@ -162,7 +162,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con
- 	if (tmp.status()!=0) {
- 		TQString reason( strerror(tmp.status()) );
- 		return i18n("Saving image to a temporary file failed.\nReason: %1.")
--			.tqarg(reason);
-+			.arg(reason);
- 	}
- 	
- 	TQString tmpName=tmp.name();
-@@ -172,11 +172,11 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con
- 	// Move the tmp file to the final dest
- 	if (url.isLocalFile()) {
- 		if( ::rename( TQFile::encodeName(tmpName), TQFile::encodeName( url.path())) < 0 ) {
--			return i18n("Could not write to %1.").tqarg(url.path());
-+			return i18n("Could not write to %1.").arg(url.path());
- 		}
- 	} else {
- 		if (!KIO::NetAccess::upload(tmp.name(), url, KApplication::kApplication()->mainWidget() )) {
--			return i18n("Could not upload the file to %1.").tqarg(url.prettyURL());
-+			return i18n("Could not upload the file to %1.").arg(url.prettyURL());
- 		}
- 	}
- 
-diff --git a/src/gvcore/documentloadingimpl.cpp b/src/gvcore/documentloadingimpl.cpp
-index 072229e..02020ad 100644
---- a/src/gvcore/documentloadingimpl.cpp
-+++ b/src/gvcore/documentloadingimpl.cpp
-@@ -99,7 +99,7 @@ void DocumentLoadingImpl::init() {
- 			emitImageRectUpdated();
- 		} else {
- 			setImage(image);
--			TQMemArray< TQRect > rects = TQRegion(d->mLoader->loadedRegion()).tqrects();
-+			TQMemArray< TQRect > rects = TQRegion(d->mLoader->loadedRegion()).rects();
- 			for( unsigned int i = 0; i < rects.count(); ++i ) {
- 				emit rectUpdated(rects[i]);
- 			}
-diff --git a/src/gvcore/dragpixmapgenerator.h b/src/gvcore/dragpixmapgenerator.h
-index efbbd93..308c391 100644
---- a/src/gvcore/dragpixmapgenerator.h
-+++ b/src/gvcore/dragpixmapgenerator.h
-@@ -128,7 +128,7 @@ public:
- 		if (listCropped) {
- 			// If list has been cropped, leave space for item count text
- 			height += fm.height();
--			bottomText = i18n("%1 items").tqarg(mItemList.count());
-+			bottomText = i18n("%1 items").arg(mItemList.count());
- 			width = TQMAX(width, fm.width("... " + bottomText));
- 		}
- 		
-diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp
-index e579b99..a71351b 100644
---- a/src/gvcore/externaltooldialog.cpp
-+++ b/src/gvcore/externaltooldialog.cpp
-@@ -144,7 +144,7 @@ struct ExternalToolDialogPrivate {
- 		for (; item; item=item->nextSibling()) {
- 			if (item==mSelectedItem) continue;
- 			if (name==item->text(0)) {
--				KMessageBox::sorry(mContent, i18n("There is already a tool named \"%1\"").tqarg(name));
-+				KMessageBox::sorry(mContent, i18n("There is already a tool named \"%1\"").arg(name));
- 				return false;
- 			}
- 		}
-diff --git a/src/gvcore/externaltoolmanager.cpp b/src/gvcore/externaltoolmanager.cpp
-index 4fd4e03..3a43d26 100644
---- a/src/gvcore/externaltoolmanager.cpp
-+++ b/src/gvcore/externaltoolmanager.cpp
-@@ -222,7 +222,7 @@ TQDict<KDesktopFile>& ExternalToolManager::desktopFiles() const {
- 
- void ExternalToolManager::hideDesktopFile(KDesktopFile* desktopFile) {
- 	TQFileInfo fi(desktopFile->fileName());
--	TQString name=TQString("%1.desktop").tqarg( fi.baseName(true) );
-+	TQString name=TQString("%1.desktop").arg( fi.baseName(true) );
- 	d->mDesktopFiles.take(name);
- 	
- 	if (desktopFile->isReadOnly()) {
-@@ -240,7 +240,7 @@ KDesktopFile* ExternalToolManager::editSystemDesktopFile(const KDesktopFile* des
- 	TQFileInfo fi(desktopFile->fileName());
- 
- 	TQString name=fi.baseName(true);
--	d->mDesktopFiles.remove(TQString("%1.desktop").tqarg(name));
-+	d->mDesktopFiles.remove(TQString("%1.desktop").arg(name));
- 	
- 	return createUserDesktopFile(name);
- }
-@@ -250,7 +250,7 @@ KDesktopFile* ExternalToolManager::createUserDesktopFile(const TQString& name) {
- 	Q_ASSERT(!name.isEmpty());
- 	KDesktopFile* desktopFile=new KDesktopFile(
- 		d->mUserToolDir + "/" + name + ".desktop", false);
--	d->mDesktopFiles.insert(TQString("%1.desktop").tqarg(name), desktopFile);	
-+	d->mDesktopFiles.insert(TQString("%1.desktop").arg(name), desktopFile);	
- 
- 	return desktopFile;
- }
-diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp
-index a8eba49..a7d9f64 100644
---- a/src/gvcore/filedetailview.cpp
-+++ b/src/gvcore/filedetailview.cpp
-@@ -525,8 +525,8 @@ void FileDetailView::setShownFileItem(KFileItem* fileItem)
- 	FileDetailViewItem* newShownItem=viewItem(fileItem);
- 	
- 	FileViewBase::setShownFileItem(fileItem);
--	if (oldShownItem) oldShownItem->tqrepaint();
--	if (newShownItem) newShownItem->tqrepaint();
-+	if (oldShownItem) oldShownItem->repaint();
-+	if (newShownItem) newShownItem->repaint();
- }
- 
- 
-diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp
-index 9f09438..cf6b036 100644
---- a/src/gvcore/fileopobject.cpp
-+++ b/src/gvcore/fileopobject.cpp
-@@ -259,7 +259,7 @@ void FileOpTrashObject::operator()() {
- 		} else {
- 			TQString filename=TQStyleSheet::escape(mURLList.first().filename());
- 			response=KMessageBox::warningContinueCancel(mParent,
--				i18n("<p>Do you really want to move <b>%1</b> to the trash?</p>").tqarg(filename),i18n("Trash used as a verb", "Trash File"),KGuiItem(i18n("Trash used as a verb", "&Trash"),"edittrash"));
-+				i18n("<p>Do you really want to move <b>%1</b> to the trash?</p>").arg(filename),i18n("Trash used as a verb", "Trash File"),KGuiItem(i18n("Trash used as a verb", "&Trash"),"edittrash"));
- 		}
- 		if (response!=KMessageBox::Continue) return;
- 	}
-@@ -287,7 +287,7 @@ void FileOpRealDeleteObject::operator()() {
- 		} else {
- 			TQString filename=TQStyleSheet::escape(mURLList.first().filename());
- 			response=KMessageBox::warningContinueCancel(mParent,
--				i18n("<p>Do you really want to delete <b>%1</b>?</p>").tqarg(filename),
-+				i18n("<p>Do you really want to delete <b>%1</b>?</p>").arg(filename),
- 				i18n("Delete File"),
- 				KStdGuiItem::del()
- 				);
-@@ -309,7 +309,7 @@ void FileOpRenameObject::operator()() {
- 	TQString filename = srcURL.filename();
- 	InputDialog dlg(mParent);
- 	dlg.setCaption(i18n("Renaming File"));
--	dlg.setLabel(i18n("<p>Rename file <b>%1</b> to:</p>").tqarg(TQStyleSheet::escape(filename)));
-+	dlg.setLabel(i18n("<p>Rename file <b>%1</b> to:</p>").arg(TQStyleSheet::escape(filename)));
- 	dlg.setButtonOK( KGuiItem(i18n("&Rename"), "edit") );
- 
- 	dlg.lineEdit()->setText(filename);
-diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
-index 3910e48..c6760fe 100644
---- a/src/gvcore/filethumbnailview.cpp
-+++ b/src/gvcore/filethumbnailview.cpp
-@@ -285,7 +285,7 @@ void FileThumbnailView::setThumbnailPixmap(const KFileItem* fileItem, const TQPi
- 	if (size.isValid()) {
- 		iconItem->setImageSize(size);
- 	}
--	iconItem->tqrepaint();
-+	iconItem->repaint();
- 
- 	// Notify progress
- 	if (d->mProgressWidget) {
-diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
-index bb57a07..1cd795e 100644
---- a/src/gvcore/fileviewcontroller.cpp
-+++ b/src/gvcore/fileviewcontroller.cpp
-@@ -747,7 +747,7 @@ void FileViewController::updateViewMode() {
- 
- void FileViewController::updateThumbnailSize(int size) {
- 	size*=SLIDER_RESOLUTION;
--	d->mSliderTracker->setText(i18n("Thumbnail size: %1x%2").tqarg(size).tqarg(size));
-+	d->mSliderTracker->setText(i18n("Thumbnail size: %1x%2").arg(size).arg(size));
- 	FileViewConfig::setThumbnailSize(size);
- 	mFileThumbnailView->setThumbnailSize(size);
- 	Cache::instance()->checkThumbnailSize(size);
-diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp
-index 699d088..c74b7ae 100644
---- a/src/gvcore/imageloader.cpp
-+++ b/src/gvcore/imageloader.cpp
-@@ -113,7 +113,7 @@ public:
- 	int getch() {
- 		if (mThread->testCancel()) {
- 			LOG("cancel detected");
--			seStatus(IO_ReadError);
-+			setStatus(IO_ReadError);
- 			return -1;
- 		}
- 		return TQBuffer::getch();
-diff --git a/src/gvcore/imagesavedialog.cpp b/src/gvcore/imagesavedialog.cpp
-index 7831830..17101e2 100644
---- a/src/gvcore/imagesavedialog.cpp
-+++ b/src/gvcore/imagesavedialog.cpp
-@@ -70,7 +70,7 @@ ImageSaveDialog::ImageSaveDialog(KURL& url, const TQCString& imageFormat, TQWidg
- 			if (!patterns.contains(pattern)) patterns.append(pattern);
- 		}
- 		if (patterns.isEmpty()) {
--			patterns.append( TQString("*.%1").tqarg(format.lower()) );
-+			patterns.append( TQString("*.%1").arg(format.lower()) );
- 		}
- 		TQString patternString=patterns.join(" ");
- 
-diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
-index f9da66f..cbfc459 100644
---- a/src/gvcore/imageview.cpp
-+++ b/src/gvcore/imageview.cpp
-@@ -113,7 +113,7 @@ as approximate as possible). However when converting from widget to image and ba
- this can result in the final rectangle being smaller than the original.
- The widgetToImageBounding() function converts from widget to image coordinates
- in a way which makes sure the reverse conversion will be at least as large
--as the original tqgeometry.
-+as the original geometry.
- 
- There are no conversion functions for only width/height, as their conversion
- depends on the position (because of the rounding etc.). For similar reasons
-@@ -257,7 +257,7 @@ struct ImageView::Private {
- 		const double zoomValues[] = { 0.5, 1, 2 };
- 		int nbValues=sizeof(zoomValues) / sizeof(double);
- 		for (int pos=0; pos<nbValues; ++pos) {
--			TQString txt=TQString("%1%").tqarg( int(zoomValues[pos]*100) );
-+			TQString txt=TQString("%1%").arg( int(zoomValues[pos]*100) );
- 			mZoomCombo->insertItem(txt);
- 		}
- 	}
-@@ -423,7 +423,7 @@ ImageView::~ImageView() {
- void ImageView::slotLoaded() {
- 	if (d->mDocument->isNull()) {
- 		resizeContents(0,0);
--		viewport()->tqrepaint(false);
-+		viewport()->repaint(false);
- 		return;
- 	}
- 
-@@ -488,7 +488,7 @@ KToggleAction* ImageView::zoomToFit() const {
- 
- 
- void ImageView::updateFromSettings() {
--	// Reset, so that next tqrepaint doesn't possibly take longer because of
-+	// Reset, so that next repaint doesn't possibly take longer because of
- 	// smoothing
- 	ImageViewConfig::setMaxRepaintSize(DEFAULT_MAX_REPAINT_SIZE);
- 	ImageViewConfig::setMaxScaleRepaintSize(DEFAULT_MAX_REPAINT_SIZE);
-@@ -625,7 +625,7 @@ void ImageView::drawContents(TQPainter* painter,int clipx,int clipy,int clipw,in
- 	TQRect widgetRect = TQRect(0, 0, visibleWidth(), visibleHeight());
- 
- 	TQRegion region = TQRegion(widgetRect) - imageRect;
--	TQMemArray<TQRect> rects = region.tqrects();
-+	TQMemArray<TQRect> rects = region.rects();
- 	for(unsigned int pos = 0; pos < rects.count(); ++pos ) {
- 		painter->eraseRect(rects[pos]);
- 	}
-@@ -701,7 +701,7 @@ void ImageView::limitPaintSize( PendingPaint& paint ) {
- 	// don't paint more than max_size pixels at a time
- 	int maxHeight = ( maxSize + paint.rect.width() - 1 ) / paint.rect.width(); // round up
- 	maxHeight = TQMAX( maxHeight, 5 ); // at least 5 lines together
--	// can't tqrepaint whole paint at once, adjust height and schedule the rest
-+	// can't repaint whole paint at once, adjust height and schedule the rest
- 	if( maxHeight < paint.rect.height()) {
- 		TQRect remaining = paint.rect;
- 		remaining.setTop( remaining.top() + maxHeight );
-@@ -781,12 +781,12 @@ void ImageView::slotBusyLevelChanged( BusyLevel level ) {
- // How to do painting:
- // When something needs to be erased: TQPainter on viewport and eraseRect()
- // When whole picture needs to be repainted: fullRepaint()
--// When a part of the picture needs to be updated: viewport()->tqrepaint(area,false)
-+// When a part of the picture needs to be updated: viewport()->repaint(area,false)
- // All other paints will be changed to progressive painting.
- void ImageView::fullRepaint() {
- 	if( !viewport()->isUpdatesEnabled()) return;
- 	cancelPending();
--	viewport()->tqrepaint(false);
-+	viewport()->repaint(false);
- }
- 
- void ImageView::cancelPending() {
-@@ -832,7 +832,7 @@ void ImageView::performPaint( TQPainter* painter, int clipx, int clipy, int clip
- 	int extraPixels = ImageUtils::extraScalePixels( smoothAlgo, zoom());
- 	TQRect imageRect = d->widgetToImageBounding( TQRect(clipx,clipy,clipw,cliph), extraPixels );
- 	imageRect = imageRect.intersect( TQRect( 0, 0, d->mDocument->width(), d->mDocument->height()));
--	TQMemArray< TQRect > rects = TQRegion(d->mValidImageArea.intersect( imageRect )).tqrects();
-+	TQMemArray< TQRect > rects = TQRegion(d->mValidImageArea.intersect( imageRect )).rects();
- 	for( unsigned int i = 1; i < rects.count(); ++i ) {
- 		addPendingPaint( secondPass, d->imageToWidget( rects[ i ] ));
- 	}
-@@ -1024,7 +1024,7 @@ bool ImageView::eventFilter(TQObject* obj, TQEvent* event) {
- 		return true;
- 
- 	// Getting/loosing focus causes repaints, but repainting here is expensive,
--	// and there's no need to tqrepaint on focus changes, as the focus is not
-+	// and there's no need to repaint on focus changes, as the focus is not
- 	// indicated.
- 	case TQEvent::FocusIn:
- 	case TQEvent::FocusOut:
-@@ -1313,7 +1313,7 @@ void ImageView::slotImageSizeUpdated() {
- 
- void ImageView::slotImageRectUpdated(const TQRect& imageRect) {
- 	d->mValidImageArea += imageRect;
--	viewport()->tqrepaint( d->imageToWidget( imageRect ), false );
-+	viewport()->repaint( d->imageToWidget( imageRect ), false );
- }
- 
- 
-@@ -1339,7 +1339,7 @@ double ImageView::computeZoomToFit() const {
- 		return 1.0;
- 	}
- 	TQSize size=d->mDocument->image().size();
--	size.tqscale(width(),height(),TQSize::ScaleMin);
-+	size.scale(width(),height(),TQSize::ScaleMin);
- 
- 	double zoom=double(size.width())/d->mDocument->width();
- 	if (zoom>1.0 && !ImageViewConfig::enlargeSmallImages()) return 1.0;
-@@ -1350,7 +1350,7 @@ double ImageView::computeZoomToWidth() const {
- 	if (d->mDocument->isNull()) {
- 		return 1.0;
- 	}
--	int sw = verticalScrollBar()->sizeHint().width(); // tqgeometry is not valid before first show()
-+	int sw = verticalScrollBar()->sizeHint().width(); // geometry is not valid before first show()
- 	int w = width();
- 	int dw = d->mDocument->width();
- 	switch( vScrollBarMode()) {
-@@ -1425,7 +1425,7 @@ void ImageView::updateImageOffset() {
- 	int zpixHeight=int(d->mDocument->height() * d->mZoom);
- 
- 	if (zpixWidth>viewWidth && hScrollBarMode()!=AlwaysOff) {
--		// use sizeHint() - tqgeometry is not valid before first show()
-+		// use sizeHint() - geometry is not valid before first show()
- 		viewHeight-=horizontalScrollBar()->sizeHint().height();
- 	}
- 	if (zpixHeight>viewHeight && vScrollBarMode()!=AlwaysOff) {
-@@ -1457,7 +1457,7 @@ void ImageView::updateZoomActions() {
- 	if (d->mZoomMode==ZOOM_FREE) {
- 		d->mZoomIn->setEnabled(d->mZoom<MAX_ZOOM);
- 		d->mZoomOut->setEnabled(d->mZoom>1/MAX_ZOOM);
--		TQString zoomText=TQString("%1%").tqarg(int(d->mZoom*100));
-+		TQString zoomText=TQString("%1%").arg(int(d->mZoom*100));
- 		d->mZoomCombo->setCurrentText(zoomText);
- 	} else {
- 		d->mZoomIn->setEnabled(true);
-diff --git a/src/gvcore/imageviewtools.cpp b/src/gvcore/imageviewtools.cpp
-index 699868a..da9044a 100644
---- a/src/gvcore/imageviewtools.cpp
-+++ b/src/gvcore/imageviewtools.cpp
-@@ -36,7 +36,7 @@ namespace Gwenview {
- // Helper function
- static TQCursor loadCursor(const TQString& name) {
- 	TQString path;
--	path=locate("data", TQString("gwenview/cursors/%1.png").tqarg(name));
-+	path=locate("data", TQString("gwenview/cursors/%1.png").arg(name));
- 	return TQCursor(TQPixmap(path));
- }
- 
-diff --git a/src/gvcore/printdialog.cpp b/src/gvcore/printdialog.cpp
-index 98524af..003fb3a 100644
---- a/src/gvcore/printdialog.cpp
-+++ b/src/gvcore/printdialog.cpp
-@@ -169,57 +169,57 @@ void PrintDialogPage::setScaleHeight( double value ) {
- }
- 
- int PrintDialogPage::getPosition(const TQString& align) {
--	int tqalignment;
-+	int alignment;
- 
- 	if (align == i18n("Central-Left")) {
--		tqalignment = TQt::AlignLeft | TQt::AlignVCenter;
-+		alignment = TQt::AlignLeft | TQt::AlignVCenter;
- 	} else if (align == i18n("Central-Right")) {
--		tqalignment = TQt::AlignRight | TQt::AlignVCenter;
-+		alignment = TQt::AlignRight | TQt::AlignVCenter;
- 	} else if (align == i18n("Top-Left")) {
--		tqalignment = TQt::AlignTop | TQt::AlignLeft;
-+		alignment = TQt::AlignTop | TQt::AlignLeft;
- 	} else if (align == i18n("Top-Right")) {
--		tqalignment = TQt::AlignTop | TQt::AlignRight;
-+		alignment = TQt::AlignTop | TQt::AlignRight;
- 	} else if (align == i18n("Bottom-Left")) {
--		tqalignment = TQt::AlignBottom | TQt::AlignLeft;
-+		alignment = TQt::AlignBottom | TQt::AlignLeft;
- 	} else if (align == i18n("Bottom-Right")) {
--		tqalignment = TQt::AlignBottom | TQt::AlignRight;
-+		alignment = TQt::AlignBottom | TQt::AlignRight;
- 	} else if (align == i18n("Top-Central")) {
--		tqalignment = TQt::AlignTop | TQt::AlignHCenter;
-+		alignment = TQt::AlignTop | TQt::AlignHCenter;
- 	} else if (align == i18n("Bottom-Central")) {
--		tqalignment = TQt::AlignBottom | TQt::AlignHCenter;
-+		alignment = TQt::AlignBottom | TQt::AlignHCenter;
- 	} else	{
- 		// Central
--		tqalignment = TQt::AlignCenter; // TQt::AlignHCenter || TQt::AlignVCenter
-+		alignment = TQt::AlignCenter; // TQt::AlignHCenter || TQt::AlignVCenter
- 	}
- 
--	return tqalignment;
-+	return alignment;
- }
- 
- TQString PrintDialogPage::setPosition(int align) {
--	TQString tqalignment;
-+	TQString alignment;
- 
- 	if (align == (TQt::AlignLeft | TQt::AlignVCenter)) {
--		tqalignment = i18n("Central-Left");
-+		alignment = i18n("Central-Left");
- 	} else if (align == (TQt::AlignRight | TQt::AlignVCenter)) {
--		tqalignment = i18n("Central-Right");
-+		alignment = i18n("Central-Right");
- 	} else if (align == (TQt::AlignTop | TQt::AlignLeft)) {
--		tqalignment = i18n("Top-Left");
-+		alignment = i18n("Top-Left");
- 	} else if (align == (TQt::AlignTop | TQt::AlignRight)) {
--		tqalignment = i18n("Top-Right");
-+		alignment = i18n("Top-Right");
- 	} else if (align == (TQt::AlignBottom | TQt::AlignLeft)) {
--		tqalignment = i18n("Bottom-Left");
-+		alignment = i18n("Bottom-Left");
- 	} else if (align == (TQt::AlignBottom | TQt::AlignRight)) {
--		tqalignment = i18n("Bottom-Right");
-+		alignment = i18n("Bottom-Right");
- 	} else if (align == (TQt::AlignTop | TQt::AlignHCenter)) {
--		tqalignment = i18n("Top-Central");
-+		alignment = i18n("Top-Central");
- 	} else if (align == (TQt::AlignBottom | TQt::AlignHCenter)) {
--		tqalignment = i18n("Bottom-Central");
-+		alignment = i18n("Bottom-Central");
- 	} else	{
- 		// Central: TQt::AlignCenter or (TQt::AlignHCenter || TQt::AlignVCenter)
--		tqalignment = i18n("Central");
-+		alignment = i18n("Central");
- 	}
- 
--	return tqalignment;
-+	return alignment;
- }
- 
- // SLOTS
-diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp
-index 27ad0b9..8e6559f 100644
---- a/src/gvcore/qxcfi.cpp
-+++ b/src/gvcore/qxcfi.cpp
-@@ -486,7 +486,7 @@ void XCFImageFormat::readXCF ( TQImageIO* image_io )
-   }
- 
-   image_io->setImage( xcf_image.image );
--  image_io->seStatus( 0 );
-+  image_io->setStatus( 0 );
- }
- 
- /*!
-diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp
-index b56ba59..a021c55 100644
---- a/src/gvcore/xpm.cpp
-+++ b/src/gvcore/xpm.cpp
-@@ -161,7 +161,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc
-     int i, cpp, ncols, w, h, index = 0;
- 
-     if ( iio ) {
--	iio->seStatus( 1 );
-+	iio->setStatus( 1 );
- 	d = iio ? iio->ioDevice() : 0;
- 	d->readLine( buf.data(), buf.size() );	// "/* XPM */"
- 	TQRegExp r( TQString::fromLatin1("/\\*.XPM.\\*/") );
-@@ -291,7 +291,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc
-     }
-     if ( iio ) {
- 	iio->setImage( image );
--	iio->seStatus( 0 );			// image ok
-+	iio->setStatus( 0 );			// image ok
-     }
- }
- 
-@@ -340,7 +340,7 @@ static const char* xpm_color_name( int cpp, int index )
- static void write_xpm_image( TQImageIO * iio )
- {
-     if ( iio )
--	iio->seStatus( 1 );
-+	iio->setStatus( 1 );
-     else
- 	return;
- 
-@@ -424,7 +424,7 @@ static void write_xpm_image( TQImageIO * iio )
-     }
-     s << "};" << endl;
- 
--    iio->seStatus( 0 );
-+    iio->setStatus( 0 );
- }
- 
- // TQt code end ---------------------------
-diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp
-index 4745bfe..3f321e5 100644
---- a/src/gvdirpart/gvdirpart.cpp
-+++ b/src/gvdirpart/gvdirpart.cpp
-@@ -173,7 +173,7 @@ bool GVDirPart::openURL(const KURL& url) {
- void GVDirPart::loaded(const KURL& url) {
- 	TQString caption = url.filename();
- 	if( !mDocument->image().isNull())
--		caption += TQString(" %1 x %2").tqarg(mDocument->width()).tqarg(mDocument->height());
-+		caption += TQString(" %1 x %2").arg(mDocument->width()).arg(mDocument->height());
- 	emit setWindowCaption(caption);
- 	emit completed();
- }
-diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
-index 95712b5..95c67e3 100644
---- a/src/gvimagepart/gvimagepart.cpp
-+++ b/src/gvimagepart/gvimagepart.cpp
-@@ -194,7 +194,7 @@ void GVImagePart::slotLoading() {
- }
- 
- void GVImagePart::slotLoaded(const KURL& url) {
--	TQString caption = url.filename() + TQString(" - %1x%2").tqarg(mDocument->width()).tqarg(mDocument->height());
-+	TQString caption = url.filename() + TQString(" - %1x%2").arg(mDocument->width()).arg(mDocument->height());
- 	emit setWindowCaption(caption);
- 	emit completed();
- 	emit setStatusBarText(i18n("Done."));
-@@ -363,7 +363,7 @@ void GVImagePart::saveOriginalAs() {
- 		if (!file.open(IO_WriteOnly)) {
- 			KMessageBox::error(
- 				widget(),
--				i18n("Could not open '%1' for writing.").tqarg(path));
-+				i18n("Could not open '%1' for writing.").arg(path));
- 			return;
- 		}
- 		storeData(widget(), &file, data);
-diff --git a/src/imageutils/jpegcontent.cpp b/src/imageutils/jpegcontent.cpp
-index 5bcb7ef..c007267 100644
---- a/src/imageutils/jpegcontent.cpp
-+++ b/src/imageutils/jpegcontent.cpp
-@@ -120,7 +120,7 @@ struct inmem_dest_mgr : public jpeg_destination_mgr {
- void inmem_init_destination(j_compress_ptr cinfo) {
- 	inmem_dest_mgr* dest=(inmem_dest_mgr*)(cinfo->dest);
- 	if (dest->mOutput->size()==0) {
--		bool result=dest->mOutput->tqresize(INMEM_DST_DELTA);
-+		bool result=dest->mOutput->resize(INMEM_DST_DELTA);
- 		Q_ASSERT(result);
- 	}
- 	dest->free_in_buffer=dest->mOutput->size();
-@@ -129,7 +129,7 @@ void inmem_init_destination(j_compress_ptr cinfo) {
- 
- int inmem_empty_output_buffer(j_compress_ptr cinfo) {
- 	inmem_dest_mgr* dest=(inmem_dest_mgr*)(cinfo->dest);
--	bool result=dest->mOutput->tqresize(dest->mOutput->size() + INMEM_DST_DELTA);
-+	bool result=dest->mOutput->resize(dest->mOutput->size() + INMEM_DST_DELTA);
- 	Q_ASSERT(result);
- 	dest->next_output_byte=(JOCTET*)( dest->mOutput->data() + dest->mOutput->size() - INMEM_DST_DELTA );
- 	dest->free_in_buffer=INMEM_DST_DELTA;
-@@ -141,7 +141,7 @@ void inmem_term_destination(j_compress_ptr cinfo) {
- 	inmem_dest_mgr* dest=(inmem_dest_mgr*)(cinfo->dest);
- 	int finalSize=dest->next_output_byte - (JOCTET*)(dest->mOutput->data());
- 	Q_ASSERT(finalSize>=0);
--	dest->mOutput->tqresize(finalSize);
-+	dest->mOutput->resize(finalSize);
- }
- 
- 
-diff --git a/src/imageutils/scale.cpp b/src/imageutils/scale.cpp
-index c8a70a7..733dc1a 100644
---- a/src/imageutils/scale.cpp
-+++ b/src/imageutils/scale.cpp
-@@ -1929,7 +1929,7 @@ TQImage scale(const TQImage& image, int width, int height,
- 	if( image.isNull()) return image.copy();
- 	
- 	TQSize newSize( image.size() );
--	newSize.tqscale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0
-+	newSize.scale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0
- 	newSize = newSize.expandedTo( TQSize( 1, 1 )); // make sure it doesn't become null
- 
- 	if ( newSize == image.size() ) return image.copy();
-diff --git a/src/spec/gwenview-mdk.spec b/src/spec/gwenview-mdk.spec
-index e2ad754..67a3cdf 100644
---- a/src/spec/gwenview-mdk.spec
-+++ b/src/spec/gwenview-mdk.spec
-@@ -272,7 +272,7 @@ rm -rf $RPM_BUILD_ROOT
-    o Update the EXIF thumbnail when rotating a JPEG file.
-    o In the folder view, folders now open with a single click (By Daniel Thaler).
-    o Reworked coordinate conversions in order to avoid subtle paint errors.
--   o Remember computed optimal tqrepaint sizes in the config file, 
-+   o Remember computed optimal repaint sizes in the config file, 
-      so they are available immediately after next start.
-    o Remember shown URL after session restore.
- * Sat Oct 16 2004 Angelo Naselli <anaselli@mandrake.org> 1.1.5-0.3mdk
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-rename_a_few_stragglers.patch b/redhat/applications/gwenview/gwenview-3.5.13-rename_a_few_stragglers.patch
deleted file mode 100644
index 2075f3345..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-rename_a_few_stragglers.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit b4881a61a24b3df9af47ee6d7e7de4ca8d369f81
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324747996 -0600
-
-    Rename a few stragglers
-
-diff --git a/src/gvcore/imageviewconfig.kcfg b/src/gvcore/imageviewconfig.kcfg
-index e5c1e04..d93051a 100644
---- a/src/gvcore/imageviewconfig.kcfg
-+++ b/src/gvcore/imageviewconfig.kcfg
-@@ -2,7 +2,7 @@
- <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
- <kcfg> 
-   <include>tqapplication.h</include>
--  <include>tqpalette.h</include>
-+  <include>palette.h</include>
-   <kcfgfile name="gwenviewrc"/> 
-   <group name="pixmap widget">
-     <entry name="smoothAlgorithm" key="smooth scale" type="Enum"> 
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-rename_obsolete_tq_methods.patch b/redhat/applications/gwenview/gwenview-3.5.13-rename_obsolete_tq_methods.patch
deleted file mode 100644
index 4be46b5e1..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-rename_obsolete_tq_methods.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-commit 04fccf73370ad95a70b8e107240e50f9fdbf98fc
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324497836 -0600
-
-    Rename obsolete tq methods to standard names
-
-diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
-index a429095..3dbdb53 100644
---- a/src/app/configdialog.cpp
-+++ b/src/app/configdialog.cpp
-@@ -93,9 +93,9 @@ template<class T>
- void addConfigPage(KDialogBase* dialog, T* content, const TQString& header, const TQString& name, const char* iconName) {
- 	TQFrame* page=dialog->addPage(name, header, BarIcon(iconName, 32));
- 	content->reparent(page, TQPoint(0,0));
--	TQVBoxLayout* tqlayout=new TQVBoxLayout(page, 0, KDialog::spacingHint());
--	tqlayout->addWidget(content);
--	tqlayout->addStretch();
-+	TQVBoxLayout* layout=new TQVBoxLayout(page, 0, KDialog::spacingHint());
-+	layout->addWidget(content);
-+	layout->addStretch();
- }
- 
- template<class T>
-diff --git a/src/app/configimagelistpage.ui b/src/app/configimagelistpage.ui
-index e2fb15b..01cfe95 100644
---- a/src/app/configimagelistpage.ui
-+++ b/src/app/configimagelistpage.ui
-@@ -150,7 +150,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout6</cstring>
-+                <cstring>layout6</cstring>
-             </property>
-             <grid>
-                 <property name="name">
-@@ -258,7 +258,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout7</cstring>
-+                <cstring>layout7</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui
-index 2f816c0..963f13d 100644
---- a/src/app/configimageviewpage.ui
-+++ b/src/app/configimageviewpage.ui
-@@ -73,7 +73,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="6">
-             <property name="name">
--                <cstring>tqlayout4</cstring>
-+                <cstring>layout4</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/src/app/configmiscpage.ui b/src/app/configmiscpage.ui
-index 9df8e96..7e5874e 100644
---- a/src/app/configmiscpage.ui
-+++ b/src/app/configmiscpage.ui
-@@ -137,7 +137,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout1</cstring>
-+                <cstring>layout1</cstring>
-             </property>
-             <grid>
-                 <property name="name">
-diff --git a/src/app/main.cpp b/src/app/main.cpp
-index bef08ae..989bffd 100644
---- a/src/app/main.cpp
-+++ b/src/app/main.cpp
-@@ -117,7 +117,7 @@ KDE_EXPORT int kdemain (int argc, char *argv[]) {
- 	aboutData.addCredit("Marco Gazzetta", I18N_NOOP("Fixed crash when trying to generate a thumbnail for a broken JPEG file (v0.16.0)"), "mililani@pobox.com");
- 	aboutData.addCredit("GeniusR13", I18N_NOOP("Fixed compilation on KDE 3.0 (v0.16.1)"), "geniusr13@gmx.net");
- 	aboutData.addCredit("Ian Koenig", I18N_NOOP("First RPM spec file"), "iguy@ionsphere.org");
--	aboutData.addCredit("Meni Livne", I18N_NOOP("Toolbar tqlayout patch for RTL languages (v0.16.0)"), "livne@kde.org");
-+	aboutData.addCredit("Meni Livne", I18N_NOOP("Toolbar layout patch for RTL languages (v0.16.0)"), "livne@kde.org");
- 	aboutData.addCredit("Angelo Naselli", I18N_NOOP("Printing support (v1.0.0)"), "anaselli@linux.it");
- 	aboutData.addCredit("Jos van den Oever", I18N_NOOP("File info view (v1.0.0)\nPatch to toggle auto-zoom on click (v1.0.0)"), "jos@vandenoever.info");
- 	aboutData.addCredit("Jeroen Peters", I18N_NOOP("Configurable mouse wheel behavior (v1.1.1)"), "jpeters@coldmail.nl");
-diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
-index 2f2275b..70b42d7 100644
---- a/src/app/mainwindow.cpp
-+++ b/src/app/mainwindow.cpp
-@@ -199,8 +199,8 @@ bool MainWindow::queryClose() {
- 
- 	KConfig* config=KGlobal::config();
- 
--	// Don't store dock tqlayout if only the image dock is visible. This avoid
--	// saving tqlayout when in "fullscreen" or "image only" mode.
-+	// Don't store dock layout if only the image dock is visible. This avoid
-+	// saving layout when in "fullscreen" or "image only" mode.
- 	if (mFileViewController->isVisible() || mDirViewController->widget()->isVisible()) {
- 		mDockArea->writeDockConfig(config,CONFIG_DOCK_GROUP);
- 	}
-@@ -867,8 +867,8 @@ void MainWindow::createWidgets() {
- 	mDockArea->manager()->setSplitterOpaqueResize(true);
- 	
- 	mViewModeWidget=new TQWidget(mCentralStack);
--	TQVBoxLayout* tqlayout=new TQVBoxLayout(mViewModeWidget);
--	tqlayout->setAutoAdd(true);
-+	TQVBoxLayout* layout=new TQVBoxLayout(mViewModeWidget);
-+	layout->setAutoAdd(true);
- 	mCentralStack->addWidget(mViewModeWidget);
- 
- 	// Status bar
-@@ -923,7 +923,7 @@ void MainWindow::createWidgets() {
- 	setGeometry(20,20,720,520);
- 
- 	// Default dock config
--	// (The "magic numbers" were found by adjusting the tqlayout from within the
-+	// (The "magic numbers" were found by adjusting the layout from within the
- 	// app and looking at the result in the configuration file)
- 	mFolderDock->manualDock(mFileDock, KDockWidget::DockLeft, 4000);
- 	mImageDock->manualDock(mFolderDock, KDockWidget::DockBottom, 3734);
-diff --git a/src/app/vtabwidget.cpp b/src/app/vtabwidget.cpp
-index 66e9b9e..40a1a0a 100644
---- a/src/app/vtabwidget.cpp
-+++ b/src/app/vtabwidget.cpp
-@@ -47,9 +47,9 @@ VTabWidget::VTabWidget(TQWidget* parent)
- 	d->mTabBar->setPosition(KMultiTabBar::Left);
- 	d->mTabBar->setStyle(KMultiTabBar::KDEV3ICON);
- 	d->mStack=new TQWidgetStack(this);
--	TQHBoxLayout* tqlayout=new TQHBoxLayout(this);
--	tqlayout->add(d->mTabBar);
--	tqlayout->add(d->mStack);
-+	TQHBoxLayout* layout=new TQHBoxLayout(this);
-+	layout->add(d->mTabBar);
-+	layout->add(d->mStack);
- }
- 
- 
-diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui
-index f7d6f90..7a8ffd4 100644
---- a/src/gvcore/deletedialogbase.ui
-+++ b/src/gvcore/deletedialogbase.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout3</cstring>
-+                <cstring>layout3</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/src/gvcore/externaltooldialogbase.ui b/src/gvcore/externaltooldialogbase.ui
-index 2c25a92..e35f222 100644
---- a/src/gvcore/externaltooldialogbase.ui
-+++ b/src/gvcore/externaltooldialogbase.ui
-@@ -153,7 +153,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="0">
-                     <property name="name">
--                        <cstring>tqlayout3</cstring>
-+                        <cstring>layout3</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
-index c6760fe..4867781 100644
---- a/src/gvcore/filethumbnailview.cpp
-+++ b/src/gvcore/filethumbnailview.cpp
-@@ -77,8 +77,8 @@ public:
- 	ProgressWidget(FileThumbnailView* view, int count)
- 	: TQFrame(view)
- 	{
--		TQHBoxLayout* tqlayout=new TQHBoxLayout(this, 3, 3);
--		tqlayout->setAutoAdd(true);
-+		TQHBoxLayout* layout=new TQHBoxLayout(this, 3, 3);
-+		layout->setAutoAdd(true);
- 		setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
- 		
- 		mStop=new TQPushButton(this);
-@@ -93,7 +93,7 @@ public:
- 	
- 	void polish() {
- 		TQFrame::polish();
--		setMinimumWidth(tqlayout()->minimumSize().width());
-+		setMinimumWidth(layout()->minimumSize().width());
- 		//setFixedHeight( mProgressBar->height() );
- 		setFixedHeight( mStop->height() );
- 	}
-diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
-index 1cd795e..86a0282 100644
---- a/src/gvcore/fileviewcontroller.cpp
-+++ b/src/gvcore/fileviewcontroller.cpp
-@@ -268,10 +268,10 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
- 	d->initFilterCombo();
- 	d->mStack=new TQWidgetStack(this);
- 	
--	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
--	tqlayout->addWidget(d->mToolBar);
--	tqlayout->addWidget(d->mFilterBar);
--	tqlayout->addWidget(d->mStack);
-+	TQVBoxLayout *layout=new TQVBoxLayout(this);
-+	layout->addWidget(d->mToolBar);
-+	layout->addWidget(d->mFilterBar);
-+	layout->addWidget(d->mStack);
- 
- 	// Actions
- 	mSelectFirst=new KAction(i18n("&First"),
-diff --git a/src/gvcore/fullscreenbar.cpp b/src/gvcore/fullscreenbar.cpp
-index be2b517..bc8375f 100644
---- a/src/gvcore/fullscreenbar.cpp
-+++ b/src/gvcore/fullscreenbar.cpp
-@@ -123,7 +123,7 @@ void FullScreenBar::showEvent(TQShowEvent* event) {
- 	if (!d->mFirstShow) return;
- 	d->mFirstShow=false;
- 	move(0, -height());
--	tqlayout()->setResizeMode(TQLayout::Fixed);
-+	layout()->setResizeMode(TQLayout::Fixed);
- }
- 
- 
-diff --git a/src/gvcore/imageviewconfig.kcfg b/src/gvcore/imageviewconfig.kcfg
-index 6424202..e5c1e04 100644
---- a/src/gvcore/imageviewconfig.kcfg
-+++ b/src/gvcore/imageviewconfig.kcfg
-@@ -18,7 +18,7 @@
-       <default>false</default>
-     </entry>
-     <entry name="backgroundColor" key="background color" type="Color">
--      <default code="true">TQApplication::tqpalette().active().dark()</default>
-+      <default code="true">TQApplication::palette().active().dark()</default>
-     </entry>
-     <entry name="enlargeSmallImages" key="enlarge small images" type="Bool">
-       <default>false</default>
-diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp
-index f24a2e8..7387cb8 100644
---- a/src/gvcore/imageviewcontroller.cpp
-+++ b/src/gvcore/imageviewcontroller.cpp
-@@ -275,12 +275,12 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, K
- 
- 	d->mContainer=new TQWidget(parent);
- 	d->mContainer->setMinimumWidth(1); // Make sure we can resize the toolbar smaller than its minimum size
--	TQVBoxLayout* tqlayout=new TQVBoxLayout(d->mContainer);
-+	TQVBoxLayout* layout=new TQVBoxLayout(d->mContainer);
- 	d->mToolBar=new KToolBar(d->mContainer, "", true);
- 
--	tqlayout->add(d->mToolBar);
-+	layout->add(d->mToolBar);
- 	d->mStack=new TQWidgetStack(d->mContainer);
--	tqlayout->add(d->mStack);
-+	layout->add(d->mStack);
- 	
- 	d->mImageView=new ImageView(d->mStack, document, actionCollection);
- 	d->mStack->addWidget(d->mImageView);
-diff --git a/src/gvcore/printdialog.cpp b/src/gvcore/printdialog.cpp
-index 003fb3a..3b013b3 100644
---- a/src/gvcore/printdialog.cpp
-+++ b/src/gvcore/printdialog.cpp
-@@ -82,8 +82,8 @@ PrintDialogPage::PrintDialogPage( Document* document, TQWidget *parent, const ch
- 	mContent = new PrintDialogPageBase(this);
- 	setTitle( mContent->caption() );
- 
--	TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
--	tqlayout->addWidget( mContent );
-+	TQVBoxLayout *layout = new TQVBoxLayout( this );
-+	layout->addWidget( mContent );
- 
- 	connect(mContent->mWidth, TQT_SIGNAL( valueChanged( double )), TQT_SLOT( slotWidthChanged( double )));
- 	connect(mContent->mHeight, TQT_SIGNAL( valueChanged( double )), TQT_SLOT( slotHeightChanged( double )));
-diff --git a/src/gvcore/printdialogpagebase.ui b/src/gvcore/printdialogpagebase.ui
-index 543877c..6ae7696 100644
---- a/src/gvcore/printdialogpagebase.ui
-+++ b/src/gvcore/printdialogpagebase.ui
-@@ -24,7 +24,7 @@
-         </property>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout2</cstring>
-+                <cstring>layout2</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -170,7 +170,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout4</cstring>
-+                        <cstring>layout4</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -236,7 +236,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout4</cstring>
-+                        <cstring>layout4</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/src/gvcore/thumbnaildetailsdialogbase.ui b/src/gvcore/thumbnaildetailsdialogbase.ui
-index e9ef011..ae03c98 100644
---- a/src/gvcore/thumbnaildetailsdialogbase.ui
-+++ b/src/gvcore/thumbnaildetailsdialogbase.ui
-@@ -29,7 +29,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout6</cstring>
-+                <cstring>layout6</cstring>
-             </property>
-             <grid>
-                 <property name="name">
-diff --git a/src/spec/gwenview-mdk.spec b/src/spec/gwenview-mdk.spec
-index 67a3cdf..c524954 100644
---- a/src/spec/gwenview-mdk.spec
-+++ b/src/spec/gwenview-mdk.spec
-@@ -317,7 +317,7 @@ rm -rf $RPM_BUILD_ROOT
-  - Avoid data loss if the JPEG images are saved while being rotated by
-    JPEGTran.
-  - The back button in Konqueror now works correctly with gvimagepart.
-- - The default tqlayout is more user-friendly.
-+ - The default layout is more user-friendly.
-  - Non-trivial URLs (e.g. http query URL) are correctly handled.
-  - You can now drop images on the image view.
- 
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-rename_old_tq_method.patch b/redhat/applications/gwenview/gwenview-3.5.13-rename_old_tq_method.patch
deleted file mode 100644
index 2f9e42d5b..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-rename_old_tq_method.patch
+++ /dev/null
@@ -1,796 +0,0 @@
-commit d0bdd0d7a768f9935b521f3bd12a4cd72739b96f
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324253323 -0600
-
-    Rename old tq methods that no longer need a unique name
-
-diff --git a/src/app/bookmarkdialogbase.ui b/src/app/bookmarkdialogbase.ui
-index d4db944..08ccea2 100644
---- a/src/app/bookmarkdialogbase.ui
-+++ b/src/app/bookmarkdialogbase.ui
-@@ -20,7 +20,7 @@
-             <verstretch>0</verstretch>
-         </sizepolicy>
-     </property>
--    <property name="tqminimumSize">
-+    <property name="minimumSize">
-         <size>
-             <width>400</width>
-             <height>0</height>
-@@ -88,7 +88,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>383</width>
-                     <height>16</height>
-diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp
-index b40f70e..68ee9f0 100644
---- a/src/app/bookmarkviewcontroller.cpp
-+++ b/src/app/bookmarkviewcontroller.cpp
-@@ -98,7 +98,7 @@ public:
- 		if ( !item) return;
- 		if (item->mBookmark.isGroup()) return;
- 		
--		TQRect rect=mListView->tqitemRect(item);
-+		TQRect rect=mListView->itemRect(item);
- 		tip(rect, item->mBookmark.url().prettyURL());
- 	};
- 	
-diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
-index 0fb33df..d274188 100644
---- a/src/app/configdialog.cpp
-+++ b/src/app/configdialog.cpp
-@@ -289,7 +289,7 @@ void ConfigDialog::emptyCache() {
- 
- 	KURL url;
- 	url.setPath(dir);
--	if (KIO::NetAccess::del(url, tqtopLevelWidget()) ) {
-+	if (KIO::NetAccess::del(url, topLevelWidget()) ) {
- 		KMessageBox::information( this,i18n("Cache emptied.") );
- 	}
- }
-diff --git a/src/app/configfileoperationspage.ui b/src/app/configfileoperationspage.ui
-index 78ac6d3..451a030 100644
---- a/src/app/configfileoperationspage.ui
-+++ b/src/app/configfileoperationspage.ui
-@@ -93,7 +93,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>16</height>
-diff --git a/src/app/configfullscreenpage.ui b/src/app/configfullscreenpage.ui
-index e7da709..855869f 100644
---- a/src/app/configfullscreenpage.ui
-+++ b/src/app/configfullscreenpage.ui
-@@ -43,7 +43,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>16</height>
-@@ -131,7 +131,7 @@ You can use the following keywords to format the On Screen Display:
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>18</height>
-diff --git a/src/app/configimagelistpage.ui b/src/app/configimagelistpage.ui
-index 6670dbd..e2fb15b 100644
---- a/src/app/configimagelistpage.ui
-+++ b/src/app/configimagelistpage.ui
-@@ -40,7 +40,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>16</height>
-@@ -131,7 +131,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>0</height>
-@@ -166,7 +166,7 @@
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>21</width>
-                             <height>20</height>
-@@ -217,7 +217,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>16</height>
-diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui
-index a99b945..32fb346 100644
---- a/src/app/configimageviewpage.ui
-+++ b/src/app/configimageviewpage.ui
-@@ -56,7 +56,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>181</width>
-                     <height>21</height>
-@@ -238,7 +238,7 @@ Use this option if your computer is not very fast.</string>
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>16</height>
-diff --git a/src/app/configmiscpage.ui b/src/app/configmiscpage.ui
-index 9b69c2d..9df8e96 100644
---- a/src/app/configmiscpage.ui
-+++ b/src/app/configmiscpage.ui
-@@ -92,7 +92,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>24</height>
-@@ -120,7 +120,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>24</height>
-@@ -153,7 +153,7 @@
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>11</width>
-                             <height>20</height>
-@@ -191,7 +191,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>41</height>
-diff --git a/src/app/configslideshowpage.ui b/src/app/configslideshowpage.ui
-index 62ab807..ccf0c15 100644
---- a/src/app/configslideshowpage.ui
-+++ b/src/app/configslideshowpage.ui
-@@ -88,7 +88,7 @@ When this option is enabled, the slideshow will stop on the last image of the fo
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>180</width>
-                     <height>20</height>
-diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
-index 1464a09..f9acc9b 100644
---- a/src/app/mainwindow.cpp
-+++ b/src/app/mainwindow.cpp
-@@ -871,7 +871,7 @@ void MainWindow::createWidgets() {
- 	tqlayout->setAutoAdd(true);
- 	mCentralStack->addWidget(mViewModeWidget);
- 
--	// tqStatus bar
-+	// Status bar
- 	mSBDetailLabel=new TQLabel("", statusBar());
- 	
- 	mSBHintLabel=new TruncatedTextLabel(statusBar());
-@@ -1216,7 +1216,7 @@ void MainWindow::createLocationToolBar() {
- 
- 	// Do not let the combobox get wider than available space, as this would
- 	// hide the toolbuttons after it
--	mURLEdit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
-+	mURLEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
- 	
- 	// Avoid stealing focus
- 	mURLEdit->setFocusPolicy(TQ_ClickFocus);
-diff --git a/src/app/truncatedtextlabel.h b/src/app/truncatedtextlabel.h
-index 8e126ed..2351890 100644
---- a/src/app/truncatedtextlabel.h
-+++ b/src/app/truncatedtextlabel.h
-@@ -39,14 +39,14 @@ public:
- 	TruncatedTextLabel(TQWidget* parent)
- 	: TQLabel(parent) {}
- 
--	TQSize tqminimumSizeHint() const {
--		TQSize size=TQLabel::tqminimumSizeHint();
-+	TQSize minimumSizeHint() const {
-+		TQSize size=TQLabel::minimumSizeHint();
- 		size.setWidth(-1);
- 		return size;
- 	}
- 
--	TQSize tqsizeHint() const {
--		return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height());
-+	TQSize sizeHint() const {
-+		return TQSize(contentsRect().width(), TQLabel::sizeHint().height());
- 	}
- 
- 	void setText(const TQString& text) {
-diff --git a/src/gvcore/cursortracker.cpp b/src/gvcore/cursortracker.cpp
-index 00f1736..3569dc8 100644
---- a/src/gvcore/cursortracker.cpp
-+++ b/src/gvcore/cursortracker.cpp
-@@ -79,7 +79,7 @@ TipTracker::TipTracker(const TQString& txt, TQWidget* reference)
- 	setPalette(TQToolTip::palette());
- 	setFrameStyle(TQFrame::Plain | TQFrame::Box);
- 	setLineWidth(1);
--	tqsetAlignment(AlignAuto | AlignTop);
-+	setAlignment(AlignAuto | AlignTop);
- }
- 	
- 
-diff --git a/src/gvcore/deletedialog.cpp b/src/gvcore/deletedialog.cpp
-index 3d6308b..9fdfac5 100644
---- a/src/gvcore/deletedialog.cpp
-+++ b/src/gvcore/deletedialog.cpp
-@@ -113,9 +113,9 @@ bool DeleteDialog::shouldDelete() const {
- }
- 
- 
--TQSize DeleteDialog::tqsizeHint() const {
-+TQSize DeleteDialog::sizeHint() const {
-     m_widget->adjustSize();
--    TQSize hint = m_widget->tqminimumSize();
-+    TQSize hint = m_widget->minimumSize();
-     hint = calculateSize(hint.width(), hint.height());
- 
-     // For some reason calculateSize does not return a correct height. As I'm
-diff --git a/src/gvcore/deletedialog.h b/src/gvcore/deletedialog.h
-index 6825368..1bdc5ab 100644
---- a/src/gvcore/deletedialog.h
-+++ b/src/gvcore/deletedialog.h
-@@ -36,7 +36,7 @@ public:
-     void setURLList(const KURL::List &files);
-     bool shouldDelete() const;
- 
--    TQSize tqsizeHint() const;
-+    TQSize sizeHint() const;
- 
- protected slots:
-     virtual void accept();
-diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui
-index 4725920..6abab10 100644
---- a/src/gvcore/deletedialogbase.ui
-+++ b/src/gvcore/deletedialogbase.ui
-@@ -47,7 +47,7 @@
-                     <property name="name">
-                         <cstring>ddDeleteText</cstring>
-                     </property>
--                    <property name="tqminimumSize">
-+                    <property name="minimumSize">
-                         <size>
-                             <width>0</width>
-                             <height>60</height>
-diff --git a/src/gvcore/externaltooldialogbase.ui b/src/gvcore/externaltooldialogbase.ui
-index 00d2954..2c25a92 100644
---- a/src/gvcore/externaltooldialogbase.ui
-+++ b/src/gvcore/externaltooldialogbase.ui
-@@ -20,7 +20,7 @@
-             <verstretch>0</verstretch>
-         </sizepolicy>
-     </property>
--    <property name="tqminimumSize">
-+    <property name="minimumSize">
-         <size>
-             <width>720</width>
-             <height>0</height>
-@@ -49,7 +49,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>487</width>
-                     <height>16</height>
-@@ -304,7 +304,7 @@ You can use keywords in the Command field:
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>21</width>
-                                     <height>140</height>
-diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp
-index f061c13..a8eba49 100644
---- a/src/gvcore/filedetailview.cpp
-+++ b/src/gvcore/filedetailview.cpp
-@@ -125,8 +125,8 @@ FileDetailView::FileDetailView(TQWidget *parent, const char *name)
- 	setDropHighlighter(false);
- 
- 	int size = IconSize(KIcon::Small);
--	mShownItemUnselectedPixmap = createShownItemPixmap(size, tqcolorGroup().highlight());
--	mShownItemSelectedPixmap = createShownItemPixmap(size, tqcolorGroup().highlightedText());
-+	mShownItemUnselectedPixmap = createShownItemPixmap(size, colorGroup().highlight());
-+	mShownItemSelectedPixmap = createShownItemPixmap(size, colorGroup().highlightedText());
- }
- 
- 
-diff --git a/src/gvcore/filedetailviewitem.h b/src/gvcore/filedetailviewitem.h
-index 1104bce..a0ad5df 100644
---- a/src/gvcore/filedetailviewitem.h
-+++ b/src/gvcore/filedetailviewitem.h
-@@ -71,7 +71,7 @@ public:
- 
- 	TQRect rect() const
- 	{
--		TQRect r = listView()->tqitemRect(this);
-+		TQRect r = listView()->itemRect(this);
- 		return TQRect( listView()->viewportToContents( r.topLeft() ),
- 					  TQSize( r.width(), r.height() ) );
- 	}
-diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp
-index e72d192..9f09438 100644
---- a/src/gvcore/fileopobject.cpp
-+++ b/src/gvcore/fileopobject.cpp
-@@ -89,7 +89,7 @@ void FileOpObject::slotResult(KIO::Job* job) {
- 
- 
- void FileOpObject::polishJob(KIO::Job* job) {
--	job->setWindow(mParent->tqtopLevelWidget());
-+	job->setWindow(mParent->topLevelWidget());
- 	connect( job, TQT_SIGNAL( result(KIO::Job*) ),
- 		this, TQT_SLOT( slotResult(KIO::Job*) ) );
- }
-diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
-index 51445be..3910e48 100644
---- a/src/gvcore/filethumbnailview.cpp
-+++ b/src/gvcore/filethumbnailview.cpp
-@@ -93,7 +93,7 @@ public:
- 	
- 	void polish() {
- 		TQFrame::polish();
--		setMinimumWidth(tqlayout()->tqminimumSize().width());
-+		setMinimumWidth(tqlayout()->minimumSize().width());
- 		//setFixedHeight( mProgressBar->height() );
- 		setFixedHeight( mStop->height() );
- 	}
-@@ -142,7 +142,7 @@ struct FileThumbnailView::Private {
- 		mWaitThumbnail.fill(view->paletteBackgroundColor());
- 		TQPainter painter(&mWaitThumbnail);
- 		
--		painter.setPen(view->tqcolorGroup().button());
-+		painter.setPen(view->colorGroup().button());
- 		painter.drawRect(0,0,mThumbnailSize,mThumbnailSize);
- 		painter.drawPixmap(
- 			(mThumbnailSize-mWaitPixmap.width())/2,
-diff --git a/src/gvcore/filethumbnailviewitem.cpp b/src/gvcore/filethumbnailviewitem.cpp
-index 65da494..cd607b7 100644
---- a/src/gvcore/filethumbnailviewitem.cpp
-+++ b/src/gvcore/filethumbnailviewitem.cpp
-@@ -271,16 +271,16 @@ void FileThumbnailViewItem::calcRect(const TQString&) {
- 		textH+=(*it)->height();
- 	}
- 	
--	TQRect tqitemRect(x(), y(), view->gridX(), 0);
-+	TQRect itemRect(x(), y(), view->gridX(), 0);
- 	TQRect itemPixmapRect(PADDING, PADDING, thumbnailSize, thumbnailSize);
- 	TQRect itemTextRect(0, 0, textW, textH);
- 	if (isRight) {
--		tqitemRect.setHeight( TQMAX(thumbnailSize + PADDING*2, textH) );
-+		itemRect.setHeight( TQMAX(thumbnailSize + PADDING*2, textH) );
- 		itemTextRect.moveLeft(thumbnailSize + PADDING * 2 );
--		itemTextRect.moveTop((tqitemRect.height() - textH)/2);
-+		itemTextRect.moveTop((itemRect.height() - textH)/2);
- 	} else {
--		itemPixmapRect.moveLeft( (tqitemRect.width() - itemPixmapRect.width()) / 2 );
--		tqitemRect.setHeight(thumbnailSize + PADDING*3 + textH);
-+		itemPixmapRect.moveLeft( (itemRect.width() - itemPixmapRect.width()) / 2 );
-+		itemRect.setHeight(thumbnailSize + PADDING*3 + textH);
- 		itemTextRect.moveLeft(PADDING);
- 		itemTextRect.moveTop(thumbnailSize + PADDING * 2);
- 	}
-@@ -292,8 +292,8 @@ void FileThumbnailViewItem::calcRect(const TQString&) {
- 	if ( itemTextRect != textRect() ) {
- 		setTextRect( itemTextRect );
- 	}
--	if ( tqitemRect != rect() ) {
--		setItemRect( tqitemRect );
-+	if ( itemRect != rect() ) {
-+		setItemRect( itemRect );
- 	}
- }
- 
-diff --git a/src/gvcore/filethumbnailviewitem.h b/src/gvcore/filethumbnailviewitem.h
-index b242355..d3a1063 100644
---- a/src/gvcore/filethumbnailviewitem.h
-+++ b/src/gvcore/filethumbnailviewitem.h
-@@ -52,7 +52,7 @@ public:
- 	void updateLines();
- 
- protected:
--	void paintItem(TQPainter* painter, const TQColorGroup& tqcolorGroup);
-+	void paintItem(TQPainter* painter, const TQColorGroup& colorGroup);
- 	void calcRect( const TQString& text_=TQString() );
- 	void paintFocus(TQPainter*, const TQColorGroup&) {}
- 	bool acceptDrop(const TQMimeSource*) const;
-diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
-index bdacf01..bb57a07 100644
---- a/src/gvcore/fileviewcontroller.cpp
-+++ b/src/gvcore/fileviewcontroller.cpp
-@@ -191,7 +191,7 @@ public:
- 
- 	void initFilterBar() {
- 		mFilterBar=new FilterBar(that);
--		mFilterBar->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
-+		mFilterBar->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
- 		mFilterBar->hide();
- 
- 		TQIconSet resetIS=BarIcon("locationbar_erase");
-@@ -256,7 +256,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
- : TQWidget(parent)
- , mMode(FILE_LIST)
- , mPrefetch( NULL )
--, mChangeDirtqStatus(CHANGE_DIR_STATUS_NONE)
-+, mChangeDirStatus(CHANGE_DIR_STATUS_NONE)
- , mBrowsing(false)
- , mSelecting(false)
- {
-@@ -338,7 +338,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
- 
- 	// Dir lister
- 	mDirLister=new DirLister;
--	mDirLister->setMainWindow(tqtopLevelWidget());
-+	mDirLister->setMainWindow(topLevelWidget());
- 	connect(mDirLister,TQT_SIGNAL(clear()),
- 		TQT_TQOBJECT(this),TQT_SLOT(dirListerClear()) );
- 
-@@ -575,13 +575,13 @@ void FileViewController::slotSelectNext() {
- }
- 
- void FileViewController::slotSelectPreviousDir() {
--	mChangeDirtqStatus = CHANGE_DIR_STATUS_PREV;
-+	mChangeDirStatus = CHANGE_DIR_STATUS_PREV;
- 	mDirLister->clearError();
- 	mDirLister->openURL(mDirURL.upURL());
- }
- 
- void FileViewController::slotSelectNextDir() {
--	mChangeDirtqStatus = CHANGE_DIR_STATUS_NEXT;
-+	mChangeDirStatus = CHANGE_DIR_STATUS_NEXT;
- 	mDirLister->clearError();
- 	mDirLister->openURL(mDirURL.upURL());
- }
-@@ -1102,12 +1102,12 @@ void FileViewController::delayedDirListerCompleted() {
- 		mFileThumbnailView->sort(mFileThumbnailView->sortDirection());
- 	}
- 
--	if (mChangeDirtqStatus != CHANGE_DIR_STATUS_NONE) {
-+	if (mChangeDirStatus != CHANGE_DIR_STATUS_NONE) {
- 		KFileItem *item;
- 		TQString fileName = mDirURL.filename();
- 		for (item=currentFileView()->firstFileItem(); item; item=currentFileView()->nextItem(item) ) {
- 			if (item->name() == fileName) {
--				if (mChangeDirtqStatus == CHANGE_DIR_STATUS_NEXT) {
-+				if (mChangeDirStatus == CHANGE_DIR_STATUS_NEXT) {
- 					do {
- 						item=currentFileView()->nextItem(item);
- 					} while (item && !Archive::fileItemIsDirOrArchive(item));
-@@ -1119,7 +1119,7 @@ void FileViewController::delayedDirListerCompleted() {
- 				break;
- 			};
- 		}
--		mChangeDirtqStatus = CHANGE_DIR_STATUS_NONE;
-+		mChangeDirStatus = CHANGE_DIR_STATUS_NONE;
- 		if (!item) {
- 			mDirLister->openURL(mDirURL);
- 		} else {
-diff --git a/src/gvcore/fileviewcontroller.h b/src/gvcore/fileviewcontroller.h
-index de0de53..8339659 100644
---- a/src/gvcore/fileviewcontroller.h
-+++ b/src/gvcore/fileviewcontroller.h
-@@ -227,7 +227,7 @@ private:
- 		CHANGE_DIR_STATUS_NONE,
- 		CHANGE_DIR_STATUS_PREV,
- 		CHANGE_DIR_STATUS_NEXT
--	} mChangeDirtqStatus;
-+	} mChangeDirStatus;
- 
- 	bool mBrowsing;
- 	bool mSelecting;
-diff --git a/src/gvcore/filterbar.ui b/src/gvcore/filterbar.ui
-index b407ce1..2c9f11c 100644
---- a/src/gvcore/filterbar.ui
-+++ b/src/gvcore/filterbar.ui
-@@ -64,7 +64,7 @@
-             <property name="sizeType">
-                 <enum>Maximum</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>16</width>
-                     <height>16</height>
-@@ -125,7 +125,7 @@ equal to this date</string>
-             <property name="sizeType">
-                 <enum>Maximum</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>16</width>
-                     <height>16</height>
-@@ -185,7 +185,7 @@ equal to this date</string>
-             <property name="sizeType">
-                 <enum>Maximum</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>16</width>
-                     <height>16</height>
-@@ -210,7 +210,7 @@ equal to this date</string>
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>16</width>
-                     <height>16</height>
-diff --git a/src/gvcore/fullscreenbar.cpp b/src/gvcore/fullscreenbar.cpp
-index 311b98d..be2b517 100644
---- a/src/gvcore/fullscreenbar.cpp
-+++ b/src/gvcore/fullscreenbar.cpp
-@@ -83,8 +83,8 @@ FullScreenBar::FullScreenBar(TQWidget* parent)
- 	setIconSize(FULLSCREEN_ICON_SIZE);
- 	setMovingEnabled(false);
- 
--	TQColor bg=tqcolorGroup().highlight();
--	TQColor fg=tqcolorGroup().highlightedText();
-+	TQColor bg=colorGroup().highlight();
-+	TQColor fg=colorGroup().highlightedText();
- 	TQPalette pal(palette());
- 	pal.setColor(TQColorGroup::Background, bg);
- 	pal.setColor(TQColorGroup::Foreground, fg);
-diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp
-index 06a9011..699d088 100644
---- a/src/gvcore/imageloader.cpp
-+++ b/src/gvcore/imageloader.cpp
-@@ -113,7 +113,7 @@ public:
- 	int getch() {
- 		if (mThread->testCancel()) {
- 			LOG("cancel detected");
--			setqStatus(IO_ReadError);
-+			seStatus(IO_ReadError);
- 			return -1;
- 		}
- 		return TQBuffer::getch();
-diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
-index a6c5b9f..f9da66f 100644
---- a/src/gvcore/imageview.cpp
-+++ b/src/gvcore/imageview.cpp
-@@ -1350,7 +1350,7 @@ double ImageView::computeZoomToWidth() const {
- 	if (d->mDocument->isNull()) {
- 		return 1.0;
- 	}
--	int sw = verticalScrollBar()->tqsizeHint().width(); // tqgeometry is not valid before first show()
-+	int sw = verticalScrollBar()->sizeHint().width(); // tqgeometry is not valid before first show()
- 	int w = width();
- 	int dw = d->mDocument->width();
- 	switch( vScrollBarMode()) {
-@@ -1370,7 +1370,7 @@ double ImageView::computeZoomToHeight() const {
- 	if (d->mDocument->isNull()) {
- 		return 1.0;
- 	}
--	int sh = horizontalScrollBar()->tqsizeHint().height();
-+	int sh = horizontalScrollBar()->sizeHint().height();
- 	int h = height();
- 	int dh = d->mDocument->height();
- 	switch( vScrollBarMode()) {
-@@ -1425,11 +1425,11 @@ void ImageView::updateImageOffset() {
- 	int zpixHeight=int(d->mDocument->height() * d->mZoom);
- 
- 	if (zpixWidth>viewWidth && hScrollBarMode()!=AlwaysOff) {
--		// use tqsizeHint() - tqgeometry is not valid before first show()
--		viewHeight-=horizontalScrollBar()->tqsizeHint().height();
-+		// use sizeHint() - tqgeometry is not valid before first show()
-+		viewHeight-=horizontalScrollBar()->sizeHint().height();
- 	}
- 	if (zpixHeight>viewHeight && vScrollBarMode()!=AlwaysOff) {
--		viewWidth-=verticalScrollBar()->tqsizeHint().width();
-+		viewWidth-=verticalScrollBar()->sizeHint().width();
- 	}
- 
- 	d->mXOffset=TQMAX(0,(viewWidth-zpixWidth)/2);
-diff --git a/src/gvcore/printdialogpagebase.ui b/src/gvcore/printdialogpagebase.ui
-index 6d92eda..543877c 100644
---- a/src/gvcore/printdialogpagebase.ui
-+++ b/src/gvcore/printdialogpagebase.ui
-@@ -98,7 +98,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>101</width>
-                             <height>21</height>
-@@ -186,7 +186,7 @@
-                             <property name="sizeType">
-                                 <enum>Fixed</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>20</height>
-@@ -214,7 +214,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>240</width>
-                                     <height>21</height>
-@@ -252,7 +252,7 @@
-                             <property name="sizeType">
-                                 <enum>Fixed</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>20</height>
-@@ -351,7 +351,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>16</width>
-                                     <height>20</height>
-diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp
-index 9fb146a..27ad0b9 100644
---- a/src/gvcore/qxcfi.cpp
-+++ b/src/gvcore/qxcfi.cpp
-@@ -486,7 +486,7 @@ void XCFImageFormat::readXCF ( TQImageIO* image_io )
-   }
- 
-   image_io->setImage( xcf_image.image );
--  image_io->setqStatus( 0 );
-+  image_io->seStatus( 0 );
- }
- 
- /*!
-diff --git a/src/gvcore/thumbnaildetailsdialogbase.ui b/src/gvcore/thumbnaildetailsdialogbase.ui
-index 1dd6646..e9ef011 100644
---- a/src/gvcore/thumbnaildetailsdialogbase.ui
-+++ b/src/gvcore/thumbnaildetailsdialogbase.ui
-@@ -45,7 +45,7 @@
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>21</width>
-                             <height>20</height>
-@@ -96,7 +96,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>21</height>
-diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp
-index cc2cabc..b56ba59 100644
---- a/src/gvcore/xpm.cpp
-+++ b/src/gvcore/xpm.cpp
-@@ -74,7 +74,7 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of
- 	    s = s.mid( i );
- 	if ( (i = s.findRev('\\')) >= 0 )
- 	    s = s.mid( i );
--	TQRegExp r( TQString::tqfromLatin1("[a-zA-Z][a-zA-Z0-9_]*") );
-+	TQRegExp r( TQString::fromLatin1("[a-zA-Z][a-zA-Z0-9_]*") );
- 	int p = r.search( s );
- 	if ( p == -1 )
- 	    s.truncate( 0 );
-@@ -82,7 +82,7 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of
- 	    s = s.mid( p, r.matchedLength() );
-     }
-     if ( s.isEmpty() )
--	s = TQString::tqfromLatin1( "dummy" );
-+	s = TQString::fromLatin1( "dummy" );
-     return s;
- }
- 
-@@ -161,10 +161,10 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc
-     int i, cpp, ncols, w, h, index = 0;
- 
-     if ( iio ) {
--	iio->setqStatus( 1 );
-+	iio->seStatus( 1 );
- 	d = iio ? iio->ioDevice() : 0;
- 	d->readLine( buf.data(), buf.size() );	// "/* XPM */"
--	TQRegExp r( TQString::tqfromLatin1("/\\*.XPM.\\*/") );
-+	TQRegExp r( TQString::fromLatin1("/\\*.XPM.\\*/") );
- 	if ( buf.find(r) == -1 )
- 	    return;					// bad magic
-     } else if ( !source ) {
-@@ -291,7 +291,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc
-     }
-     if ( iio ) {
- 	iio->setImage( image );
--	iio->setqStatus( 0 );			// image ok
-+	iio->seStatus( 0 );			// image ok
-     }
- }
- 
-@@ -340,7 +340,7 @@ static const char* xpm_color_name( int cpp, int index )
- static void write_xpm_image( TQImageIO * iio )
- {
-     if ( iio )
--	iio->setqStatus( 1 );
-+	iio->seStatus( 1 );
-     else
- 	return;
- 
-@@ -424,7 +424,7 @@ static void write_xpm_image( TQImageIO * iio )
-     }
-     s << "};" << endl;
- 
--    iio->setqStatus( 0 );
-+    iio->seStatus( 0 );
- }
- 
- // TQt code end ---------------------------
-diff --git a/src/tsthread/tsthread.cpp b/src/tsthread/tsthread.cpp
-index 6363f2e..c845cce 100644
---- a/src/tsthread/tsthread.cpp
-+++ b/src/tsthread/tsthread.cpp
-@@ -175,7 +175,7 @@ void TSThread::customEvent( TQCustomEvent* ev )
-         }
-     bool deleted = false;
-     deleted_flag = &deleted; // this is like TQGuardedPtr for self, but faster
--    int signal_id = e->object->tqmetaObject()->findSignal( normalizeSignalSlot( e->signal ).data() + 1, true );
-+    int signal_id = e->object->metaObject()->findSignal( normalizeSignalSlot( e->signal ).data() + 1, true );
-     if( signal_id >= 0 )
-         e->object->qt_emit( signal_id, e->args );
-     else
diff --git a/redhat/applications/gwenview/gwenview-3.5.13.1.spec b/redhat/applications/gwenview/gwenview-3.5.13.1.spec
deleted file mode 100644
index 69d17dfc1..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13.1.spec
+++ /dev/null
@@ -1,255 +0,0 @@
-# Default version for this component
-%define kdecomp gwenview
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Gwenview is an image viewer for KDE.
-Version:	1.4.2
-Release:	9%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [gwenview] Define QT_CLEAN_NAMESPACE during libmng checks [Commit #59c7639f]
-Patch11:	gwenview-3.5.13-fix_libmng_check.patch
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	exiv2-devel
-%endif
-
-%if "%{?tde_prefix}" == "/usr"
-Conflicts: kdegraphics
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch4 -p1
-%patch5 -p1
-%patch11 -p1 -b .libmng
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-%if 0%{?rhel} == 5
-echo "%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/" >"%{kdecomp}.lang"
-%else
-%find_lang %{kdecomp} --with-kde --without-mo
-%endif
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/gwenview
-%{tde_libdir}/libgwenviewcore.la
-%{tde_libdir}/libgwenviewcore.so.1
-%{tde_libdir}/libgwenviewcore.so.1.0.0
-%{tde_libdir}/libkdeinit_gwenview.la
-%{tde_libdir}/libkdeinit_gwenview.so
-%{tde_tdelibdir}/gwenview.la
-%{tde_tdelibdir}/gwenview.so
-%{tde_tdelibdir}/libgvdirpart.la
-%{tde_tdelibdir}/libgvdirpart.so
-%{tde_tdelibdir}/libgvimagepart.la
-%{tde_tdelibdir}/libgvimagepart.so
-%{tde_tdeappdir}/gwenview.desktop
-%{tde_datadir}/apps/gwenview/
-%{tde_datadir}/apps/gvdirpart/gvdirpart.rc
-%{tde_datadir}/apps/gvimagepart/gvimagepart.rc
-%{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc
-%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.sh
-%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.upd
-%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.sh
-%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.upd
-%{tde_datadir}/apps/konqueror/servicemenus/konqgwenview.desktop
-%{tde_datadir}/config.kcfg/fileoperationconfig.kcfg
-%{tde_datadir}/config.kcfg/fileviewconfig.kcfg
-%{tde_datadir}/config.kcfg/fullscreenconfig.kcfg
-%{tde_datadir}/config.kcfg/gvdirpartconfig.kcfg
-%{tde_datadir}/config.kcfg/imageviewconfig.kcfg
-%{tde_datadir}/config.kcfg/miscconfig.kcfg
-%{tde_datadir}/config.kcfg/slideshowconfig.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/gvdirpart.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/*/apps/gwenview.png
-%{tde_datadir}/icons/hicolor/*/apps/gvdirpart.png
-%{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz
-%{tde_datadir}/man/man1/gwenview.1*
-%{tde_datadir}/services/gvdirpart.desktop
-%{tde_datadir}/services/gvimagepart.desktop
-%{tde_tdedocdir}/HTML/en/gwenview/
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-9
-- Initial release for TDE 3.5.13.1
-
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-8
-- Add support for Mageia 2 and Mandriva 2011
-- Define QT_CLEAN_NAMESPACE during libmng checks [Commit #59c7639f]
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-7
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Adds patches from GIT
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-6
-- Fix HTML directory location
-
-* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-5
-- Adds missing files
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-4
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2
-- Add fix for Fedora 15
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/gwenview/gwenview-3.5.13.spec b/redhat/applications/gwenview/gwenview-3.5.13.spec
deleted file mode 100644
index 6129af795..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13.spec
+++ /dev/null
@@ -1,269 +0,0 @@
-# Default version for this component
-%define kdecomp gwenview
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Gwenview is an image viewer for KDE.
-Version:	1.4.2
-Release:	8%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [gwenview] Rename old tq methods that no longer need a unique name [Commit #d0bdd0d7]
-Patch1:	gwenview-3.5.13-rename_old_tq_method.patch
-# [gwenview] Remove additional unneeded tq method conversions [Commit #eba1d381]
-Patch2:	gwenview-3.5.13-remove_additional_tq_conversions.patch
-# [gwenview] Rename obsolete tq methods to standard names [Commit #04fccf73]
-Patch3:	gwenview-3.5.13-rename_obsolete_tq_methods.patch
-# [gwenview] Rename a few stragglers [Commit #b4881a61]
-Patch4:	gwenview-3.5.13-rename_a_few_stragglers.patch
-# [gwenview] Fix FTBFS [Commit #1ca2f739]
-Patch5:	gwenview-3.5.13-fix_ftbfs.patch
-# [gwenview] Fix FTBFS in jpeg code [Commit #ace6f270]
-Patch6:	gwenview-3.5.13-fix_ftbfs_in_jpeg_code.patch
-# [gwenview] Fix linear alphabet string errors [Commit #9cb99cdb]
-Patch7:	gwenview-3.5.13-fix_alphabet_string_error.patch
-# [gwenview] Fix building with libpng 1.5. [Commit #303be455]
-Patch8:	gwenview-3.5.13-fix_building_libpng15.patch
-# [gwenview] Fix inadvertent tqt changes. Part of an extensive cleanup of various problems
-#   with kipi-plugins, digikam, and gwenview to resolve bug reports 241, 962, 963. [Commit #1eac443e]
-Patch9:	gwenview-3.5.13-fix_various_problems.patch
-# [gwenview] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011
-Patch10:	gwenview-3.5.13-missing_ldflags.patch
-# [gwenview] Define QT_CLEAN_NAMESPACE during libmng checks [Commit #59c7639f]
-Patch11:	gwenview-3.5.13-fix_libmng_check.patch
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%else
-BuildRequires: exiv2-devel
-%endif
-
-%if "%{?tde_prefix}" == "/usr"
-Conflicts: kdegraphics
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1 -b .ldflags
-%patch11 -p1 -b .libmng
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-%if 0%{?rhel} == 5
-echo "%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/" >"%{kdecomp}.lang"
-%else
-%find_lang %{kdecomp} --with-kde --without-mo
-%endif
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/gwenview
-%{tde_libdir}/libgwenviewcore.la
-%{tde_libdir}/libgwenviewcore.so.1
-%{tde_libdir}/libgwenviewcore.so.1.0.0
-%{tde_libdir}/libkdeinit_gwenview.la
-%{tde_libdir}/libkdeinit_gwenview.so
-%{tde_tdelibdir}/gwenview.la
-%{tde_tdelibdir}/gwenview.so
-%{tde_tdelibdir}/libgvdirpart.la
-%{tde_tdelibdir}/libgvdirpart.so
-%{tde_tdelibdir}/libgvimagepart.la
-%{tde_tdelibdir}/libgvimagepart.so
-%{tde_tdeappdir}/gwenview.desktop
-%{tde_datadir}/apps/gwenview/
-%{tde_datadir}/apps/gvdirpart/gvdirpart.rc
-%{tde_datadir}/apps/gvimagepart/gvimagepart.rc
-%{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc
-%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.sh
-%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.upd
-%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.sh
-%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.upd
-%{tde_datadir}/apps/konqueror/servicemenus/konqgwenview.desktop
-%{tde_datadir}/config.kcfg/fileoperationconfig.kcfg
-%{tde_datadir}/config.kcfg/fileviewconfig.kcfg
-%{tde_datadir}/config.kcfg/fullscreenconfig.kcfg
-%{tde_datadir}/config.kcfg/gvdirpartconfig.kcfg
-%{tde_datadir}/config.kcfg/imageviewconfig.kcfg
-%{tde_datadir}/config.kcfg/miscconfig.kcfg
-%{tde_datadir}/config.kcfg/slideshowconfig.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/gvdirpart.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/*/apps/gwenview.png
-%{tde_datadir}/icons/hicolor/*/apps/gvdirpart.png
-%{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz
-%{tde_datadir}/man/man1/gwenview.1*
-%{tde_datadir}/services/gvdirpart.desktop
-%{tde_datadir}/services/gvimagepart.desktop
-
-
-%Changelog
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-8
-- Add support for Mageia 2 and Mandriva 2011
-- Define QT_CLEAN_NAMESPACE during libmng checks [Commit #59c7639f]
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-7
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Adds patches from GIT
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-6
-- Fix HTML directory location
-
-* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-5
-- Adds missing files
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-4
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2
-- Add fix for Fedora 15
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0
-- Initial release for RHEL 6.0
-