Remove unnecessary accelerator from .ui files.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit c4fbf434da)

.gitmodules

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

CMakeL10n.txt

@@ -0,0 +1,27 @@
+#################################################
+#
+#  (C) 2018 Slávek Banko
+#  slavek.banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+cmake_minimum_required( VERSION 3.1 )
+
+
+##### include our cmake modules #################
+
+include( TDEL10n )
+
+
+##### set directory for POT files ###############
+
+set( POT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../gwenview-i18n/template/messages" )
+
+
+##### create translation templates ##############
+
+tde_l10n_auto_add_subdirectories( )

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.

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3e

cmake

@@ -1 +0,0 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463

configure.in.in

@@ -133,7 +133,11 @@ fi
 #
 # libexiv2
 #
+SAVE_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS"
 KDE_CHECK_HEADERS(exiv2/image.hpp, have_exiv2=yes, have_exiv2=no)
+KDE_CHECK_HEADERS(exiv2/exiv2.hpp)
+CXXFLAGS=$SAVE_CXXFLAGS
 
 if test "$have_exiv2" = "yes"; then
 	LIB_EXIV2="-lexiv2"

doc/docked_windows.docbook

@@ -67,4 +67,3 @@ docked window.</para>
   </listitem>
 </itemizedlist>
 </sect1>
-<!-- vim: set ft=xml: -->

doc/external_tools.docbook

@@ -66,4 +66,3 @@
 </tip>
 
 </chapter>
-<!-- vim: set ft=xml: -->

doc/interface.docbook

@@ -47,4 +47,3 @@
 </sect1>
 
 </chapter>
-<!-- vim: set ft=xml: -->

doc/introduction.docbook

@@ -24,4 +24,3 @@ images. Lossless JPEG transforms such as rotations and mirroring are also suppor
 </sect1>
 
 </chapter>
-<!-- vim: set ft=xml: -->

doc/keybindings.docbook

@@ -18,4 +18,3 @@ all the normal TDE shortcuts are functional, unless otherwise remapped.</para>
   <listitem><para><keycap>Escape</keycap>: Exits from Full Screen mode.</para></listitem>
 </itemizedlist>
 </sect1>
-<!-- vim: set ft=xml: -->

doc/mouse.docbook

@@ -38,4 +38,3 @@
 </itemizedlist>
 </sect2>
 </sect1>
-<!-- vim: set ft=xml: -->

src/CMakeL10n.txt

@@ -0,0 +1,3 @@
+##### create translation templates ##############
+
+tde_l10n_create_template( "gwenview" )

src/app/Makefile.am

@@ -54,3 +54,5 @@ testvtabwidget_LDADD = \
 	$(LIB_TDEUTILS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_QT) \
 	$(LIBJPEG)
 testvtabwidget_LDFLAGS = $(all_libraries) $(LIB_QT)
+
+.NOTPARALLEL:

src/app/bookmarkdialog.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/app/bookmarkdialog.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

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>

src/app/bookmarkowner.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/app/bookmarkowner.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/app/bookmarkviewcontroller.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2005 Aurelien Gateau

src/app/bookmarkviewcontroller.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2005 Aurelien Gateau

src/app/configdialog.cpp

@@ -1,5 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
-// kate: indent-mode csands; indent-width 4; replace-tabs-save off; replace-tabs off; replace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4;
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/app/configdialog.h

@@ -1,5 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
-// kate: indent-mode csands; indent-width 4; replace-tabs-save off; replace-tabs off; replace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4;
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

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>

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>

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>

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>

src/app/dirviewcontroller.cpp

@@ -1,5 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
-// kate: indent-mode csands; indent-width 4; replace-tabs-save off; replace-tabs off; replace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4;
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2005 Aurelien Gateau

src/app/dirviewcontroller.h

@@ -1,5 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
-// kate: indent-mode csands; indent-width 4; replace-tabs-save off; replace-tabs off; replace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4;
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2005 Aurelien Gateau

src/app/history.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/app/history.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/app/kipiinterface.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/app/kipiinterface.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/app/main.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2006 Aurelien Gateau

src/app/mainwindow.cpp

@@ -1,5 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
-// kate: indent-mode csands; indent-width 4; replace-tabs-save off; replace-tabs off; replace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4;
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/app/mainwindow.h

@@ -1,5 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
-// kate: indent-mode csands; indent-width 4; replace-tabs-save off; replace-tabs off; replace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4;
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/app/metaedit.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Copyright (c) 2003 Jos van den Oever
 

src/app/metaedit.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Copyright (c) 2003 Jos van den Oever
 

src/app/testvtabwidget.cpp

@@ -1,5 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
-// kate: indent-mode csands; indent-width 4; replace-tabs-save off; replace-tabs off; replace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4;
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2005 Aurelien Gateau

src/app/treeview.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/app/treeview.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2005 Aurelien Gateau

src/app/truncatedtextlabel.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/app/vtabwidget.cpp

@@ -1,5 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
-// kate: indent-mode csands; indent-width 4; replace-tabs-save off; replace-tabs off; replace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4;
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2005 Aurelien Gateau

src/app/vtabwidget.h

@@ -1,5 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
-// kate: indent-mode csands; indent-width 4; replace-tabs-save off; replace-tabs off; replace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4;
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2005 Aurelien Gateau

src/gvcore/archive.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/archive.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/bcgdialog.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2006 Aurélien Gâteau

src/gvcore/bcgdialog.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2006 Aurélien Gâteau

src/gvcore/busylevelmanager.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/busylevelmanager.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/cache.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/cache.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/captionformatter.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2005 Aurelien Gateau

src/gvcore/captionformatter.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2005 Aurelien Gateau

src/gvcore/cursortracker.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/gvcore/cursortracker.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/gvcore/deletedialog.cpp

@@ -129,5 +129,3 @@ TQSize DeleteDialog::sizeHint() const {
 } // namespace
 
 #include "deletedialog.moc"
-
-// vim: set et ts=4 sw=4:

src/gvcore/deletedialog.h

@@ -52,5 +52,3 @@ private:
 } // namespace
 
 #endif
