diff options
136 files changed, 58 insertions, 190 deletions
diff --git a/.gitmodules b/.gitmodules index 4fce771..934def7 100644 --- a/.gitmodules +++ b/.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 diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 0c3b49c..40f3616 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,12 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 2.8 ) +cmake_minimum_required( VERSION 3.1 ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEL10n ) diff --git a/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/admin b/admin -Subproject f9148018b2f8a11fd830712c1b508046cc34ff2 +Subproject a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3 diff --git a/cmake b/cmake deleted file mode 160000 -Subproject 6853feb7604a8dc53e3a6b224ef86c3252b4abd diff --git a/configure.in.in b/configure.in.in index 1cdda0b..ba32728 100644 --- a/configure.in.in +++ b/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" diff --git a/doc/docked_windows.docbook b/doc/docked_windows.docbook index b5a14e3..8363310 100644 --- a/doc/docked_windows.docbook +++ b/doc/docked_windows.docbook @@ -67,4 +67,3 @@ docked window.</para> </listitem> </itemizedlist> </sect1> -<!-- vim: set ft=xml: --> diff --git a/doc/external_tools.docbook b/doc/external_tools.docbook index 5e91890..61722cc 100644 --- a/doc/external_tools.docbook +++ b/doc/external_tools.docbook @@ -66,4 +66,3 @@ </tip> </chapter> -<!-- vim: set ft=xml: --> diff --git a/doc/interface.docbook b/doc/interface.docbook index 1d17e0b..3ac0780 100644 --- a/doc/interface.docbook +++ b/doc/interface.docbook @@ -47,4 +47,3 @@ </sect1> </chapter> -<!-- vim: set ft=xml: --> diff --git a/doc/introduction.docbook b/doc/introduction.docbook index f21dd5c..d3f38b8 100644 --- a/doc/introduction.docbook +++ b/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: --> diff --git a/doc/keybindings.docbook b/doc/keybindings.docbook index eb08b24..3156400 100644 --- a/doc/keybindings.docbook +++ b/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: --> diff --git a/doc/mouse.docbook b/doc/mouse.docbook index b1f6d62..0792b3a 100644 --- a/doc/mouse.docbook +++ b/doc/mouse.docbook @@ -38,4 +38,3 @@ </itemizedlist> </sect2> </sect1> -<!-- vim: set ft=xml: --> diff --git a/src/app/bookmarkdialog.cpp b/src/app/bookmarkdialog.cpp index 33271be..d64793f 100644 --- a/src/app/bookmarkdialog.cpp +++ b/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 diff --git a/src/app/bookmarkdialog.h b/src/app/bookmarkdialog.h index a2a8311..f1f344e 100644 --- a/src/app/bookmarkdialog.h +++ b/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 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.cpp b/src/app/bookmarkowner.cpp index e1ea6c9..a687b4c 100644 --- a/src/app/bookmarkowner.cpp +++ b/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 diff --git a/src/app/bookmarkowner.h b/src/app/bookmarkowner.h index 93845ac..1263272 100644 --- a/src/app/bookmarkowner.h +++ b/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 diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp index 33aad1b..c703340 100644 --- a/src/app/bookmarkviewcontroller.cpp +++ b/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 diff --git a/src/app/bookmarkviewcontroller.h b/src/app/bookmarkviewcontroller.h index facf7b5..a0d8b41 100644 --- a/src/app/bookmarkviewcontroller.h +++ b/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 diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp index a8f7947..887d6fe 100644 --- a/src/app/configdialog.cpp +++ b/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�ien G�eau diff --git a/src/app/configdialog.h b/src/app/configdialog.h index 28b094d..a5d4b83 100644 --- a/src/app/configdialog.h +++ b/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�ien G�eau 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/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 8466681..c93dc0b 100644 --- a/src/app/dirviewcontroller.cpp +++ b/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 diff --git a/src/app/dirviewcontroller.h b/src/app/dirviewcontroller.h index 2f2bf59..c4ad2f3 100644 --- a/src/app/dirviewcontroller.h +++ b/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 diff --git a/src/app/history.cpp b/src/app/history.cpp index d88e8a0..5eb7783 100644 --- a/src/app/history.cpp +++ b/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 diff --git a/src/app/history.h b/src/app/history.h index b812824..f1d2cc7 100644 --- a/src/app/history.h +++ b/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 diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp index 73c0453..2b274f1 100644 --- a/src/app/kipiinterface.cpp +++ b/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 diff --git a/src/app/kipiinterface.h b/src/app/kipiinterface.h index f4c6fa9..da241d4 100644 --- a/src/app/kipiinterface.h +++ b/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 diff --git a/src/app/main.cpp b/src/app/main.cpp index 27ec8c3..3935568 100644 --- a/src/app/main.cpp +++ b/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 diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 7972b92..e2ec1c9 100644 --- a/src/app/mainwindow.cpp +++ b/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�ien G�eau diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h index eb21f27..d5515f5 100644 --- a/src/app/mainwindow.h +++ b/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�ien G�eau diff --git a/src/app/metaedit.cpp b/src/app/metaedit.cpp index 1a3a006..d757ad5 100644 --- a/src/app/metaedit.cpp +++ b/src/app/metaedit.cpp @@ -1,4 +1,3 @@ -// vim: set tabstop=4 shiftwidth=4 noexpandtab /* Copyright (c) 2003 Jos van den Oever diff --git a/src/app/metaedit.h b/src/app/metaedit.h index 3ef6d50..6bcf9da 100644 --- a/src/app/metaedit.h +++ b/src/app/metaedit.h @@ -1,4 +1,3 @@ -// vim: set tabstop=4 shiftwidth=4 noexpandtab /* Copyright (c) 2003 Jos van den Oever diff --git a/src/app/testvtabwidget.cpp b/src/app/testvtabwidget.cpp index 05655c7..f1cc673 100644 --- a/src/app/testvtabwidget.cpp +++ b/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 diff --git a/src/app/treeview.cpp b/src/app/treeview.cpp index f95ed2a..c29e3c4 100644 --- a/src/app/treeview.cpp +++ b/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�ien G�eau diff --git a/src/app/treeview.h b/src/app/treeview.h index 5609d11..5ab2d21 100644 --- a/src/app/treeview.h +++ b/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 diff --git a/src/app/truncatedtextlabel.h b/src/app/truncatedtextlabel.h index 082b7b7..37ded4a 100644 --- a/src/app/truncatedtextlabel.h +++ b/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�ien G�eau diff --git a/src/app/vtabwidget.cpp b/src/app/vtabwidget.cpp index d48b59d..a0f6e55 100644 --- a/src/app/vtabwidget.cpp +++ b/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 diff --git a/src/app/vtabwidget.h b/src/app/vtabwidget.h index 0c750a4..84b7c35 100644 --- a/src/app/vtabwidget.h +++ b/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 diff --git a/src/gvcore/archive.cpp b/src/gvcore/archive.cpp index 798fb77..631b8f4 100644 --- a/src/gvcore/archive.cpp +++ b/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�lien G�teau diff --git a/src/gvcore/archive.h b/src/gvcore/archive.h index 5dee17c..80bb7ff 100644 --- a/src/gvcore/archive.h +++ b/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 diff --git a/src/gvcore/bcgdialog.cpp b/src/gvcore/bcgdialog.cpp index 8f3ec36..c05869b 100644 --- a/src/gvcore/bcgdialog.cpp +++ b/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 diff --git a/src/gvcore/bcgdialog.h b/src/gvcore/bcgdialog.h index 4b3dac2..75cb81a 100644 --- a/src/gvcore/bcgdialog.h +++ b/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 diff --git a/src/gvcore/busylevelmanager.cpp b/src/gvcore/busylevelmanager.cpp index f3b12e6..319c863 100644 --- a/src/gvcore/busylevelmanager.cpp +++ b/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 diff --git a/src/gvcore/busylevelmanager.h b/src/gvcore/busylevelmanager.h index beceba9..d3cd7b0 100644 --- a/src/gvcore/busylevelmanager.h +++ b/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 diff --git a/src/gvcore/cache.cpp b/src/gvcore/cache.cpp index f7d330f..04544ea 100644 --- a/src/gvcore/cache.cpp +++ b/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 diff --git a/src/gvcore/cache.h b/src/gvcore/cache.h index 40425d1..0ee37b7 100644 --- a/src/gvcore/cache.h +++ b/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 diff --git a/src/gvcore/captionformatter.cpp b/src/gvcore/captionformatter.cpp index 63f5692..ab38fcd 100644 --- a/src/gvcore/captionformatter.cpp +++ b/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 diff --git a/src/gvcore/captionformatter.h b/src/gvcore/captionformatter.h index 7fab7ee..54f98a4 100644 --- a/src/gvcore/captionformatter.h +++ b/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 diff --git a/src/gvcore/cursortracker.cpp b/src/gvcore/cursortracker.cpp index 464a6f9..fc56682 100644 --- a/src/gvcore/cursortracker.cpp +++ b/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�ien G�eau diff --git a/src/gvcore/cursortracker.h b/src/gvcore/cursortracker.h index 5f272d8..6a7f230 100644 --- a/src/gvcore/cursortracker.h +++ b/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�ien G�eau diff --git a/src/gvcore/deletedialog.cpp b/src/gvcore/deletedialog.cpp index b1e97eb..3bedf12 100644 --- a/src/gvcore/deletedialog.cpp +++ b/src/gvcore/deletedialog.cpp @@ -129,5 +129,3 @@ TQSize DeleteDialog::sizeHint() const { } // namespace #include "deletedialog.moc" - -// vim: set et ts=4 sw=4: diff --git a/src/gvcore/deletedialog.h b/src/gvcore/deletedialog.h index a66bf67..a5a60f1 100644 --- a/src/gvcore/deletedialog.h +++ b/src/gvcore/deletedialog.h @@ -52,5 +52,3 @@ private: } // namespace #endif - -// vim: set et ts=4 sw=4: 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 f244a85..c718e1d 100644 --- a/src/gvcore/document.cpp +++ b/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 diff --git a/src/gvcore/document.h b/src/gvcore/document.h index ee95312..a8056d1 100644 --- a/src/gvcore/document.h +++ b/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 diff --git a/src/gvcore/documentanimatedloadedimpl.cpp b/src/gvcore/documentanimatedloadedimpl.cpp index a02e828..cff373c 100644 --- a/src/gvcore/documentanimatedloadedimpl.cpp +++ b/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�lien G�teau diff --git a/src/gvcore/documentanimatedloadedimpl.h b/src/gvcore/documentanimatedloadedimpl.h index 6291f97..736edcc 100644 --- a/src/gvcore/documentanimatedloadedimpl.h +++ b/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�lien G�teau diff --git a/src/gvcore/documentimpl.cpp b/src/gvcore/documentimpl.cpp index bc2f105..d34d777 100644 --- a/src/gvcore/documentimpl.cpp +++ b/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�lien G�teau diff --git a/src/gvcore/documentimpl.h b/src/gvcore/documentimpl.h index c649c49..32ac8d4 100644 --- a/src/gvcore/documentimpl.h +++ b/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�lien G�teau diff --git a/src/gvcore/documentjpegloadedimpl.cpp b/src/gvcore/documentjpegloadedimpl.cpp index 2aa6438..8d10367 100644 --- a/src/gvcore/documentjpegloadedimpl.cpp +++ b/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�lien G�teau diff --git a/src/gvcore/documentjpegloadedimpl.h b/src/gvcore/documentjpegloadedimpl.h index 315b173..4e68d25 100644 --- a/src/gvcore/documentjpegloadedimpl.h +++ b/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�lien G�teau diff --git a/src/gvcore/documentloadedimpl.cpp b/src/gvcore/documentloadedimpl.cpp index ab0271b..22f55b3 100644 --- a/src/gvcore/documentloadedimpl.cpp +++ b/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�lien G�teau diff --git a/src/gvcore/documentloadedimpl.h b/src/gvcore/documentloadedimpl.h index a51e5d3..4b362ea 100644 --- a/src/gvcore/documentloadedimpl.h +++ b/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�lien G�teau diff --git a/src/gvcore/documentloadingimpl.cpp b/src/gvcore/documentloadingimpl.cpp index 68a10fb..1b29fe1 100644 --- a/src/gvcore/documentloadingimpl.cpp +++ b/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�lien G�teau diff --git a/src/gvcore/documentloadingimpl.h b/src/gvcore/documentloadingimpl.h index 4ff3969..fc00435 100644 --- a/src/gvcore/documentloadingimpl.h +++ b/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 diff --git a/src/gvcore/documentotherloadedimpl.cpp b/src/gvcore/documentotherloadedimpl.cpp index c6b9177..79d32be 100644 --- a/src/gvcore/documentotherloadedimpl.cpp +++ b/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 diff --git a/src/gvcore/documentotherloadedimpl.h b/src/gvcore/documentotherloadedimpl.h index 2130133..b9515b3 100644 --- a/src/gvcore/documentotherloadedimpl.h +++ b/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 diff --git a/src/gvcore/dragpixmapgenerator.h b/src/gvcore/dragpixmapgenerator.h index 237f4d8..192736b 100644 --- a/src/gvcore/dragpixmapgenerator.h +++ b/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 diff --git a/src/gvcore/externaltoolaction.cpp b/src/gvcore/externaltoolaction.cpp index b325840..f123516 100644 --- a/src/gvcore/externaltoolaction.cpp +++ b/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 diff --git a/src/gvcore/externaltoolaction.h b/src/gvcore/externaltoolaction.h index 9b0f4b8..e5cd974 100644 --- a/src/gvcore/externaltoolaction.h +++ b/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 diff --git a/src/gvcore/externaltoolcontext.cpp b/src/gvcore/externaltoolcontext.cpp index 1d473f3..8b68726 100644 --- a/src/gvcore/externaltoolcontext.cpp +++ b/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 diff --git a/src/gvcore/externaltoolcontext.h b/src/gvcore/externaltoolcontext.h index 7121ea6..e0220b8 100644 --- a/src/gvcore/externaltoolcontext.h +++ b/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 diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp index 35b4bc9..7e039b9 100644 --- a/src/gvcore/externaltooldialog.cpp +++ b/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�lien G�teau diff --git a/src/gvcore/externaltooldialog.h b/src/gvcore/externaltooldialog.h index 72aa98a..cbd5d72 100644 --- a/src/gvcore/externaltooldialog.h +++ b/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 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/externaltoolmanager.cpp b/src/gvcore/externaltoolmanager.cpp index 279befc..760097e 100644 --- a/src/gvcore/externaltoolmanager.cpp +++ b/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 diff --git a/src/gvcore/externaltoolmanager.h b/src/gvcore/externaltoolmanager.h index 4668757..82734dd 100644 --- a/src/gvcore/externaltoolmanager.h +++ b/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 diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp index 9dc47bd..b965ee3 100644 --- a/src/gvcore/filedetailview.cpp +++ b/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. */ diff --git a/src/gvcore/filedetailview.h b/src/gvcore/filedetailview.h index 62b2ea7..b8085ca 100644 --- a/src/gvcore/filedetailview.h +++ b/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. */ diff --git a/src/gvcore/filedetailviewitem.cpp b/src/gvcore/filedetailviewitem.cpp index 800b852..2f0f2f0 100644 --- a/src/gvcore/filedetailviewitem.cpp +++ b/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. */ diff --git a/src/gvcore/filedetailviewitem.h b/src/gvcore/filedetailviewitem.h index 2c814ce..a2d22a1 100644 --- a/src/gvcore/filedetailviewitem.h +++ b/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. */ diff --git a/src/gvcore/fileoperation.cpp b/src/gvcore/fileoperation.cpp index db969f3..4c693c0 100644 --- a/src/gvcore/fileoperation.cpp +++ b/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�lien G�teau diff --git a/src/gvcore/fileoperation.h b/src/gvcore/fileoperation.h index 7b5f78c..87d2fa3 100644 --- a/src/gvcore/fileoperation.h +++ b/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 diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp index fe1dde6..9257af9 100644 --- a/src/gvcore/fileopobject.cpp +++ b/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�ien G�eau diff --git a/src/gvcore/fileopobject.h b/src/gvcore/fileopobject.h index 29cf54f..579667e 100644 --- a/src/gvcore/fileopobject.h +++ b/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 diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp index 2ed85bc..82249e4 100644 --- a/src/gvcore/filethumbnailview.cpp +++ b/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�lien G�teau diff --git a/src/gvcore/filethumbnailview.h b/src/gvcore/filethumbnailview.h index 28bc5f4..dbd5ed6 100644 --- a/src/gvcore/filethumbnailview.h +++ b/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 diff --git a/src/gvcore/filethumbnailviewitem.cpp b/src/gvcore/filethumbnailviewitem.cpp index 548c3b8..dae4172 100644 --- a/src/gvcore/filethumbnailviewitem.cpp +++ b/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. diff --git a/src/gvcore/filethumbnailviewitem.h b/src/gvcore/filethumbnailviewitem.h index c6c6cdf..a201990 100644 --- a/src/gvcore/filethumbnailviewitem.h +++ b/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 diff --git a/src/gvcore/fileviewbase.h b/src/gvcore/fileviewbase.h index 755e2f7..7b09ac7 100644 --- a/src/gvcore/fileviewbase.h +++ b/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 diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp index 9cd11ee..b53de13 100644 --- a/src/gvcore/fileviewcontroller.cpp +++ b/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�ien G�eau @@ -1006,7 +1005,7 @@ void FileViewController::setSilentMode( bool silent ) { void FileViewController::retryURL() { mDirLister->clearError(); - mDirLister->openURL( url()); + mDirLister->openURL(url().directory()); } diff --git a/src/gvcore/fileviewcontroller.h b/src/gvcore/fileviewcontroller.h index df59110..101ce9a 100644 --- a/src/gvcore/fileviewcontroller.h +++ b/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 diff --git a/src/gvcore/fullscreenbar.cpp b/src/gvcore/fullscreenbar.cpp index 29f84ac..159ce90 100644 --- a/src/gvcore/fullscreenbar.cpp +++ b/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�ien G�eau diff --git a/src/gvcore/fullscreenbar.h b/src/gvcore/fullscreenbar.h index 07bec14..8ef3f84 100644 --- a/src/gvcore/fullscreenbar.h +++ b/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�ien G�eau diff --git a/src/gvcore/gimp.h b/src/gvcore/gimp.h index 552916b..150b68c 100644 --- a/src/gvcore/gimp.h +++ b/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> * diff --git a/src/gvcore/imageframe.h b/src/gvcore/imageframe.h index f8ccc52..18572b5 100644 --- a/src/gvcore/imageframe.h +++ b/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 diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp index 9ea63b7..8b2c546 100644 --- a/src/gvcore/imageloader.cpp +++ b/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�lien G�teau diff --git a/src/gvcore/imageloader.h b/src/gvcore/imageloader.h index 1d1e0f5..fface6c 100644 --- a/src/gvcore/imageloader.h +++ b/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 diff --git a/src/gvcore/imagesavedialog.cpp b/src/gvcore/imagesavedialog.cpp index 78bae30..20d532d 100644 --- a/src/gvcore/imagesavedialog.cpp +++ b/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 diff --git a/src/gvcore/imagesavedialog.h b/src/gvcore/imagesavedialog.h index 35114d2..2d60ad1 100644 --- a/src/gvcore/imagesavedialog.h +++ b/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 diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp index ed7fcd8..f5b6977 100644 --- a/src/gvcore/imageview.cpp +++ b/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�ien G�eau diff --git a/src/gvcore/imageview.h b/src/gvcore/imageview.h index 4c1566a..f6f6bb4 100644 --- a/src/gvcore/imageview.h +++ b/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 diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp index 74ffe0c..136cdc5 100644 --- a/src/gvcore/imageviewcontroller.cpp +++ b/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 diff --git a/src/gvcore/imageviewcontroller.h b/src/gvcore/imageviewcontroller.h index 98b1120..0643b61 100644 --- a/src/gvcore/imageviewcontroller.h +++ b/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 diff --git a/src/gvcore/imageviewtools.cpp b/src/gvcore/imageviewtools.cpp index fdc87a1..7f41fa1 100644 --- a/src/gvcore/imageviewtools.cpp +++ b/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�lien G�teau diff --git a/src/gvcore/imageviewtools.h b/src/gvcore/imageviewtools.h index fdb71aa..0cdfafa 100644 --- a/src/gvcore/imageviewtools.h +++ b/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�ien G�eau diff --git a/src/gvcore/inputdialog.cpp b/src/gvcore/inputdialog.cpp index 99de357..3a08d5c 100644 --- a/src/gvcore/inputdialog.cpp +++ b/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 diff --git a/src/gvcore/inputdialog.h b/src/gvcore/inputdialog.h index 1c4f654..8958d80 100644 --- a/src/gvcore/inputdialog.h +++ b/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 diff --git a/src/gvcore/mimetypeutils.cpp b/src/gvcore/mimetypeutils.cpp index 0f70c95..e69834f 100644 --- a/src/gvcore/mimetypeutils.cpp +++ b/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 diff --git a/src/gvcore/mimetypeutils.h b/src/gvcore/mimetypeutils.h index 7055c0d..f0eb8cf 100644 --- a/src/gvcore/mimetypeutils.h +++ b/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 diff --git a/src/gvcore/printdialog.cpp b/src/gvcore/printdialog.cpp index 574ddb7..bf3f05f 100644 --- a/src/gvcore/printdialog.cpp +++ b/src/gvcore/printdialog.cpp @@ -1,4 +1,3 @@ -// vim: set tabstop=4 shiftwidth=4 noexpandtab /* Gwenview - printing support Copyright (c) 2003 Angelo Naselli diff --git a/src/gvcore/printdialog.h b/src/gvcore/printdialog.h index faf9752..2a4d770 100644 --- a/src/gvcore/printdialog.h +++ b/src/gvcore/printdialog.h @@ -1,4 +1,3 @@ -// vim: set tabstop=4 shiftwidth=4 noexpandtab /* Gwenview - printing support Copyright (c) 2003 Angelo Naselli 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/slideshow.cpp b/src/gvcore/slideshow.cpp index 0665733..6e3db94 100644 --- a/src/gvcore/slideshow.cpp +++ b/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�ien G�eau diff --git a/src/gvcore/slideshow.h b/src/gvcore/slideshow.h index e6742b5..f6d4806 100644 --- a/src/gvcore/slideshow.h +++ b/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�ien G�eau diff --git a/src/gvcore/threadgate.cpp b/src/gvcore/threadgate.cpp index 8c10ddb..d5907ec 100644 --- a/src/gvcore/threadgate.cpp +++ b/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 diff --git a/src/gvcore/threadgate.h b/src/gvcore/threadgate.h index bb9f9c6..afb65be 100644 --- a/src/gvcore/threadgate.h +++ b/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 diff --git a/src/gvcore/thumbnaildetailsdialog.cpp b/src/gvcore/thumbnaildetailsdialog.cpp index f320ca6..87acbe5 100644 --- a/src/gvcore/thumbnaildetailsdialog.cpp +++ b/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 diff --git a/src/gvcore/thumbnaildetailsdialog.h b/src/gvcore/thumbnaildetailsdialog.h index 5a0b77b..8fe936f 100644 --- a/src/gvcore/thumbnaildetailsdialog.h +++ b/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 diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp index 345c6e1..f10889a 100644 --- a/src/gvcore/thumbnailloadjob.cpp +++ b/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�lien G�teau This class is based on the ImagePreviewJob class from Konqueror. diff --git a/src/gvcore/thumbnailloadjob.h b/src/gvcore/thumbnailloadjob.h index 29bb4b8..283d802 100644 --- a/src/gvcore/thumbnailloadjob.h +++ b/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�lien G�teau This class is based on the ImagePreviewJob class from Konqueror. diff --git a/src/gvcore/thumbnailsize.h b/src/gvcore/thumbnailsize.h index 0fa29e2..602227c 100644 --- a/src/gvcore/thumbnailsize.h +++ b/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. diff --git a/src/gvcore/timeutils.cpp b/src/gvcore/timeutils.cpp index a00e241..3995833 100644 --- a/src/gvcore/timeutils.cpp +++ b/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 diff --git a/src/gvcore/timeutils.h b/src/gvcore/timeutils.h index b09e7e9..8d9e9c1 100644 --- a/src/gvcore/timeutils.h +++ b/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 diff --git a/src/imageutils/imageutils.cpp b/src/imageutils/imageutils.cpp index ae9a560..a50dbed 100644 --- a/src/imageutils/imageutils.cpp +++ b/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�lien G�teau diff --git a/src/imageutils/imageutils.h b/src/imageutils/imageutils.h index 7af8de8..5ec9b09 100644 --- a/src/imageutils/imageutils.h +++ b/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�lien G�teau diff --git a/src/imageutils/jpegcontent.cpp b/src/imageutils/jpegcontent.cpp index bab3b9a..7619146 100644 --- a/src/imageutils/jpegcontent.cpp +++ b/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�lien G�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" diff --git a/src/imageutils/jpegcontent.h b/src/imageutils/jpegcontent.h index e690d19..42d7833 100644 --- a/src/imageutils/jpegcontent.h +++ b/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�lien G�teau diff --git a/src/imageutils/jpegerrormanager.h b/src/imageutils/jpegerrormanager.h index 2c81188..49a0e80 100644 --- a/src/imageutils/jpegerrormanager.h +++ b/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 diff --git a/src/imageutils/orientation.h b/src/imageutils/orientation.h index 375a1af..2f289f1 100644 --- a/src/imageutils/orientation.h +++ b/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�lien G�teau diff --git a/src/imageutils/scale.cpp b/src/imageutils/scale.cpp index 3d331f0..fb9ab23 100644 --- a/src/imageutils/scale.cpp +++ b/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; /* diff --git a/src/imageutils/testjpegcontent.cpp b/src/imageutils/testjpegcontent.cpp index 200ee63..e656fe4 100644 --- a/src/imageutils/testjpegcontent.cpp +++ b/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 |