216 files changed, 2150 insertions, 1505 deletions

diff --git a/.gitmodules b/.gitmodules
index bdec8fc..934def7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "admin"]
 	path = admin
 	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
-	path = cmake
-	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index 0c3b49c..763517d 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -9,12 +9,15 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 2.8 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
 
 
 ##### include our cmake modules #################
 
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
 include( TDEL10n )
 
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..2f09482
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,85 @@
+############################################
+#                                          #
+#  Improvements and feedbacks are welcome  #
+#                                          #
+#  This file is released under GPL >= 3    #
+#                                          #
+############################################
+
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
+
+
+#### general package setup
+
+project( gwenview )
+
+
+#### include essential cmake modules
+
+include( FindPkgConfig          )
+include( CheckSymbolExists      )
+include( CheckIncludeFile       )
+include( CheckLibraryExists     )
+include( CheckCSourceCompiles   )
+include( CheckCXXSourceCompiles )
+enable_testing()
+
+
+#### include our cmake modules
+
+include( TDEMacros )
+
+
+##### setup install paths
+
+include( TDESetupPaths )
+tde_setup_paths( )
+
+
+##### optional stuff
+
+option( WITH_ALL_OPTIONS    "Enable all optional support" OFF )
+option( WITH_KIPI           "Enable kipi support"    ${WITH_ALL_OPTIONS} )
+option( WITH_MNG            "Enable mng support"     ${WITH_ALL_OPTIONS} )
+option( WITH_XCURSOR        "Enable xcursor support" ${WITH_ALL_OPTIONS} )
+
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
+##### user requested modules
+
+option( BUILD_ALL          "Build all"           ON           )
+option( BUILD_DOC          "Build documentation" ${BUILD_ALL} )
+
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings
+
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
+
+
+##### directories
+
+add_subdirectory( icons )
+add_subdirectory( src )
+
+
+##### other data ################################
+
+tde_conditional_add_project_docs( BUILD_DOC )
+
+
+##### write configure files
+
+configure_file( config.h.cmake config.h @ONLY )
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..81419bf
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,6 @@
+For changes starting from incorporation to TDE umbrella,
+see the git commit history:
+
+https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/commits/branch/master
+
+For earlier changes, see the NEWS file.
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
new file mode 100644
index 0000000..205f5f5
--- /dev/null
+++ b/ConfigureChecks.cmake
@@ -0,0 +1,139 @@
+###########################################
+#                                         #
+#  Improvements and feedback are welcome  #
+#                                         #
+#  This file is released under GPL >= 3   #
+#                                         #
+###########################################
+
+
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+set( ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:$ENV{PKG_CONFIG_PATH}:${LIB_INSTALL_DIR}/pkgconfig" )
+
+
+##### check for gcc visibility support
+
+if( WITH_GCC_VISIBILITY )
+  tde_setup_gcc_visibility( )
+endif( WITH_GCC_VISIBILITY )
+
+
+##### check for libexiv2
+
+pkg_search_module( EXIV2 exiv2 )
+if( NOT EXIV2_FOUND )
+   tde_message_fatal( "exiv2 is required, but was not found on your system" )
+endif( NOT EXIV2_FOUND )
+
+check_include_file_cxx( "exiv2/exiv2.hpp" HAVE_EXIV2_EXIV2_HPP )
+
+
+##### check for libjpeg
+
+find_package( JPEG )
+if( NOT JPEG_FOUND )
+  tde_message_fatal( "jpeg library is required, but was not found on your system" )
+endif()
+
+
+##### checks for libkipi
+
+if( WITH_KIPI )
+  pkg_search_module( LIBKIPI libkipi )
+  if( NOT LIBKIPI_FOUND )
+    tde_message_fatal( "libkipi was requested but not found on your system." )
+  endif( )
+  set( GV_HAVE_KIPI 1 )
+endif( )
+
+
+##### checks for libmng
+
+if( WITH_MNG )
+  find_file( HAVE_LIBMNG_H "libmng.h" )
+  if( NOT HAVE_LIBMNG_H )
+    tde_message_fatal( "libmng was requested but not found on your system." )
+  endif( )
+  set( MNG_LIBRARY mng )
+  set( HAVE_LIBMNG 1 )
+endif( )
+
+
+##### check for libpng
+
+find_package( PNG )
+if( NOT PNG_FOUND )
+  tde_message_fatal( "png library is required, but was not found on your system" )
+endif()
+
+
+##### check for libxcursor
+if( WITH_XCURSOR )
+  pkg_search_module( XCURSOR xcursor )
+  if( XCURSOR_FOUND )
+    set( GV_HAVE_XCURSOR 1 )
+  else( )
+    tde_message_fatal( "xcursor library is required, but was not found on your system" )
+  endif( )
+endif()
+
+
+##### check for lround function
+
+tde_save_and_set( CMAKE_REQUIRED_LIBRARIES "m" )
+check_symbol_exists ( lround  "math.h" HAVE_LROUND  )
+tde_restore( CMAKE_REQUIRED_LIBRARIES )
+if( NOT HAVE_LROUND )
+  set( HAVE_LROUND 0 )
+endif( NOT HAVE_LROUND )
+
+
+##### check for thread support
+
+find_package( Threads )
+
+
+##### check architecture
+
+if( NOT CMAKE_ARCHITECTURE )
+  execute_process(
+    COMMAND ${CMAKE_C_COMPILER} -dumpmachine
+    OUTPUT_VARIABLE CMAKE_ARCHITECTURE
+    ERROR_VARIABLE CMAKE_ARCHITECTURE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_STRIP_TRAILING_WHITESPACE )
+  set( CMAKE_ARCHITECTURE "${CMAKE_ARCHITECTURE}" CACHE INTERNAL "" FORCE )
+  message( STATUS "Detected ${CMAKE_ARCHITECTURE} target architecture" )
+endif( )
+
+
+##### check specific architecture dependant support
+
+if( ${CMAKE_ARCHITECTURE} MATCHES "i.86" )
+
+  # MMX support
+  message( STATUS "Performing MMX support test" )
+  check_c_source_compiles( "
+    int main() {
+      #if defined(__GNUC__)
+      __asm__(\"pxor %mm0, %mm0\");
+      #else
+      #error Not gcc on x86/x86_64
+      #endif
+      return 0;
+    }"
+    HAVE_X86_MMX
+  )
+
+endif( )
+
diff --git a/Makefile.am b/Makefile.am
index dcf59c5..93477be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-# COMPILE_BEFORE_digikamimageplugins = digikam
-
 AUTOMAKE_OPTIONS = foreign 1.6.1
 
 include admin/deps.am
diff --git a/Makefile.am.in b/Makefile.am.in
deleted file mode 100644
index aa68529..0000000
--- a/Makefile.am.in
+++ /dev/null
@@ -1,9 +0,0 @@
-COMPILE_BEFORE_digikamimageplugins = digikam
-
-AUTOMAKE_OPTIONS = foreign 1.6.1
-
-include admin/deps.am
-include admin/Doxyfile.am
-
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/*/*.m4
-
diff --git a/README b/README
index 2d69b90..f377b09 100644
--- a/README
+++ b/README
@@ -6,8 +6,8 @@ Gwenview - http://gwenview.sourceforge.net
 
 Gwenview is a simple image viewer for TDE. It features a folder tree window
 and a file list window to provide easy navigation in your file hierarchy.
-Image loading is done by Qt library, so it supports all image formats your
-Qt installation supports.
+Image loading is done by TQt library, so it supports all image formats your
+TQt installation supports.
 
 
 -> Requirements
@@ -21,10 +21,10 @@ KDE 3.1 or more.
  make
  make install
 
-If configure fails to find your Qt or KDE libs, you will have to type
+If configure fails to find your TQt or KDE libs, you will have to type
   'export TDEDIR=/path/to/kde'
 and 
-  'export TQTDIR=/path/to/Qt/lib'
+  'export TQTDIR=/path/to/TQt/lib'
 
 
 -> Uninstallation
diff --git a/admin b/admin
-Subproject 8c7e0d40de084fe5d54e173918756639e0d4d63
+Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7
diff --git a/cmake b/cmake
deleted file mode 160000
-Subproject 111a08942a8b5452cd51f41e6f811d55de30c65
diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644
index 0000000..53f9a48
--- /dev/null
+++ b/config.h.cmake
@@ -0,0 +1,26 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+// Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+// significant byte first (like Motorola and SPARC, unlike Intel).
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
+
+// Defined if you have exiv2/exiv2.hpp header
+#cmakedefine HAVE_EXIV2_EXIV2_HPP 1
+
+// Defined if you have libkipi install
+#cmakedefine GV_HAVE_KIPI 1
+
+// Defined if you have libmn install
+#cmakedefine HAVE_LIBMNG 1
+
+// Defined if you have libxcurso install
+#cmakedefine GV_HAVE_XCURSOR 1
+
+// Defined if you have lround function
+#cmakedefine HAVE_LROUND 1
+
+// Defined if you have MMX support
+#cmakedefine HAVE_X86_MMX 1
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 26d239d..8bd0272 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,2 +1 @@
-KDE_LANG = en
-KDE_DOCS = gwenview
+SUBDIRS = en man
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
new file mode 100644
index 0000000..26d239d
--- /dev/null
+++ b/doc/en/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = gwenview
diff --git a/doc/browse_mode.png b/doc/en/browse_mode.png
index 9020b24..9020b24 100644
--- a/doc/browse_mode.png
+++ b/doc/en/browse_mode.png
diff --git a/doc/dock_grip.png b/doc/en/dock_grip.png
index 04c090d..04c090d 100644
--- a/doc/dock_grip.png
+++ b/doc/en/dock_grip.png
diff --git a/doc/docked_windows.docbook b/doc/en/docked_windows.docbook
index 8363310..8363310 100644
--- a/doc/docked_windows.docbook
+++ b/doc/en/docked_windows.docbook
diff --git a/doc/external_tools.docbook b/doc/en/external_tools.docbook
index 61722cc..61722cc 100644
--- a/doc/external_tools.docbook
+++ b/doc/en/external_tools.docbook
diff --git a/doc/external_tools_dialog.png b/doc/en/external_tools_dialog.png
index 72e6723..72e6723 100644
--- a/doc/external_tools_dialog.png
+++ b/doc/en/external_tools_dialog.png
diff --git a/doc/index.docbook b/doc/en/index.docbook
index bbeeb09..bbeeb09 100644
--- a/doc/index.docbook
+++ b/doc/en/index.docbook
diff --git a/doc/interface.docbook b/doc/en/interface.docbook
index 3ac0780..3ac0780 100644
--- a/doc/interface.docbook
+++ b/doc/en/interface.docbook
diff --git a/doc/introduction.docbook b/doc/en/introduction.docbook
index d3f38b8..1501dc0 100644
--- a/doc/introduction.docbook
+++ b/doc/en/introduction.docbook
@@ -14,8 +14,8 @@ navigation of your file hierarchy.  &kappname; uses docked windows, so you can
 alter its layout any way you wish. You can also browse your images in
 full-screen mode, or embedded within &konqueror; using the Image View and Kpart.</para>
 
-<para>Image loading is handled by the Qt library, so &kappname; supports all
-image formats your Qt installation supports. &kappname; correctly displays images
+<para>Image loading is handled by the TQt library, so &kappname; supports all
+image formats your TQt installation supports. &kappname; correctly displays images
 with an alpha channel as well as animations.</para>
 
 <para>&kappname; supports the displaying and editing of EXIF comments in JPEG
diff --git a/doc/keybindings.docbook b/doc/en/keybindings.docbook
index 3156400..3156400 100644
--- a/doc/keybindings.docbook
+++ b/doc/en/keybindings.docbook
diff --git a/doc/mouse.docbook b/doc/en/mouse.docbook
index 0792b3a..0792b3a 100644
--- a/doc/mouse.docbook
+++ b/doc/en/mouse.docbook
diff --git a/doc/view_mode.png b/doc/en/view_mode.png
index 801ad23..801ad23 100644
--- a/doc/view_mode.png
+++ b/doc/en/view_mode.png
diff --git a/src/doc/Makefile.am b/doc/man/Makefile.am
index a34ff18..a34ff18 100644
--- a/src/doc/Makefile.am
+++ b/doc/man/Makefile.am
diff --git a/src/doc/gwenview.1 b/doc/man/gwenview.1
index decd628..d1d9de2 100644
--- a/src/doc/gwenview.1
+++ b/doc/man/gwenview.1
@@ -7,7 +7,7 @@ Gwenview \- An image viewer for TDE
 .SH DESCRIPTION
 Gwenview is an image viewer for TDE. It features a folder tree window and a file list window to provide easy navigation of your file hierarchy. Gwenview uses docked windows, so you can alter its layout any way you wish. You can also browse your images in full\-screen mode, or embedded within Konqueror using the Gwenview Image Browser View and Kpart.
 .PP
-Image loading is handled by the Qt library, so Gwenview supports all image formats your Qt installation supports. Gwenview correctly displays images with an alpha channel.
+Image loading is handled by the TQt library, so Gwenview supports all image formats your TQt installation supports. Gwenview correctly displays images with an alpha channel.
 .PP
 Gwenview supports the displaying and editing of EXIF comments, if the necessary JPEG tdefile\-plugin is installed. This comes as part of the tdegraphics package. Lossless JPEG transforms are also supported.
 .SH OPTIONS
@@ -24,8 +24,8 @@ Start in Full Screen mode.
 .B  \-\-help
 Show help about options.
 .TP
-.B  \-\-help\-qt
-Show Qt specific options.
+.B  \-\-help\-tqt
+Show TQt specific options.
 .TP
 .B  \-\-help\-kde
 Show KDE specific options.
@@ -44,7 +44,7 @@ Show license information.
 .TP
 .B  \-\-
 End of options.
-.SS Qt options:
+.SS TQt options:
 .TP
 .B  \-\-display \fIdisplayname\fR
 Use the X\-server display 'displayname'.
@@ -63,7 +63,7 @@ using the QApplication::ManyColor color
 specification.
 .TP
 .B  \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
+Tells TQt to never grab the mouse or the keyboard.
 .TP
 .B  \-\-dograb
 Running under a debugger can cause an implicit
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
new file mode 100644
index 0000000..06285c8
--- /dev/null
+++ b/icons/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory( action )
+add_subdirectory( app )
+add_subdirectory( cursor )
+add_subdirectory( thumbnail )
diff --git a/src/pics/Makefile.am b/icons/Makefile.am
index e52ab4c..e52ab4c 100644
--- a/src/pics/Makefile.am
+++ b/icons/Makefile.am
diff --git a/icons/action/CMakeLists.txt b/icons/action/CMakeLists.txt
new file mode 100644
index 0000000..529659a
--- /dev/null
+++ b/icons/action/CMakeLists.txt
@@ -0,0 +1 @@
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/gwenview/icons )
diff --git a/src/pics/action/Makefile.am b/icons/action/Makefile.am
index fe4963d..fe4963d 100644
--- a/src/pics/action/Makefile.am
+++ b/icons/action/Makefile.am
diff --git a/src/pics/action/hi16-action-dnd1.png b/icons/action/hi16-action-dnd1.png
index 2e812ea..2e812ea 100644
--- a/src/pics/action/hi16-action-dnd1.png
+++ b/icons/action/hi16-action-dnd1.png
diff --git a/src/pics/action/hi16-action-dnd2.png b/icons/action/hi16-action-dnd2.png
index c281a11..c281a11 100644
--- a/src/pics/action/hi16-action-dnd2.png
+++ b/icons/action/hi16-action-dnd2.png
diff --git a/src/pics/action/hi16-action-dnd3.png b/icons/action/hi16-action-dnd3.png
index 80b6810..80b6810 100644
--- a/src/pics/action/hi16-action-dnd3.png
+++ b/icons/action/hi16-action-dnd3.png
diff --git a/src/pics/action/hi16-action-dnd4.png b/icons/action/hi16-action-dnd4.png
index c281a11..c281a11 100644
--- a/src/pics/action/hi16-action-dnd4.png
+++ b/icons/action/hi16-action-dnd4.png
diff --git a/src/pics/action/hi16-action-dnd5.png b/icons/action/hi16-action-dnd5.png
index 19321c8..19321c8 100644
--- a/src/pics/action/hi16-action-dnd5.png
+++ b/icons/action/hi16-action-dnd5.png
diff --git a/src/pics/action/hi16-action-dnd6.png b/icons/action/hi16-action-dnd6.png
index 9f1d1eb..9f1d1eb 100644
--- a/src/pics/action/hi16-action-dnd6.png
+++ b/icons/action/hi16-action-dnd6.png
diff --git a/src/pics/action/hi16-action-dnd7.png b/icons/action/hi16-action-dnd7.png
index 7d7a266..7d7a266 100644
--- a/src/pics/action/hi16-action-dnd7.png
+++ b/icons/action/hi16-action-dnd7.png
diff --git a/src/pics/action/hi16-action-dnd8.png b/icons/action/hi16-action-dnd8.png
index d57d2b5..d57d2b5 100644
--- a/src/pics/action/hi16-action-dnd8.png
+++ b/icons/action/hi16-action-dnd8.png
diff --git a/src/pics/action/hi16-action-flip.png b/icons/action/hi16-action-flip.png
index 7f3439f..7f3439f 100644
--- a/src/pics/action/hi16-action-flip.png
+++ b/icons/action/hi16-action-flip.png
diff --git a/src/pics/action/hi16-action-mirror.png b/icons/action/hi16-action-mirror.png
index d7e9f5d..d7e9f5d 100644
--- a/src/pics/action/hi16-action-mirror.png
+++ b/icons/action/hi16-action-mirror.png
diff --git a/src/pics/action/hi16-action-rotate_left.png b/icons/action/hi16-action-rotate_left.png
index df8f3d5..df8f3d5 100644
--- a/src/pics/action/hi16-action-rotate_left.png
+++ b/icons/action/hi16-action-rotate_left.png
diff --git a/src/pics/action/hi16-action-rotate_right.png b/icons/action/hi16-action-rotate_right.png
index 41d4c68..41d4c68 100644
--- a/src/pics/action/hi16-action-rotate_right.png
+++ b/icons/action/hi16-action-rotate_right.png
diff --git a/src/pics/action/hi16-action-slideshow_pause.png b/icons/action/hi16-action-slideshow_pause.png
index 595e5f8..595e5f8 100644
--- a/src/pics/action/hi16-action-slideshow_pause.png
+++ b/icons/action/hi16-action-slideshow_pause.png
diff --git a/src/pics/action/hi16-action-slideshow_play.png b/icons/action/hi16-action-slideshow_play.png
index 9ea8b38..9ea8b38 100644
--- a/src/pics/action/hi16-action-slideshow_play.png
+++ b/icons/action/hi16-action-slideshow_play.png
diff --git a/src/pics/action/hi22-action-flip.png b/icons/action/hi22-action-flip.png
index 736d4a3..736d4a3 100644
--- a/src/pics/action/hi22-action-flip.png
+++ b/icons/action/hi22-action-flip.png
diff --git a/src/pics/action/hi22-action-mirror.png b/icons/action/hi22-action-mirror.png
index 70c1406..70c1406 100644
--- a/src/pics/action/hi22-action-mirror.png
+++ b/icons/action/hi22-action-mirror.png
diff --git a/src/pics/action/hi22-action-rotate_left.png b/icons/action/hi22-action-rotate_left.png
index 773390f..773390f 100644
--- a/src/pics/action/hi22-action-rotate_left.png
+++ b/icons/action/hi22-action-rotate_left.png
diff --git a/src/pics/action/hi22-action-rotate_right.png b/icons/action/hi22-action-rotate_right.png
index 53d0a7d..53d0a7d 100644
--- a/src/pics/action/hi22-action-rotate_right.png
+++ b/icons/action/hi22-action-rotate_right.png
diff --git a/src/pics/action/hi22-action-slideshow_pause.png b/icons/action/hi22-action-slideshow_pause.png
index f18c115..f18c115 100644
--- a/src/pics/action/hi22-action-slideshow_pause.png
+++ b/icons/action/hi22-action-slideshow_pause.png
diff --git a/src/pics/action/hi22-action-slideshow_play.png b/icons/action/hi22-action-slideshow_play.png
index 6667234..6667234 100644
--- a/src/pics/action/hi22-action-slideshow_play.png
+++ b/icons/action/hi22-action-slideshow_play.png
diff --git a/src/pics/action/hi32-action-flip.png b/icons/action/hi32-action-flip.png
index 2f2e7e9..2f2e7e9 100644
--- a/src/pics/action/hi32-action-flip.png
+++ b/icons/action/hi32-action-flip.png
diff --git a/src/pics/action/hi32-action-mirror.png b/icons/action/hi32-action-mirror.png
index 8a52df7..8a52df7 100644
--- a/src/pics/action/hi32-action-mirror.png
+++ b/icons/action/hi32-action-mirror.png
diff --git a/src/pics/action/hi32-action-rotate_left.png b/icons/action/hi32-action-rotate_left.png
index 1ce9cd2..1ce9cd2 100644
--- a/src/pics/action/hi32-action-rotate_left.png
+++ b/icons/action/hi32-action-rotate_left.png
diff --git a/src/pics/action/hi32-action-rotate_right.png b/icons/action/hi32-action-rotate_right.png
index ddca533..ddca533 100644
--- a/src/pics/action/hi32-action-rotate_right.png
+++ b/icons/action/hi32-action-rotate_right.png
diff --git a/src/pics/action/hi32-action-slideshow_pause.png b/icons/action/hi32-action-slideshow_pause.png
index 7f8c9c3..7f8c9c3 100644
--- a/src/pics/action/hi32-action-slideshow_pause.png
+++ b/icons/action/hi32-action-slideshow_pause.png
diff --git a/src/pics/action/hi32-action-slideshow_play.png b/icons/action/hi32-action-slideshow_play.png
index 170acc3..170acc3 100644
--- a/src/pics/action/hi32-action-slideshow_play.png
+++ b/icons/action/hi32-action-slideshow_play.png
diff --git a/src/pics/action/hi48-action-flip.png b/icons/action/hi48-action-flip.png
index 254414d..254414d 100644
--- a/src/pics/action/hi48-action-flip.png
+++ b/icons/action/hi48-action-flip.png
diff --git a/src/pics/action/hi48-action-mirror.png b/icons/action/hi48-action-mirror.png
index 1d42248..1d42248 100644
--- a/src/pics/action/hi48-action-mirror.png
+++ b/icons/action/hi48-action-mirror.png
diff --git a/src/pics/action/hi48-action-rotate_left.png b/icons/action/hi48-action-rotate_left.png
index 956a35a..956a35a 100644
--- a/src/pics/action/hi48-action-rotate_left.png
+++ b/icons/action/hi48-action-rotate_left.png
diff --git a/src/pics/action/hi48-action-rotate_right.png b/icons/action/hi48-action-rotate_right.png
index 2a2c319..2a2c319 100644
--- a/src/pics/action/hi48-action-rotate_right.png
+++ b/icons/action/hi48-action-rotate_right.png
diff --git a/src/pics/action/hi48-action-slideshow_pause.png b/icons/action/hi48-action-slideshow_pause.png
index c7e84bc..c7e84bc 100644
--- a/src/pics/action/hi48-action-slideshow_pause.png
+++ b/icons/action/hi48-action-slideshow_pause.png
diff --git a/src/pics/action/hi48-action-slideshow_play.png b/icons/action/hi48-action-slideshow_play.png
index 64d3fc8..64d3fc8 100644
--- a/src/pics/action/hi48-action-slideshow_play.png
+++ b/icons/action/hi48-action-slideshow_play.png
diff --git a/src/pics/action/hisc-action-imageops.svg b/icons/action/hisc-action-imageops.svg
index 191ef16..191ef16 100644
--- a/src/pics/action/hisc-action-imageops.svg
+++ b/icons/action/hisc-action-imageops.svg
diff --git a/src/pics/action/hisc-action-imageops.svgz b/icons/action/hisc-action-imageops.svgz
index b82dbe4..b82dbe4 100644
--- a/src/pics/action/hisc-action-imageops.svgz
+++ b/icons/action/hisc-action-imageops.svgz
diff --git a/src/pics/action/hisc-action-slideshow_pause.svgz b/icons/action/hisc-action-slideshow_pause.svgz
index 2282ee4..2282ee4 100644
--- a/src/pics/action/hisc-action-slideshow_pause.svgz
+++ b/icons/action/hisc-action-slideshow_pause.svgz
diff --git a/src/pics/action/hisc-action-slideshow_play.svgz b/icons/action/hisc-action-slideshow_play.svgz
index d1c861e..d1c861e 100644
--- a/src/pics/action/hisc-action-slideshow_play.svgz
+++ b/icons/action/hisc-action-slideshow_play.svgz
diff --git a/icons/app/CMakeLists.txt b/icons/app/CMakeLists.txt
new file mode 100644
index 0000000..63f765b
--- /dev/null
+++ b/icons/app/CMakeLists.txt
@@ -0,0 +1 @@
+tde_install_icons( )
diff --git a/src/pics/app/Makefile.am b/icons/app/Makefile.am
index a4b97f0..a4b97f0 100644
--- a/src/pics/app/Makefile.am
+++ b/icons/app/Makefile.am
diff --git a/src/gvdirpart/cr16-app-gvdirpart.png b/icons/app/cr16-app-gvdirpart.png
index 27e24b5..27e24b5 100644
--- a/src/gvdirpart/cr16-app-gvdirpart.png
+++ b/icons/app/cr16-app-gvdirpart.png
diff --git a/src/gvdirpart/cr22-app-gvdirpart.png b/icons/app/cr22-app-gvdirpart.png
index 88526b8..88526b8 100644
--- a/src/gvdirpart/cr22-app-gvdirpart.png
+++ b/icons/app/cr22-app-gvdirpart.png
diff --git a/src/gvdirpart/cr32-app-gvdirpart.png b/icons/app/cr32-app-gvdirpart.png
index 1a971d7..1a971d7 100644
--- a/src/gvdirpart/cr32-app-gvdirpart.png
+++ b/icons/app/cr32-app-gvdirpart.png
diff --git a/src/gvdirpart/crsc-app-gvdirpart.svg b/icons/app/crsc-app-gvdirpart.svg
index c470051..c470051 100644
--- a/src/gvdirpart/crsc-app-gvdirpart.svg
+++ b/icons/app/crsc-app-gvdirpart.svg
diff --git a/src/pics/app/hi128-app-gwenview.png b/icons/app/hi128-app-gwenview.png
index d3fa24c..d3fa24c 100644
--- a/src/pics/app/hi128-app-gwenview.png
+++ b/icons/app/hi128-app-gwenview.png
diff --git a/src/gvdirpart/hi16-app-gvdirpart.png b/icons/app/hi16-app-gvdirpart.png
index e8516ee..e8516ee 100644
--- a/src/gvdirpart/hi16-app-gvdirpart.png
+++ b/icons/app/hi16-app-gvdirpart.png
diff --git a/src/pics/app/hi16-app-gwenview.png b/icons/app/hi16-app-gwenview.png
index 2de8322..2de8322 100644
--- a/src/pics/app/hi16-app-gwenview.png
+++ b/icons/app/hi16-app-gwenview.png
diff --git a/src/gvdirpart/hi22-app-gvdirpart.png b/icons/app/hi22-app-gvdirpart.png
index 25d8432..25d8432 100644
--- a/src/gvdirpart/hi22-app-gvdirpart.png
+++ b/icons/app/hi22-app-gvdirpart.png
diff --git a/src/pics/app/hi22-app-gwenview.png b/icons/app/hi22-app-gwenview.png
index 3d1f5ad..3d1f5ad 100644
--- a/src/pics/app/hi22-app-gwenview.png
+++ b/icons/app/hi22-app-gwenview.png
diff --git a/src/gvdirpart/hi32-app-gvdirpart.png b/icons/app/hi32-app-gvdirpart.png
index bb336f3..bb336f3 100644
--- a/src/gvdirpart/hi32-app-gvdirpart.png
+++ b/icons/app/hi32-app-gvdirpart.png
diff --git a/src/pics/app/hi32-app-gwenview.png b/icons/app/hi32-app-gwenview.png
index fa0108f..fa0108f 100644
--- a/src/pics/app/hi32-app-gwenview.png
+++ b/icons/app/hi32-app-gwenview.png
diff --git a/src/pics/app/hi48-app-gwenview.png b/icons/app/hi48-app-gwenview.png
index 916137a..916137a 100644
--- a/src/pics/app/hi48-app-gwenview.png
+++ b/icons/app/hi48-app-gwenview.png
diff --git a/src/pics/app/hi64-app-gwenview.png b/icons/app/hi64-app-gwenview.png
index 6ecb60c..6ecb60c 100644
--- a/src/pics/app/hi64-app-gwenview.png
+++ b/icons/app/hi64-app-gwenview.png
diff --git a/src/gvdirpart/hisc-app-gvdirpart.svg b/icons/app/hisc-app-gvdirpart.svg
index 8846fb5..8846fb5 100644
--- a/src/gvdirpart/hisc-app-gvdirpart.svg
+++ b/icons/app/hisc-app-gvdirpart.svg
diff --git a/src/pics/app/hisc-app-gwenview.svgz b/icons/app/hisc-app-gwenview.svgz
index 70ad5a1..70ad5a1 100644
--- a/src/pics/app/hisc-app-gwenview.svgz
+++ b/icons/app/hisc-app-gwenview.svgz
diff --git a/icons/cursor/CMakeLists.txt b/icons/cursor/CMakeLists.txt
new file mode 100644
index 0000000..033bb12
--- /dev/null
+++ b/icons/cursor/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+  FILES zoom.png
+  DESTINATION ${DATA_INSTALL_DIR}/gwenview/cursors
+)
diff --git a/src/pics/cursor/Makefile.am b/icons/cursor/Makefile.am
index 3143a4e..3143a4e 100644
--- a/src/pics/cursor/Makefile.am
+++ b/icons/cursor/Makefile.am
diff --git a/src/pics/cursor/zoom.png b/icons/cursor/zoom.png
index 8d162df..8d162df 100644
--- a/src/pics/cursor/zoom.png
+++ b/icons/cursor/zoom.png
diff --git a/icons/thumbnail/CMakeLists.txt b/icons/thumbnail/CMakeLists.txt
new file mode 100644
index 0000000..0d6754d
--- /dev/null
+++ b/icons/thumbnail/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+  FILES wait.png
+  DESTINATION ${DATA_INSTALL_DIR}/gwenview/thumbnail
+)
diff --git a/src/pics/thumbnail/Makefile.am b/icons/thumbnail/Makefile.am
index 767c22b..767c22b 100644
--- a/src/pics/thumbnail/Makefile.am
+++ b/icons/thumbnail/Makefile.am
diff --git a/src/pics/thumbnail/wait.png b/icons/thumbnail/wait.png
index 3b5a9e1..3b5a9e1 100644
--- a/src/pics/thumbnail/wait.png
+++ b/icons/thumbnail/wait.png
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..3f4dd63
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,24 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### subfolders
+
+add_subdirectory( app )
+add_subdirectory( desktopfiles )
+add_subdirectory( gvcore )
+add_subdirectory( gvdirpart )
+add_subdirectory( gvimagepart )
+add_subdirectory( imageutils )
+add_subdirectory( tools )
+add_subdirectory( tsthread )
+add_subdirectory( updates )
diff --git a/src/HACKING b/src/HACKING
index 3e45a7f..79604a1 100644
--- a/src/HACKING
+++ b/src/HACKING
@@ -78,11 +78,11 @@ if (!data)
 Include files
 -------------
 
-Group include files in the Qt, KDE or local groups and sort them
+Group include files in the TQt, KDE or local groups and sort them
 alphabetically. When writing the implementation file of a class which is a
-Q_OBJECT, make sure you include the .moc file, not the .h.
+TQ_OBJECT, make sure you include the .moc file, not the .h.
 
-// Qt
+// TQt
 #include <qobject.h>
 #include <qwidget.h>
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 81a3b05..c076f0f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = tsthread imageutils gvcore pics desktopfiles doc tools updates gvimagepart gvdirpart app
+SUBDIRS = tsthread imageutils gvcore desktopfiles tools updates gvimagepart gvdirpart app
 
 EXTRA_DIST = AUTHORS ChangeLog COPYING INSTALL NEWS README TODO CREDITS DESIGN
 
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
new file mode 100644
index 0000000..4fc06d9
--- /dev/null
+++ b/src/app/CMakeLists.txt
@@ -0,0 +1,56 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+
+##### libgwenshared (static)
+
+tde_add_library( gwenshared STATIC_PIC AUTOMOC
+  SOURCES vtabwidget.cpp
+)
+
+
+##### gwenview (shared)
+
+set( gwenview_SRCS
+  bookmarkowner.cpp
+  bookmarkviewcontroller.cpp
+  bookmarkdialogbase.ui
+  bookmarkdialog.cpp
+  configfileoperationspage.ui
+  configfullscreenpage.ui
+  configimagelistpage.ui
+  configimageviewpage.ui
+  configmiscpage.ui
+  configslideshowpage.ui
+  kipiinterface.cpp
+  mainwindow.cpp
+  metaedit.cpp
+  treeview.cpp
+  dirviewcontroller.cpp
+  configdialog.cpp
+  history.cpp
+  main.cpp
+)
+
+tde_add_tdeinit_executable( gwenview AUTOMOC
+  SOURCES ${gwenview_SRCS}
+  LINK
+    gwenshared-static gwenviewcore-shared
+    tdeutils-shared ${LIBKIPI_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}/trinity
+)
+
+
+##### other files
+
+install(
+  FILES gwenviewui.rc
+  DESTINATION ${DATA_INSTALL_DIR}/gwenview
+)
+
+install(
+  FILES gwenview.xpm
+  DESTINATION ${SHARE_INSTALL_PREFIX}/pixmaps
+)
diff --git a/src/app/Makefile.am b/src/app/Makefile.am
index a15f666..13347e7 100644
--- a/src/app/Makefile.am
+++ b/src/app/Makefile.am
@@ -38,7 +38,7 @@ gwenview_la_LIBADD   = libgwenshared.la ../gvcore/libgwenviewcore.la $(GV_LIB_KI
 gwenview_la_LDFLAGS = $(all_libraries) $(LIB_TQT) -module $(KDE_PLUGIN)
 
 
-# set the include path for X, qt and KDE
+# set the include path for X, tqt and KDE
 INCLUDES = -I$(srcdir)/.. $(all_includes) -I$(kde_includes)/tde
 
 METASOURCES = AUTO
@@ -46,13 +46,7 @@ METASOURCES = AUTO
 rcdir = $(kde_datadir)/gwenview
 rc_DATA = gwenviewui.rc
 
-
-check_PROGRAMS = testvtabwidget
-testvtabwidget_SOURCES = testvtabwidget.cpp
-testvtabwidget_LDADD = \
-	libgwenshared.la \
-	$(LIB_TDEUTILS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_TQT) \
-	$(LIBJPEG)
-testvtabwidget_LDFLAGS = $(all_libraries) $(LIB_TQT)
+pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = gwenview.xpm
 
 .NOTPARALLEL:
diff --git a/src/app/bookmarkdialog.cpp b/src/app/bookmarkdialog.cpp
index d64793f..a644862 100644
--- a/src/app/bookmarkdialog.cpp
+++ b/src/app/bookmarkdialog.cpp
@@ -50,17 +50,17 @@ BookmarkDialog::BookmarkDialog(TQWidget* parent, BookmarkDialog::Mode mode)
 	d->mContent->mUrl->setMode(KFile::Directory);
 	d->mContent->mIcon->setIcon("folder");
 	
-	connect(d->mContent->mTitle,TQT_SIGNAL(textChanged(const TQString&)),
-		this, TQT_SLOT(updateOk()));
-	connect(d->mContent->mIcon,TQT_SIGNAL(iconChanged(TQString)),
-		this, TQT_SLOT(updateOk()));
+	connect(d->mContent->mTitle,TQ_SIGNAL(textChanged(const TQString&)),
+		this, TQ_SLOT(updateOk()));
+	connect(d->mContent->mIcon,TQ_SIGNAL(iconChanged(TQString)),
+		this, TQ_SLOT(updateOk()));
 	
 	if (mode==BOOKMARK_GROUP) {
 		d->mContent->mUrlLabel->hide();
 		d->mContent->mUrl->hide();
 	} else {
-		connect(d->mContent->mUrl,TQT_SIGNAL(textChanged(const TQString&)),
-			this, TQT_SLOT(updateOk()));
+		connect(d->mContent->mUrl,TQ_SIGNAL(textChanged(const TQString&)),
+			this, TQ_SLOT(updateOk()));
 	}
 
 	switch (mode) {
diff --git a/src/app/bookmarkdialog.h b/src/app/bookmarkdialog.h
index f1f344e..c3fc2ad 100644
--- a/src/app/bookmarkdialog.h
+++ b/src/app/bookmarkdialog.h
@@ -27,7 +27,7 @@ namespace Gwenview {
 class BookmarkDialogPrivate;
 
 class BookmarkDialog : public KDialogBase {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	enum Mode { BOOKMARK_GROUP, BOOKMARK };
diff --git a/src/app/bookmarkdialogbase.ui b/src/app/bookmarkdialogbase.ui
index 2dc0524..d2bee5f 100644
--- a/src/app/bookmarkdialogbase.ui
+++ b/src/app/bookmarkdialogbase.ui
@@ -100,10 +100,9 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/src/app/bookmarkowner.h b/src/app/bookmarkowner.h
index 1263272..50e2385 100644
--- a/src/app/bookmarkowner.h
+++ b/src/app/bookmarkowner.h
@@ -28,7 +28,7 @@ namespace Gwenview {
 
 
 class BookmarkOwner : public TQObject, public KBookmarkOwner {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	BookmarkOwner(TQWidget* parent);
diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp
index c703340..2229a2f 100644
--- a/src/app/bookmarkviewcontroller.cpp
+++ b/src/app/bookmarkviewcontroller.cpp
@@ -110,7 +110,7 @@ struct BookmarkViewController::Private {
 	TDEListView* mListView;
 	KBookmarkManager* mManager;
 	KURL mCurrentURL;
-	std::auto_ptr<BookmarkToolTip> mToolTip;
+	std::unique_ptr<BookmarkToolTip> mToolTip;
 	TDEActionCollection* mActionCollection;
 	KURL mDroppedURL;
 
@@ -192,24 +192,24 @@ BookmarkViewController::BookmarkViewController(TQWidget* parent)
 	d->mListView->setShowToolTips(false);
 	d->mListView->setFullWidth(true);
 
-	connect(d->mListView, TQT_SIGNAL(clicked(TQListViewItem*)),
-		this, TQT_SLOT(slotOpenBookmark(TQListViewItem*)) );
-	connect(d->mListView, TQT_SIGNAL(returnPressed(TQListViewItem*)),
-		this, TQT_SLOT(slotOpenBookmark(TQListViewItem*)) );
-	connect(d->mListView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)),
-		this, TQT_SLOT(slotContextMenu(TQListViewItem*)) );
-	connect(d->mListView, TQT_SIGNAL(urlDropped(TQDropEvent*, const KURL::List&)),
-		this, TQT_SLOT(slotURLDropped(TQDropEvent*, const KURL::List&)) );
+	connect(d->mListView, TQ_SIGNAL(clicked(TQListViewItem*)),
+		this, TQ_SLOT(slotOpenBookmark(TQListViewItem*)) );
+	connect(d->mListView, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+		this, TQ_SLOT(slotOpenBookmark(TQListViewItem*)) );
+	connect(d->mListView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)),
+		this, TQ_SLOT(slotContextMenu(TQListViewItem*)) );
+	connect(d->mListView, TQ_SIGNAL(urlDropped(TQDropEvent*, const KURL::List&)),
+		this, TQ_SLOT(slotURLDropped(TQDropEvent*, const KURL::List&)) );
 
 	// Init toolbar
 	TDEToolBar* toolbar=new TDEToolBar(d->mBox, "", true);
 	TDEAction* action;
 	toolbar->setIconText(TDEToolBar::IconTextRight);
 	action=new TDEAction(i18n("Add a bookmark (keep it short)", "Add"), "bookmark_add", 0, 
-			this, TQT_SLOT(bookmarkCurrentURL()), d->mActionCollection);
+			this, TQ_SLOT(bookmarkCurrentURL()), d->mActionCollection);
 	action->plug(toolbar);
 	action=new TDEAction(i18n("Remove a bookmark (keep it short)", "Remove"), "edit-delete", 0,
-			this, TQT_SLOT(deleteCurrentBookmark()), d->mActionCollection);
+			this, TQ_SLOT(deleteCurrentBookmark()), d->mActionCollection);
 	action->plug(toolbar);
 }
 
@@ -225,8 +225,8 @@ void BookmarkViewController::init(KBookmarkManager* manager) {
 	
 	d->mManager=manager;
 	// For now, we ignore the caller parameter and just refresh the full list on update
-	connect(d->mManager, TQT_SIGNAL(changed(const TQString&, const TQString&)),
-		this, TQT_SLOT(fill()) );
+	connect(d->mManager, TQ_SIGNAL(changed(const TQString&, const TQString&)),
+		this, TQ_SLOT(fill()) );
 	fill();
 }
 
@@ -256,7 +256,7 @@ void BookmarkViewController::slotURLDropped(TQDropEvent* event, const KURL::List
 	
 	TQPopupMenu menu(lst);
 	int addBookmarkID=menu.insertItem( SmallIcon("bookmark_add"), i18n("&Add Bookmark"),
-		this, TQT_SLOT(slotBookmarkDroppedURL()) );
+		this, TQ_SLOT(slotBookmarkDroppedURL()) );
 	if (urls.count()==1) {
 		d->mDroppedURL=*urls.begin();
 	} else {
@@ -293,16 +293,16 @@ void BookmarkViewController::slotContextMenu(TQListViewItem* item_) {
 	BookmarkItem* item=static_cast<BookmarkItem*>(item_);
 	TQPopupMenu menu(d->mListView);
 	menu.insertItem(SmallIcon("bookmark_add"), i18n("Add Bookmark..."),
-		this, TQT_SLOT(bookmarkCurrentURL()));
+		this, TQ_SLOT(bookmarkCurrentURL()));
 	menu.insertItem(SmallIcon("bookmark_folder"), i18n("Add Bookmark Folder..."),
-		this, TQT_SLOT(addBookmarkGroup()));
+		this, TQ_SLOT(addBookmarkGroup()));
 
 	if (item) {
 		menu.insertSeparator();
 		menu.insertItem(SmallIcon("edit"), i18n("Edit..."), 
-			this, TQT_SLOT(editCurrentBookmark()));
+			this, TQ_SLOT(editCurrentBookmark()));
 		menu.insertItem(SmallIcon("edit-delete"), i18n("Delete"),
-			this, TQT_SLOT(deleteCurrentBookmark()));
+			this, TQ_SLOT(deleteCurrentBookmark()));
 	}
 	menu.exec(TQCursor::pos());
 }
diff --git a/src/app/bookmarkviewcontroller.h b/src/app/bookmarkviewcontroller.h
index a0d8b41..e0e7924 100644
--- a/src/app/bookmarkviewcontroller.h
+++ b/src/app/bookmarkviewcontroller.h
@@ -41,7 +41,7 @@ namespace Gwenview {
  * A listview on which the user can drop urls
  */
 class URLDropListView : public TDEListView {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	URLDropListView(TQWidget* parent);
@@ -56,7 +56,7 @@ protected:
 
 
 class BookmarkViewController : public TQObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	BookmarkViewController(TQWidget*);
diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
index 887d6fe..6b2e0a4 100644
--- a/src/app/configdialog.cpp
+++ b/src/app/configdialog.cpp
@@ -161,10 +161,10 @@ ConfigDialog::ConfigDialog(TQWidget* parent, KIPI::PluginLoader* pluginLoader)
 	d->mImageListPage->mShowFileSize->setChecked(details & FileThumbnailView::FILESIZE);
 	d->mImageListPage->mShowImageSize->setChecked(details & FileThumbnailView::IMAGESIZE);
 
-	connect(d->mImageListPage->mCalculateCacheSize,TQT_SIGNAL(clicked()),
-		this,TQT_SLOT(calculateCacheSize()));
-	connect(d->mImageListPage->mEmptyCache,TQT_SIGNAL(clicked()),
-		this,TQT_SLOT(emptyCache()));
+	connect(d->mImageListPage->mCalculateCacheSize,TQ_SIGNAL(clicked()),
+		this,TQ_SLOT(calculateCacheSize()));
+	connect(d->mImageListPage->mEmptyCache,TQ_SIGNAL(clicked()),
+		this,TQ_SLOT(emptyCache()));
 
 	// Image View tab
 	d->mImageViewPage->mMouseWheelGroup->setButton(ImageViewConfig::mouseWheelScroll()?1:0);
@@ -172,7 +172,7 @@ ConfigDialog::ConfigDialog(TQWidget* parent, KIPI::PluginLoader* pluginLoader)
 	// Full Screen tab
 	TQTextEdit* edit=d->mFullScreenPage->kcfg_osdFormat;
 	edit->setMaximumHeight(edit->fontMetrics().height()*3);
-	connect(edit, TQT_SIGNAL(textChanged()), TQT_SLOT(updateOSDPreview()) );
+	connect(edit, TQ_SIGNAL(textChanged()), TQ_SLOT(updateOSDPreview()) );
 
 	// File Operations tab
 	d->mFileOperationsPage->kcfg_destDir->fileDialog()->setMode(
diff --git a/src/app/configdialog.h b/src/app/configdialog.h
index a5d4b83..de1ad53 100644
--- a/src/app/configdialog.h
+++ b/src/app/configdialog.h
@@ -34,7 +34,7 @@ namespace Gwenview {
 class ConfigDialogPrivate;
 
 class ConfigDialog : public KDialogBase {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	ConfigDialog(TQWidget*, KIPI::PluginLoader*);
diff --git a/src/app/configfileoperationspage.ui b/src/app/configfileoperationspage.ui
index 451a030..6ef1f16 100644
--- a/src/app/configfileoperationspage.ui
+++ b/src/app/configfileoperationspage.ui
@@ -165,9 +165,9 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/src/app/configimagelistpage.ui b/src/app/configimagelistpage.ui
index 01cfe95..96bfcc5 100644
--- a/src/app/configimagelistpage.ui
+++ b/src/app/configimagelistpage.ui
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ConfigImageListPage</class>
 <widget class="TQWidget">
     <property name="name">
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>352</width>
-            <height>437</height>
+            <width>328</width>
+            <height>411</height>
         </rect>
     </property>
     <property name="caption">
@@ -27,7 +27,26 @@
                 <cstring>kcfg_showDirs</cstring>
             </property>
             <property name="text">
-                <string>Show folders and archives</string>
+                <string>&amp;Show folders and archives</string>
+            </property>
+            <property name="whatsThis" stdset="0">
+                <string>If enabled, folders and archives will be displayed alongside images in the browse view.</string>
+            </property>
+        </widget>
+        <widget class="TQCheckBox">
+            <property name="name">
+                <cstring>kcfg_loadMetadata</cstring>
+            </property>
+            <property name="text">
+                <string>Load &amp;metadata from files</string>
+            </property>
+            <property name="whatsThis" stdset="0">
+                <string>&lt;p&gt;This will cause metadata to be loaded from all the files in the current folder.&lt;/p&gt;
+&lt;p&gt;The metadata will be used to display the creation timestamp of the image instead of the file's mtime. Also, if the preview load fails, it may be used to display the image dimensions as a fallback.
+&lt;/p&gt;
+&lt;p&gt;For this option to work, you will need to have appropriate file plugins from &lt;i&gt;tdegraphics&lt;/i&gt; to be installed.
+&lt;/p&gt;
+&lt;p&gt;This may have some performance impact when browsing very large folders.&lt;/p&gt;</string>
             </property>
         </widget>
         <spacer>
@@ -90,10 +109,10 @@
                         </sizepolicy>
                     </property>
                     <property name="text">
-                        <string>Margin between thumbnails:</string>
+                        <string>&amp;Margin between thumbnails:</string>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring></cstring>
+                        <cstring>kcfg_thumbnailMarginSize</cstring>
                     </property>
                 </widget>
                 <widget class="TQSpinBox">
@@ -120,6 +139,9 @@
                     <property name="lineStep">
                         <number>1</number>
                     </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>This is the distance in pixel between items in thumbnail view.</string>
+                    </property>
                 </widget>
                 <spacer>
                     <property name="name">
@@ -178,7 +200,12 @@
                         <cstring>mShowFileName</cstring>
                     </property>
                     <property name="text">
-                        <string>File name</string>
+                        <string>File &amp;name</string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>&lt;p&gt;Whether to display the filename in thumbnail view with information on the bottom.&lt;/p&gt;
+&lt;p&gt;
+In thumbnail view with text on the right, this is always displayed.&lt;/p&gt;</string>
                     </property>
                 </widget>
                 <widget class="TQCheckBox" row="3" column="1">
@@ -186,7 +213,14 @@
                         <cstring>mShowImageSize</cstring>
                     </property>
                     <property name="text">
-                        <string>Image size</string>
+                        <string>&amp;Image size</string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>&lt;p&gt;Whether to display the image dimensions in thumbnail view with information on the bottom if available.&lt;/p&gt;
+&lt;p&gt;
+The dimensions will be calculated when loading the previews. If the preview loading fails, the information will be queried from image metadata (if the "&lt;i&gt;Load metadata from files&lt;/i&gt;" option is enabled).&lt;/p&gt;
+&lt;p&gt;
+In thumbnail view with text on the right, this is always displayed.&lt;/p&gt;</string>
                     </property>
                 </widget>
                 <widget class="TQCheckBox" row="2" column="1">
@@ -194,7 +228,12 @@
                         <cstring>mShowFileSize</cstring>
                     </property>
                     <property name="text">
-                        <string>File size</string>
+                        <string>File si&amp;ze</string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>&lt;p&gt;Whether to display the filesize in thumbnail view with information on the bottom.&lt;/p&gt;
+&lt;p&gt;
+In thumbnail view with text on the right, this is always displayed.&lt;/p&gt;</string>
                     </property>
                 </widget>
                 <widget class="TQCheckBox" row="1" column="1">
@@ -202,7 +241,14 @@
                         <cstring>mShowFileDate</cstring>
                     </property>
                     <property name="text">
-                        <string>File date</string>
+                        <string>File &amp;date</string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>&lt;p&gt;Whether to display the file's timestamp in thumbnail view with information on the bottom.&lt;/p&gt;
+&lt;p&gt;
+If "&lt;i&gt;Load metadata from files&lt;/i&gt;" option is enabled and the metadata is available in the file this will display file creation date. Otherwice the file modification time (mtime) will be used instead.&lt;/p&gt;
+&lt;p&gt;
+In thumbnail view with text on the right, this is always displayed.&lt;/p&gt;</string>
                     </property>
                 </widget>
             </grid>
@@ -245,7 +291,12 @@
                 <cstring>kcfg_storeThumbnailsInCache</cstring>
             </property>
             <property name="text">
-                <string>Store thumbnails in cache</string>
+                <string>Store thumbnails in &amp;cache</string>
+            </property>
+            <property name="whatsThis" stdset="0">
+                <string>&lt;p&gt;Save generated thumbnails in the dedicated cache directory. This will speed up the thumbnail load in the future.&lt;/p&gt;
+&lt;p&gt;
+The cache directory is usually located in &lt;i&gt;~/.tumbnails&lt;/i&gt;.&lt;/p&gt;</string>
             </property>
         </widget>
         <widget class="TQCheckBox">
@@ -253,7 +304,10 @@
                 <cstring>kcfg_deleteCacheOnExit</cstring>
             </property>
             <property name="text">
-                <string>Automatically empty thumbnail cache on exit</string>
+                <string>Automatically &amp;empty thumbnail cache on exit</string>
+            </property>
+            <property name="whatsThis" stdset="0">
+                <string>If this option is enabled, all the files in the thumbnail cache directory will be removed on exit from the gwenview.</string>
             </property>
         </widget>
         <widget class="TQLayoutWidget">
diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui
index 963f13d..38b23a1 100644
--- a/src/app/configimageviewpage.ui
+++ b/src/app/configimageviewpage.ui
@@ -324,7 +324,7 @@ Use this option if your computer is not very fast.</string>
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/src/app/configmiscpage.ui b/src/app/configmiscpage.ui
index 7e5874e..8a8ef6b 100644
--- a/src/app/configmiscpage.ui
+++ b/src/app/configmiscpage.ui
@@ -175,9 +175,6 @@
                     <property name="text">
                         <string>State of filter</string>
                     </property>
-                    <property name="accel">
-                        <string></string>
-                    </property>
                 </widget>
             </grid>
         </widget>
diff --git a/src/app/configslideshowpage.ui b/src/app/configslideshowpage.ui
index ccf0c15..2f707ea 100644
--- a/src/app/configslideshowpage.ui
+++ b/src/app/configslideshowpage.ui
@@ -128,7 +128,7 @@ When this option is enabled, the slideshow will stop on the last image of the fo
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/src/app/dirviewcontroller.cpp b/src/app/dirviewcontroller.cpp
index c93dc0b..0597fc4 100644
--- a/src/app/dirviewcontroller.cpp
+++ b/src/app/dirviewcontroller.cpp
@@ -58,11 +58,11 @@ DirViewController::DirViewController(TQWidget* parent)
 
 	d->mTreeView=new TreeView(parent);
 
-	connect(d->mTreeView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-		this, TQT_SLOT(slotTreeViewSelectionChanged(TQListViewItem*)) );
+	connect(d->mTreeView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+		this, TQ_SLOT(slotTreeViewSelectionChanged(TQListViewItem*)) );
 
-	connect(d->mTreeView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-		this, TQT_SLOT(slotTreeViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
+	connect(d->mTreeView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+		this, TQ_SLOT(slotTreeViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
 }
 
 
@@ -90,12 +90,12 @@ void DirViewController::slotTreeViewSelectionChanged(TQListViewItem* item) {
 
 void DirViewController::slotTreeViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint& pos) {
 	TQPopupMenu menu(d->mTreeView);
-	menu.insertItem(SmallIcon("folder-new"),i18n("New Folder..."),this,TQT_SLOT(makeDir()));
+	menu.insertItem(SmallIcon("folder-new"),i18n("New Folder..."),this,TQ_SLOT(makeDir()));
 	menu.insertSeparator();
-	menu.insertItem(i18n("Rename..."),this,TQT_SLOT(renameDir()));
-	menu.insertItem(SmallIcon("edit-delete"),i18n("Delete"),this,TQT_SLOT(removeDir()));
+	menu.insertItem(i18n("Rename..."),this,TQ_SLOT(renameDir()));
+	menu.insertItem(SmallIcon("edit-delete"),i18n("Delete"),this,TQ_SLOT(removeDir()));
 	menu.insertSeparator();
-	menu.insertItem(i18n("Properties"),this,TQT_SLOT(showPropertiesDialog()));
+	menu.insertItem(i18n("Properties"),this,TQ_SLOT(showPropertiesDialog()));
 	
 	menu.exec(pos);
 }
@@ -103,7 +103,7 @@ void DirViewController::slotTreeViewContextMenu(TDEListView*, TQListViewItem*, c
 
 void DirViewController::makeDir() {
 	if (!d->mTreeView->currentItem()) return;
-	FileOperation::makeDir(d->mTreeView->currentURL(), d->mTreeView, this, TQT_SLOT(slotDirMade()) );
+	FileOperation::makeDir(d->mTreeView->currentURL(), d->mTreeView, this, TQ_SLOT(slotDirMade()) );
 }
 
 
diff --git a/src/app/dirviewcontroller.h b/src/app/dirviewcontroller.h
index c4ad2f3..7e22a4e 100644
--- a/src/app/dirviewcontroller.h
+++ b/src/app/dirviewcontroller.h
@@ -36,7 +36,7 @@ class Job;
 namespace Gwenview {
 
 class DirViewController : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	DirViewController(TQWidget* parent);
diff --git a/src/app/gwenview.xpm b/src/app/gwenview.xpm
new file mode 100644
index 0000000..076efa8
--- /dev/null
+++ b/src/app/gwenview.xpm
@@ -0,0 +1,554 @@
+/* XPM */
+static char * gwenview_xpm[] = {
+"32 32 519 2",
+"  	c None",
+". 	c #2D2F32",
+"+ 	c #3A3C3F",
+"@ 	c #3C3F42",
+"# 	c #333538",
+"$ 	c #5F6164",
+"% 	c #A0A2A4",
+"& 	c #CCCDCF",
+"* 	c #E3E4E5",
+"= 	c #ECEDEE",
+"- 	c #EEEFEF",
+"; 	c #E8E9EA",
+"> 	c #D7D8DA",
+", 	c #B4B6B8",
+"' 	c #7B7D80",
+") 	c #383A3D",
+"! 	c #6D7073",
+"~ 	c #CBCDCF",
+"{ 	c #F6F7F8",
+"] 	c #FEFFFF",
+"^ 	c #FEFEFE",
+"/ 	c #FCFDFE",
+"( 	c #FCFDFD",
+"_ 	c #FDFEFE",
+": 	c #E5E6E7",
+"< 	c #9DA0A2",
+"[ 	c #36383B",
+"} 	c #323539",
+"| 	c #ADB0B3",
+"1 	c #F3F5F7",
+"2 	c #FAFCFD",
+"3 	c #F7F9FA",
+"4 	c #F8FAFB",
+"5 	c #D7DADC",
+"6 	c #616468",
+"7 	c #3E4145",
+"8 	c #C6CACE",
+"9 	c #F6F9FB",
+"0 	c #F3F7F8",
+"a 	c #F3F6F8",
+"b 	c #F5F9FA",
+"c 	c #E6EAEC",
+"d 	c #74787C",
+"e 	c #32363A",
+"f 	c #C0C7CB",
+"g 	c #F1F6F8",
+"h 	c #EFF3F6",
+"i 	c #F0F5F7",
+"j 	c #E3E9EC",
+"k 	c #676C71",
+"l 	c #A2AAAF",
+"m 	c #EBF2F6",
+"n 	c #EDF3F6",
+"o 	c #EEF4F7",
+"p 	c #EFF5F7",
+"q 	c #EFF4F7",
+"r 	c #EEF4F6",
+"s 	c #EDF2F5",
+"t 	c #ECF1F4",
+"u 	c #EBF0F3",
+"v 	c #EBF0F4",
+"w 	c #ECF0F4",
+"x 	c #ECF1F5",
+"y 	c #EDF2F6",
+"z 	c #EEF3F7",
+"A 	c #EFF4F8",
+"B 	c #D1D9DD",
+"C 	c #42474B",
+"D 	c #686F73",
+"E 	c #D5DFE3",
+"F 	c #D1D8DB",
+"G 	c #C2C7CB",
+"H 	c #B1B5BA",
+"I 	c #A1A6AC",
+"J 	c #949AA0",
+"K 	c #899298",
+"L 	c #828D92",
+"M 	c #7D8C8E",
+"N 	c #798A8A",
+"O 	c #778985",
+"P 	c #778982",
+"Q 	c #788A7F",
+"R 	c #7A8B7E",
+"S 	c #7F8E82",
+"T 	c #869288",
+"U 	c #8F9991",
+"V 	c #9AA29D",
+"W 	c #A7AEAC",
+"X 	c #B6BCBD",
+"Y 	c #C7CCCF",
+"Z 	c #D4DCE1",
+"` 	c #A0A8AE",
+" .	c #110D12",
+"..	c #665A69",
+"+.	c #7E6B83",
+"@.	c #7F6C87",
+"#.	c #877993",
+"$.	c #928AA3",
+"%.	c #9E9DB2",
+"&.	c #AAAFBF",
+"*.	c #B5C0CA",
+"=.	c #BECCD2",
+"-.	c #C4D6D8",
+";.	c #C8DCDA",
+">.	c #CADED7",
+",.	c #CBDFD3",
+"'.	c #C9DECD",
+").	c #C5DBC5",
+"!.	c #C1D6BE",
+"~.	c #BBCFB5",
+"{.	c #B4C7A9",
+"].	c #AABB9A",
+"^.	c #9FAD8A",
+"/.	c #939E79",
+"(.	c #888F6B",
+"_.	c #808465",
+":.	c #787965",
+"<.	c #2F2D26",
+"[.	c #724051",
+"}.	c #AF889E",
+"|.	c #D8B3D1",
+"1.	c #ECCEED",
+"2.	c #F4E1FA",
+"3.	c #F7ECFE",
+"4.	c #F6F0FF",
+"5.	c #F3F2FF",
+"6.	c #F1F5FF",
+"7.	c #EEF7FF",
+"8.	c #ECFAFF",
+"9.	c #E9FDFF",
+"0.	c #E7FFFC",
+"a.	c #E6FFF6",
+"b.	c #E4FFF0",
+"c.	c #E3FFE9",
+"d.	c #E3FFE3",
+"e.	c #E6FFE2",
+"f.	c #E9FFE1",
+"g.	c #ECFFE0",
+"h.	c #EFFFDF",
+"i.	c #F3FFDD",
+"j.	c #F5FFDA",
+"k.	c #F6FED3",
+"l.	c #F4F7C7",
+"m.	c #EAE4B6",
+"n.	c #CFBE9B",
+"o.	c #A68269",
+"p.	c #3F1E13",
+"q.	c #6C2632",
+"r.	c #FCC0D2",
+"s.	c #FDD7EE",
+"t.	c #FFD4F8",
+"u.	c #FCCEFD",
+"v.	c #F3CEFE",
+"w.	c #EAD0FE",
+"x.	c #E1D2FE",
+"y.	c #D7D5FE",
+"z.	c #D2DCFE",
+"A.	c #CDE5FE",
+"B.	c #C9EFFE",
+"C.	c #C5F8FD",
+"D.	c #C2FDF6",
+"E.	c #C1FEE8",
+"F.	c #C0FEDA",
+"G.	c #BFFECB",
+"H.	c #BFFEBF",
+"I.	c #C5FEBD",
+"J.	c #CCFEBC",
+"K.	c #D2FEBB",
+"L.	c #DAFEBA",
+"M.	c #E1FEB8",
+"N.	c #E9FEB7",
+"O.	c #F1FEB7",
+"P.	c #F9FEB6",
+"Q.	c #FEF7BA",
+"R.	c #FDE8BF",
+"S.	c #FDD8BE",
+"T.	c #B96B57",
+"U.	c #A44855",
+"V.	c #FBB9CF",
+"W.	c #F8B6DD",
+"X.	c #FDB2EF",
+"Y.	c #FAACFC",
+"Z.	c #EDAFFE",
+"`.	c #DEB4FE",
+" +	c #CFB8FE",
+".+	c #C0BDFE",
+"++	c #B8C9FE",
+"@+	c #B2D7FE",
+"#+	c #ABE6FE",
+"$+	c #A5F6FD",
+"%+	c #A1FDF2",
+"&+	c #A0FEDD",
+"*+	c #9FFEC6",
+"=+	c #9DFEB0",
+"-+	c #9FFE9E",
+";+	c #A8FE9B",
+">+	c #B3FE9A",
+",+	c #BDFE99",
+"'+	c #C8FE98",
+")+	c #D3FE97",
+"!+	c #DFFE96",
+"~+	c #EBFE95",
+"{+	c #F7FD94",
+"]+	c #FDF297",
+"^+	c #FBDC9F",
+"/+	c #F4C39F",
+"(+	c #DC816C",
+"_+	c #220502",
+":+	c #B24A58",
+"<+	c #F69ABA",
+"[+	c #F899D1",
+"}+	c #FD92E9",
+"|+	c #F88BFB",
+"1+	c #E68FFE",
+"2+	c #D196FE",
+"3+	c #BC9DFE",
+"4+	c #A9A4FD",
+"5+	c #9DB5FE",
+"6+	c #95C9FE",
+"7+	c #8CDEFE",
+"8+	c #83F2FD",
+"9+	c #7EFDEE",
+"0+	c #7DFED1",
+"a+	c #7CFEB3",
+"b+	c #7BFE94",
+"c+	c #7DFD7D",
+"d+	c #8AFE79",
+"e+	c #99FE78",
+"f+	c #A8FE77",
+"g+	c #B7FE75",
+"h+	c #C5FE74",
+"i+	c #D5FE73",
+"j+	c #E4FE72",
+"k+	c #F5FD71",
+"l+	c #FDEE77",
+"m+	c #FBD282",
+"n+	c #EFAF7F",
+"o+	c #E1765D",
+"p+	c #2A0704",
+"q+	c #AB3849",
+"r+	c #F278A2",
+"s+	c #F67CC5",
+"t+	c #FD72E3",
+"u+	c #F669FB",
+"v+	c #DF6FFE",
+"w+	c #C578FE",
+"x+	c #AA81FD",
+"y+	c #918BFE",
+"z+	c #819FFC",
+"A+	c #74B5F5",
+"B+	c #6CD3FC",
+"C+	c #62F0FD",
+"D+	c #5CFDEA",
+"E+	c #5BFEC5",
+"F+	c #5AFE9F",
+"G+	c #58FE78",
+"H+	c #5CFE5B",
+"I+	c #6CFD56",
+"J+	c #7CF653",
+"K+	c #8FF853",
+"L+	c #A5FE53",
+"M+	c #B8FD52",
+"N+	c #CBFE51",
+"O+	c #DEFE50",
+"P+	c #F2FD4F",
+"Q+	c #FCEA56",
+"R+	c #FAC864",
+"S+	c #EB9A5E",
+"T+	c #D75E3F",
+"U+	c #210502",
+"V+	c #8F1F32",
+"W+	c #EF5488",
+"X+	c #F45FB8",
+"Y+	c #FC53DD",
+"Z+	c #F548FA",
+"`+	c #D850FE",
+" @	c #B95BFE",
+".@	c #9866FE",
+"+@	c #7770F8",
+"@@	c #506AC1",
+"#@	c #3B6FA2",
+"$@	c #3C9DC1",
+"%@	c #40E8F8",
+"&@	c #3BFEE6",
+"*@	c #3AFEBA",
+"=@	c #39FE8C",
+"-@	c #37FE5D",
+";@	c #3CFE3B",
+">@	c #44DA2F",
+",@	c #43A623",
+"'@	c #56AE24",
+")@	c #88E92F",
+"!@	c #ABFE31",
+"~@	c #C2FE30",
+"{@	c #D9FE2F",
+"]@	c #F1FD2E",
+"^@	c #FCE636",
+"/@	c #F8BC45",
+"(@	c #E7833C",
+"_@	c #BB401D",
+":@	c #5C091A",
+"<@	c #E92B6C",
+"[@	c #F13FA8",
+"}@	c #FC34D7",
+"|@	c #F427F9",
+"1@	c #D131FE",
+"2@	c #AC3EFE",
+"3@	c #864BFF",
+"4@	c #5A50E8",
+"5@	c #2D4696",
+"6@	c #22588E",
+"7@	c #1B7495",
+"8@	c #1DD7E7",
+"9@	c #19FEE3",
+"0@	c #18FEAE",
+"a@	c #17FE78",
+"b@	c #15FE42",
+"c@	c #1BFB19",
+"d@	c #21AF0D",
+"e@	c #2A8D0A",
+"f@	c #388D09",
+"g@	c #67C60D",
+"h@	c #9EFF10",
+"i@	c #B8FE0F",
+"j@	c #D3FE0E",
+"k@	c #EEFD0E",
+"l@	c #FCE318",
+"m@	c #F5B027",
+"n@	c #E56D19",
+"o@	c #7C2304",
+"p@	c #1C0006",
+"q@	c #BD084A",
+"r@	c #F02099",
+"s@	c #FD1AD4",
+"t@	c #F20CF9",
+"u@	c #CC18FE",
+"v@	c #A327FE",
+"w@	c #7836FE",
+"x@	c #4D44F5",
+"y@	c #2949B4",
+"z@	c #195998",
+"A@	c #1288B4",
+"B@	c #0BE0F4",
+"C@	c #04FEE1",
+"D@	c #03FFA9",
+"E@	c #03FF6E",
+"F@	c #03FE34",
+"G@	c #0AFE08",
+"H@	c #1BCF01",
+"I@	c #279B01",
+"J@	c #3BA101",
+"K@	c #6DE102",
+"L@	c #98FF02",
+"M@	c #B4FD02",
+"N@	c #D1FE02",
+"O@	c #EFFE02",
+"P@	c #FEE50E",
+"Q@	c #EAA419",
+"R@	c #944609",
+"S@	c #1B0700",
+"T@	c #2D0012",
+"U@	c #9B0E63",
+"V@	c #E810C1",
+"W@	c #F206F8",
+"X@	c #CE14FF",
+"Y@	c #A324FF",
+"Z@	c #7734FF",
+"`@	c #4E45FF",
+" #	c #3765F8",
+".#	c #2689EC",
+"+#	c #19BBF9",
+"@#	c #09E9FD",
+"##	c #00E5CA",
+"$#	c #02C381",
+"%#	c #02BF52",
+"&#	c #00DD29",
+"*#	c #08FB06",
+"=#	c #24FD02",
+"-#	c #3CF002",
+";#	c #59F302",
+">#	c #7BFE02",
+",#	c #9AFF02",
+"'#	c #B7FF02",
+")#	c #CDFA00",
+"!#	c #D4E200",
+"~#	c #B0A00C",
+"{#	c #614C1A",
+"]#	c #0F0A06",
+"^#	c #161117",
+"/#	c #6A3C67",
+"(#	c #88208E",
+"_#	c #8C13AF",
+":#	c #801CCB",
+"<#	c #652ADE",
+"[#	c #443CE7",
+"}#	c #315EEA",
+"|#	c #2284E6",
+"1#	c #139CD2",
+"2#	c #128E9D",
+"3#	c #4A7E7C",
+"4#	c #869796",
+"5#	c #8B9A98",
+"6#	c #52785B",
+"7#	c #1B891A",
+"8#	c #1CBD03",
+"9#	c #34D300",
+"0#	c #4CD400",
+"a#	c #60CA00",
+"b#	c #6EB804",
+"c#	c #749E10",
+"d#	c #73862A",
+"e#	c #797F57",
+"f#	c #7D807B",
+"g#	c #494D52",
+"h#	c #7B8487",
+"i#	c #BFCACB",
+"j#	c #9FA4AA",
+"k#	c #858294",
+"l#	c #706C89",
+"m#	c #606285",
+"n#	c #586584",
+"o#	c #5C7185",
+"p#	c #73858E",
+"q#	c #A7AEB2",
+"r#	c #DAE0E5",
+"s#	c #E5EDF2",
+"t#	c #DBE3E8",
+"u#	c #BABDC2",
+"v#	c #B1B5BB",
+"w#	c #8D9B95",
+"x#	c #798E7B",
+"y#	c #7A8D79",
+"z#	c #859385",
+"A#	c #97A09D",
+"B#	c #B0B6BC",
+"C#	c #CAD1DA",
+"D#	c #C7CED4",
+"E#	c #9A9EA1",
+"F#	c #242629",
+"G#	c #2A2D31",
+"H#	c #BFC7CC",
+"I#	c #E6F0F5",
+"J#	c #E3EDF1",
+"K#	c #E1EBEE",
+"L#	c #DFE8EB",
+"M#	c #DEE6E9",
+"N#	c #E0E8EC",
+"O#	c #E3EBF0",
+"P#	c #E3ECF2",
+"Q#	c #E1EAEF",
+"R#	c #E0E9EE",
+"S#	c #D6DEE3",
+"T#	c #D8E0E4",
+"U#	c #E2EBF0",
+"V#	c #E4EDF2",
+"W#	c #E3EBF2",
+"X#	c #E4ECF2",
+"Y#	c #E4EDF3",
+"Z#	c #E3ECF1",
+"`#	c #CED5D9",
+" $	c #ADB1B3",
+".$	c #53565A",
+"+$	c #505559",
+"@$	c #D1DADF",
+"#$	c #E1E9EE",
+"$$	c #DEE7EC",
+"%$	c #C6CDD0",
+"&$	c #AFB3B5",
+"*$	c #73777A",
+"=$	c #62666B",
+"-$	c #D3DBE0",
+";$	c #E4ECF1",
+">$	c #E2EAEF",
+",$	c #D8DFE3",
+"'$	c #C5CBCE",
+")$	c #BDC2C5",
+"!$	c #BCC1C4",
+"~$	c #C1C6C9",
+"{$	c #D1D8DC",
+"]$	c #E0E8ED",
+"^$	c #C5CACD",
+"/$	c #AEB1B3",
+"($	c #7D8083",
+"_$	c #565B5F",
+":$	c #C4CBD1",
+"<$	c #E2EBEF",
+"[$	c #CFD5D9",
+"}$	c #CDD3D6",
+"|$	c #D5DCE0",
+"1$	c #DFE6EB",
+"2$	c #DEE6EB",
+"3$	c #C6CBCF",
+"4$	c #AAADAF",
+"5$	c #727578",
+"6$	c #33363A",
+"7$	c #D5DDE2",
+"8$	c #E1E8ED",
+"9$	c #D6DDE1",
+"0$	c #BBC0C3",
+"a$	c #939698",
+"b$	c #4F5255",
+"c$	c #42464A",
+"d$	c #898F94",
+"e$	c #BFC6CB",
+"f$	c #DCE4E8",
+"g$	c #DDE4E9",
+"h$	c #DAE2E6",
+"i$	c #D4DBDF",
+"j$	c #C7CDD0",
+"k$	c #AEB3B6",
+"l$	c #888C8E",
+"m$	c #55575A",
+"n$	c #414447",
+"o$	c #575A5E",
+"p$	c #626569",
+"q$	c #626568",
+"r$	c #575A5D",
+"s$	c #434548",
+"t$	c #292B2D",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                            . + @ #                             ",
+"                      $ % & * = - ; > , ' )                     ",
+"                  ! ~ { ] ^ / ( ( / _ ] ( : < [                 ",
+"              } | 1 2 3 3 3 3 3 3 3 3 3 3 4 2 5 6               ",
+"            7 8 9 0 a a a a a a a a a a a a a b c d             ",
+"          e f g h h h h h h h h h h h h h h h h i j k           ",
+"          l m n o p q r n s t u v w x y z o A o o o B C         ",
+"        D E F G H I J K L M N O P Q R S T U V W X Y Z `         ",
+"       ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.      ",
+"    [.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.  ",
+"  q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.  ",
+"  U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+",
+"  :+<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+",
+"  q+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+",
+"  V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@  ",
+"  :@<@[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@  ",
+"  p@q@r@s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@S@  ",
+"    T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#    ",
+"      ^#/#(#_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#      ",
+"        h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#      ",
+"        G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#W#X#Y#Z#`# $.$        ",
+"          +$@$O##$Q#Q#Q#Q##$R##$Q#Q#R##$Q##$Q#$$%$&$*$          ",
+"            =$-$;$Q##$Q#>$,$'$)$!$~${$#$>$>$]$^$/$($            ",
+"              _$:$;$<$#$>$]$T#[$}$|$1$>$>$2$3$4$5$              ",
+"                6$J 7$;$;$>$U#O#O#O#O#8$9$0$a$b$                ",
+"                    c$d$e$S#f$g$h$i$j$k$l$m$                    ",
+"                          n$o$p$q$r$s$t$                        ",
+"                                                                ",
+"                                                                "};
diff --git a/src/app/history.cpp b/src/app/history.cpp
index 5eb7783..91a129f 100644
--- a/src/app/history.cpp
+++ b/src/app/history.cpp
@@ -42,21 +42,21 @@ History::History(TDEActionCollection* actionCollection) {
 	TQPair<KGuiItem, KGuiItem> backForward = KStdGuiItem::backAndForward();
 	mGoBack=new TDEToolBarPopupAction(backForward.first,
 					TDEStdAccel::shortcut(TDEStdAccel::Back),
-					this, TQT_SLOT(goBack()), actionCollection, "go_back");
+					this, TQ_SLOT(goBack()), actionCollection, "go_back");
 	mGoForward=new TDEToolBarPopupAction(backForward.second,
 					   TDEStdAccel::shortcut(TDEStdAccel::Forward),
-					   this, TQT_SLOT(goForward()), actionCollection, "go_forward");
+					   this, TQ_SLOT(goForward()), actionCollection, "go_forward");
 
 	// Connections
-	connect(mGoBack->popupMenu(),TQT_SIGNAL(activated(int)),
-		this,TQT_SLOT(goBackTo(int)) );
-	connect(mGoForward->popupMenu(),TQT_SIGNAL(activated(int)),
-		this,TQT_SLOT(goForwardTo(int)) );
-
-	connect(mGoBack->popupMenu(), TQT_SIGNAL(aboutToShow()),
-		this, TQT_SLOT(fillGoBackMenu()) );
-	connect(mGoForward->popupMenu(), TQT_SIGNAL(aboutToShow()),
-		this, TQT_SLOT(fillGoForwardMenu()) );
+	connect(mGoBack->popupMenu(),TQ_SIGNAL(activated(int)),
+		this,TQ_SLOT(goBackTo(int)) );
+	connect(mGoForward->popupMenu(),TQ_SIGNAL(activated(int)),
+		this,TQ_SLOT(goForwardTo(int)) );
+
+	connect(mGoBack->popupMenu(), TQ_SIGNAL(aboutToShow()),
+		this, TQ_SLOT(fillGoBackMenu()) );
+	connect(mGoForward->popupMenu(), TQ_SIGNAL(aboutToShow()),
+		this, TQ_SLOT(fillGoForwardMenu()) );
 }
 
 
diff --git a/src/app/history.h b/src/app/history.h
index f1d2cc7..bc90a3b 100644
--- a/src/app/history.h
+++ b/src/app/history.h
@@ -35,7 +35,7 @@ typedef TQValueList<KURL> HistoryList;
 
 namespace Gwenview {
 class History : public TQObject {
-Q_OBJECT
+TQ_OBJECT
   
 	
 public:
diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp
index e16b0ad..456129e 100644
--- a/src/app/kipiinterface.cpp
+++ b/src/app/kipiinterface.cpp
@@ -119,17 +119,17 @@ struct KIPIInterfacePrivate {
 
 
 KIPIInterface::KIPIInterface( TQWidget* parent, FileViewController* fileView)
-:KIPI::Interface(TQT_TQOBJECT(parent), "Gwenview kipi interface") {
+:KIPI::Interface(parent, "Gwenview kipi interface") {
 	d=new KIPIInterfacePrivate;
 	d->mFileView=fileView;
 
-	connect(d->mFileView, TQT_SIGNAL(selectionChanged()),
-		this, TQT_SLOT(slotSelectionChanged()) );
+	connect(d->mFileView, TQ_SIGNAL(selectionChanged()),
+		this, TQ_SLOT(slotSelectionChanged()) );
 
-	connect(d->mFileView, TQT_SIGNAL(completed()),
-		this, TQT_SLOT(slotDirectoryChanged()) );
+	connect(d->mFileView, TQ_SIGNAL(completed()),
+		this, TQ_SLOT(slotDirectoryChanged()) );
 // delay a bit, so that it's called after loadPlugins()
-	TQTimer::singleShot( 0, this, TQT_SLOT( init()));
+	TQTimer::singleShot( 0, this, TQ_SLOT( init()));
 }
 
 
diff --git a/src/app/kipiinterface.h b/src/app/kipiinterface.h
index da241d4..d9135fa 100644
--- a/src/app/kipiinterface.h
+++ b/src/app/kipiinterface.h
@@ -36,7 +36,7 @@ class KIPIInterfacePrivate;
 class FileViewController;
 
 class KIPIInterface :public KIPI::Interface {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index e2ec1c9..7b5e292 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -167,7 +167,7 @@ MainWindow::MainWindow()
 #endif
 {
 	// Backend
-	mDocument=new Document(TQT_TQOBJECT(this));
+	mDocument=new Document(this);
 	mHistory=new History(actionCollection());
 	// GUI
 	createActions();
@@ -243,9 +243,9 @@ void MainWindow::openURL(const KURL& url) {
 		mFileViewController->setDirURL(url);
 		mFileViewController->setFocus();
 	} else {
-		mDocument->setURL(url);
 		mFileViewController->setDirURL(url.upURL());
 		mFileViewController->setFileNameToSelect(url.filename());
+		mDocument->setURL(url);
 		mImageViewController->setFocus();
 	}
 	
@@ -357,7 +357,7 @@ void MainWindow::renameFile() {
 	} else {
 		url = mDocument->url();
 	}
-	FileOperation::rename(url, this, TQT_TQOBJECT(this), TQT_SLOT(slotRenamed(const TQString &)));
+	FileOperation::rename(url, this, this, TQ_SLOT(slotRenamed(const TQString &)));
 }
 
 
@@ -478,11 +478,11 @@ void MainWindow::openFileViewControllerContextMenu(const TQPoint& pos, bool onIt
 		const KFileItemList* items = mFileViewController->currentFileView()->selectedItems();
 		selectionSize = items->count();
 		externalToolContext =
-			ExternalToolManager::instance()->createContext(TQT_TQOBJECT(this), items);
+			ExternalToolManager::instance()->createContext(this, items);
 	} else {
 		selectionSize = 0;
 		externalToolContext =
-			ExternalToolManager::instance()->createContext(TQT_TQOBJECT(this), mFileViewController->dirURL());
+			ExternalToolManager::instance()->createContext(this, mFileViewController->dirURL());
 	}
 
 	TQPopupMenu menu(this);
@@ -493,7 +493,7 @@ void MainWindow::openFileViewControllerContextMenu(const TQPoint& pos, bool onIt
 	actionCollection()->action("view_sort")->plug(&menu);
 	mGoUp->plug(&menu);
 
-	menu.insertItem(SmallIcon("folder-new"), i18n("New Folder..."), TQT_TQOBJECT(this), TQT_SLOT(makeDir()));
+	menu.insertItem(SmallIcon("folder-new"), i18n("New Folder..."), this, TQ_SLOT(makeDir()));
 
 	menu.insertSeparator();
 
@@ -664,12 +664,12 @@ void MainWindow::showConfigDialog() {
 #else
 	ConfigDialog dialog(this, 0);
 #endif
-	connect(&dialog, TQT_SIGNAL(settingsChanged()),
-		mSlideShow, TQT_SLOT(slotSettingsChanged()) );
-	connect(&dialog, TQT_SIGNAL(settingsChanged()),
-		mImageViewController, TQT_SLOT(updateFromSettings()) );
-	connect(&dialog, TQT_SIGNAL(settingsChanged()),
-		mFileViewController, TQT_SLOT(updateFromSettings()) );
+	connect(&dialog, TQ_SIGNAL(settingsChanged()),
+		mSlideShow, TQ_SLOT(slotSettingsChanged()) );
+	connect(&dialog, TQ_SIGNAL(settingsChanged()),
+		mImageViewController, TQ_SLOT(updateFromSettings()) );
+	connect(&dialog, TQ_SIGNAL(settingsChanged()),
+		mFileViewController, TQ_SLOT(updateFromSettings()) );
 	dialog.exec();
 }
 
@@ -690,7 +690,7 @@ void MainWindow::showKeyDialog() {
 void MainWindow::showToolBarDialog() {
 	saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
 	KEditToolbar dlg(actionCollection());
-	connect(&dlg,TQT_SIGNAL(newToolbarConfig()),TQT_TQOBJECT(this),TQT_SLOT(applyMainWindowSettings()));
+	connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(applyMainWindowSettings()));
 	dlg.exec();
 }
 
@@ -880,15 +880,15 @@ void MainWindow::createWidgets() {
 	statusBar()->addWidget(mSBDetailLabel, 0);
 	statusBar()->addWidget(mSBHintLabel, 1);
 	mHintTimer=new TQTimer(this);
-	connect(mHintTimer, TQT_SIGNAL(timeout()),
-		mSBHintLabel, TQT_SLOT(clear()) );
+	connect(mHintTimer, TQ_SIGNAL(timeout()),
+		mSBHintLabel, TQ_SLOT(clear()) );
 
 	// Pixmap widget
 	mImageDock = mDockArea->createDockWidget("Image",SmallIcon("gwenview"),NULL,i18n("Image"));
 	mImageViewController=new ImageViewController(mImageDock, mDocument, actionCollection());
 	mImageDock->setWidget(mImageViewController->widget());
-	connect(mImageViewController, TQT_SIGNAL(requestHintDisplay(const TQString&)),
-		TQT_TQOBJECT(this), TQT_SLOT(showHint(const TQString&)) );
+	connect(mImageViewController, TQ_SIGNAL(requestHintDisplay(const TQString&)),
+		this, TQ_SLOT(showHint(const TQString&)) );
 
 	// Folder widget
 	mFolderDock = mDockArea->createDockWidget("Folders",SmallIcon("folder_open"),NULL,i18n("Folders"));
@@ -962,55 +962,55 @@ void MainWindow::createWidgets() {
  */
 void MainWindow::createActions() {
 	// Stack
-	mSwitchToBrowseMode=new TDERadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode");
+	mSwitchToBrowseMode=new TDERadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, this, TQ_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode");
 	mSwitchToBrowseMode->setExclusiveGroup("centralStackMode");
 	mSwitchToBrowseMode->setChecked(true);
-	mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image-x-generic", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode");
+	mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image-x-generic", 0, this, TQ_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode");
 	mSwitchToViewMode->setExclusiveGroup("centralStackMode");
 	
 	// File
-	KStdAction::open(TQT_TQOBJECT(this),TQT_SLOT(showFileDialog()),actionCollection() );
-	mSaveFile=KStdAction::save(mDocument,TQT_SLOT(save()),actionCollection() );
-	mSaveFileAs=KStdAction::saveAs(mDocument,TQT_SLOT(saveAs()),actionCollection() );
-	mFilePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printFile()), actionCollection());
-	mRenameFile=new TDEAction(i18n("&Rename..."),Key_F2,TQT_TQOBJECT(this),TQT_SLOT(renameFile()),actionCollection(),"file_rename");
-	mCopyFiles=new TDEAction(i18n("&Copy To..."),Key_F7,TQT_TQOBJECT(this),TQT_SLOT(copyFiles()),actionCollection(),"file_copy");
-	mMoveFiles=new TDEAction(i18n("&Move To..."),Key_F8,TQT_TQOBJECT(this),TQT_SLOT(moveFiles()),actionCollection(),"file_move");
-	mLinkFiles=new TDEAction(i18n("&Link To..."),Key_F9,TQT_TQOBJECT(this),TQT_SLOT(linkFiles()),actionCollection(),"file_link");
-	mDeleteFiles=new TDEAction(i18n("&Delete"),"edit-delete",Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(deleteFiles()),actionCollection(),"file_delete");
-	mShowFileProperties=new TDEAction(i18n("Properties"),0,TQT_TQOBJECT(this),TQT_SLOT(showFileProperties()),actionCollection(),"file_properties");
-	KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT (closeAllWindows()), actionCollection() );
+	KStdAction::open(this,TQ_SLOT(showFileDialog()),actionCollection() );
+	mSaveFile=KStdAction::save(mDocument,TQ_SLOT(save()),actionCollection() );
+	mSaveFileAs=KStdAction::saveAs(mDocument,TQ_SLOT(saveAs()),actionCollection() );
+	mFilePrint = KStdAction::print(this, TQ_SLOT(printFile()), actionCollection());
+	mRenameFile=new TDEAction(i18n("&Rename..."),Key_F2,this,TQ_SLOT(renameFile()),actionCollection(),"file_rename");
+	mCopyFiles=new TDEAction(i18n("&Copy To..."),Key_F7,this,TQ_SLOT(copyFiles()),actionCollection(),"file_copy");
+	mMoveFiles=new TDEAction(i18n("&Move To..."),Key_F8,this,TQ_SLOT(moveFiles()),actionCollection(),"file_move");
+	mLinkFiles=new TDEAction(i18n("&Link To..."),Key_F9,this,TQ_SLOT(linkFiles()),actionCollection(),"file_link");
+	mDeleteFiles=new TDEAction(i18n("&Delete"),"edit-delete",Key_Delete,this,TQ_SLOT(deleteFiles()),actionCollection(),"file_delete");
+	mShowFileProperties=new TDEAction(i18n("Properties"),0,this,TQ_SLOT(showFileProperties()),actionCollection(),"file_properties");
+	KStdAction::quit( kapp, TQ_SLOT (closeAllWindows()), actionCollection() );
 
 	// Edit
-	mRotateLeft=new TDEAction(i18n("Rotate &Left"),"rotate_left",CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(rotateLeft()),actionCollection(),"rotate_left");
-	mRotateRight=new TDEAction(i18n("Rotate &Right"),"rotate_right",CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(rotateRight()),actionCollection(),"rotate_right");
-	mMirror=new TDEAction(i18n("&Mirror"),"mirror",0, TQT_TQOBJECT(this), TQT_SLOT(mirror()),actionCollection(),"mirror");
-	mFlip=new TDEAction(i18n("&Flip"),"flip",0, TQT_TQOBJECT(this), TQT_SLOT(flip()),actionCollection(),"flip");
+	mRotateLeft=new TDEAction(i18n("Rotate &Left"),"rotate_left",CTRL + Key_L, this, TQ_SLOT(rotateLeft()),actionCollection(),"rotate_left");
+	mRotateRight=new TDEAction(i18n("Rotate &Right"),"rotate_right",CTRL + Key_R, this, TQ_SLOT(rotateRight()),actionCollection(),"rotate_right");
+	mMirror=new TDEAction(i18n("&Mirror"),"mirror",0, this, TQ_SLOT(mirror()),actionCollection(),"mirror");
+	mFlip=new TDEAction(i18n("&Flip"),"flip",0, this, TQ_SLOT(flip()),actionCollection(),"flip");
 
 	// View
-	mReload=new TDEAction(i18n("Reload"), "reload", Key_F5, mDocument, TQT_SLOT(reload()), actionCollection(), "reload");
+	mReload=new TDEAction(i18n("Reload"), "reload", Key_F5, mDocument, TQ_SLOT(reload()), actionCollection(), "reload");
 	mReload->setEnabled(false);
 
-	mToggleFullScreen= KStdAction::fullScreen(TQT_TQOBJECT(this),TQT_SLOT(toggleFullScreen()),actionCollection(),0);
-	mToggleSlideShow=new TDEAction(i18n("Slide Show"),"slideshow_play",0,TQT_TQOBJECT(this),TQT_SLOT(toggleSlideShow()),actionCollection(),"slideshow");
+	mToggleFullScreen= KStdAction::fullScreen(this,TQ_SLOT(toggleFullScreen()),actionCollection(),0);
+	mToggleSlideShow=new TDEAction(i18n("Slide Show"),"slideshow_play",0,this,TQ_SLOT(toggleSlideShow()),actionCollection(),"slideshow");
 	mFullScreenLabelAction=new TDEToolBarLabelAction("", 0, 0, 0, actionCollection(), "fullscreen_label");
   
 	// Go
-	mGoUp=new TDEToolBarPopupAction(i18n("Up"), "go-up", ALT + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(goUp()), actionCollection(), "go_up");
-	new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(goHome()), actionCollection(), "go_home");
+	mGoUp=new TDEToolBarPopupAction(i18n("Up"), "go-up", ALT + Key_Up, this, TQ_SLOT(goUp()), actionCollection(), "go_up");
+	new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), this, TQ_SLOT(goHome()), actionCollection(), "go_home");
 
 	// Window
-	mResetDockWidgets = new TDEAction(i18n("Reset"), 0, TQT_TQOBJECT(this), TQT_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets");
+	mResetDockWidgets = new TDEAction(i18n("Reset"), 0, this, TQ_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets");
 
 	// Settings
 	mShowConfigDialog=
-		KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showConfigDialog()), actionCollection() );
+		KStdAction::preferences(this, TQ_SLOT(showConfigDialog()), actionCollection() );
 	mShowKeyDialog=
-		KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showKeyDialog()), actionCollection() );
+		KStdAction::keyBindings(this, TQ_SLOT(showKeyDialog()), actionCollection() );
 	(void)new TDEAction(i18n("Configure External Tools..."), "configure", 0,
-		TQT_TQOBJECT(this), TQT_SLOT(showExternalToolDialog()), actionCollection(), "configure_tools");
+		this, TQ_SLOT(showExternalToolDialog()), actionCollection(), "configure_tools");
 	(void)KStdAction::configureToolbars(
-		TQT_TQOBJECT(this), TQT_SLOT(showToolBarDialog()), actionCollection() );
+		this, TQ_SLOT(showToolBarDialog()), actionCollection() );
 
 	actionCollection()->readShortcutSettings();
 }
@@ -1059,11 +1059,11 @@ void MainWindow::createObjectInteractions() {
 	}
 
 	// Make sure file actions are correctly updated
-	connect(mFileViewController, TQT_SIGNAL(selectionChanged()),
-		TQT_TQOBJECT(this), TQT_SLOT(updateImageActions()) );
+	connect(mFileViewController, TQ_SIGNAL(selectionChanged()),
+		this, TQ_SLOT(updateImageActions()) );
 
-	connect(mFileViewController, TQT_SIGNAL(requestContextMenu(const TQPoint&, bool)),
-		TQT_TQOBJECT(this), TQT_SLOT(openFileViewControllerContextMenu(const TQPoint&, bool)) );
+	connect(mFileViewController, TQ_SIGNAL(requestContextMenu(const TQPoint&, bool)),
+		this, TQ_SLOT(openFileViewControllerContextMenu(const TQPoint&, bool)) );
 
 	// Bookmarks
 	TQString file = locate( "data", "tdefile/bookmarks.xml" );
@@ -1081,11 +1081,11 @@ void MainWindow::createObjectInteractions() {
 	TDEActionMenu* bookmark=new TDEActionMenu(i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" );
 	new KBookmarkMenu(manager, bookmarkOwner, bookmark->popupMenu(), 0, true);
 
-	connect(bookmarkOwner,TQT_SIGNAL(openURL(const KURL&)),
-		mFileViewController,TQT_SLOT(setDirURL(const KURL&)) );
+	connect(bookmarkOwner,TQ_SIGNAL(openURL(const KURL&)),
+		mFileViewController,TQ_SLOT(setDirURL(const KURL&)) );
 
-	connect(mFileViewController,TQT_SIGNAL(directoryChanged(const KURL&)),
-		bookmarkOwner,TQT_SLOT(setURL(const KURL&)) );
+	connect(mFileViewController,TQ_SIGNAL(directoryChanged(const KURL&)),
+		bookmarkOwner,TQ_SLOT(setURL(const KURL&)) );
 }
 
 
@@ -1097,7 +1097,7 @@ void MainWindow::createHideShowAction(KDockWidget* dock) {
 		caption=i18n("Show %1").arg(dock->caption());
 	}
 
-	TDEAction* action=new TDEAction(caption, 0, TQT_TQOBJECT(dock), TQT_SLOT(changeHideShowState()), (TQObject*)0 );
+	TDEAction* action=new TDEAction(caption, 0, dock, TQ_SLOT(changeHideShowState()), (TQObject*)0 );
 	if (dock->icon()) {
 		action->setIconSet( TQIconSet(*dock->icon()) );
 	}
@@ -1116,91 +1116,91 @@ void MainWindow::updateWindowActions() {
 
 
 void MainWindow::createConnections() {
-	connect(mGoUp->popupMenu(), TQT_SIGNAL(aboutToShow()),
-		this,TQT_SLOT(fillGoUpMenu()));
+	connect(mGoUp->popupMenu(), TQ_SIGNAL(aboutToShow()),
+		this,TQ_SLOT(fillGoUpMenu()));
 	
-	connect(mGoUp->popupMenu(), TQT_SIGNAL(activated(int)),
-		this,TQT_SLOT(goUpTo(int)));
+	connect(mGoUp->popupMenu(), TQ_SIGNAL(activated(int)),
+		this,TQ_SLOT(goUpTo(int)));
 	
 	// Slideshow connections
-	connect( mSlideShow, TQT_SIGNAL(nextURL(const KURL&)),
-		TQT_SLOT( openURL(const KURL&)) );
-	connect( mSlideShow, TQT_SIGNAL( stateChanged(bool)),
-		TQT_SLOT( slotSlideShowChanged(bool)) );
+	connect( mSlideShow, TQ_SIGNAL(nextURL(const KURL&)),
+		TQ_SLOT( openURL(const KURL&)) );
+	connect( mSlideShow, TQ_SIGNAL( stateChanged(bool)),
+		TQ_SLOT( slotSlideShowChanged(bool)) );
 
 	// Dir view connections
-	connect(mDirViewController, TQT_SIGNAL(urlChanged(const KURL&)),
-		mFileViewController, TQT_SLOT(setDirURL(const KURL&)) );
-	connect(mDirViewController, TQT_SIGNAL(urlRenamed(const KURL&, const KURL&)),
-		TQT_TQOBJECT(this), TQT_SLOT(slotDirRenamed(const KURL&, const KURL&)) );
+	connect(mDirViewController, TQ_SIGNAL(urlChanged(const KURL&)),
+		mFileViewController, TQ_SLOT(setDirURL(const KURL&)) );
+	connect(mDirViewController, TQ_SIGNAL(urlRenamed(const KURL&, const KURL&)),
+		this, TQ_SLOT(slotDirRenamed(const KURL&, const KURL&)) );
 
 	// Bookmark view connections
-	connect(mBookmarkViewController, TQT_SIGNAL(openURL(const KURL&)),
-		mFileViewController,TQT_SLOT(setDirURL(const KURL&)) );
-	connect(mFileViewController, TQT_SIGNAL(directoryChanged(const KURL&)),
-		mBookmarkViewController, TQT_SLOT(setURL(const KURL&)) );
+	connect(mBookmarkViewController, TQ_SIGNAL(openURL(const KURL&)),
+		mFileViewController,TQ_SLOT(setDirURL(const KURL&)) );
+	connect(mFileViewController, TQ_SIGNAL(directoryChanged(const KURL&)),
+		mBookmarkViewController, TQ_SLOT(setURL(const KURL&)) );
 
 	// Pixmap view connections
-	connect(mImageViewController, TQT_SIGNAL(selectPrevious()),
-		mFileViewController, TQT_SLOT(slotSelectPrevious()) );
-	connect(mImageViewController, TQT_SIGNAL(selectNext()),
-		mFileViewController, TQT_SLOT(slotSelectNext()) );
-	connect(mImageViewController, TQT_SIGNAL(doubleClicked()),
-		mToggleFullScreen, TQT_SLOT(activate()) );
+	connect(mImageViewController, TQ_SIGNAL(selectPrevious()),
+		mFileViewController, TQ_SLOT(slotSelectPrevious()) );
+	connect(mImageViewController, TQ_SIGNAL(selectNext()),
+		mFileViewController, TQ_SLOT(slotSelectNext()) );
+	connect(mImageViewController, TQ_SIGNAL(doubleClicked()),
+		mToggleFullScreen, TQ_SLOT(activate()) );
 
 	// File view connections
-	connect(mFileViewController,TQT_SIGNAL(urlChanged(const KURL&)),
-		mDocument,TQT_SLOT(setURL(const KURL&)) );
-	connect(mFileViewController,TQT_SIGNAL(directoryChanged(const KURL&)),
-		this,TQT_SLOT(slotDirURLChanged(const KURL&)) );
-	connect(mFileViewController,TQT_SIGNAL(directoryChanged(const KURL&)),
-		mDirViewController,TQT_SLOT(setURL(const KURL&)) );
-	connect(mFileViewController,TQT_SIGNAL(directoryChanged(const KURL&)),
-		mHistory,TQT_SLOT(addURLToHistory(const KURL&)) );
-
-	connect(mFileViewController,TQT_SIGNAL(completed()),
-		this,TQT_SLOT(updateStatusInfo()) );
-	connect(mFileViewController,TQT_SIGNAL(canceled()),
-		this,TQT_SLOT(updateStatusInfo()) );
-	connect(mFileViewController,TQT_SIGNAL(imageDoubleClicked()),
-		mToggleFullScreen,TQT_SLOT(activate()) );
-	connect(mFileViewController,TQT_SIGNAL(shownFileItemRefreshed(const KFileItem*)),
-		this,TQT_SLOT(slotShownFileItemRefreshed(const KFileItem*)) );
-	connect(mFileViewController,TQT_SIGNAL(sortingChanged()),
-		TQT_TQOBJECT(this), TQT_SLOT(updateStatusInfo()) );
+	connect(mFileViewController,TQ_SIGNAL(urlChanged(const KURL&)),
+		mDocument,TQ_SLOT(setURL(const KURL&)) );
+	connect(mFileViewController,TQ_SIGNAL(directoryChanged(const KURL&)),
+		this,TQ_SLOT(slotDirURLChanged(const KURL&)) );
+	connect(mFileViewController,TQ_SIGNAL(directoryChanged(const KURL&)),
+		mDirViewController,TQ_SLOT(setURL(const KURL&)) );
+	connect(mFileViewController,TQ_SIGNAL(directoryChanged(const KURL&)),
+		mHistory,TQ_SLOT(addURLToHistory(const KURL&)) );
+
+	connect(mFileViewController,TQ_SIGNAL(completed()),
+		this,TQ_SLOT(updateStatusInfo()) );
+	connect(mFileViewController,TQ_SIGNAL(canceled()),
+		this,TQ_SLOT(updateStatusInfo()) );
+	connect(mFileViewController,TQ_SIGNAL(imageDoubleClicked()),
+		mToggleFullScreen,TQ_SLOT(activate()) );
+	connect(mFileViewController,TQ_SIGNAL(shownFileItemRefreshed(const KFileItem*)),
+		this,TQ_SLOT(slotShownFileItemRefreshed(const KFileItem*)) );
+	connect(mFileViewController,TQ_SIGNAL(sortingChanged()),
+		this, TQ_SLOT(updateStatusInfo()) );
 
 	// History connections
-	connect(mHistory, TQT_SIGNAL(urlChanged(const KURL&)),
-		mFileViewController, TQT_SLOT(setDirURL(const KURL&)) );
+	connect(mHistory, TQ_SIGNAL(urlChanged(const KURL&)),
+		mFileViewController, TQ_SLOT(setDirURL(const KURL&)) );
 	
 	// Document connections
-	connect(mDocument,TQT_SIGNAL(loading()),
-		this,TQT_SLOT(slotImageLoading()) );
-	connect(mDocument,TQT_SIGNAL(loaded(const KURL&)),
-		this,TQT_SLOT(slotImageLoaded()) );
-	connect(mDocument,TQT_SIGNAL(saved(const KURL&)),
-		mFileViewController,TQT_SLOT(updateThumbnail(const KURL&)) );
-	connect(mDocument,TQT_SIGNAL(reloaded(const KURL&)),
-		mFileViewController,TQT_SLOT(updateThumbnail(const KURL&)) );
+	connect(mDocument,TQ_SIGNAL(loading()),
+		this,TQ_SLOT(slotImageLoading()) );
+	connect(mDocument,TQ_SIGNAL(loaded(const KURL&)),
+		this,TQ_SLOT(slotImageLoaded()) );
+	connect(mDocument,TQ_SIGNAL(saved(const KURL&)),
+		mFileViewController,TQ_SLOT(updateThumbnail(const KURL&)) );
+	connect(mDocument,TQ_SIGNAL(reloaded(const KURL&)),
+		mFileViewController,TQ_SLOT(updateThumbnail(const KURL&)) );
 
 	// Location bar
-	connect(mURLEdit, TQT_SIGNAL(activated(const TQString &)),
-		this,TQT_SLOT(slotGo()) );
-	connect(mURLEdit, TQT_SIGNAL(returnPressed()),
-		this,TQT_SLOT(slotGo()) );
+	connect(mURLEdit, TQ_SIGNAL(activated(const TQString &)),
+		this,TQ_SLOT(slotGo()) );
+	connect(mURLEdit, TQ_SIGNAL(returnPressed()),
+		this,TQ_SLOT(slotGo()) );
 
 	// Non configurable stop-fullscreen accel
 	TQAccel* accel=new TQAccel(this);
-	accel->connectItem(accel->insertItem(Key_Escape),TQT_TQOBJECT(this),TQT_SLOT(escapePressed()));
+	accel->connectItem(accel->insertItem(Key_Escape),this,TQ_SLOT(escapePressed()));
 
 	// Dock related
-	connect(mDockArea->manager(), TQT_SIGNAL(change()),
-		TQT_TQOBJECT(this), TQT_SLOT(updateWindowActions()) );
+	connect(mDockArea->manager(), TQ_SIGNAL(change()),
+		this, TQ_SLOT(updateWindowActions()) );
 
 	// Plugin menu
 	TQPopupMenu *popup = static_cast<TQPopupMenu*>(
 		factory()->container( "plugins", this));
-    connect(popup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(loadPlugins()) );
+    connect(popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(loadPlugins()) );
 }
 
 
@@ -1217,7 +1217,7 @@ void MainWindow::createLocationToolBar() {
 	mURLEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
 	
 	// Avoid stealing focus
-	mURLEdit->setFocusPolicy(TQ_ClickFocus);
+	mURLEdit->setFocusPolicy(TQWidget::ClickFocus);
 
 	mURLEditCompletion=new KURLCompletion();
 
@@ -1232,15 +1232,15 @@ void MainWindow::createLocationToolBar() {
 	// Clear button
 	(void)new TDEAction( i18n("Clear Location Bar"),
 		TQApplication::reverseLayout()?"clear_left" : "locationbar_erase",
-		0, TQT_TQOBJECT(this), TQT_SLOT(clearLocationLabel()), actionCollection(), "clear_location");
+		0, this, TQ_SLOT(clearLocationLabel()), actionCollection(), "clear_location");
 
 	// URL Label
 	TDEToolBarLabelAction* locationAction = new TDEToolBarLabelAction(i18n("L&ocation:"), 
-		Key_F6, TQT_TQOBJECT(this), TQT_SLOT( activateLocationLabel()), actionCollection(), "location_label");
+		Key_F6, this, TQ_SLOT( activateLocationLabel()), actionCollection(), "location_label");
 	locationAction->setBuddy(mURLEdit);
 
 	// Go button
-	(void)new TDEAction(i18n("Go"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGo()), actionCollection(), "location_go");
+	(void)new TDEAction(i18n("Go"), "key_enter", 0, this, TQ_SLOT(slotGo()), actionCollection(), "location_go");
 
 }
 
@@ -1266,7 +1266,7 @@ void MainWindow::loadPlugins() {
 	// Sets up the plugin interface, and load the plugins
 	KIPIInterface* interface = new KIPIInterface(this, mFileViewController);
 	mPluginLoader = new KIPI::PluginLoader(TQStringList(), interface );
-	connect( mPluginLoader, TQT_SIGNAL( replug() ), TQT_TQOBJECT(this), TQT_SLOT( slotReplug() ) );
+	connect( mPluginLoader, TQ_SIGNAL( replug() ), this, TQ_SLOT( slotReplug() ) );
 	mPluginLoader->loadPlugins();
 }
 
diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h
index d5515f5..9ce1e73 100644
--- a/src/app/mainwindow.h
+++ b/src/app/mainwindow.h
@@ -61,7 +61,7 @@ class SlideShow;
 
 
 class MainWindow : public TDEMainWindow {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	MainWindow();
diff --git a/src/app/metaedit.cpp b/src/app/metaedit.cpp
index d757ad5..e7da66e 100644
--- a/src/app/metaedit.cpp
+++ b/src/app/metaedit.cpp
@@ -38,12 +38,12 @@ MetaEdit::MetaEdit(TQWidget *parent, Document *gvp, const char *name)
 {
 	mCommentEdit=new TQTextEdit(this);
 	mCommentEdit->installEventFilter(this);
-	connect(mCommentEdit, TQT_SIGNAL(modificationChanged(bool)),
-		this, TQT_SLOT(setModified(bool)));
-	connect(mDocument,TQT_SIGNAL(loaded(const KURL&)),
-		this,TQT_SLOT(updateContent()) );
-	connect(mCommentEdit, TQT_SIGNAL(textChanged()),
-		this, TQT_SLOT(updateDoc()) );
+	connect(mCommentEdit, TQ_SIGNAL(modificationChanged(bool)),
+		this, TQ_SLOT(setModified(bool)));
+	connect(mDocument,TQ_SIGNAL(loaded(const KURL&)),
+		this,TQ_SLOT(updateContent()) );
+	connect(mCommentEdit, TQ_SIGNAL(textChanged()),
+		this, TQ_SLOT(updateDoc()) );
 	updateContent();
 	mCommentEdit->setMinimumHeight(int (mCommentEdit->fontMetrics().height() * 1.5) );
 }
diff --git a/src/app/metaedit.h b/src/app/metaedit.h
index 6bcf9da..e7c4d36 100644
--- a/src/app/metaedit.h
+++ b/src/app/metaedit.h
@@ -31,7 +31,7 @@ namespace Gwenview {
 class Document;
 
 class MetaEdit : public TQVBox {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	MetaEdit(TQWidget *parent, Document*, const char *name="");
diff --git a/src/app/testvtabwidget.cpp b/src/app/testvtabwidget.cpp
deleted file mode 100644
index f1cc673..0000000
--- a/src/app/testvtabwidget.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Gwenview - A simple image viewer for TDE
-Copyright 2005 Aurelien Gateau
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-*/
-// TQt
-#include <tqlabel.h>
-
-// KDE
-#include <tdeapplication.h>
-#include <tdeaboutdata.h>
-#include <tdecmdlineargs.h>
-#include <kiconloader.h>
-
-// Local
-#include <vtabwidget.h>
-
-int main(int argc, char* argv[]) {
-	TDEAboutData aboutData("testvtabwidget", "testvtabwidget", "0");
-	TDECmdLineArgs::init( argc, argv, &aboutData );
-	TDEApplication app;
-
-	Gwenview::VTabWidget tabWidget(0);
-	TQLabel* lbl=new TQLabel("label 1", &tabWidget);
-	tabWidget.addTab(lbl, SmallIcon("text"), "tab1");
-	lbl=new TQLabel("label 2", &tabWidget);
-	tabWidget.addTab(lbl, SmallIcon("image-x-generic"), "tab2");
-	
-	app.setMainWidget(&tabWidget);
-	tabWidget.show();
-	app.exec();
-}
diff --git a/src/app/treeview.cpp b/src/app/treeview.cpp
index c29e3c4..77a44f8 100644
--- a/src/app/treeview.cpp
+++ b/src/app/treeview.cpp
@@ -134,8 +134,8 @@ TreeView::TreeView(TQWidget* parent)
 	setDropHighlighter(true);
 	setAcceptDrops(true);
 
-	connect(d->mAutoOpenTimer, TQT_SIGNAL(timeout()),
-		TQT_TQOBJECT(this), TQT_SLOT(autoOpenDropTarget()));
+	connect(d->mAutoOpenTimer, TQ_SIGNAL(timeout()),
+		this, TQ_SLOT(autoOpenDropTarget()));
 }
 
 
@@ -206,8 +206,8 @@ void TreeView::createBranch(const KURL& url) {
 	d->mBranch->setChildRecurse(false);
 	d->mBranch->root()->setOpen(true);
 
-	connect(d->mBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*) ),
-		TQT_TQOBJECT(this), TQT_SLOT(slotTreeViewPopulateFinished(KFileTreeViewItem*)) );
+	connect(d->mBranch, TQ_SIGNAL(populateFinished(KFileTreeViewItem*) ),
+		this, TQ_SLOT(slotTreeViewPopulateFinished(KFileTreeViewItem*)) );
 }
 	
 
diff --git a/src/app/treeview.h b/src/app/treeview.h
index 5ab2d21..a100a64 100644
--- a/src/app/treeview.h
+++ b/src/app/treeview.h
@@ -30,7 +30,7 @@ namespace Gwenview {
 
 
 class TreeView : public KFileTreeView {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	TreeView(TQWidget* parent);
diff --git a/src/app/vtabwidget.cpp b/src/app/vtabwidget.cpp
index a0f6e55..704f0ee 100644
--- a/src/app/vtabwidget.cpp
+++ b/src/app/vtabwidget.cpp
@@ -59,8 +59,8 @@ VTabWidget::~VTabWidget() {
 void VTabWidget::addTab(TQWidget* child, const TQPixmap& pix, const TQString& label) {
 	int id=d->mStack->addWidget(child);
 	d->mTabBar->appendTab(pix, id, label);
-	connect(d->mTabBar->tab(id), TQT_SIGNAL(clicked(int)),
-		this, TQT_SLOT(slotClicked(int)) );
+	connect(d->mTabBar->tab(id), TQ_SIGNAL(clicked(int)),
+		this, TQ_SLOT(slotClicked(int)) );
 
 	if (d->mEmpty) {
 		d->mTabBar->tab(id)->setOn(true);
diff --git a/src/app/vtabwidget.h b/src/app/vtabwidget.h
index 84b7c35..dc0363d 100644
--- a/src/app/vtabwidget.h
+++ b/src/app/vtabwidget.h
@@ -29,7 +29,7 @@ namespace Gwenview {
 
 
 class VTabWidget : public TQWidget {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	VTabWidget(TQWidget* parent);
diff --git a/src/desktopfiles/CMakeLists.txt b/src/desktopfiles/CMakeLists.txt
new file mode 100644
index 0000000..5352cbd
--- /dev/null
+++ b/src/desktopfiles/CMakeLists.txt
@@ -0,0 +1,11 @@
+##### desktop files
+
+tde_create_translated_desktop(
+  SOURCE gwenview.desktop
+  DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
+
+tde_create_translated_desktop(
+  SOURCE konqgwenview.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus
+)
diff --git a/src/gvcore/CMakeLists.txt b/src/gvcore/CMakeLists.txt
new file mode 100644
index 0000000..b8362ad
--- /dev/null
+++ b/src/gvcore/CMakeLists.txt
@@ -0,0 +1,90 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+
+##### gwenviewcore (shared)
+
+set( gwenviewcore_SRCS
+  pngformattype.cpp
+  printdialog.cpp
+  printdialogpagebase.ui
+  thumbnailloadjob.cpp
+  imageview.cpp
+  imageviewcontroller.cpp
+  document.cpp
+  externaltoolmanager.cpp
+  externaltoolcontext.cpp
+  externaltoolaction.cpp
+  externaltooldialogbase.ui
+  externaltooldialog.cpp
+  fileviewcontroller.cpp
+  filethumbnailview.cpp
+  fileoperation.cpp
+  fileopobject.cpp
+  filethumbnailviewitem.cpp
+  filterbar.ui
+  qxcfi.cpp
+  archive.cpp
+  slideshow.cpp
+  filedetailview.cpp
+  filedetailviewitem.cpp
+  imagesavedialog.cpp
+  jpegformattype.cpp
+  mngformattype.cpp
+  xpm.cpp
+  documentimpl.cpp
+  documentloadingimpl.cpp
+  documentloadedimpl.cpp
+  documentjpegloadedimpl.cpp
+  documentanimatedloadedimpl.cpp
+  documentotherloadedimpl.cpp
+  busylevelmanager.cpp
+  cache.cpp
+  threadgate.cpp
+  imageviewtools.cpp
+  fullscreenbar.cpp
+  imageloader.cpp
+  cursortracker.cpp
+  captionformatter.cpp
+  thumbnaildetailsdialogbase.ui
+  thumbnaildetailsdialog.cpp
+  xcursor.cpp
+  mimetypeutils.cpp
+  bcgdialog.cpp
+  bcgdialogbase.ui
+  timeutils.cpp
+  clicklineedit.cpp
+  inputdialog.cpp
+  deletedialog.cpp
+  deletedialogbase.ui
+  miscconfig.kcfgc
+  slideshowconfig.kcfgc
+  fileoperationconfig.kcfgc
+  fullscreenconfig.kcfgc
+  imageviewconfig.kcfgc
+  fileviewconfig.kcfgc
+)
+
+tde_add_library( gwenviewcore SHARED AUTOMOC
+  SOURCES ${gwenviewcore_SRCS}
+  LINK
+    tsthread-static gvimageutils-static
+    tdecore-shared tdeio-shared tdemediaplayer-shared
+    tdeparts-shared tdeprint-shared tdeui-shared
+    ${EXIV2_LIBRARIES} ${JPEG_LIBRARIES} ${MNG_LIBRARY}
+    ${PNG_LIBRARIES} ${XCURSOR_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
+  VERSION 1.0.0
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### other files
+
+install(
+  FILES
+    miscconfig.kcfg slideshowconfig.kcfg fileoperationconfig.kcfg
+    fullscreenconfig.kcfg imageviewconfig.kcfg fileviewconfig.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/src/gvcore/bcgdialog.cpp b/src/gvcore/bcgdialog.cpp
index c05869b..ccecdfb 100644
--- a/src/gvcore/bcgdialog.cpp
+++ b/src/gvcore/bcgdialog.cpp
@@ -48,15 +48,15 @@ BCGDialog::BCGDialog(ImageView* view)
 	d->mView=view;
 	d->mContent=new BCGDialogBase(this);
 	setMainWidget(d->mContent);
-	connect(d->mContent->mBSlider, TQT_SIGNAL(valueChanged(int)),
-		view, TQT_SLOT(setBrightness(int)) );
-	connect(d->mContent->mCSlider, TQT_SIGNAL(valueChanged(int)),
-		view, TQT_SLOT(setContrast(int)) );
-	connect(d->mContent->mGSlider, TQT_SIGNAL(valueChanged(int)),
-		view, TQT_SLOT(setGamma(int)) );
+	connect(d->mContent->mBSlider, TQ_SIGNAL(valueChanged(int)),
+		view, TQ_SLOT(setBrightness(int)) );
+	connect(d->mContent->mCSlider, TQ_SIGNAL(valueChanged(int)),
+		view, TQ_SLOT(setContrast(int)) );
+	connect(d->mContent->mGSlider, TQ_SIGNAL(valueChanged(int)),
+		view, TQ_SLOT(setGamma(int)) );
 	
-	connect(view, TQT_SIGNAL(bcgChanged()),
-		this, TQT_SLOT(updateFromImageView()) );
+	connect(view, TQ_SIGNAL(bcgChanged()),
+		this, TQ_SLOT(updateFromImageView()) );
 }
 
 
diff --git a/src/gvcore/bcgdialog.h b/src/gvcore/bcgdialog.h
index 75cb81a..641e7ab 100644
--- a/src/gvcore/bcgdialog.h
+++ b/src/gvcore/bcgdialog.h
@@ -30,7 +30,7 @@ namespace Gwenview {
 class ImageView;
 
 class BCGDialog : public KDialogBase {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	BCGDialog(ImageView*);
diff --git a/src/gvcore/busylevelmanager.cpp b/src/gvcore/busylevelmanager.cpp
index 319c863..09716f4 100644
--- a/src/gvcore/busylevelmanager.cpp
+++ b/src/gvcore/busylevelmanager.cpp
@@ -40,8 +40,8 @@ namespace Gwenview {
 BusyLevelManager::BusyLevelManager()
 : mCurrentBusyLevel( BUSY_NONE )
 {
-	connect( &mDelayedBusyLevelTimer, TQT_SIGNAL( timeout()),
-		this, TQT_SLOT( delayedBusyLevelChanged()));
+	connect( &mDelayedBusyLevelTimer, TQ_SIGNAL( timeout()),
+		this, TQ_SLOT( delayedBusyLevelChanged()));
 }
 
 BusyLevelManager* BusyLevelManager::instance() {
@@ -68,12 +68,12 @@ void BusyLevelManager::setBusyLevel( TQObject* obj, BusyLevel level ) {
 	if( level > BUSY_NONE ) {
 		if( mBusyLevels.contains( obj ) && mBusyLevels[ obj ] == level ) return;
 		if( !mBusyLevels.contains( obj )) {
-			connect( obj, TQT_SIGNAL( destroyed( TQObject* )), this, TQT_SLOT( objectDestroyed( TQObject* )));
+			connect( obj, TQ_SIGNAL( destroyed( TQObject* )), this, TQ_SLOT( objectDestroyed( TQObject* )));
 		}
 		mBusyLevels[ obj ] = level;
 	} else {
 		mBusyLevels.remove( obj );
-		disconnect( obj, TQT_SIGNAL( destroyed( TQObject* )), this, TQT_SLOT( objectDestroyed( TQObject* )));
+		disconnect( obj, TQ_SIGNAL( destroyed( TQObject* )), this, TQ_SLOT( objectDestroyed( TQObject* )));
 	}
 	mDelayedBusyLevelTimer.start( 0, true );
 }
diff --git a/src/gvcore/busylevelmanager.h b/src/gvcore/busylevelmanager.h
index d3cd7b0..d1f22e1 100644
--- a/src/gvcore/busylevelmanager.h
+++ b/src/gvcore/busylevelmanager.h
@@ -42,7 +42,7 @@ enum BusyLevel {
 };
 
 class LIBGWENVIEW_EXPORT BusyLevelManager : public TQObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	static BusyLevelManager* instance();
@@ -82,7 +82,7 @@ private:
   destructor resets the busy level to none.
  */
 class BusyLevelHelper : public TQObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	BusyLevelHelper( BusyLevel level );
diff --git a/src/gvcore/cache.h b/src/gvcore/cache.h
index 0ee37b7..37315f0 100644
--- a/src/gvcore/cache.h
+++ b/src/gvcore/cache.h
@@ -38,7 +38,7 @@ class TDEConfig;
 
 namespace Gwenview {
 class LIBGWENVIEW_EXPORT Cache : public TQObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	static Cache* instance();
diff --git a/src/gvcore/clicklineedit.h b/src/gvcore/clicklineedit.h
index 594dc37..dea9996 100644
--- a/src/gvcore/clicklineedit.h
+++ b/src/gvcore/clicklineedit.h
@@ -34,7 +34,7 @@ namespace Gwenview {
 */
 class ClickLineEdit : public KLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
     public:
diff --git a/src/gvcore/cursortracker.cpp b/src/gvcore/cursortracker.cpp
index fc56682..914093c 100644
--- a/src/gvcore/cursortracker.cpp
+++ b/src/gvcore/cursortracker.cpp
@@ -43,12 +43,12 @@ void CursorTracker::setText(const TQString& txt) {
 
 
 bool CursorTracker::eventFilter(TQObject* object, TQEvent* _event) {
-	TQWidget* widget=TQT_TQWIDGET(object);
+	TQWidget* widget=static_cast<TQWidget*>(object);
 	
 	switch (_event->type()) {
 	case TQEvent::MouseMove: {
-		TQMouseEvent* event=TQT_TQMOUSEEVENT(_event);
-		if (TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) || (event->stateAfter() & Qt::LeftButton)) {
+		TQMouseEvent* event=static_cast<TQMouseEvent*>(_event);
+		if (widget->rect().contains(event->pos()) || (event->stateAfter() & TQt::LeftButton)) {
 			show();
 			move(event->globalPos().x() + 15, event->globalPos().y() + 15);
 		} else {
@@ -58,8 +58,8 @@ bool CursorTracker::eventFilter(TQObject* object, TQEvent* _event) {
 	}
 
 	case TQEvent::MouseButtonRelease: {
-		TQMouseEvent* event=TQT_TQMOUSEEVENT(_event);
-		if ( !TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) ) {
+		TQMouseEvent* event=static_cast<TQMouseEvent*>(_event);
+		if ( !widget->rect().contains(event->pos()) ) {
 			hide();
 		}
 		break;
diff --git a/src/gvcore/deletedialog.cpp b/src/gvcore/deletedialog.cpp
index 3bedf12..7cf30e5 100644
--- a/src/gvcore/deletedialog.cpp
+++ b/src/gvcore/deletedialog.cpp
@@ -55,7 +55,7 @@ DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) :
     bool deleteInstead = ! FileOperationConfig::deleteToTrash();
     m_widget->ddShouldDelete->setChecked(deleteInstead);
 
-    connect(m_widget->ddShouldDelete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateUI()));
+    connect(m_widget->ddShouldDelete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateUI()));
 }
 
 void DeleteDialog::setURLList(const KURL::List &files)
diff --git a/src/gvcore/deletedialog.h b/src/gvcore/deletedialog.h
index a5a60f1..bf08cbe 100644
--- a/src/gvcore/deletedialog.h
+++ b/src/gvcore/deletedialog.h
@@ -27,7 +27,7 @@ namespace Gwenview {
 
 class DeleteDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui
index 1312a06..b787c0a 100644
--- a/src/gvcore/deletedialogbase.ui
+++ b/src/gvcore/deletedialogbase.ui
@@ -105,7 +105,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
 </UI>
diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp
index c718e1d..9174a0f 100644
--- a/src/gvcore/document.cpp
+++ b/src/gvcore/document.cpp
@@ -124,10 +124,10 @@ Document::Document(TQObject* parent)
 		static Gwenview::XCursorFormatType sXCursorFormatType;
 	}
 
-	connect( this, TQT_SIGNAL( loading()),
-		this, TQT_SLOT( slotLoading()));
-	connect( this, TQT_SIGNAL( loaded(const KURL&)),
-		this, TQT_SLOT( slotLoaded()));
+	connect( this, TQ_SIGNAL( loading()),
+		this, TQ_SLOT( slotLoading()));
+	connect( this, TQ_SIGNAL( loaded(const KURL&)),
+		this, TQ_SLOT( slotLoaded()));
 }
 
 
@@ -196,8 +196,8 @@ void Document::setURL(const KURL& paramURL) {
 	d->mURL = localURL; // this may be fixed after stat() is complete, but set at least something
 	d->mStatJob = TDEIO::stat( localURL, !localURL.isLocalFile() );
 	d->mStatJob->setWindow(TDEApplication::kApplication()->mainWidget());
-	connect( d->mStatJob, TQT_SIGNAL( result (TDEIO::Job *) ),
-	   this, TQT_SLOT( slotStatResult (TDEIO::Job *) ) );
+	connect( d->mStatJob, TQ_SIGNAL( result (TDEIO::Job *) ),
+	   this, TQ_SLOT( slotStatResult (TDEIO::Job *) ) );
 }
 
 
@@ -560,12 +560,12 @@ void Document::switchToImpl(DocumentImpl* impl) {
 	delete d->mImpl;
 	d->mImpl=impl;
 
-	connect(d->mImpl, TQT_SIGNAL(finished(bool)),
-		this, TQT_SLOT(slotFinished(bool)) );
-	connect(d->mImpl, TQT_SIGNAL(sizeUpdated()),
-		this, TQT_SIGNAL(sizeUpdated()) );
-	connect(d->mImpl, TQT_SIGNAL(rectUpdated(const TQRect&)),
-		this, TQT_SIGNAL(rectUpdated(const TQRect&)) );
+	connect(d->mImpl, TQ_SIGNAL(finished(bool)),
+		this, TQ_SLOT(slotFinished(bool)) );
+	connect(d->mImpl, TQ_SIGNAL(sizeUpdated()),
+		this, TQ_SIGNAL(sizeUpdated()) );
+	connect(d->mImpl, TQ_SIGNAL(rectUpdated(const TQRect&)),
+		this, TQ_SIGNAL(rectUpdated(const TQRect&)) );
 	d->mImpl->init();
 }
 
diff --git a/src/gvcore/document.h b/src/gvcore/document.h
index a8056d1..a7e46be 100644
--- a/src/gvcore/document.h
+++ b/src/gvcore/document.h
@@ -52,7 +52,7 @@ class DocumentImpl;
  * - loaded() is emitted
  */
 class LIBGWENVIEW_EXPORT Document : public TQObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	enum CommentState { NONE=0, READ_ONLY=1, WRITABLE=2 };
diff --git a/src/gvcore/documentanimatedloadedimpl.cpp b/src/gvcore/documentanimatedloadedimpl.cpp
index cff373c..e8f625c 100644
--- a/src/gvcore/documentanimatedloadedimpl.cpp
+++ b/src/gvcore/documentanimatedloadedimpl.cpp
@@ -54,7 +54,7 @@ DocumentAnimatedLoadedImpl::DocumentAnimatedLoadedImpl(Document* document, const
 	d=new DocumentAnimatedLoadedImplPrivate;
 	d->mFrames = frames;
 	d->mCurrentFrame = -1;
-	connect( &d->mFrameTimer, TQT_SIGNAL( timeout()), TQT_SLOT( nextFrame()));
+	connect( &d->mFrameTimer, TQ_SIGNAL( timeout()), TQ_SLOT( nextFrame()));
 }
 
 void DocumentAnimatedLoadedImpl::init() {
diff --git a/src/gvcore/documentanimatedloadedimpl.h b/src/gvcore/documentanimatedloadedimpl.h
index 736edcc..5a6a1e7 100644
--- a/src/gvcore/documentanimatedloadedimpl.h
+++ b/src/gvcore/documentanimatedloadedimpl.h
@@ -38,7 +38,7 @@ class Document;
 class DocumentAnimatedLoadedImplPrivate;
 
 class DocumentAnimatedLoadedImpl : public DocumentLoadedImpl {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	DocumentAnimatedLoadedImpl(Document* document, const ImageFrames& frames);
diff --git a/src/gvcore/documentimpl.h b/src/gvcore/documentimpl.h
index 32ac8d4..4091b51 100644
--- a/src/gvcore/documentimpl.h
+++ b/src/gvcore/documentimpl.h
@@ -31,7 +31,7 @@ namespace Gwenview {
 
 
 class DocumentImpl : public TQObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	DocumentImpl(Document* document);
diff --git a/src/gvcore/documentjpegloadedimpl.cpp b/src/gvcore/documentjpegloadedimpl.cpp
index 8d10367..66e4f8e 100644
--- a/src/gvcore/documentjpegloadedimpl.cpp
+++ b/src/gvcore/documentjpegloadedimpl.cpp
@@ -94,7 +94,7 @@ TQString DocumentJPEGLoadedImpl::localSave(TQFile* file, const TQCString& format
 		d->mJPEGContent.resetOrientation();
 		if (!d->mJPEGContent.thumbnail().isNull()) {
 			d->mJPEGContent.setThumbnail( ImageUtils::scale(
-				mDocument->image(), 128, 128, ImageUtils::SMOOTH_FAST, TQ_ScaleMin));
+				mDocument->image(), 128, 128, ImageUtils::SMOOTH_FAST, TQImage::ScaleMin));
 		}
 
 		LOG("JPEG Lossless save");
diff --git a/src/gvcore/documentjpegloadedimpl.h b/src/gvcore/documentjpegloadedimpl.h
index 4e68d25..9fd0bba 100644
--- a/src/gvcore/documentjpegloadedimpl.h
+++ b/src/gvcore/documentjpegloadedimpl.h
@@ -32,7 +32,7 @@ class Document;
 class DocumentJPEGLoadedImplPrivate;
 
 class DocumentJPEGLoadedImpl : public DocumentLoadedImpl {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	DocumentJPEGLoadedImpl(Document* document, const TQByteArray& rawData);
diff --git a/src/gvcore/documentloadedimpl.h b/src/gvcore/documentloadedimpl.h
index 4b362ea..e629b62 100644
--- a/src/gvcore/documentloadedimpl.h
+++ b/src/gvcore/documentloadedimpl.h
@@ -32,7 +32,7 @@ namespace Gwenview {
 class Document;
 
 class DocumentLoadedImpl : public DocumentImpl {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	DocumentLoadedImpl(Document* document);
diff --git a/src/gvcore/documentloadingimpl.cpp b/src/gvcore/documentloadingimpl.cpp
index 1b29fe1..091982a 100644
--- a/src/gvcore/documentloadingimpl.cpp
+++ b/src/gvcore/documentloadingimpl.cpp
@@ -85,10 +85,10 @@ void DocumentLoadingImpl::init() {
 		switchToImpl(new DocumentOtherLoadedImpl(mDocument));
 		return;
 	}
-	connect( d->mLoader, TQT_SIGNAL( urlKindDetermined()), TQT_SLOT( slotURLKindDetermined() ));
-	connect( d->mLoader, TQT_SIGNAL( sizeLoaded( int, int )), TQT_SLOT( sizeLoaded( int, int )));
-	connect( d->mLoader, TQT_SIGNAL( imageChanged( const TQRect& )), TQT_SLOT( imageChanged( const TQRect& )));
-	connect( d->mLoader, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( imageLoaded( bool )));
+	connect( d->mLoader, TQ_SIGNAL( urlKindDetermined()), TQ_SLOT( slotURLKindDetermined() ));
+	connect( d->mLoader, TQ_SIGNAL( sizeLoaded( int, int )), TQ_SLOT( sizeLoaded( int, int )));
+	connect( d->mLoader, TQ_SIGNAL( imageChanged( const TQRect& )), TQ_SLOT( imageChanged( const TQRect& )));
+	connect( d->mLoader, TQ_SIGNAL( imageLoaded( bool )), TQ_SLOT( imageLoaded( bool )));
 
 	// it's possible the loader already has the whole or at least part of the image loaded
 	TQImage image = d->mLoader->processedImage();
diff --git a/src/gvcore/documentloadingimpl.h b/src/gvcore/documentloadingimpl.h
index fc00435..3b2a0c2 100644
--- a/src/gvcore/documentloadingimpl.h
+++ b/src/gvcore/documentloadingimpl.h
@@ -31,7 +31,7 @@ class Document;
 class DocumentLoadingImplPrivate;
 
 class DocumentLoadingImpl : public DocumentImpl {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	DocumentLoadingImpl(Document* document);
diff --git a/src/gvcore/externaltoolaction.cpp b/src/gvcore/externaltoolaction.cpp
index f123516..27be02b 100644
--- a/src/gvcore/externaltoolaction.cpp
+++ b/src/gvcore/externaltoolaction.cpp
@@ -38,8 +38,8 @@ ExternalToolAction::ExternalToolAction(
 {
 	setText(service->name());
 	setIcon(service->icon());
-	connect(this, TQT_SIGNAL(activated()),
-		this, TQT_SLOT(openExternalTool()) );
+	connect(this, TQ_SIGNAL(activated()),
+		this, TQ_SLOT(openExternalTool()) );
 			
 }
 
diff --git a/src/gvcore/externaltoolaction.h b/src/gvcore/externaltoolaction.h
index e5cd974..59c17ec 100644
--- a/src/gvcore/externaltoolaction.h
+++ b/src/gvcore/externaltoolaction.h
@@ -32,7 +32,7 @@ namespace Gwenview {
  * as the urls to call it with.
  */
 class ExternalToolAction : public TDEAction {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	ExternalToolAction(TQObject* parent, const KService*, const KURL::List&);
diff --git a/src/gvcore/externaltoolcontext.cpp b/src/gvcore/externaltoolcontext.cpp
index 8b68726..1ccc2aa 100644
--- a/src/gvcore/externaltoolcontext.cpp
+++ b/src/gvcore/externaltoolcontext.cpp
@@ -67,11 +67,11 @@ TQPopupMenu* ExternalToolContext::popupMenu() {
 
 	menu->insertSeparator();
 	menu->insertItem(i18n("Other..."),
-		this, TQT_SLOT(showOpenWithDialog()) );
+		this, TQ_SLOT(showOpenWithDialog()) );
 	menu->insertItem(
 		SmallIcon("configure"),
 		i18n("Configure External Tools..."), 
-		this, TQT_SLOT(showExternalToolDialog()) );
+		this, TQ_SLOT(showExternalToolDialog()) );
 	
 	return menu;
 }
diff --git a/src/gvcore/externaltoolcontext.h b/src/gvcore/externaltoolcontext.h
index e0220b8..66d2f5c 100644
--- a/src/gvcore/externaltoolcontext.h
+++ b/src/gvcore/externaltoolcontext.h
@@ -37,7 +37,7 @@ class KService;
 
 namespace Gwenview {
 class LIBGWENVIEW_EXPORT ExternalToolContext : public TQObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	ExternalToolContext(TQObject* parent,
diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp
index 7e039b9..5ccc277 100644
--- a/src/gvcore/externaltooldialog.cpp
+++ b/src/gvcore/externaltooldialog.cpp
@@ -271,18 +271,18 @@ ExternalToolDialog::ExternalToolDialog(TQWidget* parent)
 	d->fillMimeTypeListView();
 	d->fillToolListView();
 	d->mContent->mToolListView->viewport()->installEventFilter(
-		new ToolListViewFilterObject(TQT_TQOBJECT(this), d));
-
-	connect( d->mContent->mToolListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-		this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
-	connect( d->mContent->mAddButton, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(addTool()) );
-	connect( d->mContent->mDeleteButton, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(deleteTool()) );
-	connect( d->mContent->mHelp, TQT_SIGNAL(leftClickedURL()),
-		this, TQT_SLOT(showCommandHelp()) );
-	connect( d->mContent->mMoreTools, TQT_SIGNAL(leftClickedURL(const TQString&)),
-		this, TQT_SLOT(openURL(const TQString&)) );
+		new ToolListViewFilterObject(this, d));
+
+	connect( d->mContent->mToolListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+		this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) );
+	connect( d->mContent->mAddButton, TQ_SIGNAL(clicked()),
+		this, TQ_SLOT(addTool()) );
+	connect( d->mContent->mDeleteButton, TQ_SIGNAL(clicked()),
+		this, TQ_SLOT(deleteTool()) );
+	connect( d->mContent->mHelp, TQ_SIGNAL(leftClickedURL()),
+		this, TQ_SLOT(showCommandHelp()) );
+	connect( d->mContent->mMoreTools, TQ_SIGNAL(leftClickedURL(const TQString&)),
+		this, TQ_SLOT(openURL(const TQString&)) );
 
 	TDEListView* view=d->mContent->mToolListView;
 	if (view->firstChild()) {
diff --git a/src/gvcore/externaltooldialog.h b/src/gvcore/externaltooldialog.h
index cbd5d72..85eb263 100644
--- a/src/gvcore/externaltooldialog.h
+++ b/src/gvcore/externaltooldialog.h
@@ -31,7 +31,7 @@ namespace Gwenview {
 
 class ExternalToolDialogPrivate;
 class LIBGWENVIEW_EXPORT ExternalToolDialog : public KDialogBase {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	ExternalToolDialog(TQWidget* parent);
diff --git a/src/gvcore/externaltooldialogbase.ui b/src/gvcore/externaltooldialogbase.ui
index 1b684df..1eb9616 100644
--- a/src/gvcore/externaltooldialogbase.ui
+++ b/src/gvcore/externaltooldialogbase.ui
@@ -359,15 +359,12 @@ You can use keywords in the Command field:
     <tabstop>mMimeTypeListView</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kurllabel.h</includehint>
-    <includehint>kicondialog.h</includehint>
-    <includehint>kurllabel.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kicondialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurllabel.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp
index b965ee3..b3ff35b 100644
--- a/src/gvcore/filedetailview.cpp
+++ b/src/gvcore/filedetailview.cpp
@@ -87,29 +87,29 @@ FileDetailView::FileDetailView(TQWidget *parent, const char *name)
 	setShowSortIndicator( TRUE );
 	setAllColumnsShowFocus( TRUE );
 
-	connect( header(), TQT_SIGNAL( sectionClicked(int)),
-			 TQT_SLOT(slotSortingChanged(int) ));
+	connect( header(), TQ_SIGNAL( sectionClicked(int)),
+			 TQ_SLOT(slotSortingChanged(int) ));
 
 
-	connect( this, TQT_SIGNAL( returnPressed(TQListViewItem *) ),
-			 TQT_SLOT( slotActivate( TQListViewItem *) ) );
+	connect( this, TQ_SIGNAL( returnPressed(TQListViewItem *) ),
+			 TQ_SLOT( slotActivate( TQListViewItem *) ) );
 
-	connect( this, TQT_SIGNAL( clicked(TQListViewItem *, const TQPoint&, int)),
-			 TQT_SLOT( selected( TQListViewItem *) ) );
-	connect( this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint&, int)),
-			 TQT_SLOT( slotActivate( TQListViewItem *) ) );
+	connect( this, TQ_SIGNAL( clicked(TQListViewItem *, const TQPoint&, int)),
+			 TQ_SLOT( selected( TQListViewItem *) ) );
+	connect( this, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint&, int)),
+			 TQ_SLOT( slotActivate( TQListViewItem *) ) );
 
-	connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *,
+	connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *,
 												const TQPoint &, int )),
-			 this, TQT_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& )));
+			 this, TQ_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& )));
 
 	TQListView::setSelectionMode( TQListView::Extended );
-	connect( this, TQT_SIGNAL( selectionChanged() ),
-			 TQT_SLOT( slotSelectionChanged() ));
+	connect( this, TQ_SIGNAL( selectionChanged() ),
+			 TQ_SLOT( slotSelectionChanged() ));
 
 	// FileViewStack need to be aware of sort changes, to update the sort menu
-	connect( sig, TQT_SIGNAL(sortingChanged(TQDir::SortSpec)),
-		this, TQT_SIGNAL(sortingChanged(TQDir::SortSpec)) );
+	connect( sig, TQ_SIGNAL(sortingChanged(TQDir::SortSpec)),
+		this, TQ_SIGNAL(sortingChanged(TQDir::SortSpec)) );
 	
 	setSorting( sorting() );
 
@@ -251,7 +251,7 @@ void FileDetailView::updateView( bool b )
 	}
 }
 
-void FileDetailView::updateView( const KFileItem *i )
+void FileDetailView::updateView( const KFileItem *i, bool /*metaDataOnly*/ )
 {
 	if ( !i ) return;
 
@@ -306,13 +306,13 @@ void FileDetailView::slotSortingChanged( int col )
 
 	switch( col ) {
 	case COL_NAME:
-		sortSpec = (sort & ~TQDir::SortByMask | TQDir::Name);
+		sortSpec = ((sort & ~TQDir::SortByMask) | TQDir::Name);
 		break;
 	case COL_SIZE:
-		sortSpec = (sort & ~TQDir::SortByMask | TQDir::Size);
+		sortSpec = ((sort & ~TQDir::SortByMask) | TQDir::Size);
 		break;
 	case COL_DATE:
-		sortSpec = (sort & ~TQDir::SortByMask | TQDir::Time);
+		sortSpec = ((sort & ~TQDir::SortByMask) | TQDir::Time);
 		break;
 
 	// the following columns have no equivalent in TQDir, so we set it
diff --git a/src/gvcore/filedetailview.h b/src/gvcore/filedetailview.h
index b8085ca..aced4ba 100644
--- a/src/gvcore/filedetailview.h
+++ b/src/gvcore/filedetailview.h
@@ -42,7 +42,7 @@ class FileDetailViewItem;
 
 class FileDetailView : public TDEListView, public FileViewBase
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 	friend class FileDetailViewItem;
@@ -55,7 +55,8 @@ public:
 	virtual void clearView();
 
 	virtual void updateView( bool );
-	virtual void updateView(const KFileItem*);
+	using FileViewBase::updateView;
+	virtual void updateView(const KFileItem*, bool metaInfoOnly);
 	virtual void removeItem( const KFileItem* );
 	virtual void listingCompleted();
 
diff --git a/src/gvcore/fileoperation.cpp b/src/gvcore/fileoperation.cpp
index 4c693c0..cd26ade 100644
--- a/src/gvcore/fileoperation.cpp
+++ b/src/gvcore/fileoperation.cpp
@@ -51,52 +51,52 @@ void linkTo(const KURL::List& srcURL,TQWidget* parent) {
 
 void moveTo(const KURL::List& srcURL,TQWidget* parent,TQObject* receiver,const char* slot) {
 	FileOpObject* op=new FileOpMoveToObject(srcURL,parent);
-	if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot);
+	if (receiver && slot) TQObject::connect(op,TQ_SIGNAL(success()),receiver,slot);
 	(*op)();
 }
 
 void makeDir(const KURL& parentURL, TQWidget* parent, TQObject* receiver, const char* slot) {
     FileOpObject* op=new FileOpMakeDirObject(parentURL, parent);
-	if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot);
+	if (receiver && slot) TQObject::connect(op,TQ_SIGNAL(success()),receiver,slot);
 	(*op)();
 }
 
 void del(const KURL::List& url,TQWidget* parent,TQObject* receiver,const char* slot) {
 	FileOpObject* op = new FileOpDelObject(url,parent);
-	if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot);
+	if (receiver && slot) TQObject::connect(op,TQ_SIGNAL(success()),receiver,slot);
 	(*op)();
 }
 
 
 void trash(const KURL::List& url, TQWidget* parent, TQObject* receiver, const char* slot) {
 	FileOpObject* op = new FileOpTrashObject(url,parent);
-	if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot);
+	if (receiver && slot) TQObject::connect(op,TQ_SIGNAL(success()),receiver,slot);
 	(*op)();
 }
 
 
 void realDelete(const KURL::List& url, TQWidget* parent, TQObject* receiver, const char* slot) {
 	FileOpObject* op = new FileOpRealDeleteObject(url,parent);
-	if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot);
+	if (receiver && slot) TQObject::connect(op,TQ_SIGNAL(success()),receiver,slot);
 	(*op)();
 }
 
 
 void rename(const KURL& url,TQWidget* parent,TQObject* receiver,const char* slot) {
 	FileOpObject* op=new FileOpRenameObject(url,parent);
-	if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(renamed(const TQString&)),receiver,slot);
+	if (receiver && slot) TQObject::connect(op,TQ_SIGNAL(renamed(const TQString&)),receiver,slot);
 	(*op)();
 }
 
 
 void fillDropURLMenu(TQPopupMenu* menu, const KURL::List& urls, const KURL& target, bool* wasMoved) {
-	DropMenuContext* context=new DropMenuContext(TQT_TQOBJECT(menu), urls, target, wasMoved);
+	DropMenuContext* context=new DropMenuContext(menu, urls, target, wasMoved);
 	menu->insertItem( SmallIcon("goto"), i18n("&Move Here"),
-		context, TQT_SLOT(move()) );
+		context, TQ_SLOT(move()) );
 	menu->insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"),
-		context, TQT_SLOT(copy()) );
+		context, TQ_SLOT(copy()) );
 	menu->insertItem( SmallIcon("www"), i18n("&Link Here"),
-		context, TQT_SLOT(link()) );
+		context, TQ_SLOT(link()) );
 }
 
 
diff --git a/src/gvcore/fileoperation.h b/src/gvcore/fileoperation.h
index 87d2fa3..550dafb 100644
--- a/src/gvcore/fileoperation.h
+++ b/src/gvcore/fileoperation.h
@@ -52,7 +52,7 @@ LIBGWENVIEW_EXPORT void rename(const KURL&,TQWidget* parent,TQObject* receiver=0
  * @internal
  */
 class DropMenuContext : public TQObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	DropMenuContext(TQObject* parent, const KURL::List& src, const KURL& dst, bool* wasMoved)
diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp
index 9257af9..6e567d3 100644
--- a/src/gvcore/fileopobject.cpp
+++ b/src/gvcore/fileopobject.cpp
@@ -89,8 +89,8 @@ void FileOpObject::slotResult(TDEIO::Job* job) {
 
 void FileOpObject::polishJob(TDEIO::Job* job) {
 	job->setWindow(mParent->topLevelWidget());
-	connect( job, TQT_SIGNAL( result(TDEIO::Job*) ),
-		this, TQT_SLOT( slotResult(TDEIO::Job*) ) );
+	connect( job, TQ_SIGNAL( result(TDEIO::Job*) ),
+		this, TQ_SLOT( slotResult(TDEIO::Job*) ) );
 }
 
 
diff --git a/src/gvcore/fileopobject.h b/src/gvcore/fileopobject.h
index 579667e..b7994d3 100644
--- a/src/gvcore/fileopobject.h
+++ b/src/gvcore/fileopobject.h
@@ -42,7 +42,7 @@ namespace Gwenview {
  * All these classes are used by the @FileOperation namespace-like class
  */
 class FileOpObject : public TQObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	FileOpObject(const KURL&,TQWidget* parent=0L);
@@ -64,7 +64,7 @@ protected:
 
 
 class FileOpCopyToObject : public FileOpObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	FileOpCopyToObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
@@ -73,7 +73,7 @@ public:
 };
 
 class FileOpLinkToObject : public FileOpObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	FileOpLinkToObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
@@ -82,7 +82,7 @@ public:
 };
 
 class FileOpMoveToObject : public FileOpObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	FileOpMoveToObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
@@ -91,7 +91,7 @@ public:
 };
 
 class FileOpMakeDirObject : public FileOpObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     FileOpMakeDirObject(const KURL& url, TQWidget* parent=0L) : FileOpObject(url, parent) {}
@@ -99,7 +99,7 @@ public:
 };
 
 class FileOpDelObject : public FileOpObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	FileOpDelObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
@@ -109,7 +109,7 @@ public:
 
 
 class FileOpTrashObject : public FileOpObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	FileOpTrashObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
@@ -119,7 +119,7 @@ public:
 
 
 class FileOpRealDeleteObject : public FileOpObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	FileOpRealDeleteObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
@@ -129,7 +129,7 @@ public:
 
 
 class FileOpRenameObject : public FileOpObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	FileOpRenameObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
index 82249e4..a6a3a1a 100644
--- a/src/gvcore/filethumbnailview.cpp
+++ b/src/gvcore/filethumbnailview.cpp
@@ -109,7 +109,7 @@ public:
 	}
 
 	void updatePosition() {
-		FileThumbnailView* view=static_cast<FileThumbnailView*>(TQT_TQWIDGET(parent()));
+		FileThumbnailView* view=static_cast<FileThumbnailView*>(parent());
 		TQSize tmp=view->clipper()->size() - size();
 		move(tmp.width() - 2, tmp.height() - 2);
 	}
@@ -169,7 +169,7 @@ FileThumbnailView::FileThumbnailView(TQWidget* parent)
 	d->mThumbnailUpdateTimer=new TQTimer(this);
 	d->mMarginSize=FileViewConfig::thumbnailMarginSize();
 	d->mItemDetails=FileViewConfig::thumbnailDetails();
-	d->mPrefetch = NULL;
+	d->mPrefetch = nullptr;
 	d->mThumbnailSize = 0;
 	d->mThumbnailsDetailDialog = 0;
 
@@ -186,25 +186,25 @@ FileThumbnailView::FileThumbnailView(TQWidget* parent)
 	// item is unselected after being clicked, so we use TDEIconView::Select mode
 	// and emit the execute() signal with slotClicked() ourself.
 	setMode(TDEIconView::Select);
-	connect(this, TQT_SIGNAL(clicked(TQIconViewItem*)),
-		this, TQT_SLOT(slotClicked(TQIconViewItem*)) );
-	connect(this, TQT_SIGNAL(doubleClicked(TQIconViewItem*)),
-		this, TQT_SLOT(slotDoubleClicked(TQIconViewItem*)) );
-
-	connect(this, TQT_SIGNAL(dropped(TQDropEvent*,const TQValueList<TQIconDragItem>&)),
-		this, TQT_SLOT(slotDropped(TQDropEvent*)) );
-	connect(this, TQT_SIGNAL( contentsMoving( int, int )),
-		this, TQT_SLOT( slotContentsMoving( int, int )));
-	connect(this, TQT_SIGNAL(currentChanged(TQIconViewItem*)),
-		this, TQT_SLOT(slotCurrentChanged(TQIconViewItem*)) );
+	connect(this, TQ_SIGNAL(clicked(TQIconViewItem*)),
+		this, TQ_SLOT(slotClicked(TQIconViewItem*)) );
+	connect(this, TQ_SIGNAL(doubleClicked(TQIconViewItem*)),
+		this, TQ_SLOT(slotDoubleClicked(TQIconViewItem*)) );
+
+	connect(this, TQ_SIGNAL(dropped(TQDropEvent*,const TQValueList<TQIconDragItem>&)),
+		this, TQ_SLOT(slotDropped(TQDropEvent*)) );
+	connect(this, TQ_SIGNAL( contentsMoving( int, int )),
+		this, TQ_SLOT( slotContentsMoving( int, int )));
+	connect(this, TQ_SIGNAL(currentChanged(TQIconViewItem*)),
+		this, TQ_SLOT(slotCurrentChanged(TQIconViewItem*)) );
 
 	TQIconView::setSelectionMode(Extended);
 
-	connect(BusyLevelManager::instance(), TQT_SIGNAL(busyLevelChanged(BusyLevel)),
-		this, TQT_SLOT( slotBusyLevelChanged(BusyLevel)));
+	connect(BusyLevelManager::instance(), TQ_SIGNAL(busyLevelChanged(BusyLevel)),
+		this, TQ_SLOT( slotBusyLevelChanged(BusyLevel)));
 
-	connect(d->mThumbnailUpdateTimer, TQT_SIGNAL(timeout()),
-		this, TQT_SLOT( startThumbnailUpdate()) );
+	connect(d->mThumbnailUpdateTimer, TQ_SIGNAL(timeout()),
+		this, TQ_SLOT( startThumbnailUpdate()) );
 }
 
 
@@ -362,21 +362,21 @@ void FileThumbnailView::doStartThumbnailUpdate(const KFileItemList* list) {
 	}
 	if (imageList.empty()) return;
 
-	BusyLevelManager::instance()->setBusyLevel( TQT_TQOBJECT(this), BUSY_THUMBNAILS );
+	BusyLevelManager::instance()->setBusyLevel( this, BUSY_THUMBNAILS );
 
 	Q_ASSERT(!d->mProgressWidget);
 	d->mProgressWidget=new ProgressWidget(this, imageList.count() );
 	
-	connect(d->mProgressWidget->stopButton(), TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(stopThumbnailUpdate()) );
+	connect(d->mProgressWidget->stopButton(), TQ_SIGNAL(clicked()),
+		this, TQ_SLOT(stopThumbnailUpdate()) );
 	d->mProgressWidget->show();
 	
 	d->mThumbnailLoadJob = new ThumbnailLoadJob(&imageList, d->mThumbnailSize);
 
-	connect(d->mThumbnailLoadJob, TQT_SIGNAL(thumbnailLoaded(const KFileItem*, const TQPixmap&, const TQSize&)),
-		this, TQT_SLOT(setThumbnailPixmap(const KFileItem*,const TQPixmap&, const TQSize&)) );
-	connect(d->mThumbnailLoadJob, TQT_SIGNAL(result(TDEIO::Job*)),
-		this, TQT_SLOT(slotUpdateEnded()) );
+	connect(d->mThumbnailLoadJob, TQ_SIGNAL(thumbnailLoaded(const KFileItem*, const TQPixmap&, const TQSize&)),
+		this, TQ_SLOT(setThumbnailPixmap(const KFileItem*,const TQPixmap&, const TQSize&)) );
+	connect(d->mThumbnailLoadJob, TQ_SIGNAL(result(TDEIO::Job*)),
+		this, TQ_SLOT(slotUpdateEnded()) );
 
 	slotBusyLevelChanged( BusyLevelManager::instance()->busyLevel());
 	// start updating at visible position
@@ -388,6 +388,10 @@ void FileThumbnailView::doStartThumbnailUpdate(const KFileItemList* list) {
 void FileThumbnailView::stopThumbnailUpdate() {
 	if (!d->mThumbnailLoadJob.isNull()) {
 		d->mThumbnailLoadJob->kill(false);
+		d->mThumbnailLoadJob=nullptr;
+		// The job loads image dimensions and this may add extra line to the descriptions, which
+		// may mess up the grid, even if the job is canceled, some items may be already updated.
+		arrangeItemsInGrid();
 	}
 }
 
@@ -397,7 +401,9 @@ void FileThumbnailView::slotUpdateEnded() {
 	delete d->mProgressWidget;
 	d->mProgressWidget=0L;
 
-	BusyLevelManager::instance()->setBusyLevel( TQT_TQOBJECT(this), BUSY_NONE );
+	BusyLevelManager::instance()->setBusyLevel( this, BUSY_NONE );
+	// Besides thumbnails the job loads image dimensions and this may mess up the grid
+	arrangeItemsInGrid();
 }
 
 
@@ -453,15 +459,19 @@ void FileThumbnailView::insertItem(KFileItem* item) {
 }
 
 
-void FileThumbnailView::updateView(const KFileItem* fileItem) {
+void FileThumbnailView::updateView(const KFileItem* fileItem, bool metaInfoOnly) {
 	if (!fileItem) return;
-
 	FileThumbnailViewItem* iconItem=viewItem(this, fileItem);
 	if (iconItem) {
-		iconItem->setText(fileItem->text());
-		updateThumbnail(fileItem);
+		if (metaInfoOnly) {
+			iconItem->updateLines();
+			// Note: resort will be done when metadata is completely loaded
+		} else {
+			iconItem->setText(fileItem->text());
+			updateThumbnail(fileItem);
+			sortView();
+		}
 	}
-	sort();
 }
 
 
@@ -564,7 +574,7 @@ void FileThumbnailView::setSorting(TQDir::SortSpec spec) {
 		if (iconItem) setSortingKey(iconItem, item);
 	}
 
-	TDEIconView::sort(! (spec & TQDir::Reversed) );
+	sortView();
 }
 
 //--------------------------------------------------------------------------
@@ -587,7 +597,7 @@ void FileThumbnailView::showEvent(TQShowEvent* event) {
 	if (!d->mUpdateThumbnailsOnNextShow) return;
 
 	d->mUpdateThumbnailsOnNextShow=false;
-	TQTimer::singleShot(0, this, TQT_SLOT(startThumbnailUpdate()));
+	TQTimer::singleShot(0, this, TQ_SLOT(startThumbnailUpdate()));
 }
 
 
@@ -674,15 +684,15 @@ void FileThumbnailView::slotCurrentChanged(TQIconViewItem* item ) {
 	prefetchDone();
 	// if the first image is selected, no matter how, preload the next one
 	for( TQIconViewItem* pos = item;
-	     pos != NULL;
+	     pos != nullptr;
 	     pos = pos->nextItem()) {
 		FileThumbnailViewItem* cur = static_cast< FileThumbnailViewItem* >( pos );
 		if( cur->fileItem()->isDir() || Archive::fileItemIsArchive(cur->fileItem())) continue;
-		if( pos == item && pos->nextItem() != NULL ) {
+		if( pos == item && pos->nextItem() != nullptr ) {
 			d->mPrefetch = ImageLoader::loader(
 				static_cast<const FileThumbnailViewItem*>( cur->nextItem() )->fileItem()->url(),
-				TQT_TQOBJECT(this), BUSY_PRELOADING );
-			connect( d->mPrefetch, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( prefetchDone()));
+				this, BUSY_PRELOADING );
+			connect( d->mPrefetch, TQ_SIGNAL( imageLoaded( bool )), TQ_SLOT( prefetchDone()));
 		}
 	}
 }
@@ -698,7 +708,7 @@ void FileThumbnailView::updateVisibilityInfo( int x, int y ) {
 	TQRect rect( x, y, visibleWidth(), visibleHeight());
 	FileThumbnailViewItem* first = static_cast< FileThumbnailViewItem* >( findFirstVisibleItem( rect ));
 	if (!first) {
-		d->mThumbnailLoadJob->setPriorityItems(NULL,NULL,NULL);
+		d->mThumbnailLoadJob->setPriorityItems(nullptr,nullptr,nullptr);
 		return;
 	}
 	
@@ -727,8 +737,8 @@ void FileThumbnailView::keyPressEvent( TQKeyEvent* e ) {
 
 	TQIconViewItem* current = currentItem();
 	TDEIconView::keyPressEvent( e );
-	TQIconViewItem* next = NULL;
-	if( current != currentItem() && currentItem() != NULL ) { // it actually moved
+	TQIconViewItem* next = nullptr;
+	if( current != currentItem() && currentItem() != nullptr ) { // it actually moved
 		switch( e->key()) {
 			case Key_Left:
 				next = currentItem()->prevItem();
@@ -739,13 +749,13 @@ void FileThumbnailView::keyPressEvent( TQKeyEvent* e ) {
 			case Key_Up:
 			// This relies on the thumbnails being in a grid ( x() == x() )
 				for( next = currentItem()->prevItem();
-				     next != NULL && next->x() != currentItem()->x();
+				     next != nullptr && next->x() != currentItem()->x();
 				     next = next->prevItem())
 					;
 				break;
 			case Key_Down:
 				for( next = currentItem()->nextItem();
-				     next != NULL && next->x() != currentItem()->x();
+				     next != nullptr && next->x() != currentItem()->x();
 				     next = next->nextItem())
 					;
 				break;
@@ -753,21 +763,25 @@ void FileThumbnailView::keyPressEvent( TQKeyEvent* e ) {
 
 	}
 	prefetchDone();
-	if( next != NULL ) {
+	if( next != nullptr ) {
 		d->mPrefetch = ImageLoader::loader(
 			static_cast<const FileThumbnailViewItem*>( next )->fileItem()->url(),
-			TQT_TQOBJECT(this), BUSY_PRELOADING );
-		connect( d->mPrefetch, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( prefetchDone()));
+			this, BUSY_PRELOADING );
+		connect( d->mPrefetch, TQ_SIGNAL( imageLoaded( bool )), TQ_SLOT( prefetchDone()));
 	}
 }
 
 void FileThumbnailView::prefetchDone() {
-	if( d->mPrefetch != NULL ) {
-		d->mPrefetch->release( TQT_TQOBJECT(this) );
-		d->mPrefetch = NULL;
+	if( d->mPrefetch != nullptr ) {
+		d->mPrefetch->release( this );
+		d->mPrefetch = nullptr;
 	}
 }
 
+void FileThumbnailView::sortView() {
+	TDEIconView::sort( !(KFileView::sorting() & TQDir::Reversed) );
+}
+
 //--------------------------------------------------------------------------
 //
 // Protected
@@ -810,7 +824,7 @@ void FileThumbnailView::startDrag() {
 			}
 			
 			TQImage img = pix->convertToImage();
-			img = img.smoothScale(size, TQ_ScaleMin);
+			img = img.smoothScale(size, TQImage::ScaleMin);
 			painter->drawImage(left, top, img);
 		}
 
diff --git a/src/gvcore/filethumbnailview.h b/src/gvcore/filethumbnailview.h
index dbd5ed6..4312b8a 100644
--- a/src/gvcore/filethumbnailview.h
+++ b/src/gvcore/filethumbnailview.h
@@ -45,7 +45,7 @@ namespace Gwenview {
 class FileThumbnailViewItem;
 
 class LIBGWENVIEW_EXPORT FileThumbnailView : public TDEIconView, public FileViewBase {
-Q_OBJECT
+TQ_OBJECT
   
 	friend class FileThumbnailViewItem;
 	
@@ -65,7 +65,7 @@ public:
 	void setSelected(const KFileItem* item,bool enable);
 	bool isSelected(const KFileItem* item) const;
 	void removeItem(const KFileItem* item);
-	void updateView(const KFileItem* item);
+	void updateView(const KFileItem* item, bool metaInfoOnly);
 	void setSorting(TQDir::SortSpec);
 
 	KFileItem* firstFileItem() const;
@@ -95,6 +95,8 @@ public slots:
 
 	void showThumbnailDetailsDialog();
 
+	void sortView();
+
 signals:
 	void dropped(TQDropEvent*, KFileItem* target);
 
@@ -105,7 +107,7 @@ protected:
 	virtual void keyPressEvent( TQKeyEvent* );
 
 private:
-	class Private;
+	struct Private;
 	Private* d;
 
 	void updateGrid();
diff --git a/src/gvcore/filethumbnailviewitem.cpp b/src/gvcore/filethumbnailviewitem.cpp
index dae4172..46a79ca 100644
--- a/src/gvcore/filethumbnailviewitem.cpp
+++ b/src/gvcore/filethumbnailviewitem.cpp
@@ -204,46 +204,57 @@ void FileThumbnailViewItem::updateLines() {
 	mLines.clear();
 	if (!mFileItem) return;
 
+	bool showName, showDate, showImageSize, showFilesize;
+
 	bool isDir=mFileItem->isDir();
+
 	if (iconView()->itemTextPos()==TQIconView::Right) {
 		// Text is on the right, show everything
-
-		time_t time = TimeUtils::getTime(mFileItem);
-		mLines.append( new WrappedLine(this, mFileItem->name()) );
-		mLines.append( new CroppedLine(this, TimeUtils::formatTime(time)) );
-		if (mImageSize.isValid()) {
-			TQString txt=TQString::number(mImageSize.width())+"x"+TQString::number(mImageSize.height());
-			mLines.append( new CroppedLine(this, txt) );
-		}
-		if (!isDir) {
-			mLines.append( new CroppedLine(this, TDEIO::convertSize(mFileItem->size())) );
-		}
-
+		showName = true;
+		showDate = true;
+		showImageSize = true;
+		showFilesize = !isDir;
 	} else {
 		// Text is below the icon, only show details selected in
 		// view->itemDetails()
 		FileThumbnailView *view=static_cast<FileThumbnailView*>(iconView());
 		int details=view->itemDetails();
 		bool isImage=!Archive::fileItemIsDirOrArchive(mFileItem);
-		
-		if (!isImage || (details & FileThumbnailView::FILENAME)) {
-			mLines.append( new WrappedLine(this, mFileItem->name()) );
-		}
-		if (details & FileThumbnailView::FILEDATE) {
-			time_t time = TimeUtils::getTime(mFileItem);
-			mLines.append( new CroppedLine(this, TimeUtils::formatTime(time)) );
-		}
-		if (details & FileThumbnailView::IMAGESIZE) {
-			TQString txt;
-			if (mImageSize.isValid()) {
-				txt=TQString::number(mImageSize.width())+"x"+TQString::number(mImageSize.height());
+
+		showName      = !isImage || ( details & FileThumbnailView::FILENAME  );
+		showDate      =             ( details & FileThumbnailView::FILEDATE  );
+		showImageSize =             ( details & FileThumbnailView::IMAGESIZE );
+		showFilesize  = !isDir   && ( details & FileThumbnailView::FILESIZE  );
+	}
+
+	if (showName) {
+		mLines.append( new WrappedLine(this, mFileItem->name()) );
+	}
+	if (showDate) {
+		time_t time = TimeUtils::getTime(mFileItem);
+		mLines.append( new CroppedLine(this, TimeUtils::formatTime(time)) );
+	}
+	if (showImageSize) {
+		TQSize sz;
+		if (mImageSize.isValid()) {
+			sz=mImageSize;
+		} else if (FileViewConfig::loadMetadata()) {
+			const KFileMetaInfo& info = mFileItem->metaInfo(/*autogen=*/false);
+			if (info.isValid()) {
+				sz = info.value("Dimensions").toSize();
 			}
-			mLines.append( new CroppedLine(this, txt) );
 		}
-		if (!isDir && (details & FileThumbnailView::FILESIZE)) {
-			mLines.append( new CroppedLine(this, TDEIO::convertSize(mFileItem->size())) );
+		if (sz.isValid()) {
+			TQString txt = TQString::number(sz.width())+"x"+TQString::number(sz.height());
+			mLines.append( new CroppedLine(this, txt) );
+		} else if (iconView()->itemTextPos()==TQIconView::Right) {
+			// add empty line for they would nicely alligned;
+			// for text at the bottom it doesn't look that nice
+			mLines.append( new CroppedLine(this, TQString()));
 		}
-
+	}
+	if (showFilesize) {
+		mLines.append( new CroppedLine(this, TDEIO::convertSize(mFileItem->size())) );
 	}
 
 	calcRect();
@@ -283,8 +294,11 @@ void FileThumbnailViewItem::calcRect(const TQString&) {
 		itemTextRect.moveLeft(PADDING);
 		itemTextRect.moveTop(thumbnailSize + PADDING * 2);
 	}
-	
+
 	// Update rects
+	// NOTE: this results in 3 calls to TQIconViewContainer(), which is costly if
+	//       there are a lot (tens of thousands) of items, unfortunately there
+	//       is no way to workaround this in current (14.1.1, 2024) TQt API
 	if ( itemPixmapRect != pixmapRect() ) {
 		setPixmapRect( itemPixmapRect );
 	}
@@ -305,13 +319,11 @@ void FileThumbnailViewItem::paintItem(TQPainter *p, const TQColorGroup &cg) {
 	bool isRight=view->itemTextPos()==TQIconView::Right;
 	bool isShownItem=view->shownFileItem() && view->shownFileItem()->extraData(view)==this;
 	bool isImage=!Archive::fileItemIsDirOrArchive(mFileItem);
-	int textX, textY, textW, textH;
+	int textX, textY;
 	int thumbnailSize=FileViewConfig::thumbnailSize();
 
 	textX=textRect(false).x();
 	textY=textRect(false).y();
-	textW=textRect(false).width();
-	textH=textRect(false).height();
 
 	// Draw pixmap
 	TQRect pRect = pixmapRect(false);
diff --git a/src/gvcore/fileviewbase.h b/src/gvcore/fileviewbase.h
index 7b09ac7..8d22182 100644
--- a/src/gvcore/fileviewbase.h
+++ b/src/gvcore/fileviewbase.h
@@ -34,9 +34,15 @@ public:
 	
 	KFileItem* shownFileItem() const { return mShownFileItem; }
 	virtual void setShownFileItem(KFileItem* fileItem) { mShownFileItem=fileItem; }
-	
+
 	virtual void updateFromSettings() {}
 
+	using KFileView::updateView;
+	void updateView(const KFileItem* fileItem) override {
+		updateView(fileItem, false);
+	}
+	virtual void updateView(const KFileItem* fileItem, bool metaDataOnly) = 0;
+
 protected:
 	KFileItem* mShownFileItem;
 };
diff --git a/src/gvcore/fileviewconfig.kcfg b/src/gvcore/fileviewconfig.kcfg
index 9ec2ed6..489b48c 100644
--- a/src/gvcore/fileviewconfig.kcfg
+++ b/src/gvcore/fileviewconfig.kcfg
@@ -7,6 +7,9 @@
     <entry name="showDirs" key="show dirs" type="Bool">
       <default>true</default>
     </entry>
+    <entry name="loadMetadata" key="load metadata" type="Bool">
+      <default>true</default>
+    </entry>
     <entry name="showDotFiles" key="show dot files" type="Bool">
       <default>false</default>
     </entry>
diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
index b53de13..576f9c6 100644
--- a/src/gvcore/fileviewcontroller.cpp
+++ b/src/gvcore/fileviewcontroller.cpp
@@ -48,6 +48,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kurldrag.h>
 #include <tdeio/job.h>
 #include <tdeio/file.h>
+#include <tdeio/metainfojob.h>
 
 // Local
 #include "archive.h"
@@ -171,8 +172,7 @@ private:
 // FileViewController::Private
 //
 //-----------------------------------------------------------------------
-class FileViewController::Private {
-public:
+struct FileViewController::Private {
 	~Private() {
 		delete mSliderTracker;
 	}
@@ -188,6 +188,9 @@ public:
 	TQComboBox* mFilterComboBox;
 	TQCheckBox* mShowFilterBarCheckBox;
 
+	TDEIO::MetaInfoJob* mMetaInfoJob;
+	KFileItemList mMetaInfoTodo;
+
 	void initFilterBar() {
 		mFilterBar=new FilterBar(that);
 		mFilterBar->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
@@ -199,18 +202,18 @@ public:
 		mFilterBar->mResetTo->setIconSet(resetIS);
 
 		TQObject::connect(
-			mFilterBar->mResetNameCombo, TQT_SIGNAL(clicked()),
-			that, TQT_SLOT(resetNameFilter()) );
+			mFilterBar->mResetNameCombo, TQ_SIGNAL(clicked()),
+			that, TQ_SLOT(resetNameFilter()) );
 		TQObject::connect(
-			mFilterBar->mResetFrom, TQT_SIGNAL(clicked()),
-			that, TQT_SLOT(resetFromFilter()) );
+			mFilterBar->mResetFrom, TQ_SIGNAL(clicked()),
+			that, TQ_SLOT(resetFromFilter()) );
 		TQObject::connect(
-			mFilterBar->mResetTo, TQT_SIGNAL(clicked()),
-			that, TQT_SLOT(resetToFilter()) );
+			mFilterBar->mResetTo, TQ_SIGNAL(clicked()),
+			that, TQ_SLOT(resetToFilter()) );
 
 		TQObject::connect(
-			mFilterBar->mFilterButton, TQT_SIGNAL(clicked()),
-			that, TQT_SLOT(applyFilter()) );
+			mFilterBar->mFilterButton, TQ_SIGNAL(clicked()),
+			that, TQ_SLOT(applyFilter()) );
 	}
 
 	void initFilterCombo() {
@@ -223,16 +226,16 @@ public:
 		mFilterComboBox->insertItem(i18n("Videos only"), VIDEOS_ONLY);
 
 		TQObject::connect(
-			mFilterComboBox, TQT_SIGNAL(activated(int)),
-			that, TQT_SLOT(applyFilter()) );
+			mFilterComboBox, TQ_SIGNAL(activated(int)),
+			that, TQ_SLOT(applyFilter()) );
 
 		mShowFilterBarCheckBox = new TQCheckBox(i18n("More"), mFilterHBox);
 		TQObject::connect(
-			mShowFilterBarCheckBox, TQT_SIGNAL(toggled(bool)),
-			mFilterBar, TQT_SLOT(setShown(bool)) );
+			mShowFilterBarCheckBox, TQ_SIGNAL(toggled(bool)),
+			mFilterBar, TQ_SLOT(setShown(bool)) );
 		TQObject::connect(
-			mShowFilterBarCheckBox, TQT_SIGNAL(toggled(bool)),
-			that, TQT_SLOT(applyFilter()) );
+			mShowFilterBarCheckBox, TQ_SIGNAL(toggled(bool)),
+			that, TQ_SLOT(applyFilter()) );
 	}
 
 
@@ -266,6 +269,7 @@ FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* act
 	d->initFilterBar();
 	d->initFilterCombo();
 	d->mStack=new TQWidgetStack(this);
+	d->mMetaInfoJob=NULL;
 	
 	TQVBoxLayout *layout=new TQVBoxLayout(this);
 	layout->addWidget(d->mToolBar);
@@ -275,36 +279,36 @@ FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* act
 	// Actions
 	mSelectFirst=new TDEAction(i18n("&First"),
 		TQApplication::reverseLayout() ? "2rightarrow":"2leftarrow", Key_Home,
-		TQT_TQOBJECT(this),TQT_SLOT(slotSelectFirst()), actionCollection, "first");
+		this,TQ_SLOT(slotSelectFirst()), actionCollection, "first");
 
 	mSelectLast=new TDEAction(i18n("&Last"),
 		TQApplication::reverseLayout() ? "2leftarrow":"2rightarrow", Key_End,
-		TQT_TQOBJECT(this),TQT_SLOT(slotSelectLast()), actionCollection, "last");
+		this,TQ_SLOT(slotSelectLast()), actionCollection, "last");
 
 	mSelectPrevious=new TDEAction(i18n("&Previous"),
 		TQApplication::reverseLayout() ? "1rightarrow":"1leftarrow", Key_BackSpace,
-		TQT_TQOBJECT(this),TQT_SLOT(slotSelectPrevious()), actionCollection, "previous");
+		this,TQ_SLOT(slotSelectPrevious()), actionCollection, "previous");
 
 	mSelectNext=new TDEAction(i18n("&Next"),
 		TQApplication::reverseLayout() ? "1leftarrow":"1rightarrow", Key_Space,
-		TQT_TQOBJECT(this),TQT_SLOT(slotSelectNext()), actionCollection, "next");
+		this,TQ_SLOT(slotSelectNext()), actionCollection, "next");
 
 	mSelectPreviousDir=new TDEAction(i18n("&Previous Folder"),
 		TQApplication::reverseLayout() ? "media-seek-forward":"media-seek-backward", ALT + Key_BackSpace,
-		TQT_TQOBJECT(this),TQT_SLOT(slotSelectPreviousDir()), actionCollection, "previous_folder");
+		this,TQ_SLOT(slotSelectPreviousDir()), actionCollection, "previous_folder");
 
 	mSelectNextDir=new TDEAction(i18n("&Next Folder"),
 		TQApplication::reverseLayout() ? "media-seek-backward":"media-seek-forward", ALT + Key_Space,
-		TQT_TQOBJECT(this),TQT_SLOT(slotSelectNextDir()), actionCollection, "next_folder");
+		this,TQ_SLOT(slotSelectNextDir()), actionCollection, "next_folder");
 
 	mSelectFirstSubDir=new TDEAction(i18n("&First Sub Folder"), "go-down", ALT + Key_Down,
-		TQT_TQOBJECT(this),TQT_SLOT(slotSelectFirstSubDir()), actionCollection, "first_sub_folder");
+		this,TQ_SLOT(slotSelectFirstSubDir()), actionCollection, "first_sub_folder");
 
-	mListMode=new TDERadioAction(i18n("Details"),"view_detailed",0,TQT_TQOBJECT(this),TQT_SLOT(updateViewMode()),actionCollection,"list_mode");
+	mListMode=new TDERadioAction(i18n("Details"),"view_detailed",0,this,TQ_SLOT(updateViewMode()),actionCollection,"list_mode");
 	mListMode->setExclusiveGroup("thumbnails");
-	mSideThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Side"),"view_multicolumn",0,TQT_TQOBJECT(this),TQT_SLOT(updateViewMode()),actionCollection,"side_thumbnail_mode");
+	mSideThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Side"),"view_multicolumn",0,this,TQ_SLOT(updateViewMode()),actionCollection,"side_thumbnail_mode");
 	mSideThumbnailMode->setExclusiveGroup("thumbnails");
-	mBottomThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Bottom"),"view_icon",0,TQT_TQOBJECT(this),TQT_SLOT(updateViewMode()),actionCollection,"bottom_thumbnail_mode");
+	mBottomThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Bottom"),"view_icon",0,this,TQ_SLOT(updateViewMode()),actionCollection,"bottom_thumbnail_mode");
 	mBottomThumbnailMode->setExclusiveGroup("thumbnails");
 
 	// Size slider
@@ -315,21 +319,21 @@ FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* act
 		ThumbnailSize::LARGE/SLIDER_RESOLUTION);
 	mSizeSlider->setValue(FileViewConfig::thumbnailSize() / SLIDER_RESOLUTION);
 
-	connect(mSizeSlider, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(updateThumbnailSize(int)) );
-	connect(mListMode, TQT_SIGNAL(toggled(bool)), mSizeSlider, TQT_SLOT(setDisabled(bool)) );
+	connect(mSizeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateThumbnailSize(int)) );
+	connect(mListMode, TQ_SIGNAL(toggled(bool)), mSizeSlider, TQ_SLOT(setDisabled(bool)) );
 	TDEAction* sliderAction=new KWidgetAction(mSizeSlider, i18n("Thumbnail Size"), 0, 0, 0, actionCollection, "size_slider");
 	d->mSliderTracker=new TipTracker("", mSizeSlider);
 	// /Size slider
 
-	mShowDotFiles=new TDEToggleAction(i18n("Show &Hidden Files"),CTRL + Key_H,TQT_TQOBJECT(this),TQT_SLOT(toggleShowDotFiles()),actionCollection,"show_dot_files");
+	mShowDotFiles=new TDEToggleAction(i18n("Show &Hidden Files"),CTRL + Key_H,this,TQ_SLOT(toggleShowDotFiles()),actionCollection,"show_dot_files");
 
-	d->mSortAction=new TDESelectAction(i18n("Sort"), 0, TQT_TQOBJECT(this), TQT_SLOT(setSorting()), actionCollection, "view_sort");
+	d->mSortAction=new TDESelectAction(i18n("Sort"), 0, this, TQ_SLOT(setSorting()), actionCollection, "view_sort");
 	TQStringList sortItems;
 	sortItems << i18n("By Name") << i18n("By Date") << i18n("By Size");
 	d->mSortAction->setItems(sortItems);
 	d->mSortAction->setCurrentItem(0);
 
-	d->mRevertSortAction=new TDEToggleAction(i18n("Descending"),0, TQT_TQOBJECT(this), TQT_SLOT(setSorting()), actionCollection, "descending");
+	d->mRevertSortAction=new TDEToggleAction(i18n("Descending"),0, this, TQ_SLOT(setSorting()), actionCollection, "descending");
 	TQPopupMenu* sortMenu=d->mSortAction->popupMenu();
 	Q_ASSERT(sortMenu);
 	sortMenu->insertSeparator();
@@ -338,85 +342,85 @@ FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* act
 	// Dir lister
 	mDirLister=new DirLister;
 	mDirLister->setMainWindow(topLevelWidget());
-	connect(mDirLister,TQT_SIGNAL(clear()),
-		TQT_TQOBJECT(this),TQT_SLOT(dirListerClear()) );
+	connect(mDirLister,TQ_SIGNAL(clear()),
+		this,TQ_SLOT(dirListerClear()) );
 
-	connect(mDirLister,TQT_SIGNAL(newItems(const KFileItemList&)),
-		TQT_TQOBJECT(this),TQT_SLOT(dirListerNewItems(const KFileItemList&)) );
+	connect(mDirLister,TQ_SIGNAL(newItems(const KFileItemList&)),
+		this,TQ_SLOT(dirListerNewItems(const KFileItemList&)) );
 
-	connect(mDirLister,TQT_SIGNAL(deleteItem(KFileItem*)),
-		TQT_TQOBJECT(this),TQT_SLOT(dirListerDeleteItem(KFileItem*)) );
+	connect(mDirLister,TQ_SIGNAL(deleteItem(KFileItem*)),
+		this,TQ_SLOT(dirListerDeleteItem(KFileItem*)) );
 
-	connect(mDirLister,TQT_SIGNAL(refreshItems(const KFileItemList&)),
-		TQT_TQOBJECT(this),TQT_SLOT(dirListerRefreshItems(const KFileItemList&)) );
+	connect(mDirLister,TQ_SIGNAL(refreshItems(const KFileItemList&)),
+		this,TQ_SLOT(dirListerRefreshItems(const KFileItemList&)) );
 
-	connect(mDirLister,TQT_SIGNAL(started(const KURL&)),
-		TQT_TQOBJECT(this),TQT_SLOT(dirListerStarted()) );
+	connect(mDirLister,TQ_SIGNAL(started(const KURL&)),
+		this,TQ_SLOT(dirListerStarted()) );
 
-	connect(mDirLister,TQT_SIGNAL(completed()),
-		TQT_TQOBJECT(this),TQT_SLOT(dirListerCompleted()) );
+	connect(mDirLister,TQ_SIGNAL(completed()),
+		this,TQ_SLOT(dirListerCompleted()) );
 
-	connect(mDirLister,TQT_SIGNAL(canceled()),
-		TQT_TQOBJECT(this),TQT_SLOT(dirListerCanceled()) );
+	connect(mDirLister,TQ_SIGNAL(canceled()),
+		this,TQ_SLOT(dirListerCanceled()) );
 
 	// Propagate canceled signals
-	connect(mDirLister,TQT_SIGNAL(canceled()),
-		this,TQT_SIGNAL(canceled()) );
+	connect(mDirLister,TQ_SIGNAL(canceled()),
+		this,TQ_SIGNAL(canceled()) );
 
 	// File detail widget
 	mFileDetailView=new FileDetailView(d->mStack, "filedetailview");
 	d->mStack->addWidget(mFileDetailView,0);
 	mFileDetailView->viewport()->installEventFilter(this);
 
-	connect(mFileDetailView,TQT_SIGNAL(executed(TQListViewItem*)),
-		TQT_TQOBJECT(this),TQT_SLOT(slotViewExecuted()) );
-	connect(mFileDetailView,TQT_SIGNAL(returnPressed(TQListViewItem*)),
-		TQT_TQOBJECT(this),TQT_SLOT(slotViewExecuted()) );
-	connect(mFileDetailView,TQT_SIGNAL(currentChanged(TQListViewItem*)),
-		TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) );
-	connect(mFileDetailView,TQT_SIGNAL(selectionChanged()),
-		TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) );
-	connect(mFileDetailView,TQT_SIGNAL(clicked(TQListViewItem*)),
-		TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) );
-	connect(mFileDetailView,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-		TQT_TQOBJECT(this),TQT_SLOT(openContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
-	connect(mFileDetailView,TQT_SIGNAL(dropped(TQDropEvent*,KFileItem*)),
-		TQT_TQOBJECT(this),TQT_SLOT(openDropURLMenu(TQDropEvent*, KFileItem*)) );
-	connect(mFileDetailView, TQT_SIGNAL(sortingChanged(TQDir::SortSpec)),
-		this, TQT_SLOT(updateSortMenu(TQDir::SortSpec)) );
-	connect(mFileDetailView, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-		this, TQT_SLOT(slotViewDoubleClicked()) );
-	connect(mFileDetailView, TQT_SIGNAL(selectionChanged()),
-		this, TQT_SIGNAL(selectionChanged()) );
+	connect(mFileDetailView,TQ_SIGNAL(executed(TQListViewItem*)),
+		this,TQ_SLOT(slotViewExecuted()) );
+	connect(mFileDetailView,TQ_SIGNAL(returnPressed(TQListViewItem*)),
+		this,TQ_SLOT(slotViewExecuted()) );
+	connect(mFileDetailView,TQ_SIGNAL(currentChanged(TQListViewItem*)),
+		this,TQ_SLOT(slotViewClicked()) );
+	connect(mFileDetailView,TQ_SIGNAL(selectionChanged()),
+		this,TQ_SLOT(slotViewClicked()) );
+	connect(mFileDetailView,TQ_SIGNAL(clicked(TQListViewItem*)),
+		this,TQ_SLOT(slotViewClicked()) );
+	connect(mFileDetailView,TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+		this,TQ_SLOT(openContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
+	connect(mFileDetailView,TQ_SIGNAL(dropped(TQDropEvent*,KFileItem*)),
+		this,TQ_SLOT(openDropURLMenu(TQDropEvent*, KFileItem*)) );
+	connect(mFileDetailView, TQ_SIGNAL(sortingChanged(TQDir::SortSpec)),
+		this, TQ_SLOT(updateSortMenu(TQDir::SortSpec)) );
+	connect(mFileDetailView, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+		this, TQ_SLOT(slotViewDoubleClicked()) );
+	connect(mFileDetailView, TQ_SIGNAL(selectionChanged()),
+		this, TQ_SIGNAL(selectionChanged()) );
 
 	// Thumbnail widget
 	mFileThumbnailView=new FileThumbnailView(d->mStack);
 	d->mStack->addWidget(mFileThumbnailView,1);
 	mFileThumbnailView->viewport()->installEventFilter(this);
 
-	connect(mFileThumbnailView,TQT_SIGNAL(executed(TQIconViewItem*)),
-		TQT_TQOBJECT(this),TQT_SLOT(slotViewExecuted()) );
-	connect(mFileThumbnailView,TQT_SIGNAL(returnPressed(TQIconViewItem*)),
-		TQT_TQOBJECT(this),TQT_SLOT(slotViewExecuted()) );
-	connect(mFileThumbnailView,TQT_SIGNAL(currentChanged(TQIconViewItem*)),
-		TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) );
-	connect(mFileThumbnailView,TQT_SIGNAL(selectionChanged()),
-		TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) );
-	connect(mFileThumbnailView,TQT_SIGNAL(clicked(TQIconViewItem*)),
-		TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) );
-	connect(mFileThumbnailView,TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),
-		TQT_TQOBJECT(this),TQT_SLOT(openContextMenu(TQIconViewItem*,const TQPoint&)) );
-	connect(mFileThumbnailView,TQT_SIGNAL(dropped(TQDropEvent*,KFileItem*)),
-		TQT_TQOBJECT(this),TQT_SLOT(openDropURLMenu(TQDropEvent*, KFileItem*)) );
-	connect(mFileThumbnailView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)),
-		this, TQT_SLOT(slotViewDoubleClicked()) );
-	connect(mFileThumbnailView, TQT_SIGNAL(selectionChanged()),
-		this, TQT_SIGNAL(selectionChanged()) );
+	connect(mFileThumbnailView,TQ_SIGNAL(executed(TQIconViewItem*)),
+		this,TQ_SLOT(slotViewExecuted()) );
+	connect(mFileThumbnailView,TQ_SIGNAL(returnPressed(TQIconViewItem*)),
+		this,TQ_SLOT(slotViewExecuted()) );
+	connect(mFileThumbnailView,TQ_SIGNAL(currentChanged(TQIconViewItem*)),
+		this,TQ_SLOT(slotViewClicked()) );
+	connect(mFileThumbnailView,TQ_SIGNAL(selectionChanged()),
+		this,TQ_SLOT(slotViewClicked()) );
+	connect(mFileThumbnailView,TQ_SIGNAL(clicked(TQIconViewItem*)),
+		this,TQ_SLOT(slotViewClicked()) );
+	connect(mFileThumbnailView,TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),
+		this,TQ_SLOT(openContextMenu(TQIconViewItem*,const TQPoint&)) );
+	connect(mFileThumbnailView,TQ_SIGNAL(dropped(TQDropEvent*,KFileItem*)),
+		this,TQ_SLOT(openDropURLMenu(TQDropEvent*, KFileItem*)) );
+	connect(mFileThumbnailView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)),
+		this, TQ_SLOT(slotViewDoubleClicked()) );
+	connect(mFileThumbnailView, TQ_SIGNAL(selectionChanged()),
+		this, TQ_SIGNAL(selectionChanged()) );
 	
 	// Thumbnail details dialog