-
-// vim: set et ts=4 sw=4:

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>

src/gvcore/document.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2006 Aurelien Gateau

src/gvcore/document.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2006 Aurelien Gateau

src/gvcore/documentanimatedloadedimpl.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/documentanimatedloadedimpl.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/documentimpl.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/documentimpl.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/documentjpegloadedimpl.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/documentjpegloadedimpl.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/documentloadedimpl.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/documentloadedimpl.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/documentloadingimpl.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/documentloadingimpl.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/documentotherloadedimpl.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2006 Aurelien Gateau

src/gvcore/documentotherloadedimpl.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2006 Aurelien Gateau

src/gvcore/dragpixmapgenerator.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/externaltoolaction.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/externaltoolaction.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/externaltoolcontext.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/externaltoolcontext.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/externaltooldialog.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/externaltooldialog.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

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>

src/gvcore/externaltoolmanager.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/externaltoolmanager.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/filedetailview.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /* This file is based on tdefiledetailview.cpp v1.43 from the KDE libs. Original
    copyright follows.
 */

src/gvcore/filedetailview.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /* This file is based on tdefiledetailview.h v1.30 from the KDE libs. Original
    copyright follows.
 */

src/gvcore/filedetailviewitem.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /* This file is based on tdefiledetailview.cpp from the KDE libs. Original
    copyright follows.
 */

src/gvcore/filedetailviewitem.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /* This file is based on tdefiledetailview.h from the KDE libs. Original
    copyright follows.
 */

src/gvcore/fileoperation.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/fileoperation.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/fileopobject.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/gvcore/fileopobject.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/filethumbnailview.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/filethumbnailview.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/filethumbnailviewitem.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*  Gwenview - A simple image viewer for TDE
     Copyright 2000-2004 Aurélien Gâteau
     This class is based on the TDEIconViewItem class from KDE libs.

src/gvcore/filethumbnailviewitem.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/fileviewbase.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/fileviewcontroller.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau
@@ -1006,7 +1005,7 @@ void FileViewController::setSilentMode( bool silent ) {
 
 void FileViewController::retryURL() {
 	mDirLister->clearError();
-	mDirLister->openURL( url());
+	mDirLister->openURL(url().directory());
 }
 
 

src/gvcore/fileviewcontroller.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/fullscreenbar.cpp

@@ -1,4 +1,3 @@
-// vim:set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/gvcore/fullscreenbar.h

@@ -1,4 +1,3 @@
-// vim:set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/gvcore/gimp.h

@@ -1,5 +1,4 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
-/* -*- c++ -*-
+/*
  * gimp.h: Header for a TQt 3 plug-in for reading GIMP XCF image files
  * Copyright (C) 2001 lignum Computing, Inc. <allen@lignumcomputing.com>
  *

src/gvcore/imageframe.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/imageloader.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/imageloader.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/imagesavedialog.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/imagesavedialog.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/imageview.cpp

@@ -1,4 +1,3 @@
-// vim:set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/gvcore/imageview.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/imageviewcontroller.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2006 Aurélien Gâteau

src/gvcore/imageviewcontroller.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2006 Aurélien Gâteau

src/gvcore/imageviewtools.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/gvcore/imageviewtools.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/gvcore/inputdialog.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2006 Aurélien Gâteau

src/gvcore/inputdialog.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2006 Aurélien Gâteau

src/gvcore/mimetypeutils.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2006 Aurelien Gateau

src/gvcore/mimetypeutils.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2006 Aurelien Gateau

src/gvcore/printdialog.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - printing support
 Copyright (c) 2003 Angelo Naselli

src/gvcore/printdialog.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - printing support
 Copyright (c) 2003 Angelo Naselli

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>

src/gvcore/slideshow.cpp

@@ -1,5 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
-// kate: indent-mode csands; indent-width 4; replace-tabs-save off; replace-tabs off; replace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4;
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/gvcore/slideshow.h

@@ -1,5 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
-// kate: indent-mode csands; indent-width 4; replace-tabs-save off; replace-tabs off; replace-trailing-space-save off; space-indent off; tabs-indents on; tab-width 4;
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>ien G<EFBFBD>eau

src/gvcore/threadgate.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/threadgate.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/gvcore/thumbnaildetailsdialog.cpp

@@ -1,4 +1,3 @@
-// vi: tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2005 Aurelien Gateau

src/gvcore/thumbnaildetailsdialog.h

@@ -1,4 +1,3 @@
-// vi: tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2005 Aurelien Gateau

src/gvcore/thumbnailloadjob.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*	Gwenview - A simple image viewer for TDE
 	Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau
 	This class is based on the ImagePreviewJob class from Konqueror.

src/gvcore/thumbnailloadjob.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*	Gwenview - A simple image viewer for TDE
 	Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau
 	This class is based on the ImagePreviewJob class from Konqueror.

src/gvcore/thumbnailsize.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*	Gwenview - A simple image viewer for TDE
 	Copyright 2000-2004 Aurélien Gâteau
 	This class is based on the ImagePreviewJob class from Konqueror.

src/gvcore/timeutils.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2006 Aurélien Gâteau

src/gvcore/timeutils.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2006 Aurélien Gâteau

src/imageutils/imageutils.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/imageutils/imageutils.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/imageutils/jpegcontent.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab:
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau
@@ -18,6 +17,10 @@ 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>
 #include <stdio.h>
@@ -39,8 +42,12 @@ extern "C" {
 #include <kdebug.h>
 
 // Exiv2
+#if defined(HAVE_EXIV2_EXIV2_HPP)
+#include <exiv2/exiv2.hpp>
+#else
 #include <exiv2/exif.hpp>
 #include <exiv2/image.hpp>
+#endif
 
 // Local
 #include "imageutils/imageutils.h"

src/imageutils/jpegcontent.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/imageutils/jpegerrormanager.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau

src/imageutils/orientation.h

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aur<EFBFBD>lien G<EFBFBD>teau

src/imageutils/scale.cpp

@@ -439,7 +439,7 @@ static void HorizontalFilter(const TQImage& source,TQImage& destination,
     stop,
     y;
 
-  register long
+  long
     i,
     x;
 
@@ -524,7 +524,7 @@ static void VerticalFilter(const TQImage& source,TQImage& destination,
     stop,
     x;
 
-  register long
+  long
     i,
     y;
 
@@ -738,13 +738,13 @@ TQImage SampleImage(const TQImage& image,const int columns,
   uchar
     *pixels;
 
-  register const uchar
+  const uchar
     *p;
 
-  register long
+  long
     x;
 
-  register uchar
+  uchar
     *q;
 
   /*

src/imageutils/testjpegcontent.cpp

@@ -1,4 +1,3 @@
-// vim: set tabstop=4 shiftwidth=4 noexpandtab
 /*
 Gwenview - A simple image viewer for TDE
 Copyright 2000-2004 Aurélien Gâteau