-	TDEAction* thumbnailDetailsDialogAction=new TDEAction(i18n("Edit Thumbnail Details..."), "configure", 0, TQT_TQOBJECT(mFileThumbnailView), TQT_SLOT(showThumbnailDetailsDialog()), actionCollection, "thumbnail_details_dialog");
-	connect(mBottomThumbnailMode, TQT_SIGNAL(toggled(bool)),
-		thumbnailDetailsDialogAction, TQT_SLOT(setEnabled(bool)) );
+	TDEAction* thumbnailDetailsDialogAction=new TDEAction(i18n("Edit Thumbnail Details..."), "configure", 0, mFileThumbnailView, TQ_SLOT(showThumbnailDetailsDialog()), actionCollection, "thumbnail_details_dialog");
+	connect(mBottomThumbnailMode, TQ_SIGNAL(toggled(bool)),
+		thumbnailDetailsDialogAction, TQ_SLOT(setEnabled(bool)) );
 	
 	// Fill toolbar
 	mListMode->plug(d->mToolBar);
@@ -470,6 +474,7 @@ FileViewController::~FileViewController() {
 	FileViewConfig::setToDateFilter(d->mFilterBar->mToDateEdit->date());
 	
 	FileViewConfig::writeConfig();
+	stopMetaInfoUpdate();
 	delete mDirLister;
 	delete d;
 }
@@ -487,7 +492,7 @@ void FileViewController::setFocus() {
 bool FileViewController::eventFilter(TQObject*, TQEvent* event) {
 	if (event->type()!=TQEvent::MouseButtonDblClick) return false;
 
-	TQMouseEvent* mouseEvent=TQT_TQMOUSEEVENT(event);
+	TQMouseEvent* mouseEvent=static_cast<TQMouseEvent*>(event);
 	if (mouseEvent->state() & TQt::ControlButton || mouseEvent->state() & TQt::ShiftButton) {
 		return true;
 	}
@@ -542,13 +547,13 @@ void FileViewController::setFileNameToSelect(const TQString& fileName) {
 void FileViewController::prefetch( KFileItem* item ) {
 	prefetchDone();
 	if( item == NULL ) return;
-	mPrefetch = ImageLoader::loader( item->url(), TQT_TQOBJECT(this), BUSY_PRELOADING );
-	connect( mPrefetch, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( prefetchDone()));
+	mPrefetch = ImageLoader::loader( item->url(), this, BUSY_PRELOADING );
+	connect( mPrefetch, TQ_SIGNAL( imageLoaded( bool )), TQ_SLOT( prefetchDone()));
 }
 
 void FileViewController::prefetchDone() {
 	if( mPrefetch != NULL ) {
-		mPrefetch->release( TQT_TQOBJECT(this) );
+		mPrefetch->release( this );
 		mPrefetch = NULL;
 	}
 }
@@ -716,6 +721,7 @@ void FileViewController::slotViewDoubleClicked() {
 
 
 void FileViewController::updateViewMode() {
+	KFileItem* currentItem=currentFileView()->currentFileItem();
 	if (mListMode->isChecked()) {
 		setMode(FILE_LIST);
 		return;
@@ -739,6 +745,7 @@ void FileViewController::updateViewMode() {
 		mFileThumbnailView->setShownFileItem(shownFileItem);
 	}
 
+	browseTo(currentItem);
 	updateThumbnailSize(mSizeSlider->value());
 	mFileThumbnailView->startThumbnailUpdate();
 }
@@ -1022,6 +1029,12 @@ void FileViewController::dirListerDeleteItem(KFileItem* item) {
 		if (!newShownItem) newShownItem=findPreviousImage();
 	}
 
+	// Remove item from metadata todo list and job's pending update lists
+	d->mMetaInfoTodo.remove(item);
+	if (d->mMetaInfoJob) {
+		d->mMetaInfoJob->removeItem(item);
+	}
+
 	currentFileView()->removeItem(item);
 
 	if (shownItem==item) {
@@ -1040,21 +1053,30 @@ void FileViewController::dirListerNewItems(const KFileItemList& items) {
 	LOG("");
 	mThumbnailsNeedUpdate=true;
 	currentFileView()->addItemList(items);
+	if (FileViewConfig::loadMetadata()) {
+		loadMetaInfo(items);
+	}
 }
 
 
 void FileViewController::dirListerRefreshItems(const KFileItemList& list) {
 	LOG("");
-	const KFileItem* item=currentFileView()->shownFileItem();
 	KFileItemListIterator it(list);
 	for (; *it!=0L; ++it) {
-		currentFileView()->updateView(*it);
-		if (*it==item) {
-			emit shownFileItemRefreshed(item);
-		}
+		updateViewItem(*it);
+	}
+
+	if (FileViewConfig::loadMetadata()) {
+		loadMetaInfo(list, true);
 	}
 }
 
+void FileViewController::updateViewItem(const KFileItem *item, bool metaDataOnly) {
+	currentFileView()->updateView(item, metaDataOnly);
+	if (item==currentFileView()->shownFileItem()) {
+		emit shownFileItemRefreshed(item);
+	}
+}
 
 void FileViewController::refreshItems(const KURL::List& urls) {
 	LOG("");
@@ -1088,7 +1110,7 @@ void FileViewController::dirListerCompleted() {
 	LOG("");
 	// Delay the code to be executed when the dir lister has completed its job
 	// to avoid crash in KDirLister (see bug #57991)
-	TQTimer::singleShot(0,TQT_TQOBJECT(this),TQT_SLOT(delayedDirListerCompleted()));
+	TQTimer::singleShot(0,this,TQ_SLOT(delayedDirListerCompleted()));
 }
 
 
@@ -1098,7 +1120,7 @@ void FileViewController::delayedDirListerCompleted() {
 	// around is not in firstFileItem() because it's const and sort() is a non
 	// const method
 	if (mMode!=FILE_LIST) {
-		mFileThumbnailView->sort(mFileThumbnailView->sortDirection());
+		mFileThumbnailView->sortView();
 	}
 
 	if (mChangeDirStatus != CHANGE_DIR_STATUS_NONE) {
@@ -1145,6 +1167,7 @@ void FileViewController::dirListerCanceled() {
 	if (mMode!=FILE_LIST) {
 		mFileThumbnailView->stopThumbnailUpdate();
 	}
+	stopMetaInfoUpdate();
 
 	browseToFileNameToSelect();
 }
@@ -1316,5 +1339,62 @@ KFileItem* FileViewController::findItemByFileName(const TQString& fileName) cons
 	return 0L;
 }
 
+//-----------------------------------------------------------------------------
+//
+// MetaInfo loading
+//
+//-----------------------------------------------------------------------------
+
+void FileViewController::loadMetaInfo(const KFileItemList& items, bool forceReload) {
+	if (forceReload) {
+		// Reset metadata of all items if we want MetaInfoJob to reload it
+		for(const auto& item: items) {
+			item->setMetaInfo(KFileMetaInfo());
+		}
+	}
+
+	if(d->mMetaInfoTodo.isEmpty()) {
+		d->mMetaInfoTodo = items;
+	} else {
+		for(const auto& item: items) {
+			d->mMetaInfoTodo.append(item);
+		}
+	}
+
+	if(!d->mMetaInfoJob) {
+		nextMetaInfoJob();
+	}
+}
+
+void FileViewController::nextMetaInfoJob() {
+	if( !d->mMetaInfoTodo.isEmpty() ) {
+		d->mMetaInfoJob = new TDEIO::MetaInfoJob(d->mMetaInfoTodo);
+		connect( d->mMetaInfoJob, TQ_SIGNAL(result(TDEIO::Job *)),
+				this, TQ_SLOT(nextMetaInfoJob()) );
+		connect( d->mMetaInfoJob, TQ_SIGNAL( gotMetaInfo(const KFileItem *)),
+				this, TQ_SLOT(updateItemMetaInfo(const KFileItem *)) );
+		d->mMetaInfoTodo.clear();
+	} else {
+		d->mMetaInfoJob = NULL;
+
+		// When we finished all metadata load we should update view sorting
+		// We can't do it during the item update due to performance impact
+		if (mMode!=FILE_LIST) {
+			mFileThumbnailView->sortView();
+		}
+	}
+}
+
+void FileViewController::stopMetaInfoUpdate() {
+	d->mMetaInfoTodo.clear();
+	if(d->mMetaInfoJob) {
+		d->mMetaInfoJob->kill();
+		d->mMetaInfoJob = 0;
+	}
+}
+
+void FileViewController::updateItemMetaInfo(const KFileItem *item) {
+	updateViewItem(item, /* metaInfoOnly = */ true);
+}
 
 } // namespace
diff --git a/src/gvcore/fileviewcontroller.h b/src/gvcore/fileviewcontroller.h
index 101ce9a..55c2ebd 100644
--- a/src/gvcore/fileviewcontroller.h
+++ b/src/gvcore/fileviewcontroller.h
@@ -54,7 +54,7 @@ class ImageLoader;
 class DirLister;
 
 class LIBGWENVIEW_EXPORT FileViewController : public TQWidget {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
@@ -184,6 +184,12 @@ private slots:
 	void dirListerCanceled();
 	void dirListerCompleted();
 
+	// Metadata info loader job's slots
+	void loadMetaInfo(const KFileItemList& items, bool forceReload=false);
+	void nextMetaInfoJob();
+	void stopMetaInfoUpdate();
+	void updateItemMetaInfo(const KFileItem *item);
+
 	void openDropURLMenu(TQDropEvent*, KFileItem*);
 
 	void prefetchDone();
@@ -240,6 +246,7 @@ private:
 	void emitURLChanged();
 	void updateActions();
 	void prefetch( KFileItem* item );
+	void updateViewItem(const KFileItem *item, bool metaInfoOnly=false);
 	
 	KFileItem* findFirstImage() const;
 	KFileItem* findLastImage() const;
diff --git a/src/gvcore/fullscreenbar.cpp b/src/gvcore/fullscreenbar.cpp
index 159ce90..493dfd0 100644
--- a/src/gvcore/fullscreenbar.cpp
+++ b/src/gvcore/fullscreenbar.cpp
@@ -92,7 +92,7 @@ FullScreenBar::FullScreenBar(TQWidget* parent)
 	setPalette(pal);
 	
 	// Timer
-	connect(&d->mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateSlide()) );
+	connect(&d->mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateSlide()) );
 }
 
 
diff --git a/src/gvcore/fullscreenbar.h b/src/gvcore/fullscreenbar.h
index 8ef3f84..a9eb418 100644
--- a/src/gvcore/fullscreenbar.h
+++ b/src/gvcore/fullscreenbar.h
@@ -30,7 +30,7 @@ class TQString;
 
 namespace Gwenview {
 class FullScreenBar : public TDEToolBar {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	FullScreenBar(TQWidget* parent);
diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp
index 8b2c546..17aedf2 100644
--- a/src/gvcore/imageloader.cpp
+++ b/src/gvcore/imageloader.cpp
@@ -139,7 +139,7 @@ void DecoderThread::run() {
 		
 		CancellableBuffer buffer(mRawData, this);
 		buffer.open(IO_ReadOnly);
-		imageIO.setIODevice(TQT_TQIODEVICE(&buffer));
+		imageIO.setIODevice(&buffer);
 		bool ok=imageIO.read();
 		if (testCancel()) {
 			LOG("cancelled");
@@ -148,7 +148,7 @@ void DecoderThread::run() {
 			
 		if (!ok) {
 			LOG("failed");
-			postSignal( this, TQT_SIGNAL(failed()) );
+			postSignal( this, TQ_SIGNAL(failed()) );
 			return;
 		}
 		
@@ -157,7 +157,7 @@ void DecoderThread::run() {
 	}
 	
 	LOG("succeeded, emitting signal");
-	postSignal( this, TQT_SIGNAL(succeeded()) );
+	postSignal( this, TQ_SIGNAL(succeeded()) );
 }
 
 
@@ -275,7 +275,7 @@ public:
 		Q_ASSERT(mRawData.size()>0);
 		TQBuffer buffer(mRawData);
 		buffer.open(IO_ReadOnly);
-		mImageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&buffer));
+		mImageFormat = TQImageIO::imageFormat(&buffer);
 	}
 };
 
@@ -288,8 +288,8 @@ public:
 ImageLoader::ImageLoader() {
 	LOG("");
 	d = new ImageLoaderPrivate(this);
-	connect( BusyLevelManager::instance(), TQT_SIGNAL( busyLevelChanged(BusyLevel)),
-		this, TQT_SLOT( slotBusyLevelChanged(BusyLevel)));
+	connect( BusyLevelManager::instance(), TQ_SIGNAL( busyLevelChanged(BusyLevel)),
+		this, TQ_SLOT( slotBusyLevelChanged(BusyLevel)));
 }
 
 
@@ -312,12 +312,12 @@ void ImageLoader::startLoading() {
 	d->mTimestamp = Cache::instance()->timestamp( d->mURL );
 	slotBusyLevelChanged( BusyLevelManager::instance()->busyLevel());
 
-	connect(&d->mDecoderTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(decodeChunk()) );
+	connect(&d->mDecoderTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(decodeChunk()) );
 
-	connect(&d->mDecoderThread, TQT_SIGNAL(succeeded()),
-		this, TQT_SLOT(slotDecoderThreadSucceeded()) );
-	connect(&d->mDecoderThread, TQT_SIGNAL(failed()),
-		this, TQT_SLOT(slotDecoderThreadFailed()) );
+	connect(&d->mDecoderThread, TQ_SIGNAL(succeeded()),
+		this, TQ_SLOT(slotDecoderThreadSucceeded()) );
+	connect(&d->mDecoderThread, TQ_SIGNAL(failed()),
+		this, TQ_SLOT(slotDecoderThreadFailed()) );
 
 	checkPendingStat();
 }
@@ -327,8 +327,8 @@ void ImageLoader::checkPendingStat() {
 
 	TDEIO::Job* job=TDEIO::stat( d->mURL, false );
 	job->setWindow(TDEApplication::kApplication()->mainWidget());
-	connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
-		this, TQT_SLOT(slotStatResult(TDEIO::Job*)) );
+	connect(job, TQ_SIGNAL(result(TDEIO::Job*)),
+		this, TQ_SLOT(slotStatResult(TDEIO::Job*)) );
 	d->mGetState = GET_STATING;
 }
 
@@ -394,11 +394,11 @@ void ImageLoader::checkPendingGet() {
 	TDEIO::Job* getJob=TDEIO::get( d->mURL, false, false);
 	getJob->setWindow(TDEApplication::kApplication()->mainWidget());
 
-	connect(getJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
-		this, TQT_SLOT(slotDataReceived(TDEIO::Job*, const TQByteArray&)) );
+	connect(getJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+		this, TQ_SLOT(slotDataReceived(TDEIO::Job*, const TQByteArray&)) );
 	
-	connect(getJob, TQT_SIGNAL(result(TDEIO::Job*)),
-		this, TQT_SLOT(slotGetResult(TDEIO::Job*)) );
+	connect(getJob, TQ_SIGNAL(result(TDEIO::Job*)),
+		this, TQ_SLOT(slotGetResult(TDEIO::Job*)) );
 
 	d->mTimeSinceLastUpdate.start();
 	d->mGetState = GET_GETTING;
@@ -444,7 +444,12 @@ static TQString mimeTypeFromFormat(const char* format) {
 	TQStringList formats = KImageIO::types(KImageIO::Reading);
 	TQStringList mimeTypes = KImageIO::mimeTypes(KImageIO::Reading);
 	int pos = formats.findIndex(TQString::fromAscii(format));
-	Q_ASSERT(pos != -1);
+	if(pos < 0) {
+		// TQImageIO::imageFormat() nay return some different types than listed by
+		// TQImage::inputFormats(), e.g. "PPMRAW". Also TDE might simly be ignorant
+		// abous some types known to TQt.
+		return TQString::null;
+	}
 	return mimeTypes[pos];
 }
 
@@ -460,16 +465,21 @@ void ImageLoader::slotDataReceived(TDEIO::Job* job, const TQByteArray& chunk) {
 		// Try to determine the data type
 		TQBuffer buffer(d->mRawData);
 		buffer.open(IO_ReadOnly);
-		const char* format = TQImageIO::imageFormat(TQT_TQIODEVICE(&buffer));
+		const char* format = TQImageIO::imageFormat(&buffer);
 		if (format) {
 			// This is a raster image, get the mime type now
-			d->mURLKind = MimeTypeUtils::KIND_RASTER_IMAGE;
 			d->mMimeType = mimeTypeFromFormat(format);
+			if(d->mMimeType.isNull()) { // fall back to TDE's autoguess of mime by content
+				KMimeType::Ptr ptr = KMimeType::findByContent(d->mRawData);
+				d->mMimeType = ptr->name();
+			}
+			d->mURLKind = MimeTypeUtils::KIND_RASTER_IMAGE;
 		} else {
 			KMimeType::Ptr ptr = KMimeType::findByContent(d->mRawData);
 			d->mMimeType = ptr->name();
 			d->mURLKind = MimeTypeUtils::mimeTypeKind(d->mMimeType);
 		}
+
 		if (d->mURLKind!=MimeTypeUtils::KIND_RASTER_IMAGE) {
 			Q_ASSERT(!d->mDecoderTimer.isActive());
 			job->kill(true /* quietly */);
@@ -655,7 +665,7 @@ void ImageLoader::end() {
 	// when we return from this function we will be in decodeChunk(), after the
 	// call to decode(), so we don't want to switch to a new impl yet, since
 	// this means deleting "this".
-	TQTimer::singleShot(0, this, TQT_SLOT(callFinish()) );
+	TQTimer::singleShot(0, this, TQ_SLOT(callFinish()) );
 }
 
 
@@ -858,7 +868,7 @@ void ImageLoader::ref( const TQObject* owner, BusyLevel priority ) {
 	data.owner = owner;
 	data.priority = priority;
 	d->mOwners.append( data );
-	connect( owner, TQT_SIGNAL( destroyed()), TQT_SLOT( ownerDestroyed()));
+	connect( owner, TQ_SIGNAL( destroyed()), TQ_SLOT( ownerDestroyed()));
 }
 
 void ImageLoader::deref( const TQObject* owner ) {
@@ -883,7 +893,7 @@ void ImageLoader::release( const TQObject* owner ) {
 }
 
 void ImageLoader::ownerDestroyed() {
-	deref( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
+	deref( sender() );
 }
 
 //---------------------------------------------------------------------
@@ -909,7 +919,7 @@ ImageLoader* ImageLoader::loader( const KURL& url, const TQObject* owner, BusyLe
 	// This also helps with preloading jobs, since BUSY_LOADING busy level is not entered immediately
 	// when a new picture is selected, so preloading jobs without this delay could start working
 	// immediately.
-	TQTimer::singleShot( priority >= BUSY_LOADING ? 0 : 10, loader, TQT_SLOT( startLoading()));
+	TQTimer::singleShot( priority >= BUSY_LOADING ? 0 : 10, loader, TQ_SLOT( startLoading()));
 	return loader;
 }
 
diff --git a/src/gvcore/imageloader.h b/src/gvcore/imageloader.h
index fface6c..8ddd733 100644
--- a/src/gvcore/imageloader.h
+++ b/src/gvcore/imageloader.h
@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "libgwenview_export.h"
 namespace Gwenview {
 class DecoderThread : public TSThread {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	void setRawData(const TQByteArray&);
@@ -59,7 +59,7 @@ private:
 class ImageLoaderPrivate;
 
 class LIBGWENVIEW_EXPORT ImageLoader : public TQObject, public TQImageConsumer {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	static ImageLoader* loader( const KURL& url, const TQObject* owner, BusyLevel priority ); // use this instead of ctor
diff --git a/src/gvcore/imagesavedialog.cpp b/src/gvcore/imagesavedialog.cpp
index 20d532d..8d524f1 100644
--- a/src/gvcore/imagesavedialog.cpp
+++ b/src/gvcore/imagesavedialog.cpp
@@ -97,12 +97,12 @@ ImageSaveDialog::ImageSaveDialog(KURL& url, const TQCString& imageFormat, TQWidg
 	// Tweak the filter widget
 	filterWidget->setEditable(false);
 	
-	connect(filterWidget,TQT_SIGNAL(activated(const TQString&)),
-		this,TQT_SLOT(updateImageFormat(const TQString&)) );
+	connect(filterWidget,TQ_SIGNAL(activated(const TQString&)),
+		this,TQ_SLOT(updateImageFormat(const TQString&)) );
 	
 	// Call slotFilterChanged() to get the list filtered by the filter we
 	// selected. If we don't use a single shot, it leads to a crash :-/
-	TQTimer::singleShot(0,this,TQT_SLOT(slotFilterChanged()));
+	TQTimer::singleShot(0,this,TQ_SLOT(slotFilterChanged()));
 }
 
 
diff --git a/src/gvcore/imagesavedialog.h b/src/gvcore/imagesavedialog.h
index 2d60ad1..9f7b820 100644
--- a/src/gvcore/imagesavedialog.h
+++ b/src/gvcore/imagesavedialog.h
@@ -30,7 +30,7 @@ class KURL;
 
 namespace Gwenview {
 class ImageSaveDialog : public KFileDialog {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	ImageSaveDialog(KURL& url,const TQCString& imageFormat,TQWidget* parent);
diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
index f5b6977..371eff4 100644
--- a/src/gvcore/imageview.cpp
+++ b/src/gvcore/imageview.cpp
@@ -279,8 +279,7 @@ public:
 		case TQEvent::KeyPress:
 		case TQEvent::KeyRelease:
 		case TQEvent::AccelOverride:
-			return static_cast< ImageView* >( TQT_TQWIDGET(parent()))
-						->viewportKeyEvent(TQT_TQKEYEVENT(event));
+			return static_cast< ImageView* >(parent())->viewportKeyEvent(static_cast<TQKeyEvent*>(event));
 		default:
 			break;
 		}
@@ -311,7 +310,7 @@ ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* a
 	d->mContrast = 100;
 	d->mBCGDialog = 0;
 
-	viewport()->setFocusPolicy(TQ_WheelFocus);
+	viewport()->setFocusPolicy(TQWidget::WheelFocus);
 	setFrameStyle(NoFrame);
 	setAcceptDrops( true );
 	viewport()->setAcceptDrops( true );
@@ -325,32 +324,32 @@ ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* a
 
 	// Create actions
 	d->mZoomToFit=new TDEToggleAction(i18n("Fit to &Window"),"zoom-fit-best",0,d->mActionCollection,"view_zoom_to_fit");
-	connect(d->mZoomToFit,TQT_SIGNAL(toggled(bool)),
-		TQT_TQOBJECT(this), TQT_SLOT(setZoomToFit(bool)) );
+	connect(d->mZoomToFit,TQ_SIGNAL(toggled(bool)),
+		this, TQ_SLOT(setZoomToFit(bool)) );
 	d->mZoomToWidth=new TDEToggleAction(i18n("Fit to &Width"),0,0,d->mActionCollection,"view_zoom_to_width");
-	connect(d->mZoomToWidth,TQT_SIGNAL(toggled(bool)),
-		TQT_TQOBJECT(this), TQT_SLOT(setZoomToWidth(bool)) );
+	connect(d->mZoomToWidth,TQ_SIGNAL(toggled(bool)),
+		this, TQ_SLOT(setZoomToWidth(bool)) );
 	d->mZoomToHeight=new TDEToggleAction(i18n("Fit to &Height"),0,0,d->mActionCollection,"view_zoom_to_height");
-	connect(d->mZoomToHeight,TQT_SIGNAL(toggled(bool)),
-		TQT_TQOBJECT(this), TQT_SLOT(setZoomToHeight(bool)) );
+	connect(d->mZoomToHeight,TQ_SIGNAL(toggled(bool)),
+		this, TQ_SLOT(setZoomToHeight(bool)) );
 
-	d->mZoomIn=KStdAction::zoomIn(TQT_TQOBJECT(this),TQT_SLOT(slotZoomIn()),d->mActionCollection);
+	d->mZoomIn=KStdAction::zoomIn(this,TQ_SLOT(slotZoomIn()),d->mActionCollection);
 
-	d->mZoomOut=KStdAction::zoomOut(TQT_TQOBJECT(this),TQT_SLOT(slotZoomOut()),d->mActionCollection);
+	d->mZoomOut=KStdAction::zoomOut(this,TQ_SLOT(slotZoomOut()),d->mActionCollection);
 
-	d->mResetZoom=KStdAction::actualSize(TQT_TQOBJECT(this),TQT_SLOT(slotResetZoom()),d->mActionCollection);
+	d->mResetZoom=KStdAction::actualSize(this,TQ_SLOT(slotResetZoom()),d->mActionCollection);
 	d->mResetZoom->setIcon("zoom-original");
 
 	d->mLockZoom=new TDEToggleAction(i18n("&Lock Zoom"),"system-lock-screen",0,d->mActionCollection,"view_zoom_lock");
 	d->mLockZoom->setChecked(ImageViewConfig::lockZoom());
-	connect(d->mLockZoom,TQT_SIGNAL(toggled(bool)),
-		TQT_TQOBJECT(this), TQT_SLOT(setLockZoom(bool)) );
+	connect(d->mLockZoom,TQ_SIGNAL(toggled(bool)),
+		this, TQ_SLOT(setLockZoom(bool)) );
 
 	d->mZoomCombo=new TQComboBox(true);
 	// Avoid stealing focus
-	d->mZoomCombo->setFocusPolicy(TQ_ClickFocus);
-	connect(d->mZoomCombo, TQT_SIGNAL(activated(int)),
-		TQT_TQOBJECT(this), TQT_SLOT(slotSelectZoom()) );
+	d->mZoomCombo->setFocusPolicy(TQWidget::ClickFocus);
+	connect(d->mZoomCombo, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(slotSelectZoom()) );
 	
 	d->mZoomComboAction=new KWidgetAction(d->mZoomCombo, i18n("Zoom"), 0, 0, 0, d->mActionCollection, "view_zoom_to");
 
@@ -363,41 +362,41 @@ ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* a
 	d->initZoomCombo();
 
 	d->mAdjustBCG=new TDEAction(i18n("Adjust Brightness/Contrast/Gamma"), "colorize", 0,
-		TQT_TQOBJECT(this), TQT_SLOT(showBCGDialog()), d->mActionCollection, "adjust_bcg");
+		this, TQ_SLOT(showBCGDialog()), d->mActionCollection, "adjust_bcg");
 	d->mIncreaseGamma=new TDEAction(i18n("Increase Gamma"),0,CTRL+Key_G,
-		TQT_TQOBJECT(this), TQT_SLOT(increaseGamma()),d->mActionCollection,"increase_gamma");
+		this, TQ_SLOT(increaseGamma()),d->mActionCollection,"increase_gamma");
 	d->mDecreaseGamma=new TDEAction(i18n("Decrease Gamma"),0,SHIFT+CTRL+Key_G,
-		TQT_TQOBJECT(this), TQT_SLOT(decreaseGamma()),d->mActionCollection,"decrease_gamma");
+		this, TQ_SLOT(decreaseGamma()),d->mActionCollection,"decrease_gamma");
 	d->mIncreaseBrightness=new TDEAction(i18n("Increase Brightness" ),0,CTRL+Key_B,
-		TQT_TQOBJECT(this), TQT_SLOT(increaseBrightness()),d->mActionCollection,"increase_brightness");
+		this, TQ_SLOT(increaseBrightness()),d->mActionCollection,"increase_brightness");
 	d->mDecreaseBrightness=new TDEAction(i18n("Decrease Brightness" ),0,SHIFT+CTRL+Key_B,
-		TQT_TQOBJECT(this), TQT_SLOT(decreaseBrightness()),d->mActionCollection,"decrease_brightness");
+		this, TQ_SLOT(decreaseBrightness()),d->mActionCollection,"decrease_brightness");
 	d->mIncreaseContrast=new TDEAction(i18n("Increase Contrast" ),0,CTRL+Key_C,
-		TQT_TQOBJECT(this), TQT_SLOT(increaseContrast()),d->mActionCollection,"increase_contrast");
+		this, TQ_SLOT(increaseContrast()),d->mActionCollection,"increase_contrast");
 	d->mDecreaseContrast=new TDEAction(i18n("Decrease Contrast" ),0,SHIFT+CTRL+Key_C,
-		TQT_TQOBJECT(this), TQT_SLOT(decreaseContrast()),d->mActionCollection,"decrease_contrast");
+		this, TQ_SLOT(decreaseContrast()),d->mActionCollection,"decrease_contrast");
 
 	// Connect to some interesting signals
-	connect(d->mDocument,TQT_SIGNAL(loaded(const KURL&)),
-		TQT_TQOBJECT(this), TQT_SLOT(slotLoaded()) );
+	connect(d->mDocument,TQ_SIGNAL(loaded(const KURL&)),
+		this, TQ_SLOT(slotLoaded()) );
 
-	connect(d->mDocument,TQT_SIGNAL(loading()),
-		TQT_TQOBJECT(this), TQT_SLOT( loadingStarted()) );
+	connect(d->mDocument,TQ_SIGNAL(loading()),
+		this, TQ_SLOT( loadingStarted()) );
 
-	connect(d->mDocument,TQT_SIGNAL(modified()),
-		TQT_TQOBJECT(this), TQT_SLOT(slotModified()) );
+	connect(d->mDocument,TQ_SIGNAL(modified()),
+		this, TQ_SLOT(slotModified()) );
 
-	connect(d->mDocument, TQT_SIGNAL(sizeUpdated()),
-		TQT_TQOBJECT(this), TQT_SLOT(slotImageSizeUpdated()) );
+	connect(d->mDocument, TQ_SIGNAL(sizeUpdated()),
+		this, TQ_SLOT(slotImageSizeUpdated()) );
 
-	connect(d->mDocument, TQT_SIGNAL(rectUpdated(const TQRect&)),
-		TQT_TQOBJECT(this), TQT_SLOT(slotImageRectUpdated(const TQRect&)) );
+	connect(d->mDocument, TQ_SIGNAL(rectUpdated(const TQRect&)),
+		this, TQ_SLOT(slotImageRectUpdated(const TQRect&)) );
 
-	connect(&d->mPendingPaintTimer,TQT_SIGNAL(timeout()),
-		TQT_TQOBJECT(this), TQT_SLOT(checkPendingOperations()) );
+	connect(&d->mPendingPaintTimer,TQ_SIGNAL(timeout()),
+		this, TQ_SLOT(checkPendingOperations()) );
 
-	connect(BusyLevelManager::instance(),TQT_SIGNAL(busyLevelChanged(BusyLevel)),
-		TQT_TQOBJECT(this), TQT_SLOT(slotBusyLevelChanged(BusyLevel) ));
+	connect(BusyLevelManager::instance(),TQ_SIGNAL(busyLevelChanged(BusyLevel)),
+		this, TQ_SLOT(slotBusyLevelChanged(BusyLevel) ));
 
 	// This event filter is here to make sure the pixmap view is aware of the changes
 	// in the keyboard modifiers, even if it isn't focused. However, making this widget
@@ -749,12 +748,12 @@ void ImageView::scheduleOperation( Operation operation )
 
 void ImageView::updateBusyLevels() {
 	if( !d->mPendingPaintTimer.isActive()) {
-		BusyLevelManager::instance()->setBusyLevel( TQT_TQOBJECT(this), BUSY_NONE );
+		BusyLevelManager::instance()->setBusyLevel( this, BUSY_NONE );
 	} else if( !d->mPendingPaints.isEmpty() && !(*d->mPendingPaints.begin()).smooth ) {
-		BusyLevelManager::instance()->setBusyLevel( TQT_TQOBJECT(this), BUSY_PAINTING );
+		BusyLevelManager::instance()->setBusyLevel( this, BUSY_PAINTING );
 	} else if(( d->mPendingOperations & SMOOTH_PASS )
 		|| ( !d->mPendingPaints.isEmpty() && (*d->mPendingPaints.begin()).smooth )) {
-		BusyLevelManager::instance()->setBusyLevel( TQT_TQOBJECT(this), BUSY_SMOOTHING );
+		BusyLevelManager::instance()->setBusyLevel( this, BUSY_SMOOTHING );
 	} else {
 		assert( false );
 	}
@@ -958,10 +957,10 @@ void ImageView::performPaint( TQPainter* painter, int clipx, int clipy, int clip
 void ImageView::viewportMousePressEvent(TQMouseEvent* event) {
 	viewport()->setFocus();
 	switch (event->button()) {
-	case Qt::LeftButton:
+	case TQt::LeftButton:
 		d->mTools[d->mToolID]->leftButtonPressEvent(event);
 		break;
-	case Qt::RightButton:
+	case TQt::RightButton:
 		d->mTools[d->mToolID]->rightButtonPressEvent(event);
 		break;
 	default: // Avoid compiler complain
@@ -978,8 +977,8 @@ void ImageView::viewportMouseMoveEvent(TQMouseEvent* event) {
 
 void ImageView::viewportMouseReleaseEvent(TQMouseEvent* event) {
 	switch (event->button()) {
-	case Qt::LeftButton:
-		if (event->stateAfter() & Qt::RightButton) {
+	case TQt::LeftButton:
+		if (event->stateAfter() & TQt::RightButton) {
 			d->mOperaLikePrevious=true;
 			emit selectPrevious();
 			return;
@@ -987,12 +986,12 @@ void ImageView::viewportMouseReleaseEvent(TQMouseEvent* event) {
 		d->mTools[d->mToolID]->leftButtonReleaseEvent(event);
 		break;
 
-	case Qt::MidButton:
+	case TQt::MidButton:
 		d->mTools[d->mToolID]->midButtonReleaseEvent(event);
 		break;
 
-	case Qt::RightButton:
-		if (event->stateAfter() & Qt::LeftButton) {
+	case TQt::RightButton:
+		if (event->stateAfter() & TQt::LeftButton) {
 			emit selectNext();
 			return;
 		}
@@ -1015,7 +1014,7 @@ bool ImageView::eventFilter(TQObject* obj, TQEvent* event) {
 	case TQEvent::KeyPress:
 	case TQEvent::KeyRelease:
 	case TQEvent::AccelOverride:
-		return viewportKeyEvent(TQT_TQKEYEVENT(event));
+		return viewportKeyEvent(static_cast<TQKeyEvent*>(event));
 
 	case TQEvent::MouseButtonDblClick:
 		if (d->mToolID==ZOOM) return false;
@@ -1062,7 +1061,7 @@ void ImageView::keyPressEvent( TQKeyEvent *event ) {
 	TQScrollView::keyPressEvent( event );
 	int deltaX, deltaY;
 
-	if (event->state() != Qt::NoButton) {
+	if (event->state() != TQt::NoButton) {
 		return;
 	}
 	switch (event->key()) {
diff --git a/src/gvcore/imageview.h b/src/gvcore/imageview.h
index f6f6bb4..2febb3c 100644
--- a/src/gvcore/imageview.h
+++ b/src/gvcore/imageview.h
@@ -47,7 +47,7 @@ namespace Gwenview {
 class Document;
 
 class LIBGWENVIEW_EXPORT ImageView : public TQScrollView {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp
index 136cdc5..4a00ccb 100644
--- a/src/gvcore/imageviewcontroller.cpp
+++ b/src/gvcore/imageviewcontroller.cpp
@@ -153,7 +153,7 @@ struct ImageViewController::Private {
 		TQString library=service->library();
 		Q_ASSERT(!library.isNull());
 		LOG("Library:" << library);
-		mPlayerPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>(service, TQT_TQWIDGET(mStack), 0, TQT_TQOBJECT(mStack), 0);
+		mPlayerPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>(service, mStack, 0, mStack, 0);
 		if (!mPlayerPart) {
 			kdWarning() << "Failed to instantiate KPart from library " << library << endl;
 			return;
@@ -293,22 +293,22 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, T
 	d->mFullScreen=false;
 	d->mFullScreenBar=0;
 	
-	connect(d->mDocument,TQT_SIGNAL(loaded(const KURL&)),
-		this,TQT_SLOT(slotLoaded()) );
+	connect(d->mDocument,TQ_SIGNAL(loaded(const KURL&)),
+		this,TQ_SLOT(slotLoaded()) );
 	
-	connect(d->mImageView, TQT_SIGNAL(requestContextMenu(const TQPoint&)),
-		this, TQT_SLOT(openImageViewContextMenu(const TQPoint&)) );
+	connect(d->mImageView, TQ_SIGNAL(requestContextMenu(const TQPoint&)),
+		this, TQ_SLOT(openImageViewContextMenu(const TQPoint&)) );
 	
-	connect(d->mImageView, TQT_SIGNAL(requestHintDisplay(const TQString&)),
-		this, TQT_SIGNAL(requestHintDisplay(const TQString&)) );
+	connect(d->mImageView, TQ_SIGNAL(requestHintDisplay(const TQString&)),
+		this, TQ_SIGNAL(requestHintDisplay(const TQString&)) );
 
-	connect(d->mAutoHideTimer,TQT_SIGNAL(timeout()),
-		this,TQT_SLOT(slotAutoHide()) );
+	connect(d->mAutoHideTimer,TQ_SIGNAL(timeout()),
+		this,TQ_SLOT(slotAutoHide()) );
 	
 	// Forward Image view signals
-	connect(d->mImageView, TQT_SIGNAL(selectPrevious()), TQT_SIGNAL(selectPrevious()) );
-	connect(d->mImageView, TQT_SIGNAL(selectNext()), TQT_SIGNAL(selectNext()) );
-	connect(d->mImageView, TQT_SIGNAL(doubleClicked()), TQT_SIGNAL(doubleClicked()) );
+	connect(d->mImageView, TQ_SIGNAL(selectPrevious()), TQ_SIGNAL(selectPrevious()) );
+	connect(d->mImageView, TQ_SIGNAL(selectNext()), TQ_SIGNAL(selectNext()) );
+	connect(d->mImageView, TQ_SIGNAL(doubleClicked()), TQ_SIGNAL(doubleClicked()) );
 }
 
 
@@ -387,15 +387,15 @@ void ImageViewController::slotAutoHide() {
 	if (d->mFullScreenBar) {
 		// Do not auto hide if the cursor is over the bar
 		TQPoint pos=d->mFullScreenBar->mapFromGlobal(TQCursor::pos());
-		if (TQT_TQRECT_OBJECT(d->mFullScreenBar->rect()).contains(pos)) {
+		if (d->mFullScreenBar->rect().contains(pos)) {
 			d->restartAutoHideTimer();
 			return;
 		}
 	}
 
 	// Only hide cursor if we are not over a dialog
-	TQWidget* widget = TQT_TQWIDGET(TDEApplication::kApplication()->activeWindow());
-	if (!widget || !widget->inherits(TQDIALOG_OBJECT_NAME_STRING)) {
+	TQWidget* widget = TDEApplication::kApplication()->activeWindow();
+	if (!widget || !widget->inherits("TQDialog")) {
 		TQApplication::setOverrideCursor(blankCursor);
 		d->mCursorHidden=true;
 	}
@@ -418,14 +418,14 @@ void ImageViewController::updateFromSettings() {
  */
 bool ImageViewController::eventFilter(TQObject* object, TQEvent* event) {
 	if (!d->mFullScreen) return false;
-	if (!event->type()==TQEvent::MouseMove) return false;
+	if (event->type()!=TQEvent::MouseMove) return false;
 
 	// Check we must filter this object. This is an application filter, so we
 	// have to check we are not dealing with another object.
 	bool isAChildOfStack=false;
 	TQObject* parentObject;
 	for (parentObject=object->parent(); parentObject; parentObject=parentObject->parent()) {
-		if (TQT_BASE_OBJECT(parentObject)==TQT_BASE_OBJECT(d->mStack)) {
+		if (parentObject==d->mStack) {
 			isAChildOfStack=true;
 			break;
 		}
@@ -434,16 +434,10 @@ bool ImageViewController::eventFilter(TQObject* object, TQEvent* event) {
 
 	d->updateFullScreenBarPosition();
 
-	if (event->type()==TQEvent::MouseMove) {
-		d->mCursorHidden=false;
-		d->restartAutoHideTimer();
-	}
+	d->mCursorHidden=false;
+	d->restartAutoHideTimer();
 
-	if (d->mCursorHidden) {
-		TQApplication::setOverrideCursor(blankCursor,true);
-	} else {
-		TQApplication::restoreOverrideCursor();
-	}
+	TQApplication::restoreOverrideCursor();
 
 	return false;
 }
diff --git a/src/gvcore/imageviewcontroller.h b/src/gvcore/imageviewcontroller.h
index 0643b61..e97b812 100644
--- a/src/gvcore/imageviewcontroller.h
+++ b/src/gvcore/imageviewcontroller.h
@@ -42,7 +42,7 @@ class ImageView;
 
 
 class LIBGWENVIEW_EXPORT ImageViewController : public TQObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	ImageViewController(TQWidget* parent, Document*, TDEActionCollection*);
diff --git a/src/gvcore/inputdialog.cpp b/src/gvcore/inputdialog.cpp
index 3a08d5c..b2a64f6 100644
--- a/src/gvcore/inputdialog.cpp
+++ b/src/gvcore/inputdialog.cpp
@@ -48,8 +48,8 @@ InputDialog::InputDialog(TQWidget* parent)
 	
 	setMinimumWidth(350);
 
-	connect(d->mLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
-		this, TQT_SLOT(updateButtons()) );
+	connect(d->mLineEdit, TQ_SIGNAL(textChanged(const TQString&)),
+		this, TQ_SLOT(updateButtons()) );
 }
 
 
diff --git a/src/gvcore/inputdialog.h b/src/gvcore/inputdialog.h
index 8958d80..438e347 100644
--- a/src/gvcore/inputdialog.h
+++ b/src/gvcore/inputdialog.h
@@ -34,7 +34,7 @@ namespace Gwenview {
  * An input dialog which give access to its line edit
  */
 class InputDialog : public KDialogBase {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	InputDialog(TQWidget* parent);
diff --git a/src/gvcore/mngformattype.cpp b/src/gvcore/mngformattype.cpp
index fa1e445..2ce2f1c 100644
--- a/src/gvcore/mngformattype.cpp
+++ b/src/gvcore/mngformattype.cpp
@@ -293,34 +293,35 @@ TQImageFormat* MNGFormatType::decoderFor( const uchar* buffer, int length )
 {
     if (length < 8) return 0;
 
-    if (buffer[0]==138 // MNG signature
-     && buffer[1]=='M'
-     && buffer[2]=='N'
-     && buffer[3]=='G'
-     && buffer[4]==13
-     && buffer[5]==10
-     && buffer[6]==26
-     && buffer[7]==10
-     || buffer[0]==139 // JNG signature
-     && buffer[1]=='J'
-     && buffer[2]=='N'
-     && buffer[3]=='G'
-     && buffer[4]==13
-     && buffer[5]==10
-     && buffer[6]==26
-     && buffer[7]==10
+    if (  (   buffer[0]==138 // MNG signature
+           && buffer[1]=='M'
+           && buffer[2]=='N'
+           && buffer[3]=='G'
+           && buffer[4]==13
+           && buffer[5]==10
+           && buffer[6]==26
+           && buffer[7]==10 )
+       || (   buffer[0]==139 // JNG signature
+           && buffer[1]=='J'
+           && buffer[2]=='N'
+           && buffer[3]=='G'
+           && buffer[4]==13
+           && buffer[5]==10
+           && buffer[6]==26
+           && buffer[7]==10 )
 #ifdef TQT_NO_IMAGEIO_PNG // if we don't have native PNG support use libmng
-     || buffer[0]==137 // PNG signature
-     && buffer[1]=='P'
-     && buffer[2]=='N'
-     && buffer[3]=='G'
-     && buffer[4]==13
-     && buffer[5]==10
-     && buffer[6]==26
-     && buffer[7]==10
+       || (   buffer[0]==137 // PNG signature
+           && buffer[1]=='P'
+           && buffer[2]=='N'
+           && buffer[3]=='G'
+           && buffer[4]==13
+           && buffer[5]==10
+           && buffer[6]==26
+           && buffer[7]==10 )
 #endif
-    )
-	return new MNGFormat;
+    ) {
+        return new MNGFormat;
+    }
     return 0;
 }
 
diff --git a/src/gvcore/pngformattype.cpp b/src/gvcore/pngformattype.cpp
index 8da8089..96273b2 100644
--- a/src/gvcore/pngformattype.cpp
+++ b/src/gvcore/pngformattype.cpp
@@ -256,7 +256,7 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
 #endif
 		if (g < ncols) {
 		    image.setAlphaBuffer(TRUE);
-		    image.setColor(g, image.color(g) & TQRGB_MASK);
+		    image.setColor(g, image.color(g) & TQT_RGB_MASK);
 		}
 	    }
 	}
diff --git a/src/gvcore/printdialog.cpp b/src/gvcore/printdialog.cpp
index bf3f05f..0a75b4f 100644
--- a/src/gvcore/printdialog.cpp
+++ b/src/gvcore/printdialog.cpp
@@ -84,10 +84,10 @@ PrintDialogPage::PrintDialogPage( Document* document, TQWidget *parent, const ch
 	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 )));
-	connect(mContent->mKeepRatio, TQT_SIGNAL( toggled( bool )), TQT_SLOT( toggleRatio( bool )));
-	connect(mContent->mUnit, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(slotUnitChanged(const TQString& )));
+	connect(mContent->mWidth, TQ_SIGNAL( valueChanged( double )), TQ_SLOT( slotWidthChanged( double )));
+	connect(mContent->mHeight, TQ_SIGNAL( valueChanged( double )), TQ_SLOT( slotHeightChanged( double )));
+	connect(mContent->mKeepRatio, TQ_SIGNAL( toggled( bool )), TQ_SLOT( toggleRatio( bool )));
+	connect(mContent->mUnit, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(slotUnitChanged(const TQString& )));
 
 	mPreviousUnit = GV_MILLIMETERS;
 }
diff --git a/src/gvcore/printdialog.h b/src/gvcore/printdialog.h
index 2a4d770..d21c3c2 100644
--- a/src/gvcore/printdialog.h
+++ b/src/gvcore/printdialog.h
@@ -46,7 +46,7 @@ enum ScaleId {
 };
 
 class LIBGWENVIEW_EXPORT PrintDialogPage : public KPrintDialogPage {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/src/gvcore/printdialogpagebase.ui b/src/gvcore/printdialogpagebase.ui
index 6ae7696..ebf6c8c 100644
--- a/src/gvcore/printdialogpagebase.ui
+++ b/src/gvcore/printdialogpagebase.ui
@@ -125,9 +125,6 @@
             <property name="text">
                 <string>Print image comment</string>
             </property>
-            <property name="accel">
-                <string></string>
-            </property>
         </widget>
         <widget class="TQButtonGroup">
             <property name="name">
@@ -399,10 +396,8 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp
index c4bf928..afd414f 100644
--- a/src/gvcore/qxcfi.cpp
+++ b/src/gvcore/qxcfi.cpp
@@ -28,7 +28,7 @@
 // Change a TQRgb value's alpha only. (an optimization)
 inline TQRgb tqRgba ( TQRgb rgb, int a )
 {
-  return ( ( a & 0xff ) << 24 | ( rgb & TQRGB_MASK ) );
+  return ( ( a & 0xff ) << 24 | ( rgb & TQT_RGB_MASK ) );
 }
 
 
@@ -530,7 +530,7 @@ void XCFImageFormat::initializeImage ( XCFImage& xcf_image )
       image.fill( tqRgb( 255, 255, 255 ) );
       break;
     } // else, fall through to 32-bit representation
-
+      // fall through
   case RGBA_GIMAGE:
     image.create( xcf_image.width, xcf_image.height, 32 );
     image.fill( tqRgba( 255, 255, 255, 0 ) );
@@ -546,7 +546,7 @@ void XCFImageFormat::initializeImage ( XCFImage& xcf_image )
       image.fill( 255 );
       break;
     } // else, fall through to 32-bit representation
-
+      // fall through
   case GRAYA_GIMAGE:
     image.create( xcf_image.width, xcf_image.height, 32 );
     image.fill( tqRgba( 255, 255, 255, 0 ) );
diff --git a/src/gvcore/slideshow.cpp b/src/gvcore/slideshow.cpp
index 6e3db94..d6a4799 100644
--- a/src/gvcore/slideshow.cpp
+++ b/src/gvcore/slideshow.cpp
@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // STL
 #include <algorithm>
+#include <random>
 
 // TQt
 #include <tqtimer.h>
@@ -50,10 +51,10 @@ namespace Gwenview {
 SlideShow::SlideShow(Document* document)
 : mDocument(document), mStarted(false), mPrefetch( NULL ) {
 	mTimer=new TQTimer(this);
-	connect(mTimer, TQT_SIGNAL(timeout()),
-			this, TQT_SLOT(slotTimeout()) );
-	connect(mDocument, TQT_SIGNAL(loaded(const KURL&)),
-			this, TQT_SLOT(slotLoaded()) );
+	connect(mTimer, TQ_SIGNAL(timeout()),
+			this, TQ_SLOT(slotTimeout()) );
+	connect(mDocument, TQ_SIGNAL(loaded(const KURL&)),
+			this, TQ_SLOT(slotLoaded()) );
 }
 
 SlideShow::~SlideShow() {
@@ -82,7 +83,8 @@ void SlideShow::start(const KURL::List& urls) {
 	mURLs.resize(urls.size());
 	tqCopy(urls.begin(), urls.end(), mURLs.begin());
 	if (SlideShowConfig::random()) {
-		std::random_shuffle(mURLs.begin(), mURLs.end());
+		std::random_device rd;
+		std::shuffle(mURLs.begin(), mURLs.end(), std::mt19937(rd()));
 	}
 
 	mStartIt=tqFind(mURLs.begin(), mURLs.end(), mDocument->url());
@@ -173,8 +175,8 @@ void SlideShow::prefetch() {
 	if( !mPriorityURL.isEmpty()) Cache::instance()->setPriorityURL( mPriorityURL, false );
 	mPriorityURL = *it;
 	Cache::instance()->setPriorityURL( mPriorityURL, true ); // make sure it will stay in the cache
-	connect( mPrefetch, TQT_SIGNAL( urlKindDetermined()), TQT_SLOT( slotUrlKindDetermined()));
-	connect( mPrefetch, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( prefetchDone()));
+	connect( mPrefetch, TQ_SIGNAL( urlKindDetermined()), TQ_SLOT( slotUrlKindDetermined()));
+	connect( mPrefetch, TQ_SIGNAL( imageLoaded( bool )), TQ_SLOT( prefetchDone()));
 	
 	if (mPrefetch->urlKind()==MimeTypeUtils::KIND_FILE) {
 		// Prefetch is already done, and this is not a raster image
diff --git a/src/gvcore/slideshow.h b/src/gvcore/slideshow.h
index f6d4806..d2b188d 100644
--- a/src/gvcore/slideshow.h
+++ b/src/gvcore/slideshow.h
@@ -38,7 +38,7 @@ class ImageLoader;
 
 class LIBGWENVIEW_EXPORT SlideShow : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	SlideShow(Document* document);
diff --git a/src/gvcore/threadgate.cpp b/src/gvcore/threadgate.cpp
index d5907ec..098e183 100644
--- a/src/gvcore/threadgate.cpp
+++ b/src/gvcore/threadgate.cpp
@@ -32,8 +32,8 @@ namespace Gwenview {
 // there's even no need to do any locking.
 
 ThreadGate::ThreadGate() {
-	connect( this, TQT_SIGNAL( signalColor( TQColor&, const char* )),
-		this, TQT_SLOT( slotColor( TQColor&, const char* )));
+	connect( this, TQ_SIGNAL( signalColor( TQColor&, const char* )),
+		this, TQ_SLOT( slotColor( TQColor&, const char* )));
 }
 
 ThreadGate* ThreadGate::instance() {
@@ -48,7 +48,7 @@ TQColor ThreadGate::color( const char* name ) {
 	if( TSThread::currentThread() == TSThread::mainThread())
 		return TQColor( name );
 	TQColor col;
-	TSThread::currentThread()->emitCancellableSignal( this, TQT_SIGNAL( signalColor( TQColor&, const char* )), col, name );
+	TSThread::currentThread()->emitCancellableSignal( this, TQ_SIGNAL( signalColor( TQColor&, const char* )), col, name );
 	return col;
 }
 
diff --git a/src/gvcore/threadgate.h b/src/gvcore/threadgate.h
index afb65be..330c9f0 100644
--- a/src/gvcore/threadgate.h
+++ b/src/gvcore/threadgate.h
@@ -27,7 +27,7 @@ namespace Gwenview {
 
 class ThreadGate : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	static ThreadGate* instance();
diff --git a/src/gvcore/thumbnaildetailsdialog.cpp b/src/gvcore/thumbnaildetailsdialog.cpp
index 87acbe5..9fa3276 100644
--- a/src/gvcore/thumbnaildetailsdialog.cpp
+++ b/src/gvcore/thumbnaildetailsdialog.cpp
@@ -52,10 +52,10 @@ ThumbnailDetailsDialog::ThumbnailDetailsDialog(FileThumbnailView* view)
 	d->mContent->mShowFileSize->setChecked(details & FileThumbnailView::FILESIZE);
 	d->mContent->mShowImageSize->setChecked(details & FileThumbnailView::IMAGESIZE);
 
-	connect(d->mContent->mShowFileName, TQT_SIGNAL(toggled(bool)), TQT_SLOT(applyChanges()) );
-	connect(d->mContent->mShowFileDate, TQT_SIGNAL(toggled(bool)), TQT_SLOT(applyChanges()) );
-	connect(d->mContent->mShowFileSize, TQT_SIGNAL(toggled(bool)), TQT_SLOT(applyChanges()) );
-	connect(d->mContent->mShowImageSize, TQT_SIGNAL(toggled(bool)), TQT_SLOT(applyChanges()) );
+	connect(d->mContent->mShowFileName, TQ_SIGNAL(toggled(bool)), TQ_SLOT(applyChanges()) );
+	connect(d->mContent->mShowFileDate, TQ_SIGNAL(toggled(bool)), TQ_SLOT(applyChanges()) );
+	connect(d->mContent->mShowFileSize, TQ_SIGNAL(toggled(bool)), TQ_SLOT(applyChanges()) );
+	connect(d->mContent->mShowImageSize, TQ_SIGNAL(toggled(bool)), TQ_SLOT(applyChanges()) );
 }
 
 ThumbnailDetailsDialog::~ThumbnailDetailsDialog() {
diff --git a/src/gvcore/thumbnaildetailsdialog.h b/src/gvcore/thumbnaildetailsdialog.h
index 8fe936f..84690b9 100644
--- a/src/gvcore/thumbnaildetailsdialog.h
+++ b/src/gvcore/thumbnaildetailsdialog.h
@@ -28,7 +28,7 @@ namespace Gwenview {
 class FileThumbnailView;
 
 class ThumbnailDetailsDialog : public KDialogBase {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	ThumbnailDetailsDialog(FileThumbnailView* view);
diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp
index f10889a..826d641 100644
--- a/src/gvcore/thumbnailloadjob.cpp
+++ b/src/gvcore/thumbnailloadjob.cpp
@@ -123,7 +123,7 @@ void ThumbnailThread::run() {
 		loadThumbnail();
 		mPixPath = TQString(); // done, ready for next
 		TQSize size(mOriginalWidth, mOriginalHeight);
-		emitCancellableSignal( this, TQT_SIGNAL( done( const TQImage&, const TQSize&)), mImage, size);
+		emitCancellableSignal( this, TQ_SIGNAL( done( const TQImage&, const TQSize&)), mImage, size);
 	}
 }
 
@@ -169,7 +169,7 @@ void ThumbnailThread::loadThumbnail() {
 				mImage=originalImage;
 				needCaching = false;
 			} else {
-				mImage=ImageUtils::scale(originalImage,thumbSize,thumbSize,ImageUtils::SMOOTH_FAST,TQ_ScaleMin);
+				mImage=ImageUtils::scale(originalImage,thumbSize,thumbSize,ImageUtils::SMOOTH_FAST,TQImage::ScaleMin);
 			}
 			loaded = true;
 		}
@@ -387,8 +387,8 @@ ThumbnailLoadJob::ThumbnailLoadJob(const TQValueVector<const KFileItem*>* items,
 	tqFill( mProcessedState.begin(), mProcessedState.end(), false );
 	mCurrentItem = NULL;
 
-	connect(&mThumbnailThread, TQT_SIGNAL(done(const TQImage&, const TQSize&)),
-		TQT_SLOT(thumbnailReady(const TQImage&, const TQSize&)) );
+	connect(&mThumbnailThread, TQ_SIGNAL(done(const TQImage&, const TQSize&)),
+		TQ_SLOT(thumbnailReady(const TQImage&, const TQSize&)) );
 	Cache::instance()->updateAge(); // see addThumbnail in Cache
 }
 
@@ -548,7 +548,7 @@ void ThumbnailLoadJob::determineNextIcon() {
 		KDE_struct_stat buff;
 		if ( KDE_stat( TQFile::encodeName(mCurrentURL.path()), &buff ) == 0 )  {
 			mOriginalTime = buff.st_mtime;
-			TQTimer::singleShot( 0, this, TQT_SLOT( checkThumbnail()));
+			TQTimer::singleShot( 0, this, TQ_SLOT( checkThumbnail()));
 		}
 	}
 	if( mOriginalTime == 0 ) { // TDEIO must be used
@@ -711,10 +711,10 @@ void ThumbnailLoadJob::checkThumbnail() {
 		list.append(mCurrentItem);
 		TDEIO::Job* job=TDEIO::filePreview(list, mThumbnailSize);
 		job->setWindow(TDEApplication::kApplication()->mainWidget());
-		connect(job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
-			this, TQT_SLOT(slotGotPreview(const KFileItem*, const TQPixmap&)) );
-		connect(job, TQT_SIGNAL(failed(const KFileItem*)),
-			this, TQT_SLOT(emitThumbnailLoadingFailed()) );
+		connect(job, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
+			this, TQ_SLOT(slotGotPreview(const KFileItem*, const TQPixmap&)) );
+		connect(job, TQ_SIGNAL(failed(const KFileItem*)),
+			this, TQ_SLOT(emitThumbnailLoadingFailed()) );
 		addSubjob(job);
 		return;
 	}
@@ -741,7 +741,7 @@ void ThumbnailLoadJob::emitThumbnailLoaded(const TQImage& img, TQSize size) {
 	TQImage thumbImg;
 	if (biggestDimension>mThumbnailSize) {
 		// Scale down thumbnail if necessary
-		thumbImg=ImageUtils::scale(img,mThumbnailSize, mThumbnailSize, ImageUtils::SMOOTH_FAST,TQ_ScaleMin);
+		thumbImg=ImageUtils::scale(img,mThumbnailSize, mThumbnailSize, ImageUtils::SMOOTH_FAST,TQImage::ScaleMin);
 	} else {
 		thumbImg=img;
 	}
diff --git a/src/gvcore/thumbnailloadjob.h b/src/gvcore/thumbnailloadjob.h
index 283d802..39541a2 100644
--- a/src/gvcore/thumbnailloadjob.h
+++ b/src/gvcore/thumbnailloadjob.h
@@ -45,7 +45,7 @@ typedef TQPtrList<KFileItem> KFileItemList;
 
 namespace Gwenview {
 class ThumbnailThread : public TSThread {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	void load(
@@ -84,7 +84,7 @@ private:
  * A job that determines the thumbnails for the images in the current directory
  */
 class LIBGWENVIEW_EXPORT ThumbnailLoadJob : public TDEIO::Job {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	/**
diff --git a/src/gvcore/timeutils.cpp b/src/gvcore/timeutils.cpp
index 3995833..75dd41f 100644
--- a/src/gvcore/timeutils.cpp
+++ b/src/gvcore/timeutils.cpp
@@ -25,17 +25,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdefilemetainfo.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-	
+
+// Local
+#include "fileviewconfig.h"
+
 namespace Gwenview {
 namespace TimeUtils {
 
 time_t getTime(const KFileItem* item) {
-	const KFileMetaInfo& info = item->metaInfo();
-	if (info.isValid()) {
-		TQVariant value = info.value("Date/time");
-		TQDateTime dt = value.toDateTime();
-		if (dt.isValid()) {
-			return dt.toTime_t();
+
+	if (FileViewConfig::loadMetadata()) {
+		const KFileMetaInfo& info = item->metaInfo(/*autogen=*/false);
+		if (info.isValid()) {
+			TQDateTime dt = info.value("Date/time").toDateTime();
+			if (dt.isValid()) {
+				return dt.toTime_t();
+			}
 		}
 	}
 	return item->time(TDEIO::UDS_MODIFICATION_TIME);
diff --git a/src/gvcore/timeutils.h b/src/gvcore/timeutils.h
index 8d9e9c1..53eb065 100644
--- a/src/gvcore/timeutils.h
+++ b/src/gvcore/timeutils.h
@@ -29,7 +29,8 @@ namespace Gwenview {
 namespace TimeUtils {
 
 /**
- * Returns the time of an item, using EXIF info if available
+ * Returns the time of an item, using EXIF info if available, enabled and
+ * already loaded
  */
 time_t getTime(const KFileItem*);
 
diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp
index edb79e3..c398540 100644
--- a/src/gvcore/xpm.cpp
+++ b/src/gvcore/xpm.cpp
@@ -221,10 +221,10 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc
 	    int transparentColor = currentColor;
 	    if ( image.depth() == 8 ) {
 		image.setColor( transparentColor,
-				TQRGB_MASK & tqRgb(198,198,198) );
+				TQT_RGB_MASK & tqRgb(198,198,198) );
 		colorMap.insert( index, transparentColor );
 	    } else {
-		TQRgb rgb = TQRGB_MASK & tqRgb(198,198,198);
+		TQRgb rgb = TQT_RGB_MASK & tqRgb(198,198,198);
 		colorMap.insert( index, rgb );
 	    }
 	} else {
@@ -388,7 +388,7 @@ static void write_xpm_image( TQImageIO * iio )
     TQMap<TQRgb, int>::Iterator c = colorMap.begin();
     while ( c != colorMap.end() ) {
 	TQRgb color = c.key();
-	if ( image.hasAlphaBuffer() && color == (color & TQRGB_MASK) )
+	if ( image.hasAlphaBuffer() && color == (color & TQT_RGB_MASK) )
 	    line.sprintf( "\"%s c None\"",
 			  xpm_color_name(cpp, *c) );
 	else
diff --git a/src/gvdirpart/CMakeLists.txt b/src/gvdirpart/CMakeLists.txt
new file mode 100644
index 0000000..9837c29
--- /dev/null
+++ b/src/gvdirpart/CMakeLists.txt
@@ -0,0 +1,31 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+
+##### gvdirpart (shared)
+
+tde_add_kpart( libgvdirpart AUTOMOC
+  SOURCES gvdirpart.cpp gvdirpartconfig.kcfgc
+  LINK tdeparts-shared gwenviewcore-shared
+  DESTINATION ${LIB_INSTALL_DIR}/trinity
+)
+
+
+##### other files
+
+tde_create_translated_desktop(
+  SOURCE gvdirpart.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+  FILES gvdirpart.rc
+  DESTINATION ${DATA_INSTALL_DIR}/gvdirpart
+)
+
+install(
+  FILES gvdirpartconfig.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/src/gvdirpart/Makefile.am b/src/gvdirpart/Makefile.am
index 2e1062c..c003d39 100644
--- a/src/gvdirpart/Makefile.am
+++ b/src/gvdirpart/Makefile.am
@@ -18,6 +18,4 @@ gv_DATA = gvdirpart.rc
 # Install the .desktop file into the kde_services directory
 kde_services_DATA = gvdirpart.desktop
 
-KDE_ICON = AUTO
-
 kde_kcfg_DATA = gvdirpartconfig.kcfg
diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp
index beb3d9d..186439a 100644
--- a/src/gvdirpart/gvdirpart.cpp
+++ b/src/gvdirpart/gvdirpart.cpp
@@ -68,8 +68,8 @@ GVDirPart::GVDirPart(TQWidget* parentWidget, const char* /*widgetName*/, TQObjec
 
 	mBrowserExtension = new GVDirPartBrowserExtension(this);
 
-	mSplitter = new TQSplitter(Qt::Horizontal, parentWidget, "gwenview-kpart-splitter");
-	mSplitter->setFocusPolicy(TQ_ClickFocus);
+	mSplitter = new TQSplitter(TQt::Horizontal, parentWidget, "gwenview-kpart-splitter");
+	mSplitter->setFocusPolicy(TQWidget::ClickFocus);
 	mSplitter->setOpaqueResize(true);
 
 	// Create the widgets
@@ -86,38 +86,38 @@ GVDirPart::GVDirPart(TQWidget* parentWidget, const char* /*widgetName*/, TQObjec
 
 	setWidget(mSplitter);
 
-	KStdAction::saveAs( mDocument, TQT_SLOT(saveAs()), actionCollection(), "saveAs" );
-	new TDEAction(i18n("Rotate &Left"), "object-rotate-left", CTRL + Key_L, this, TQT_SLOT(rotateLeft()), actionCollection(), "rotate_left");
-	new TDEAction(i18n("Rotate &Right"), "object-rotate-right", CTRL + Key_R, this, TQT_SLOT(rotateRight()), actionCollection(), "rotate_right");
+	KStdAction::saveAs( mDocument, TQ_SLOT(saveAs()), actionCollection(), "saveAs" );
+	new TDEAction(i18n("Rotate &Left"), "object-rotate-left", CTRL + Key_L, this, TQ_SLOT(rotateLeft()), actionCollection(), "rotate_left");
+	new TDEAction(i18n("Rotate &Right"), "object-rotate-right", CTRL + Key_R, this, TQ_SLOT(rotateRight()), actionCollection(), "rotate_right");
 
-	connect(mFileViewController, TQT_SIGNAL(requestContextMenu(const TQPoint&, bool)),
-		mBrowserExtension, TQT_SLOT(openFileViewContextMenu(const TQPoint&, bool)) );
+	connect(mFileViewController, TQ_SIGNAL(requestContextMenu(const TQPoint&, bool)),
+		mBrowserExtension, TQ_SLOT(openFileViewContextMenu(const TQPoint&, bool)) );
 
-	connect(mFileViewController, TQT_SIGNAL(urlChanged(const KURL&)),
-		mDocument, TQT_SLOT(setURL(const KURL&)) );
+	connect(mFileViewController, TQ_SIGNAL(urlChanged(const KURL&)),
+		mDocument, TQ_SLOT(setURL(const KURL&)) );
 
-	connect(mFileViewController, TQT_SIGNAL(directoryChanged(const KURL&)),
-		this, TQT_SLOT(directoryChanged(const KURL&)) );
+	connect(mFileViewController, TQ_SIGNAL(directoryChanged(const KURL&)),
+		this, TQ_SLOT(directoryChanged(const KURL&)) );
 
-	connect(mFileViewController, TQT_SIGNAL(selectionChanged()),
-		mBrowserExtension, TQT_SLOT(updateActions()) );
+	connect(mFileViewController, TQ_SIGNAL(selectionChanged()),
+		mBrowserExtension, TQ_SLOT(updateActions()) );
 
-	connect(mImageView, TQT_SIGNAL(requestContextMenu(const TQPoint&)),
-		mBrowserExtension, TQT_SLOT(openImageViewContextMenu(const TQPoint&)) );
+	connect(mImageView, TQ_SIGNAL(requestContextMenu(const TQPoint&)),
+		mBrowserExtension, TQ_SLOT(openImageViewContextMenu(const TQPoint&)) );
 
-	connect(mSlideShow, TQT_SIGNAL(nextURL(const KURL&)),
-		this, TQT_SLOT(slotSlideShowChanged(const KURL&)) );
+	connect(mSlideShow, TQ_SIGNAL(nextURL(const KURL&)),
+		this, TQ_SLOT(slotSlideShowChanged(const KURL&)) );
 
-	connect(mDocument, TQT_SIGNAL(loaded(const KURL&)),
-		this, TQT_SLOT(loaded(const KURL&)) );
+	connect(mDocument, TQ_SIGNAL(loaded(const KURL&)),
+		this, TQ_SLOT(loaded(const KURL&)) );
 
 	// For wheel browsing
-	connect(mImageView, TQT_SIGNAL(selectPrevious()),
-		mFileViewController, TQT_SLOT(slotSelectPrevious()) );
-	connect(mImageView, TQT_SIGNAL(selectNext()),
-		mFileViewController, TQT_SLOT(slotSelectNext()) );
+	connect(mImageView, TQ_SIGNAL(selectPrevious()),
+		mFileViewController, TQ_SLOT(slotSelectPrevious()) );
+	connect(mImageView, TQ_SIGNAL(selectNext()),
+		mFileViewController, TQ_SLOT(slotSelectNext()) );
 
-	mToggleSlideShow = new TDEToggleAction(i18n("Slide Show..."), "slideshow", 0, this, TQT_SLOT(toggleSlideShow()), actionCollection(), "slideshow");
+	mToggleSlideShow = new TDEToggleAction(i18n("Slide Show..."), "slideshow", 0, this, TQ_SLOT(toggleSlideShow()), actionCollection(), "slideshow");
 	mToggleSlideShow->setCheckedState( i18n("Stop Slide Show" ));
 
 	setXMLFile( "gvdirpart/gvdirpart.rc" );
diff --git a/src/gvdirpart/gvdirpart.h b/src/gvdirpart/gvdirpart.h
index 6bf34d2..1bea0b0 100644
--- a/src/gvdirpart/gvdirpart.h
+++ b/src/gvdirpart/gvdirpart.h
@@ -43,7 +43,7 @@ class GVDirPart;
  * some services to Konqueror.  All Konqueror KParts have one.
  */
 class GVDirPartBrowserExtension: public KParts::BrowserExtension {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -70,7 +70,7 @@ private:
  * A Read Only KPart to browse directories and their images using Gwenview
  */
 class GVDirPart : public KParts::ReadOnlyPart {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	GVDirPart(TQWidget*, const char*, TQObject*, const char*, const TQStringList &);
diff --git a/src/gvimagepart/CMakeLists.txt b/src/gvimagepart/CMakeLists.txt
new file mode 100644
index 0000000..0c962fc
--- /dev/null
+++ b/src/gvimagepart/CMakeLists.txt
@@ -0,0 +1,26 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+
+##### gvimagepart
+
+tde_add_kpart( libgvimagepart AUTOMOC
+  SOURCES gvimagepart.cpp
+  LINK tdeparts-shared gwenviewcore-shared
+  DESTINATION ${LIB_INSTALL_DIR}/trinity
+)
+
+
+##### other files
+
+tde_create_translated_desktop(
+  SOURCE gvimagepart.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+  FILES gvimagepart.rc gvimagepartpopup.rc
+  DESTINATION ${DATA_INSTALL_DIR}/gvimagepart
+)
diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
index 0988efd..134b525 100644
--- a/src/gvimagepart/gvimagepart.cpp
+++ b/src/gvimagepart/gvimagepart.cpp
@@ -89,35 +89,35 @@ GVImagePart::GVImagePart(TQWidget* parentWidget, const char* /*widgetName*/, TQO
 
 	// Create the widgets
 	mDocument = new Document(this);
-	connect( mDocument, TQT_SIGNAL( loading()), TQT_SLOT( slotLoading()));
-	connect( mDocument, TQT_SIGNAL( loaded(const KURL&)), TQT_SLOT( slotLoaded(const KURL&)));
+	connect( mDocument, TQ_SIGNAL( loading()), TQ_SLOT( slotLoading()));
+	connect( mDocument, TQ_SIGNAL( loaded(const KURL&)), TQ_SLOT( slotLoaded(const KURL&)));
 	mImageView = new ImageView(parentWidget, mDocument, actionCollection());
-	connect( mImageView, TQT_SIGNAL(requestContextMenu(const TQPoint&)),
-		this, TQT_SLOT(openContextMenu(const TQPoint&)) );
+	connect( mImageView, TQ_SIGNAL(requestContextMenu(const TQPoint&)),
+		this, TQ_SLOT(openContextMenu(const TQPoint&)) );
 	setWidget(mImageView);
 
 	mDirLister = new KDirLister;
 	mDirLister->setAutoErrorHandlingEnabled( false, 0 );
 	mDirLister->setMainWindow(TDEApplication::kApplication()->mainWidget());
-	connect( mDirLister, TQT_SIGNAL( clear()), TQT_SLOT( dirListerClear()));
-	connect( mDirLister, TQT_SIGNAL( newItems( const KFileItemList& )),
-		TQT_SLOT( dirListerNewItems( const KFileItemList& )));
-	connect(mDirLister,TQT_SIGNAL(deleteItem(KFileItem*)),
-		TQT_SLOT(dirListerDeleteItem(KFileItem*)) );
+	connect( mDirLister, TQ_SIGNAL( clear()), TQ_SLOT( dirListerClear()));
+	connect( mDirLister, TQ_SIGNAL( newItems( const KFileItemList& )),
+		TQ_SLOT( dirListerNewItems( const KFileItemList& )));
+	connect(mDirLister,TQ_SIGNAL(deleteItem(KFileItem*)),
+		TQ_SLOT(dirListerDeleteItem(KFileItem*)) );
 	
 	TQStringList mimeTypes=MimeTypeUtils::rasterImageMimeTypes();
 	mDirLister->setMimeFilter(mimeTypes);
 	mPreviousImage=new TDEAction(i18n("&Previous Image"),
 		TQApplication::reverseLayout() ? "1rightarrow":"1leftarrow", Key_BackSpace,
-		this,TQT_SLOT(slotSelectPrevious()), actionCollection(), "previous");
+		this,TQ_SLOT(slotSelectPrevious()), actionCollection(), "previous");
 	mNextImage=new TDEAction(i18n("&Next Image"),
 		TQApplication::reverseLayout() ? "1leftarrow":"1rightarrow", Key_Space,
-		this,TQT_SLOT(slotSelectNext()), actionCollection(), "next");
+		this,TQ_SLOT(slotSelectNext()), actionCollection(), "next");
 	updateNextPrevious();
 
-	KStdAction::saveAs( this, TQT_SLOT(saveAs()), actionCollection(), "saveAs" );
-	new TDEAction(i18n("Rotate &Left"), "object-rotate-left", CTRL + Key_L, this, TQT_SLOT(rotateLeft()), actionCollection(), "rotate_left");
-	new TDEAction(i18n("Rotate &Right"), "object-rotate-right", CTRL + Key_R, this, TQT_SLOT(rotateRight()), actionCollection(), "rotate_right");
+	KStdAction::saveAs( this, TQ_SLOT(saveAs()), actionCollection(), "saveAs" );
+	new TDEAction(i18n("Rotate &Left"), "object-rotate-left", CTRL + Key_L, this, TQ_SLOT(rotateLeft()), actionCollection(), "rotate_left");
+	new TDEAction(i18n("Rotate &Right"), "object-rotate-right", CTRL + Key_R, this, TQ_SLOT(rotateRight()), actionCollection(), "rotate_right");
 
 	setXMLFile( "gvimagepart/gvimagepart.rc" );
 }
@@ -201,7 +201,7 @@ void GVImagePart::slotLoaded(const KURL& url) {
 	prefetchDone();
 	mPrefetch = ImageLoader::loader( mLastDirection == DirectionPrevious ? previousURL() : nextURL(),
 		this, BUSY_PRELOADING );
-	connect( mPrefetch, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( prefetchDone()));
+	connect( mPrefetch, TQ_SIGNAL( imageLoaded( bool )), TQ_SLOT( prefetchDone()));
 }
 
 void GVImagePart::prefetchDone() {
@@ -351,8 +351,8 @@ void GVImagePart::saveOriginalAs() {
 		// We need to read the image again. Let TDEIO::copy do the work.
 		TDEIO::Job* job = TDEIO::copy(srcURL, dstURL);
 		job->setWindow(widget());
-		connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
-			this, TQT_SLOT(showJobError(TDEIO::Job*)) );
+		connect(job, TQ_SIGNAL(result(TDEIO::Job*)),
+			this, TQ_SLOT(showJobError(TDEIO::Job*)) );
 		return;
 	}
 
@@ -388,8 +388,8 @@ DataUploader::DataUploader(TQWidget* dialogParent, const TQByteArray& data, cons
 	tmpURL.setPath(mTempFile.name());
 	TDEIO::Job* job = TDEIO::copy(tmpURL, dstURL);
 	job->setWindow(dialogParent);
-	connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
-		this, TQT_SLOT(slotJobFinished(TDEIO::Job*)) );
+	connect(job, TQ_SIGNAL(result(TDEIO::Job*)),
+		this, TQ_SLOT(slotJobFinished(TDEIO::Job*)) );
 }
 
 
@@ -418,7 +418,7 @@ void GVImagePart::openContextMenu(const TQPoint& pos) {
 	TQString doc = KXMLGUIFactory::readConfigFile( "gvimagepartpopup.rc", true, instance() );
 	PopupGUIClient guiClient(instance(), doc);
 	
-	KStdAction::saveAs( this, TQT_SLOT(saveAs()), guiClient.actionCollection(), "saveAs" );
+	KStdAction::saveAs( this, TQ_SLOT(saveAs()), guiClient.actionCollection(), "saveAs" );
 	
 	KParts::URLArgs urlArgs;
 	urlArgs.serviceType = mDocument->mimeType();
diff --git a/src/gvimagepart/gvimagepart.h b/src/gvimagepart/gvimagepart.h
index 82a423d..68db9b1 100644
--- a/src/gvimagepart/gvimagepart.h
+++ b/src/gvimagepart/gvimagepart.h
@@ -44,7 +44,7 @@ class GVImagePart;
  * some services to Konqueror.  All Konqueror KParts have one.
  */
 class GVImagePartBrowserExtension: public KParts::BrowserExtension {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -63,7 +63,7 @@ private:
  * A Read Only KPart to view images using Gwenview
  */
 class GVImagePart : public KParts::ReadOnlyPart {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	GVImagePart(TQWidget*, const char*, TQObject*, const char*, const TQStringList &);
@@ -167,7 +167,7 @@ private:
  * This simple helper class uploads data to a remote URL asynchronously
  */
 class DataUploader : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	DataUploader(TQWidget* dialogParent, const TQByteArray& data, const KURL& destURL);
diff --git a/src/imageutils/CMakeLists.txt b/src/imageutils/CMakeLists.txt
new file mode 100644
index 0000000..88257bd
--- /dev/null
+++ b/src/imageutils/CMakeLists.txt
@@ -0,0 +1,34 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${EXIV2_INCLUDE_DIRS}
+  ${JPEG_INCLUDE_DIR}
+)
+
+
+##### gvimageutils (static)
+
+set( gvimageutils_SRCS imageutils.cpp jpegcontent.cpp scale.cpp transupp.c croppedqimage.cpp )
+
+if( HAVE_X86_MMX )
+  list( APPEND gvimageutils_SRCS asm_scale.S )
+
+  # Force to use C compiler for asm_scale.S instead of ASM
+  # because it contains mixed code - ASM with C definitions
+  set_source_files_properties( asm_scale.S PROPERTIES LANGUAGE C )
+
+  add_compile_options( -DHAVE_X86_MMX )
+endif( )
+
+tde_add_library( gvimageutils STATIC_PIC AUTOMOC
+  SOURCES ${gvimageutils_SRCS}
+  LINK tdecore-shared tdeio-shared ${EXIV2_LIBRARIES} ${JPEG_LIBRARIES}
+)
+
+
+##### testjpegcontent (executable)
+
+tde_add_check_executable( testjpegcontent AUTOMOC
+  SOURCES testjpegcontent.cpp
+  LINK gvimageutils-static
+)
diff --git a/src/imageutils/croppedqimage.cpp b/src/imageutils/croppedqimage.cpp
index 7f47366..8133074 100644
--- a/src/imageutils/croppedqimage.cpp
+++ b/src/imageutils/croppedqimage.cpp
@@ -39,7 +39,7 @@ CroppedTQImage::CroppedTQImage( const TQImage& im, const TQRect& rect )
     {
     if( im.isNull())
         return;
-    memcpy( tqcolorTable(), im.tqcolorTable(), im.numColors() * sizeof( TQRgb ));
+    memcpy( colorTable(), im.colorTable(), im.numColors() * sizeof( TQRgb ));
     setAlphaBuffer( im.hasAlphaBuffer());
     setDotsPerMeterX( im.dotsPerMeterX());
     setDotsPerMeterY( im.dotsPerMeterY());
diff --git a/src/imageutils/imageutils.cpp b/src/imageutils/imageutils.cpp
index a50dbed..9da3680 100644
--- a/src/imageutils/imageutils.cpp
+++ b/src/imageutils/imageutils.cpp
@@ -169,7 +169,7 @@ TQImage changeImage( const TQImage& image, int value )
         }
     else
         {
-        TQRgb* colors = im.tqcolorTable();
+        TQRgb* colors = im.colorTable();
         for( int i = 0;
              i < im.numColors();
              ++i )
diff --git a/src/imageutils/imageutils.h b/src/imageutils/imageutils.h
index 5ec9b09..2cf8559 100644
--- a/src/imageutils/imageutils.h
+++ b/src/imageutils/imageutils.h
@@ -30,7 +30,7 @@ namespace ImageUtils {
 	enum SmoothAlgorithm { SMOOTH_NONE, SMOOTH_FAST, SMOOTH_NORMAL, SMOOTH_BEST };
 
 	TQImage scale(const TQImage& image, int width, int height,
-		SmoothAlgorithm alg, TQ_ScaleMode mode = TQ_ScaleFree, double blur = 1.0);
+		SmoothAlgorithm alg, TQImage::ScaleMode mode = TQImage::ScaleFree, double blur = 1.0);
 
 	int extraScalePixels( SmoothAlgorithm alg, double zoom, double blur = 1.0 );
 
diff --git a/src/imageutils/jpegcontent.cpp b/src/imageutils/jpegcontent.cpp
index 7619146..55bc384 100644
--- a/src/imageutils/jpegcontent.cpp
+++ b/src/imageutils/jpegcontent.cpp
@@ -17,9 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  
 */
-#if defined(HAVE_CONFIG_H)
 #include "config.h"
-#endif
 
 // System
 #include <math.h>
@@ -54,17 +52,6 @@ extern "C" {
 #include "imageutils/jpegcontent.h"
 #include "imageutils/jpegerrormanager.h"
 
-// Make sure an EXIV2_TEST_VERSION macro exists:
-
-#ifdef EXIV2_VERSION
-#    ifndef EXIV2_TEST_VERSION
-#        define EXIV2_TEST_VERSION(major,minor,patch) \
-         ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
-#    endif
-#else
-#    define EXIV2_TEST_VERSION(major,minor,patch) (false)
-#endif
-
 namespace ImageUtils {
 
 const int INMEM_DST_DELTA=4096;
@@ -99,7 +86,7 @@ int inmem_fill_input_buffer(j_decompress_ptr cinfo) {
 
 void inmem_skip_input_data(j_decompress_ptr cinfo, long num_bytes) {
 	if (num_bytes<=0) return;
-	Q_ASSERT(num_bytes>=long(cinfo->src->bytes_in_buffer));
+	Q_ASSERT(num_bytes<=long(cinfo->src->bytes_in_buffer));
 	cinfo->src->next_input_byte+=num_bytes;
 	cinfo->src->bytes_in_buffer-=num_bytes;
 }
@@ -206,7 +193,6 @@ struct JPEGContent::Private {
 	}
 	bool readSize() {
 		struct jpeg_decompress_struct srcinfo;
-		jpeg_saved_marker_ptr mark;
 		
 		// Init JPEG structs 
 		JPEGErrorManager errorManager;
@@ -275,7 +261,11 @@ bool JPEGContent::loadFromData(const TQByteArray& data) {
 
 	if (!d->readSize()) return false;
 
+#if (EXIV2_TEST_VERSION(0,28,0))
+	Exiv2::Image::UniquePtr image;
+#else
 	Exiv2::Image::AutoPtr image;
+#endif
 	try {
 		image = Exiv2::ImageFactory::open((unsigned char*)data.data(), data.size());
 		image->readMetadata();
@@ -314,7 +304,11 @@ Orientation JPEGContent::orientation() const {
 	if (it == d->mExifData.end()) {
 		return NOT_AVAILABLE;
 	}
+#if (EXIV2_TEST_VERSION(0,28,0))
+	return Orientation( it->toInt64() );
+#else
 	return Orientation( it->toLong() );
+#endif
 }
 
 
@@ -334,7 +328,11 @@ int JPEGContent::dotsPerMeter(const TQString& keyName) const {
 	if (it == d->mExifData.end()) {
 		return 0;
 	}
-	int res = it->toLong();
+#if (EXIV2_TEST_VERSION(0,28,0))
+	int64_t res = it->toInt64();
+#else
+	long res = it->toLong();
+#endif
 	TQString keyVal = "Exif.Image." + keyName;
 	Exiv2::ExifKey keyResolution(keyVal.ascii());
 	it = d->mExifData.findKey(keyResolution);
@@ -613,13 +611,13 @@ void JPEGContent::applyPendingTransformation() {
 TQImage JPEGContent::thumbnail() const {
 	TQImage image;
 	if (!d->mExifData.empty()) {
-#if (EXIV2_TEST_VERSION(0,17,91))
 		Exiv2::ExifThumbC thumb(d->mExifData);
 		Exiv2::DataBuf const thumbnail = thumb.copy();
+#if (EXIV2_TEST_VERSION(0,28,0))
+		image.loadFromData(thumbnail.c_data(), thumbnail.size());
 #else
-		Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail();
-#endif
 		image.loadFromData(thumbnail.pData_, thumbnail.size_);
+#endif
 	}
 	return image;
 }
@@ -640,12 +638,8 @@ void JPEGContent::setThumbnail(const TQImage& thumbnail) {
 		return;
 	}
 	
-#if (EXIV2_TEST_VERSION(0,17,91))
 	Exiv2::ExifThumb thumb(d->mExifData);
 	thumb.setJpegThumbnail((unsigned char*)array.data(), array.size());
-#else
-	d->mExifData.setJpegThumbnail((unsigned char*)array.data(), array.size());
-#endif
 }
 
 
@@ -671,7 +665,11 @@ bool JPEGContent::save(TQFile* file) {
 		d->mPendingTransformation = false;
 	}
 
+#if (EXIV2_TEST_VERSION(0,28,0))
+	Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open((unsigned char*)d->mRawData.data(), d->mRawData.size());
+#else
 	Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open((unsigned char*)d->mRawData.data(), d->mRawData.size());
+#endif
 
 	// Store Exif info
 	image->setExifData(d->mExifData);
diff --git a/src/imageutils/scale.cpp b/src/imageutils/scale.cpp
index fb9ab23..3c719a7 100644
--- a/src/imageutils/scale.cpp
+++ b/src/imageutils/scale.cpp
@@ -1924,7 +1924,7 @@ int extraScalePixels( SmoothAlgorithm alg, double zoom, double blur )
 }
 
 TQImage scale(const TQImage& image, int width, int height,
-	SmoothAlgorithm alg, TQ_ScaleMode mode, double blur )
+	SmoothAlgorithm alg, TQImage::ScaleMode mode, double blur )
 {
 	if( image.isNull()) return image.copy();
 	
diff --git a/src/imageutils/transupp.c b/src/imageutils/transupp.c
index 099fade..0ede0db 100644
--- a/src/imageutils/transupp.c
+++ b/src/imageutils/transupp.c
@@ -2329,6 +2329,7 @@ jtransform_adjust_parameters (j_decompress_ptr srcinfo,
 			      jvirt_barray_ptr *src_coef_arrays,
 			      jpeg_transform_info *info)
 {
+  (void) srcinfo; /* unused */
   /* If force-to-grayscale is requested, adjust destination parameters */
   if (info->force_grayscale) {
     /* We use jpeg_set_colorspace to make sure subsidiary settings get fixed
@@ -2455,6 +2456,8 @@ jtransform_execute_transformation (j_decompress_ptr srcinfo,
 GLOBAL(void)
 jcopy_markers_setup (j_decompress_ptr srcinfo, JCOPY_OPTION option)
 {
+  (void) srcinfo; /* maybe unused */
+  (void) option;  /* maybe unused */
 #ifdef SAVE_MARKERS_SUPPORTED
   int m;
 
@@ -2481,6 +2484,7 @@ GLOBAL(void)
 jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
 		       JCOPY_OPTION option)
 {
+  (void) option; /* unused */
   jpeg_saved_marker_ptr marker;
 
   /* In the current implementation, we don't actually need to examine the
@@ -2522,4 +2526,4 @@ jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
   }
 }
 
-#endif // JPEG_LIB_VERSION >= 80
\ No newline at end of file
+#endif // JPEG_LIB_VERSION >= 80
diff --git a/src/spec/gwenview-RH.spec b/src/spec/gwenview-RH.spec
deleted file mode 100644
index 1786913..0000000
--- a/src/spec/gwenview-RH.spec
+++ /dev/null
@@ -1,86 +0,0 @@
-%define	desktop_vendor	rockers
-
-Name: gwenview
-Summary: Gwenview is an image viewer for TDE.
-Version: 0.16.2
-Release: 0
-License: GPL
-Group: Amusements/Graphics
-Source: http://prdownloads.sourceforge.net/gwenview/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-root
-Url: http://gwenview.sourceforge.net/home/
-Requires: libpng, tdebase >= 3.0
-BuildRequires: libpng-devel, tdelibs-devel, arts-devel, libjpeg-devel
-BuildRequires:  XFree86-devel, zlib-devel, qt-devel >= 3.0.2
-
-%description
-Gwenview is an image viewer for TDE.
-
-It features a folder tree window and a file list window to 
-provide easy navigation among your thousand images.
-
-Image loading is done by the Qt library, giving you access 
-to all image formats your Qt installation supports, but 
-Gwenview can also browse GIMP files (*.xcf) thanks to the 
-included QXCFI component developed by Lignum Computing.
-
-Gwenview correctly displays images with alpha channel, 
-using the traditionnal checker board as a background to
-reveal transparency.
-
-%prep
-rm -rf %{buildroot}
-
-%setup -q
-
-%build
-%configure --with-xinerama
-make %{_smp_mflags}
-
-%install
-%makeinstall
-
-desktop-file-install --vendor %{desktop_vendor} --delete-original \
-  --dir %{buildroot}%{_datadir}/applications                      \
-  --add-category X-Red-Hat-Extra                                  \
-  --add-category Application                                      \
-  --add-category Graphics					  \
-  %{buildroot}%{_datadir}/applnk/Graphics/%{name}.desktop
-
-rm -rf %{buildroot}%{_datadir}/applnk
-
-mv %{buildroot}%{_datadir}/hicolor/16x16/actions/	\
-%{buildroot}%{_datadir}/icons/hicolor/16x16
-
-mkdir %{buildroot}%{_datadir}/icons/hicolor/22x22
-mv %{buildroot}%{_datadir}/hicolor/22x22/actions/	\
-%{buildroot}%{_datadir}/icons/hicolor/22x22
-
-mv %{buildroot}%{_datadir}/hicolor/32x32/actions/	\
-%{buildroot}%{_datadir}/icons/hicolor/32x32
-
-rm -rf %{buildroot}%{_datadir}/hicolor
-
-%clean
-rm -rf %{buildroot}
-
-%post
-
-%postun
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL CREDITS TODO NEWS
-%{_bindir}/%{name}*
-%{_mandir}/man1/%{name}*
-%{_datadir}/apps/konqueror/servicemenus/konqgwenview.desktop
-%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/locale/*/LC_MESSAGES/%{name}*
-
-%changelog
-* Fri Feb 14 2003 Robert Rockers <brockers at dps.state.ok.us> 0.16.2
-- Recompiled for version 0.16.2
-
-* Fri Feb 7 2003 Robert Rockers <brockers at dps.state.ok.us> 0.16.1
-- Initial RedHat RPM release.
diff --git a/src/spec/gwenview-SuSE.spec b/src/spec/gwenview-SuSE.spec
deleted file mode 100644
index 0be40f2..0000000
--- a/src/spec/gwenview-SuSE.spec
+++ /dev/null
@@ -1,45 +0,0 @@
-Summary:Simple image viewer for TDE
-Name: gwenview
-Version: 0.15.1
-Release: 1
-Copyright: GPL
-Group: Application/Multimedia 
-Source0: %{name}-%{version}.tar.bz2
-URL: http://gwenview.sourceforge.net 
-
-Packager: Dario Abatianni <eisfuchs@tigress.com>
-
-BuildRoot: /tmp/build/%{name}-%{version}
-
-%description
-Gwenview is an image viewer for TDE.
-
-It features a folder tree window and a file list window to provide easy 
-navigation in your file hierarchy.  Image loading is done by the Qt library, 
-so it supports all image formats your Qt installation supports. 
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-
-%setup
-
-%build
-./configure --prefix=$RPM_BUILD_ROOT/opt/trinity --enable-final
-make
-
-%install
-make install 
-
-%files
-%defattr(-,root,root,0755)
-/opt/trinity/bin/gwenview
-/opt/trinity/share/apps/gwenview/icons/*/*/actions/*.png
-/opt/trinity/share/icons/*/*/apps/gwenview.png
-/opt/trinity/share/applnk/Graphics/gwenview.desktop
-/opt/trinity/share/apps/konqueror/servicemenus/konqgwenview.desktop
-/opt/trinity/share/locale/*/LC_MESSAGES/gwenview.mo
-/opt/trinity/man/man1/gwenview.1
-%doc NEWS README TODO ChangeLog COPYING CREDITS
-
-%clean
-rm -rf $RPM_BUILD_ROOT
diff --git a/src/spec/gwenview-mdk.spec b/src/spec/gwenview-mdk.spec
deleted file mode 100644
index e3447ad..0000000
--- a/src/spec/gwenview-mdk.spec
+++ /dev/null
@@ -1,466 +0,0 @@
-%define gvname gwenview
-%define version 1.2.92
-## Distribution Specific Release Tag
-%{?!mkrel: %define mkrel(c:) %{-c:0.%{-c*}.}%{!?_with_unstable:%(perl -e '$_="%{1}";m/(.\*)(\\d+)$/;$rel=${2}-1;re;print "$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo $[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}}
-%define release %mkrel 1
-
-%define gvcorename libgwenviewcore
-%define gvdirpartname gvdirpart
-%define gvimagepartname gvimagepart
-
-%define name %gvname
-
-%define major 1
-%define libname %mklibname %{gvname} %major
-%define libnamedev %mklibname %{gvname} %major -d
-
-# building kipi version
-%define build_kipi 1
-%{?_with_nokipi: %global build_kipi 0}
-%if %build_kipi
-%define kipiopt --enable-kipi
-%define kipireq  libkipi-devel
-%endif
-
-
-Summary: Fast and easy to use image viewer for TDE
-Name: %name
-Version: %version
-Release: %release
-License: GPL
-Group: Graphics
-Source0: http://prdownloads.sourceforge.net/gwenview/%{gvname}-%{version}.tar.bz2
-
-URL: http://gwenview.sourceforge.net 
-BuildRoot: %_tmppath/%{name}-%{version}
-#  added automake1.7 requirement to patch Makefile(s).am
-%if %build_kipi
-BuildRequires: tdelibs-devel automake1.7 X11-devel %{kipireq}
-%else
-BuildRequires: tdelibs-devel automake1.7 X11-devel
-%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 TDEIO 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.
-
-%package -n %libname
-Summary: Libraries for gwenview image viewer
-Group: System/Libraries
-Requires:  %{name} = %{version}
-
-%description -n %libname
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-%{libname} contains the libraries needed to use %{gvname}
-
-%package -n %libnamedev
-Summary: Devel files (gwenview image viewer)
-Group: Development/Other
-Requires: %libname = %{version}
-Provides: lib%{gvname}-devel = %{version}-%{release}
-Provides: %{gvname}-devel = %{version}-%{release}
-
-%description -n %libnamedev
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-%{libnamedev} contains the libraries and header files needed to
-develop programs which make use of %{libname}.
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-
-%setup -q -n %{gvname}-%{version}
-
-%build
-make -f admin/Makefile.common cvs
-
-export TQTDIR=%_prefix/%_lib/qt3
-export TDEDIR=%_prefix
-
-export LD_LIBRARY_PATH=$TQTDIR/%_lib:$TDEDIR/%_lib:$LD_LIBRARY_PATH
-export PATH=$TQTDIR/bin:$TDEDIR/bin:$PATH
-
-# Search for qt/kde libraries in the right directories (avoid patch)
-# NOTE: please don't regenerate configure scripts below
-perl -pi -e "s@/lib(\"|\b[^/])@/%_lib\1@g if /(kde|qt)_(libdirs|libraries)=/" configure
-
-./configure --disable-rpath \
-%if %build_kipi
-            %kipiopt \
-%else
-             \
-%endif
-            --prefix=%_prefix \
-            --libdir=%_libdir \
-            --mandir=%_mandir \
-            --datadir=%_datadir 
-
-
-%make 
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p %buildroot/%_datadir/applnk/Multimedia/Graphics
-%makeinstall 
-
-install -d %buildroot/%_menudir/
-kdedesktop2mdkmenu.pl %{gvname} "Multimedia/Graphics" %buildroot/%_datadir/applications/tde/%{gvname}.desktop %buildroot/%_menudir/%{gvname}
-
-#icons for rpmlint
-mkdir -p %buildroot/{%_liconsdir,%_miconsdir,%_iconsdir}
-ln -s %_datadir/icons/hicolor/64x64/apps/%{gvname}.png %buildroot/%_liconsdir
-ln -s %_datadir/icons/hicolor/32x32/apps/%{gvname}.png %buildroot/%_iconsdir
-ln -s %_datadir/icons/hicolor/16x16/apps/%{gvname}.png %buildroot/%_miconsdir
-
-%find_lang %{gvname}
-
-%post
-%update_menus
-
-%postun
-%clean_menus
-
-%post -n %libname -p /sbin/ldconfig
-
-%postun -n %libname -p /sbin/ldconfig
-
-%files -f %{gvname}.lang
-%defattr(-,root,root,0755)
-%doc NEWS AUTHORS README TODO ChangeLog COPYING INSTALL
-%_bindir/%{gvname}
-
-%dir %_datadir/apps/%{gvdirpartname}/
-%_datadir/apps/%{gvdirpartname}/gvdirpart.rc
-
-%dir %_datadir/apps/%{gvimagepartname}/
-%_datadir/apps/%{gvimagepartname}/gvimagepart.rc
-%_datadir/services/%{gvdirpartname}.desktop
-%_datadir/services/%{gvimagepartname}.desktop
-%_menudir/*
-%_datadir/apps/konqueror/servicemenus/*
-%_datadir/apps/tdeconf_update/%{gvname}*
-%dir %_datadir/apps/%{gvname}/
-%_datadir/apps/%{gvname}/*
-%_datadir/icons/crystalsvg/16x16/apps/*
-%_datadir/icons/crystalsvg/22x22/apps/*
-%_datadir/icons/hicolor/*
-%_liconsdir/%{gvname}.png
-%_iconsdir/%{gvname}.png
-%_miconsdir/%{gvname}.png
-%_datadir/applications/tde/%{gvname}.desktop
-%_datadir/config.kcfg/gvconfig.kcfg
-%dir %_datadir/doc/HTML/
-%_datadir/doc/HTML/*
-%_mandir/man1/%{gvname}.1.bz2
-
-%_libdir/trinity/*
-%_libdir/libtdeinit_%{gvname}.so
-%_libdir/libtdeinit_%{gvname}.la
-
-%files -n %libname
-%defattr(-,root,root,0755)
-%_libdir/*.so.*
-
-%files -n %libnamedev
-%defattr(-,root,root,0755)
-%_includedir/libgwenview_export.h
-%_libdir/%{gvcorename}.so
-%_libdir/%{gvcorename}.la
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%changelog
-* Sun Aug 21 2005 Angelo Naselli <anaselli@mandriva.org> 1.2.92-1mdk
-- New release 1.2.92
-
-* Wed Jul 20 2005 Angelo Naselli <anaselli@mandriva.org> 1.2.91-1mdk
-- New release 1.2.91
-- patched for fvisibility problem (aligned to svn)
-
-* Mon May 09 2005 Laurent MONTEL <lmontel@mandriva.com> 1.2.0-4
-- Real fix build on x86_64
-
-* Sun May 08 2005 Angelo Naselli <anaselli@mandriva.org> 1.2.0-3mdk
-- fix for x86_64 arch
-
-* Sun May 08 2005 Angelo Naselli <anaselli@mandriva.org> 1.2.0-2mdk
-- Rebuild
-
-* Sun Apr 03 2005 Angelo Naselli <anaselli@mandrake.org> 1.2.0-1mdk
-- really built new version
-
-* Sun Mar 20 2005 Angelo Naselli <anaselli@mandrake.org> 1.2.0-0.pre4.2mdk
-- really built new version
-
-* Sun Mar 20 2005 Angelo Naselli <anaselli@mandrake.org> 1.2.0-0.pre4.1mdk
-- new version
-
-* Sat Mar 19 2005 Angelo Naselli <anaselli@mandrake.org> 1.2.0-0.pre3.2mdk
-- fix bug #14731 
-
-* Sun Feb 27 2005 Angelo Naselli <anaselli@mandrake.org> 1.2.0-0.pre3.1mdk
-- new version
-
-* Sun Feb 13 2005 Angelo Naselli <anaselli@mandrake.org> 1.2.0-0.pre2.2mdk
-- define mkrel macro if not exist
-
-* Sun Feb 13 2005 Angelo Naselli <anaselli@mandrake.org> 1.2.0-0.pre2.1mdk
-- new version
-
-* Sat Jan 29 2005 Angelo Naselli <anaselli@mandrake.org> 1.2.0-0.pre1.2mdk
-- added patch to make it compile for mdk official 10.1
-- added patch to fix zoom (from cvs)
-- added patch to add missing files (from cvs)
-
-* Mon Jan 24 2005 Angelo Naselli <anaselli@mandrake.org> 1.2.0-0.pre1.1mdk
-- new version
-
-* Wed Jan 19 2005 Angelo Naselli <anaselli@mandrake.org> 1.1.8-0.4mdk
-- fix bug 13100
-
-* Sun Jan 16 2005 Angelo Naselli <anaselli@mandrake.org> 1.1.8-0.3mdk
-- better handling of symlink
-
-* Thu Jan 13 2005 Angelo Naselli <anaselli@mandrake.org> 1.1.8-0.2mdk
-- fix double click into kpart
-
-* Sun Jan 09 2005 Angelo Naselli <anaselli@mandrake.org> 1.1.8-0.1mdk
-- 1.1.8 
-- fix Requires section to be compliant to the library policy
-
-* Thu Dec 30 2004 Angelo Naselli <anaselli@mandrake.org> 1.1.7-0.5mdk
-- added 1.1.7b patch (solved some build problems)
-
-* Wed Dec 29 2004 Angelo Naselli <anaselli@mandrake.org> 1.1.7-0.4mdk
-- description restyling
-
-* Sun Dec 26 2004 Angelo Naselli <anaselli@mandrake.org> 1.1.7-0.3mdk
-- fix Require and Provide section
-
-* Sun Dec 26 2004 Angelo Naselli <anaselli@mandrake.org> 1.1.7-0.2mdk
-- removed hack management
-- added distro-specific release tag management 
-  use option "--with official" to build mdk official package
-
-* Mon Dec 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 1.1.7-0.1mdk
-- 1.1.7
-
-* Fri Dec 10 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 1.1.6-0.2mdk
-- Fix spec file
-
-* Sun Oct 24 2004 Angelo Naselli <anaselli@mandrake.org> 1.1.6-0.1mdk
-- new version
-  *  New features:
-   o The application now has two modes: browse and view. Browse mode shows 
-     all views: folder, file and image. View mode only shows the image. 
-     Gwenview starts in browse mode except if an image URL is given as 
-     an argument. You can switch between modes using the toolbar button, 
-     or with the "View/Browse mode" menu item or with the Ctrl+Return shortcut.
-   o JPEGTran code has been integrated into Gwenview, there's no need to install 
-     it separately anymore.
-  * Fixes:
-   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 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
-- rebuilt for new liblipi + fixing
-* Sat Oct 09 2004 Angelo Naselli <anaselli@mandrake.org> 1.1.5-0.2mdk
-- applied Lubos Lunak's patch to avoid printing crash using Konqueror
-* Mon Sep 20 2004 Angelo Naselli <anaselli@mandrake.org> 1.1.5-0.1mdk
-- new version
-   *  New features:
-    o The thumbnail progress bar and stop buttons are now embedded in the thumbnail view.
-    o The location bar now shows the file names instead of the folders.
-    o The thumbnails toolbar buttons have been moved to a specialized file view toolbar.
-    o It's now possible to assign key shortcuts to KIPI plugins.
-    o New manpage by Christopher Martin.
-   * Fixes:
-    o Do not display the folder name as an image in the status bar.
-    o Make sure the folder KPart starts in the right folder.
-    o Unbreak the saving of key shortcuts.
-    o Remote urls are correctly bookmarked.
-    o Do not try to overwrite the trash when trashing only one file.
-
-* Sun Aug 29 2004 Angelo Naselli <random_lx@yahoo.com> 1.1.4-0.2mdk
-- patch for russian language
-
-* Tue Aug 24 2004 Angelo Naselli <anaselli@mandrake.org> 1.1.4-0.1mdk
-- changed spec file to manage -with-hack option to build gwenview with 
-  hack suffix (default is without hack)
-- from Aurélien Gâteau:
-- New features:
- - In the thumbnail view, It's now possible to sort images in reverse order.
- - Use EXIF-stored thumbnail if available.
- - Option to disable saving of generated thumbnails to cache.
- - In fullscreen mode, it's now possible to display the image comment or size
-   in addition to the file path.
- - The fullscreen On-Screen-Display is more readable now.
- - The background color of the image view can be configured.
- - When printing, it's now possible to enlarge images so that they fill the
-   page.
-- Fixes:
- - In the folder view, pressing Enter now opens the selected folder.
- - Use icon list for the configuration dialog.
- - 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 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.
-
-* Sat Jun 12 2004 Angelo Naselli <random_lx@yahoo.com> 1.1.3-0.1mdk
-- new release: my wedding present :-)
-   from Aurélien Gâteau:
-   Gwenview codenamed "Hurry up, I'm getting married tomorrow"
-   *  New features:
-          o You can now define custom branches in the dir view (By Craig Drummond)
-          o An image cache has been added to speedup image loading.
-          o Gwenview now uses freedesktop.org thumbnail spec to store thumbnails.
-          o A new option to automatically empty thumbnail cache on exit (By Angelo Naselli).
-          o The image size is now displayed below file names in thumbnail view.
-    * Fixes:
-          o Don't crash when switching to fullscreen while generating thumbnails and coming back (By Lubos Lunak)
-          o Faster thumbnail generation (By Lubos Lunak)
-          o Faster image painting by dynamically determining suitable paint size (By Lubos Lunak)
-          o Use the "Standard Background" color as the background for thumbnails and folders (By Craig Drummond).
-          o Make sure the current image is reloaded if it has been modified outside Gwenview.
-
-* Tue Jun 1 2004 Angelo Naselli <random_lx@yahoo.com> 1.1.2-0.3mdk
-- hack suffix on kpart lib
-
-* Thu May 13 2004 Lenny Cartier <lenny@mandrakesoft.com> 1.1.2-0.2mdk
-- merge with changes from Angelo Naselli <random_lx@yahoo.com>
-
-* Wed May 12 2004 Lenny Cartier <lenny@mandrakesoft.com> 1.1.2-0.1mdk
-- 1.1.2
-- from Angelo Naselli <random_lx@yahoo.com> : 
-- mdk version of the development release (1.1.1) named gwenview_hack
-    from Aurélien Gâteau:
-    - New features:
-     - Added KPart support, this installs in Konqueror a new file view mode and let you view 
-       images in an embedded Gwenview (By Jonathan Riddell).
-     - Asynchronous JPEG loading, based on Khtml loader.
-     - Really asynchronous PNG loading (By Lubos Lunak).
-     - Mouse wheel will now scroll the image by default. Holding Ctrl will scroll horizontally. 
-       An option has been added to the setting dialog to toggle between scroll and browse 
-       (By Jeroen Peters).
-     - When holding shift over the image, right click will zoom out (By Jeroen Peters).
-     - Image painting is now progressive (By Lubos Lunak).
-    - Fixes:
-     - The rotate and mirror functions can now work on multiple selection.
-     - Make it possible to load another image or quit even if you can't save your changes.
-     - Gwenview won't spawn multiple instances of jpegtran anymore.
-
-* Sun Feb 01 2004 Angelo Naselli <random_lx@yahoo.com> 1.1.0-0.1mdk
-- mdk version of the first development release (1.1.0)
-    from Aurélien Gâteau:
-    - New features:
-     - New settings in print dialog to specify how the image must be printed.
-     - Big thumbnails are really BIG now.
-     - First implementation of asynchronous image loading. Only for PNG right now.
-    - Fixes:
-     - The move and copy dialogs now use a tree view.
-     - In the thumbnail view, create thumbnails for the visible images first 
-
-* Sun Jan 11 2004 Angelo Naselli <random_lx@yahoo.com> 1.0.1-0.1mdk
-- built mdk version of Gwenview 1.0.0 release
-- fix icons for rpmlint
-    from Aurélien Gâteau:
-	- New features:
-	 - Double-clicking an image in the file view will open it in fullscreen.
-	- Fixes:
-	 - Gave contributors the credit they deserve in the about box.
-	 - Updated to libexif 0.5.12 and applied patch from libexif CVS.
-	 - When going to the parent folder, make sure the folder we were in before is selected.
-	 - If there's no image in the current folder, select the first visible file.
-	 - When holding down Shift to zoom, keep the same area of the image under the cursor.
-	 - Nicer drag cursor.
-	 - Hopefully fixed every cases where the image was not centered in the view.
-
-* Mon Dec 08 2003 Angelo Naselli <random_lx@yahoo.com> 1.0.0-0.1mdk
-- built mdk version of Gwenview 1.0.0 release
-    from Aurélien Gâteau:
-    - New features:
-          - Show a wait icon for not-generated-yet thumbnails (inspired from Nautilus 
-            thumbnail view).
-          - Show a broken icon for broken images.
-    - Fixes:
-          - If auto-zoom is on, make sure the zoom is updated after rotating an image.
-          - Fixed crash when loading XCF images if Gwenview was compiled with gcc 3.3.1.
-          - Before running an external tool, change working directory to current folder.
-          - When switching images in fullscreen, don't show the cursor.
-          - Use standard KDE icons for zoom actions.
-          - New icons for slideshow and image operations.
-          - New magnifier cursor.
-
-* Sun Nov 16 2003 Angelo Naselli <random_lx@yahoo.com> 1.0.0-0.pre4.1mdk
-- built mdk version
-    from Aurélien Gâteau:
-   - New features 
-     - Added a new option to hide the busy pointer when loading an 
-       image in fullscreen.
-     - Added a popup menu to select the sorting mode.
-       Usefull in thumbnail view.
-   - Fixes:
-     - Use a KDE dialog for the configuration dialog.
-     - Removed the image view mouse behavior configuration 
-       options. The behavior is much simpler now: left button 
-       to drag image,
-     - middle button to toggle auto-zoom and mouse-wheel 
-       to browse images. Ifrom Aurélien Gâteauef you want to zoom hold Shift
-       and use either the mouse-wheel or the left button.
-
-* Wed Nov 05 2003 Marcel Pol <mpol@gmx.net> 1.0.0-0.pre3.2mdk
-- redo changelog
-- rm -rf $RPM_BUILD_ROOT in %%install instead of %%prep
-
-* Tue Nov 04 2003 Angelo Naselli <random_lx@yahoo.com> 1.0.0-0.pre3.1mdk
-- built mdk version
-      - New features from Aurélien Gâteau:
-       - Added a "don't ask me again" check box to the save prompt dialog.
-       - Added a reload button.
-       - Added a "Go" button to the location toolbar.
-      - Fixes:
-        - Really fixed saving of external tools.
-	- Make sure the folder view is updated when a folder is renamed.
-	- The mouse-wheel behaviors are not messed anymore by dialogs or by 
-	  showing the popup menu.
-
-* Mon Nov 03 2003 Marcel Pol <mpol@gmx.net> 1.0.0-0.pre2.2mdk
-- buildrequires
-- quiet setup
-
-* Wed Oct 22 2003 Angelo Naselli <random_lx@yahoo.com> 1.0.0-0.pre2.1mdk
-- added some changes on spec file imported from 
-  Lenny Cartier <lenny@mandrakesoft.com> 1.0.0-0.pre1.1mdk
-
-* Mon Oct 20 2003 Lenny Cartier <lenny@mandrakesoft.com> 1.0.0-0.pre1.1mdk
-- from Angelo Naselli <random_lx@yahoo.com> :
-       - built mdk version
-
-* Mon Oct 12 2003 Angelo Naselli <random_lx@yahoo.com> 1.0.0pre2-1mdk
-- fixed some bugs on spec file
-- built mdk version
-
-* Mon Oct 6 2003 Angelo Naselli <random_lx@yahoo.com> 1.0.0pre1-2mdk
-- Added print button patch
-
-* Mon Sep 29 2003 Angelo Naselli <random_lx@yahoo.com> 1.0.0pre1-1mdk
-- built mdk version
-
-* Fri Aug 08 2003 Angelo N. <random_lx@yahoo.com>  0.17.1a-1mdk
-- built mdk version
-
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
new file mode 100644
index 0000000..98ddfa8
--- /dev/null
+++ b/src/tools/CMakeLists.txt
@@ -0,0 +1,6 @@
+##### desktop files
+
+tde_create_translated_desktop(
+  SOURCE gimp.desktop kolourpaint.desktop konqueror.desktop tiledwallpaper.desktop wallpaper.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/gwenview/tools
+)
diff --git a/src/tsthread/CMakeLists.txt b/src/tsthread/CMakeLists.txt
new file mode 100644
index 0000000..9d16a37
--- /dev/null
+++ b/src/tsthread/CMakeLists.txt
@@ -0,0 +1,11 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+
+##### tsthread (static)
+
+tde_add_library( tsthread STATIC_PIC AUTOMOC
+  SOURCES tsthread.cpp tswaitcondition.cpp
+)
diff --git a/src/tsthread/tsthread.h b/src/tsthread/tsthread.h
index abdb556..bd8e48d 100644
--- a/src/tsthread/tsthread.h
+++ b/src/tsthread/tsthread.h
@@ -58,7 +58,7 @@ class TSCurrentThread;
 class TSThread
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         TSThread();
@@ -113,7 +113,7 @@ class TSThread
          * in slots is valid.
          * Example:
          * \code
-         *   emitSignal( this, TQT_SIGNAL( result( int* )), &result_data );
+         *   emitSignal( this, TQ_SIGNAL( result( int* )), &result_data );
          * \endcode
          * @see postSignal
          * @see emitCancellableSignal
@@ -293,43 +293,43 @@ TSThread* TSThread::mainThread()
 inline
 void TSThread::setSignalData( TQUObject* o, int i )
     {
-    static_TQUType_int.set( o, i );
+    static_QUType_int.set( o, i );
     }
 
 inline
 void TSThread::setSignalData( TQUObject* o, const TQImage& i )
     {
-    static_TQUType_varptr.set( o, &i );
+    static_QUType_varptr.set( o, &i );
     }
 
 inline
 void TSThread::setSignalData( TQUObject* o, const TQString& s )
     {
-    static_TQUType_TQString.set( o, s );
+    static_QUType_TQString.set( o, s );
     }
 
 inline
 void TSThread::setSignalData( TQUObject* o, bool b )
     {
-    static_TQUType_bool.set( o, b );
+    static_QUType_bool.set( o, b );
     }
 
 inline
 void TSThread::setSignalData( TQUObject* o, const TQColor& c )
     {
-    static_TQUType_varptr.set( o, &c );
+    static_QUType_varptr.set( o, &c );
     }
 
 inline
 void TSThread::setSignalData( TQUObject* o, const char* s )
     {
-    static_TQUType_charstar.set( o, s );
+    static_QUType_charstar.set( o, s );
     }
 
 inline
 void TSThread::setSignalData( TQUObject* o, const TQSize& s )
     {
-    static_TQUType_varptr.set( o, &s );
+    static_QUType_varptr.set( o, &s );
     }
 
 inline
diff --git a/src/updates/CMakeLists.txt b/src/updates/CMakeLists.txt
new file mode 100644
index 0000000..ba99a56
--- /dev/null
+++ b/src/updates/CMakeLists.txt
@@ -0,0 +1,11 @@
+##### update files
+
+install(
+  FILES gwenview_thumbnail_size.upd gwenview_1.4_osdformat.upd
+  DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update
+)
+
+install(
+  PROGRAMS gwenview_thumbnail_size.sh gwenview_1.4_osdformat.sh
+  DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update
+)
diff --git a/subdirs b/subdirs
index 1e0df52..9e98a66 100644
--- a/subdirs
+++ b/subdirs
@@ -1,2 +1,3 @@
 doc
+icons
 src