diff options
940 files changed, 2096 insertions, 7029 deletions
diff --git a/.gitmodules b/.gitmodules index bdec8fca..934def7f 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 d1857d32..af2a7034 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,12 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 2.8 ) +cmake_minimum_required( VERSION 3.1 ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEL10n ) diff --git a/CMakeLists.txt b/CMakeLists.txt index ddc29fcb..0330dbb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,14 +9,13 @@ # ################################################# -cmake_minimum_required( VERSION 2.8 ) +cmake_minimum_required( VERSION 3.1 ) ##### general package setup ##################### project( tdepim ) set( PACKAGE tdepim ) -set( VERSION R14.0.9 ) ##### include essential cmake modules ########### @@ -33,10 +32,14 @@ enable_testing( ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEMacros ) +##### set version number ######################## + +tde_set_project_version( ) + + ##### setup install paths ####################### include( TDESetupPaths ) @@ -45,13 +48,42 @@ tde_setup_paths( ) ##### add apidox targets ############ -add_custom_target(apidox - COMMAND "./generate_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "/usr/share/qt3/doc/html" - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/") +if( "${CMAKE_VERSION}" VERSION_LESS "3.1" ) + set( CMAKE_ENV "env" ) +else() + set( CMAKE_ENV "${CMAKE_COMMAND};-E;env" ) +endif() -add_custom_target(install-apidox - COMMAND "./install_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}" - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/") +add_custom_target( apidox + COMMAND ${CMAKE_ENV} + "QTDOCDIR=/usr/share/tqt3/doc/html" + "DOXDATA=${HTML_INSTALL_DIR}/en/common" + ${CMAKE_SOURCE_DIR}/admin/doxygen.sh + --no-modulename + ${CMAKE_SOURCE_DIR} + COMMAND + find ${CMAKE_BINARY_DIR}/apidocs -name '*.html' | + xargs -r sed -i 's|${CMAKE_BINARY_DIR}/apidocs|${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs|g' + COMMAND + find ${CMAKE_BINARY_DIR}/apidocs -name '*.tag' | + xargs -r sed -i 's|${CMAKE_SOURCE_DIR}/|${PROJECT_NAME}/|g' + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +) + +add_custom_target( install-apidox + COMMAND ${CMAKE_COMMAND} -E echo Apidox installed in ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs +) + +install( CODE " + if( EXISTS ${CMAKE_BINARY_DIR}/apidocs ) + file( + INSTALL ${CMAKE_BINARY_DIR}/apidocs/ + DESTINATION ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs + PATTERN doxygen_sqlite3.db EXCLUDE + PATTERN installdox-slow EXCLUDE + ) + endif()" +) ##### optional stuff ############################ diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index cfb6a8d7..67500f42 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -59,95 +59,99 @@ if( WITH_GNOKII AND (BUILD_KADDRESSBOOK OR BUILD_KMOBILE) ) pkg_search_module( GNOKII gnokii ) if( NOT GNOKII_FOUND ) tde_message_fatal( "gnokii are requested, but was not found on your system" ) + else( ) + tde_save_and_set( CMAKE_REQUIRED_INCLUDES "${GNOKII_INCLUDE_DIRS}" ) + check_include_file( "gnokii.h" HAVE_GNOKII_H ) + tde_restore( CMAKE_REQUIRED_INCLUDES ) endif( ) endif( ) -if( BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOOK OR BUILD_KONTACT ) +if( (BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOOK OR BUILD_KONTACT) AND NOT HAVE_GPGME_0_4_BRANCH ) - if( NOT HAVE_GPGME_0_4_BRANCH ) - message( STATUS "checking for 'gpgme'" ) - endif( ) + message( STATUS "checking for 'gpgme'" ) - # find gpgme-config - find_program( GPGME_EXECUTABLE NAMES gpgme-config ) - if( NOT GPGME_EXECUTABLE ) - tde_message_fatal( "gpgme-config was NOT found.\n gpgme library is installed?" ) - endif( ) + # check for gpgme + pkg_search_module( GPGME gpgme ) + if( NOT GPGME_FOUND ) - # find gpg-error-config - find_program( GPG_ERR_EXECUTABLE NAMES gpg-error-config ) - if( NOT GPG_ERR_EXECUTABLE ) - tde_message_fatal( "gpg-error-config was NOT found.\n gpg-error library is installed?" ) - endif( ) + # find gpgme-config + find_program( GPGME_EXECUTABLE NAMES gpgme-config ) + if( NOT GPGME_EXECUTABLE ) + tde_message_fatal( "gpgme-config was NOT found.\n gpgme library is installed?" ) + endif( ) - macro( __run_gpgme_config __type __var ) - execute_process( - COMMAND ${GPGME_EXECUTABLE} --${__type} - OUTPUT_VARIABLE ${__var} - RESULT_VARIABLE __result - OUTPUT_STRIP_TRAILING_WHITESPACE ) - if( _result ) - tde_message_fatal( "Unable to run ${GPGME_EXECUTABLE}!\n gpgme library incorrectly installed?\n Path to gpgme-config incorrect?" ) + macro( __run_gpgme_config __type __var ) + execute_process( + COMMAND ${GPGME_EXECUTABLE} --${__type} + OUTPUT_VARIABLE ${__var} + RESULT_VARIABLE __result + OUTPUT_STRIP_TRAILING_WHITESPACE ) + if( _result ) + tde_message_fatal( "Unable to run ${GPGME_EXECUTABLE}!\n gpgme library incorrectly installed?\n Path to gpgme-config incorrect?" ) + endif( ) + endmacro( ) + + __run_gpgme_config( version GPGME_VERSION ) + __run_gpgme_config( cflags GPGME_INCLUDE_DIRS ) + __run_gpgme_config( libs GPGME_LIBRARIES ) + + if( GPGME_INCLUDE_DIRS ) + string( REGEX REPLACE "(^| +)-I" ";" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" ) endif( ) - endmacro( ) - - macro( __run_gpgerr_config __type __var ) - execute_process( - COMMAND ${GPG_ERR_EXECUTABLE} --${__type} - OUTPUT_VARIABLE ${__var} - RESULT_VARIABLE __result - OUTPUT_STRIP_TRAILING_WHITESPACE ) - if( _result ) - tde_message_fatal( "Unable to run ${GPG_ERR_EXECUTABLE}!\n gpg-error library incorrectly installed?\n Path to gpgme-config are incorrect?" ) + if( GPGME_LIBRARIES ) + string( REGEX REPLACE "(^| +)-l" ";" GPGME_LIBRARIES "${GPGME_LIBRARIES}" ) endif( ) - endmacro( ) - __run_gpgme_config( version GPGME_VERSION ) - __run_gpgme_config( cflags GPGME_INCLUDE_DIRS ) - __run_gpgme_config( libs GPGME_LIBRARIES ) + endif() - __run_gpgerr_config( version GPGERR_VERSION ) - __run_gpgerr_config( cflags GPGERR_INCLUDE_DIRS ) - __run_gpgerr_config( libs GPGERR_LIBRARIES ) + # check for gpg-error + pkg_search_module( GPGERR gpg-error ) + if( NOT GPGERR_FOUND ) - # cleanup - if( GPGME_INCLUDE_DIRS ) - string( REGEX REPLACE "(^| )-I" ";" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" ) - endif( ) - if( GPGME_LIBRARIES ) - string( REGEX REPLACE "(^| )-l" ";" GPGME_LIBRARIES "${GPGME_LIBRARIES}" ) - endif( ) - if( GPGERR_INCLUDE_DIRS ) - string( REGEX REPLACE "(^| )-I" ";" GPGERR_INCLUDE_DIRS "${GPGERR_INCLUDE_DIRS}" ) - endif( ) - if( GPGERR_LIBRARIES ) - string( REGEX REPLACE "(^| )-l" ";" GPGERR_LIBRARIES "${GPGERR_LIBRARIES}" ) - endif( ) - set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS} ${GPGERR_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE ) - set( GPGME_LIBRARIES "${GPGME_LIBRARIES} ${GPGERR_LIBRARIES}" CACHE INTERNAL "" FORCE ) - string( REGEX REPLACE " ;" ";" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" ) - string( REGEX REPLACE " ;" ";" GPGME_LIBRARIES "${GPGME_LIBRARIES}" ) - set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE ) - set( GPGME_LIBRARIES "${GPGME_LIBRARIES}" CACHE INTERNAL "" FORCE ) + # find gpg-error-config + find_program( GPG_ERR_EXECUTABLE NAMES gpgrt-config gpg-error-config ) + if( NOT GPG_ERR_EXECUTABLE ) + tde_message_fatal( "gpgrt-config or gpg-error-config was NOT found.\n gpg-error library is installed?" ) + endif( ) - # assuming that all newer system have gpgme >= 0.4 - set( HAVE_GPGME_0_4_BRANCH 1 CACHE INTERNAL "" ) + macro( __run_gpgerr_config __type __var ) + execute_process( + COMMAND ${GPG_ERR_EXECUTABLE} --${__type} + OUTPUT_VARIABLE ${__var} + RESULT_VARIABLE __result + OUTPUT_STRIP_TRAILING_WHITESPACE ) + if( _result ) + tde_message_fatal( "Unable to run ${GPG_ERR_EXECUTABLE}!\n gpg-error library incorrectly installed?\n Path to gpgme-config are incorrect?" ) + endif( ) + endmacro( ) + + __run_gpgerr_config( version GPGERR_VERSION ) + __run_gpgerr_config( cflags GPGERR_INCLUDE_DIRS ) + __run_gpgerr_config( libs GPGERR_LIBRARIES ) + + if( GPGERR_INCLUDE_DIRS ) + string( REGEX REPLACE "(^| +)-I" ";" GPGERR_INCLUDE_DIRS "${GPGERR_INCLUDE_DIRS}" ) + endif( ) + if( GPGERR_LIBRARIES ) + string( REGEX REPLACE "(^| +)-l" ";" GPGERR_LIBRARIES "${GPGERR_LIBRARIES}" ) + endif( ) - # NOTE: assume we have largefile support (need for gpgme) - # FIXME: to be sure, we must check it - add_definitions( -D_FILE_OFFSET_BITS=64 ) + endif() - if( NOT HAVE_GPGME_0_4_BRANCH ) - message( STATUS " found 'gpgme', version ${GPGME_VERSION}" ) - endif( ) + # assuming that all newer system have gpgme >= 0.4 + set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS};${GPGERR_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE ) + set( GPGME_LIBRARIES "${GPGME_LIBRARIES};${GPGERR_LIBRARIES}" CACHE INTERNAL "" FORCE ) + set( HAVE_GPGME_0_4_BRANCH 1 CACHE INTERNAL "" ) + message( STATUS " found 'gpgme', version ${GPGME_VERSION}" ) # check for various GPGME features tde_save( CMAKE_CXX_FLAGS ) + tde_save( CMAKE_REQUIRED_INCLUDES ) tde_save( CMAKE_REQUIRED_LIBRARIES ) string( REGEX REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) - # See FIXME above regarding -D_FILE_OFFSET_BITS=64 - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GPGME_INCLUDE_DIRS} -D_FILE_OFFSET_BITS=64") + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LARGEFILES_DEFINITIONS}") + set( CMAKE_REQUIRED_INCLUDES "${GPGME_INCLUDE_DIRS}") set( CMAKE_REQUIRED_LIBRARIES "${GPGME_LIBRARIES}") # check for GPGME_KEYLIST_MODE_VALIDATE @@ -206,6 +210,7 @@ if( BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOO # done checking for GPGME features tde_restore( CMAKE_CXX_FLAGS ) + tde_restore( CMAKE_REQUIRED_INCLUDES ) tde_restore( CMAKE_REQUIRED_LIBRARIES ) endif( ) @@ -237,6 +242,25 @@ if( BUILD_KARM AND WITH_XSCREENSAVER ) endif( ) endif( ) +if( BUILD_TDERESOURCES AND WITH_GROUPWISE ) + check_symbol_exists( strrchr "string.h" HAVE_STRRCHR ) + check_symbol_exists( strtod "stdlib.h" HAVE_STRTOD ) + check_symbol_exists( sscanf "stdio.h" HAVE_SSCANF ) + check_symbol_exists( strtol "stdlib.h" HAVE_STRTOL ) + check_symbol_exists( strtoul "stdlib.h" HAVE_STRTOUL ) + check_symbol_exists( strtoll "stdlib.h" HAVE_STRTOLL ) + check_symbol_exists( strtoull "stdlib.h" HAVE_STRTOULL ) + check_symbol_exists( gettimeofday "sys/time.h" HAVE_GETTIMEOFDAY ) + check_include_file( "sys/timeb.h" HAVE_SYS_TIMEB_H ) + check_symbol_exists( ftime "sys/timeb.h" HAVE_FTIME ) + check_symbol_exists( rand_r "stdlib.h" HAVE_RAND_R ) + check_symbol_exists( gmtime_r "time.h" HAVE_GMTIME_R ) + check_symbol_exists( localtime_r "time.h" HAVE_LOCALTIME_R ) + check_symbol_exists( timegm "time.h" HAVE_TIMEGM ) + check_symbol_exists( wctomb "stdlib.h" HAVE_WCTOMB ) + check_symbol_exists( mbtowc "stdlib.h" HAVE_MBTOWC ) + check_symbol_exists( isnan "math.h" HAVE_ISNAN ) +endif ( ) # required stuff find_package( TQt ) diff --git a/admin b/admin -Subproject 20b5a47aa3db7c7a75c6574be638f3d07a26cfe +Subproject a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3 diff --git a/akregator/src/about/akregator.css b/akregator/src/about/akregator.css index 9c31cfe3..ab0bb774 100644 --- a/akregator/src/about/akregator.css +++ b/akregator/src/about/akregator.css @@ -15,6 +15,3 @@ background-position: bottom right; } */ - -/* vim:set sw=2 et nocindent smartindent: */ - diff --git a/akregator/src/about/main.html b/akregator/src/about/main.html index 5bcca3d4..52cfe4ad 100644 --- a/akregator/src/about/main.html +++ b/akregator/src/about/main.html @@ -64,4 +64,3 @@ <div id="footer"><div id="footerL"/><div id="footerR"/></div> </body> </html> -<!-- vim:set sw=2 et nocindent smartindent: --> diff --git a/akregator/src/aboutdata.h b/akregator/src/aboutdata.h index aa461134..9b57d201 100644 --- a/akregator/src/aboutdata.h +++ b/akregator/src/aboutdata.h @@ -26,7 +26,7 @@ #define ABOUTDATA_H #include <tdeaboutdata.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #define AKREGATOR_VERSION "1.2.9" diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index 05a6a8e0..24dc8b49 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -120,4 +120,3 @@ void AddFeedDialog::textChanged(const TQString& text) } // namespace Akregator #include "addfeeddialog.moc" -// vim: ts=4 sw=4 et diff --git a/akregator/src/akregator_export.h b/akregator/src/akregator_export.h index 00fead92..d389c0d9 100644 --- a/akregator/src/akregator_export.h +++ b/akregator/src/akregator_export.h @@ -21,7 +21,7 @@ #ifndef AKREGATOR_AKREGATOREXPORT_H #define AKREGATOR_AKREGATOREXPORT_H -#include <tdepimmacros.h> +#include <kdemacros.h> #define AKREGATOR_EXPORT KDE_EXPORT diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h index 1e17c05f..66abcae5 100644 --- a/akregator/src/akregator_part.h +++ b/akregator/src/akregator_part.h @@ -220,5 +220,3 @@ namespace Akregator } #endif // _AKREGATORPART_H_ - -// vim: set et ts=4 sts=4 sw=4: diff --git a/akregator/src/akregator_run.cpp b/akregator/src/akregator_run.cpp index 84fd6572..89bb190a 100644 --- a/akregator/src/akregator_run.cpp +++ b/akregator/src/akregator_run.cpp @@ -68,5 +68,3 @@ void BrowserRun::slotViewerDeleted() } // namespace Akregator #include "akregator_run.moc" - -// vim: set et ts=4 sts=4 sw=4: diff --git a/akregator/src/akregator_run.h b/akregator/src/akregator_run.h index e819dc13..4d22ca82 100644 --- a/akregator/src/akregator_run.h +++ b/akregator/src/akregator_run.h @@ -67,5 +67,3 @@ class BrowserRun : public KParts::BrowserRun } #endif - -// vim: set et ts=4 sts=4 sw=4: diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index a0e5c8b7..48114f97 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -809,4 +809,3 @@ TQValueList<Article> ArticleListView::selectedArticles() const } // namespace Akregator #include "articlelistview.moc" -// vim: ts=4 sw=4 et diff --git a/akregator/src/fetchqueue.h b/akregator/src/fetchqueue.h index 1a0f449e..d70413b8 100644 --- a/akregator/src/fetchqueue.h +++ b/akregator/src/fetchqueue.h @@ -86,6 +86,3 @@ class FetchQueue : public TQObject } // namespace Akregator #endif - -// vim: set et ts=4 sts=4 sw=4: - diff --git a/akregator/src/frame.h b/akregator/src/frame.h index 4a0cb36d..b5ed013f 100644 --- a/akregator/src/frame.h +++ b/akregator/src/frame.h @@ -96,6 +96,3 @@ namespace Akregator } #endif - - -// vim: set et ts=4 sts=4 sw=4: diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp index 24413053..18522fe3 100644 --- a/akregator/src/librss/article.cpp +++ b/akregator/src/librss/article.cpp @@ -286,5 +286,3 @@ bool Article::operator==(const Article &other) const { return d->guid == other.guid(); } - -// vim:noet:ts=4 diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h index 7656eeed..c27fdfe7 100644 --- a/akregator/src/librss/article.h +++ b/akregator/src/librss/article.h @@ -169,4 +169,3 @@ namespace RSS } #endif // LIBRSS_ARTICLE_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index 6d6e1057..3bc64d00 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/document.cpp @@ -649,5 +649,3 @@ Document &Document::operator=(const Document &other) } return *this; } - -// vim:noet:ts=4 diff --git a/akregator/src/librss/document.h b/akregator/src/librss/document.h index 7a94e59d..8d098e7d 100644 --- a/akregator/src/librss/document.h +++ b/akregator/src/librss/document.h @@ -234,4 +234,3 @@ namespace RSS } #endif // LIBRSS_DOCUMENT_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h index 091018cb..966521cc 100644 --- a/akregator/src/librss/global.h +++ b/akregator/src/librss/global.h @@ -11,7 +11,7 @@ #ifndef LIBRSS_GLOBAL_H #define LIBRSS_GLOBAL_H -#include <tdepimmacros.h> +#include <kdemacros.h> template <class> class TQValueList; @@ -145,4 +145,3 @@ namespace RSS } #endif // LIBRSS_GLOBAL_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp index 383d76b9..174a105b 100644 --- a/akregator/src/librss/image.cpp +++ b/akregator/src/librss/image.cpp @@ -164,4 +164,3 @@ bool Image::operator==(const Image &other) const } #include "image.moc" -// vim:noet:ts=4 diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h index ab0cf687..299b4292 100644 --- a/akregator/src/librss/image.h +++ b/akregator/src/librss/image.h @@ -171,4 +171,3 @@ namespace RSS } #endif // LIBRSS_IMAGE_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/librss.h b/akregator/src/librss/librss.h index b99556b1..877d06f2 100644 --- a/akregator/src/librss/librss.h +++ b/akregator/src/librss/librss.h @@ -21,4 +21,3 @@ #include "textinput.h" #endif // LIBRSS_LIBRSS_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index ea0134e6..8e2967b7 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -410,4 +410,3 @@ void Loader::discoverFeeds(const TQByteArray &data) } #include "loader.moc" -// vim:noet:ts=4 diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index 670ed9d3..ed22da22 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -342,4 +342,3 @@ namespace RSS } #endif // LIBRSS_LOADER_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/textinput.cpp b/akregator/src/librss/textinput.cpp index 04799fca..a32c9f58 100644 --- a/akregator/src/librss/textinput.cpp +++ b/akregator/src/librss/textinput.cpp @@ -92,5 +92,3 @@ bool TextInput::operator==(const TextInput &other) const d->name == other.name() && d->link == other.link(); } - -// vim:noet:ts=4 diff --git a/akregator/src/librss/textinput.h b/akregator/src/librss/textinput.h index cbf5bdb6..dd46d176 100644 --- a/akregator/src/librss/textinput.h +++ b/akregator/src/librss/textinput.h @@ -118,4 +118,3 @@ namespace RSS } #endif // LIBRSS_TEXTINPUT_H -// vim: noet:ts=4 diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index bd8ce39b..9303bdf5 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -245,5 +245,3 @@ TQString parseItemAuthor(const TQDomElement& element, Format format, Version ver } } // namespace RSS - -// vim:noet:ts=4 diff --git a/akregator/src/librss/tools_p.h b/akregator/src/librss/tools_p.h index 47be905d..0ec9013f 100644 --- a/akregator/src/librss/tools_p.h +++ b/akregator/src/librss/tools_p.h @@ -37,4 +37,3 @@ namespace RSS } #endif // LIBRSS_TOOLS_P_H -// vim:noet:ts=4 diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index c4e47338..f5654d9b 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -285,6 +285,3 @@ void MainWindow::slotSetStatusBarText( const TQString & text ) } // namespace Akregator #include "mainwindow.moc" - - -// vim: set et ts=4 sts=4 sw=4: diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES index 160c4bad..edd5f861 100644 --- a/akregator/src/mk4storage/metakit/CHANGES +++ b/akregator/src/mk4storage/metakit/CHANGES @@ -1686,5 +1686,3 @@ ALSO LISTED IN THE RELEASE HISTORY Moves do not involve any data copying w.r.t. subviews and memo's. The old release history is at http://www.equi4.com/metakit/history.html - -# vim: tw=72 diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui index c5c837a5..9eea1d7d 100644 --- a/akregator/src/mk4storage/mk4confwidgetbase.ui +++ b/akregator/src/mk4storage/mk4confwidgetbase.ui @@ -104,9 +104,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -132,9 +129,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -170,9 +164,9 @@ </connection> </connections> <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/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 14e702aa..f818043b 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -384,7 +384,7 @@ void PageViewer::slotSetCaption(const TQString& cap) void PageViewer::slotPaletteOrFontChanged() { kdDebug() << "PageViewer::slotPaletteOrFontChanged()" << endl; - // taken from KonqView (tdebase/konqueror/konq_view.cc) + // taken from KonqView (tdebase/konqueror/konq_view.cpp) TQObject *obj = KParts::BrowserExtension::childObject(this); if ( !obj ) // not all views have a browser extension ! diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp index 149eb480..b8d318e8 100644 --- a/akregator/src/propertiesdialog.cpp +++ b/akregator/src/propertiesdialog.cpp @@ -321,4 +321,3 @@ void FeedPropertiesDialog::selectFeedName() } // namespace Akregator #include "propertiesdialog.moc" -// vim: ts=4 sw=4 et diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 0588a429..02bba26c 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -332,5 +332,3 @@ void Viewer::setSafeMode() } // namespace Akregator #include "viewer.moc" - -// vim: set et ts=4 sts=4 sw=4: diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h index af89fee2..112e71b0 100644 --- a/akregator/src/viewer.h +++ b/akregator/src/viewer.h @@ -121,4 +121,3 @@ namespace Akregator } #endif // VIEWER_H -// vim: ts=4 sw=4 et diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui index cb544807..6eddb9cb 100644 --- a/certmanager/certificatewizard.ui +++ b/certmanager/certificatewizard.ui @@ -552,10 +552,8 @@ If you want to change anything, press Back and make your changes; otherwise, pre </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <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> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 86ee531a..a972ce9b 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -96,7 +96,7 @@ // other #include <algorithm> #include <assert.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kinputdialog.h> namespace { diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h index c61ce7db..cf03a710 100644 --- a/certmanager/certmanager.h +++ b/certmanager/certmanager.h @@ -1,4 +1,4 @@ -/* -*- mode: c++; c-basic-offset:4 -*- +/* certmanager.h This file is part of Kleopatra, the KDE keymanager @@ -36,7 +36,7 @@ //#include <gpgme.h> #include <tdemainwindow.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kurl.h> #include <tqcstring.h> #include <tqptrlist.h> diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index c31fa900..087e237e 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -36,7 +36,7 @@ #include <tdelocale.h> #include <kdebug.h> -#include <tdepimmacros.h> +#include <kdemacros.h> AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name ) : TDECModule( parent, name ) diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index 7a19d451..43373e72 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -47,7 +47,7 @@ #include <tqcheckbox.h> #include <tqlayout.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #if 0 // disabled, since it is apparently confusing // For sync'ing kabldaprc diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h index f6a32301..e9bdd51a 100644 --- a/certmanager/conf/dirservconfigpage.h +++ b/certmanager/conf/dirservconfigpage.h @@ -34,7 +34,7 @@ #include <tdecmodule.h> #include <kleo/cryptoconfig.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQCheckBox; class TQTimeEdit; diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp index a802a06f..18668684 100644 --- a/certmanager/conf/dnorderconfigpage.cpp +++ b/certmanager/conf/dnorderconfigpage.cpp @@ -34,7 +34,7 @@ #include <ui/dnattributeorderconfigwidget.h> #include <kleo/dn.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqlayout.h> diff --git a/certmanager/hierarchyanalyser.h b/certmanager/hierarchyanalyser.h index dede3814..45ef9ccb 100644 --- a/certmanager/hierarchyanalyser.h +++ b/certmanager/hierarchyanalyser.h @@ -1,4 +1,4 @@ -/* -*- mode: c++ -*- +/* hierarchyanalyser.h This file is part of Kleopatra, the KDE keymanager diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.h b/certmanager/lib/backends/chiasmus/chiasmusbackend.h index 1619f9ea..17f7572c 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.h +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* chiasmusbackend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.h b/certmanager/lib/backends/chiasmus/chiasmusjob.h index 1ca6ba19..69274d10 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.h +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* chiasmusjob.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.h b/certmanager/lib/backends/chiasmus/chiasmuslibrary.h index fa1adc73..3a3536af 100644 --- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.h +++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* chiasmuslibrary.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.h b/certmanager/lib/backends/chiasmus/obtainkeysjob.h index 10ed5d5f..09a1c7c3 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* obtainkeysjob.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/gpg1backend.h b/certmanager/lib/backends/kpgp/gpg1backend.h index a1ff723c..96729f33 100644 --- a/certmanager/lib/backends/kpgp/gpg1backend.h +++ b/certmanager/lib/backends/kpgp/gpg1backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* gpg1backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp index b5b006b5..dfa88af6 100644 --- a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp +++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpbackendbase.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.h b/certmanager/lib/backends/kpgp/kpgpbackendbase.h index 6fdf29bf..d9dbf579 100644 --- a/certmanager/lib/backends/kpgp/kpgpbackendbase.h +++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpbackendbase.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h index d126ea67..3434dd97 100644 --- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h +++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* kpgpkeylistjob.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp index 71c08293..6778f45d 100644 --- a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp +++ b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpwrapper.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.h b/certmanager/lib/backends/kpgp/kpgpwrapper.h index 8dc7dbc2..7776e98c 100644 --- a/certmanager/lib/backends/kpgp/kpgpwrapper.h +++ b/certmanager/lib/backends/kpgp/kpgpwrapper.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpwrapper.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/pgp2backend.h b/certmanager/lib/backends/kpgp/pgp2backend.h index b486bfd6..622566e1 100644 --- a/certmanager/lib/backends/kpgp/pgp2backend.h +++ b/certmanager/lib/backends/kpgp/pgp2backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* pgp2backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/pgp5backend.h b/certmanager/lib/backends/kpgp/pgp5backend.h index 2db55932..b02183de 100644 --- a/certmanager/lib/backends/kpgp/pgp5backend.h +++ b/certmanager/lib/backends/kpgp/pgp5backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* pgp5backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/pgp6backend.h b/certmanager/lib/backends/kpgp/pgp6backend.h index c5f9eeff..46494244 100644 --- a/certmanager/lib/backends/kpgp/pgp6backend.h +++ b/certmanager/lib/backends/kpgp/pgp6backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* pgp6backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp index c38097ed..ee4128bf 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* qgpgmebackend.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.h b/certmanager/lib/backends/qgpgme/qgpgmebackend.h index a23c08d4..9d6aca81 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.h +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* qgpgmebackend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h index 79ff268b..7e4eda03 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h @@ -38,7 +38,7 @@ #include "qgpgmejob.h" #include <tqcstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Error; diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h index 844ca974..64ce36bc 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h @@ -43,7 +43,7 @@ #include <tqstring.h> #include <vector> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Data; diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h index c9e16474..0b1362c9 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h @@ -36,7 +36,7 @@ #include <kleo/keygenerationjob.h> #include "qgpgmejob.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Error; diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp index bc0d232e..54d13358 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* qgpgmeprogresstokenmapper.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h index 24672d83..90079706 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h @@ -44,7 +44,7 @@ #include <utility> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Error; class Context; diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp index 77a91451..20747457 100644 --- a/certmanager/lib/cryptplug.cpp +++ b/certmanager/lib/cryptplug.cpp @@ -1,5 +1,4 @@ -/* -*- Mode: C++ -*- - +/* this is a C++-ification of: GPGMEPLUG - an GPGME based cryptography plug-in following the common CRYPTPLUG specification. diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h index d633e639..fce71937 100644 --- a/certmanager/lib/cryptplug.h +++ b/certmanager/lib/cryptplug.h @@ -1,5 +1,4 @@ -/* -*- Mode: C++ -*- - +/* this is a C++-ification of: CRYPTPLUG - an independent cryptography plug-in API @@ -26,7 +25,7 @@ #include <gpgmepp/context.h> #include <gpgme.h> // need it for gpgme_protocol_t :( -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class ImportResult; diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h index 3eb5f7e6..6f3f6f3d 100644 --- a/certmanager/lib/cryptplugfactory.h +++ b/certmanager/lib/cryptplugfactory.h @@ -35,7 +35,7 @@ #include "kleo/cryptobackendfactory.h" -#include <tdepimmacros.h> +#include <kdemacros.h> #ifndef LIBKLEOPATRA_NO_COMPAT namespace Kleo { diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h index 39fd680a..651c9f9f 100644 --- a/certmanager/lib/cryptplugwrapper.h +++ b/certmanager/lib/cryptplugwrapper.h @@ -54,7 +54,7 @@ #include <tqpair.h> #include <tqstringlist.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEConfigBase; diff --git a/certmanager/lib/cryptplugwrapperlist.cpp b/certmanager/lib/cryptplugwrapperlist.cpp index 43f88670..94d8a48c 100644 --- a/certmanager/lib/cryptplugwrapperlist.cpp +++ b/certmanager/lib/cryptplugwrapperlist.cpp @@ -1,5 +1,4 @@ -/* -*- c++ -*- - +/* CRYPTPLUG - an independent cryptography plug-in API. CryptPlugWrapperList holds any number of crypto plug-ins. diff --git a/certmanager/lib/cryptplugwrapperlist.h b/certmanager/lib/cryptplugwrapperlist.h index 30d4fcd9..01691338 100644 --- a/certmanager/lib/cryptplugwrapperlist.h +++ b/certmanager/lib/cryptplugwrapperlist.h @@ -1,5 +1,4 @@ -/* -*- Mode: C++ -*- - +/* CRYPTPLUG - an independent cryptography plug-in API. CryptPlugWrapperList holds any number of crypto plug-ins. diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h index 09012da3..3fa642f3 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.h +++ b/certmanager/lib/kleo/cryptobackendfactory.h @@ -36,7 +36,7 @@ #include <tqobject.h> #include "cryptobackend.h" -#include <tdepimmacros.h> +#include <kdemacros.h> #include <vector> #include <map> diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h index c9bdbffd..c194d58e 100644 --- a/certmanager/lib/kleo/dn.h +++ b/certmanager/lib/kleo/dn.h @@ -35,7 +35,7 @@ #include <tqstring.h> #include <tqvaluevector.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQStringList; class TQWidget; diff --git a/certmanager/lib/kleo/enum.h b/certmanager/lib/kleo/enum.h index 07e93c49..723f65ae 100644 --- a/certmanager/lib/kleo/enum.h +++ b/certmanager/lib/kleo/enum.h @@ -33,7 +33,7 @@ #ifndef __KLEO_ENUM_H__ #define __KLEO_ENUM_H__ -#include <tdepimmacros.h> +#include <kdemacros.h> class TQString; class TQStringList; diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h index 0b74d2f9..ebce19f2 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.h +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h @@ -35,7 +35,7 @@ #include <kleo/keylistjob.h> #include <kleo/cryptobackend.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <gpgmepp/keylistresult.h> diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h index a573934d..e65be1d2 100644 --- a/certmanager/lib/kleo/keyfiltermanager.h +++ b/certmanager/lib/kleo/keyfiltermanager.h @@ -34,7 +34,7 @@ #define __KLEO_KEYFILTERMANAGER_H__ #include <tqobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Key; } diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h index d927c927..31d9d9e9 100644 --- a/certmanager/lib/kleo/multideletejob.h +++ b/certmanager/lib/kleo/multideletejob.h @@ -36,7 +36,7 @@ #include <kleo/job.h> #include <kleo/cryptobackend.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqguardedptr.h> #include <vector> diff --git a/certmanager/lib/tests/test.data b/certmanager/lib/tests/test.data index a4109fbd..5a63ff09 100644 --- a/certmanager/lib/tests/test.data +++ b/certmanager/lib/tests/test.data @@ -1,4 +1,4 @@ -/* -*- mode: c++; c-basic-offset:4 -*- +/* tests/test_uiserver.cpp This file is part of Kleopatra, the KDE keymanager diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index a97b0020..9d8f4d40 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* backendconfigwidget.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h index f0131547..ad60654b 100644 --- a/certmanager/lib/ui/backendconfigwidget.h +++ b/certmanager/lib/ui/backendconfigwidget.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* backendconfigwidget.h This file is part of libkleopatra, the KDE keymanagement library @@ -35,7 +35,7 @@ #define __KLEO_UI_BACKENDCONFIGWIDGET_H__ #include <tqwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { class CryptoBackendFactory; diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h index 3f6ba328..0ef8009c 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.h +++ b/certmanager/lib/ui/cryptoconfigdialog.h @@ -33,7 +33,7 @@ #define CRYPTOCONFIGDIALOG_H #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h index a98bc5fe..950a87e9 100644 --- a/certmanager/lib/ui/directoryserviceswidget.h +++ b/certmanager/lib/ui/directoryserviceswidget.h @@ -34,7 +34,7 @@ #define DIRECTORYSERVICESWIDGET_H #include "directoryserviceswidgetbase.h" #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class CryptPlugWrapper; namespace Kleo { diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index b2f1343a..874ba0fa 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* dnattributeorderconfigwidget.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h index b7ba1330..d39220ac 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.h +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* dnattributeorderconfigwidget.h This file is part of libkleopatra, the KDE keymanagement library @@ -34,7 +34,7 @@ #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__ #include <tqwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { class DNAttributeMapper; } diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index 118b6b10..2892a05e 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* KD Tools - a set of useful widgets for TQt */ diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h index 71c1c928..4cae46b1 100644 --- a/certmanager/lib/ui/kdhorizontalline.h +++ b/certmanager/lib/ui/kdhorizontalline.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* KD Tools - a set of useful widgets for TQt */ diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 0ee6d865..900605ae 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyapprovaldialog.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h index bd953fa3..a83e124b 100644 --- a/certmanager/lib/ui/keyapprovaldialog.h +++ b/certmanager/lib/ui/keyapprovaldialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyselectiondialog.h This file is part of libkleopatra, the KDE keymanagement library @@ -40,7 +40,7 @@ #include <kleo/enum.h> #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kpgpkey.h> // for EncryptPref #include <gpgmepp/key.h> diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 4149cb41..6eeef5d8 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -36,7 +36,7 @@ #include <tdelistview.h> #include <gpgmepp/key.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQPainter; class TQColorGroup; diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index c9516a2b..e245898e 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyrequester.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h index 899d3cde..30fba80d 100644 --- a/certmanager/lib/ui/keyrequester.h +++ b/certmanager/lib/ui/keyrequester.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyrequester.h This file is part of libkleopatra, the KDE keymanagement library @@ -53,7 +53,7 @@ #include <kleo/cryptobackend.h> #include <vector> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { class KeyListView; diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index c46228a4..25a1a225 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyselectiondialog.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h index 630255c1..126baa73 100644 --- a/certmanager/lib/ui/keyselectiondialog.h +++ b/certmanager/lib/ui/keyselectiondialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyselectiondialog.h This file is part of libkleopatra, the KDE keymanagement library @@ -41,7 +41,7 @@ #include <kleo/cryptobackend.h> #include <gpgmepp/key.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <vector> class TQVBoxLayout; diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index a2d0e7c3..5fce3838 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* passphrasedialog.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h index e83eca42..48fc4716 100644 --- a/certmanager/lib/ui/passphrasedialog.h +++ b/certmanager/lib/ui/passphrasedialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* passphrasedialog.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h index 51f86dad..c5495d39 100644 --- a/certmanager/lib/ui/progressbar.h +++ b/certmanager/lib/ui/progressbar.h @@ -34,7 +34,7 @@ #define __KLEO_PROGRESSBAR_H__ #include <tqprogressbar.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQTimer; namespace Kleo { diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h index dadfd769..eb1b95b7 100644 --- a/certmanager/lib/ui/progressdialog.h +++ b/certmanager/lib/ui/progressdialog.h @@ -35,7 +35,7 @@ #include <tqprogressdialog.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { class Job; diff --git a/cmake b/cmake deleted file mode 160000 -Subproject 80ab8717cc0b9514786c1992e130c753d16590e diff --git a/config.h.cmake b/config.h.cmake index 6a53137b..a4700493 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -43,6 +43,7 @@ #cmakedefine STD_NAMESPACE_PREFIX @STD_NAMESPACE_PREFIX@ // kaddressbook +#cmakedefine HAVE_GNOKII_H 1 #cmakedefine TDEPIM_NEW_DISTRLISTS 1 // karm @@ -72,3 +73,22 @@ unsigned long strlcat(char*, const char*, unsigned long); } #endif #endif + +// tderesources/groupwise/soap +#cmakedefine HAVE_STRRCHR +#cmakedefine HAVE_STRTOD +#cmakedefine HAVE_SSCANF +#cmakedefine HAVE_STRTOL +#cmakedefine HAVE_STRTOUL +#cmakedefine HAVE_STRTOLL +#cmakedefine HAVE_STRTOULL +#cmakedefine HAVE_GETTIMEOFDAY +#cmakedefine HAVE_SYS_TIMEB_H +#cmakedefine HAVE_FTIME +#cmakedefine HAVE_RAND_R +#cmakedefine HAVE_GMTIME_R +#cmakedefine HAVE_LOCALTIME_R +#cmakedefine HAVE_TIMEGM +#cmakedefine HAVE_WCTOMB +#cmakedefine HAVE_MBTOWC +#cmakedefine HAVE_ISNAN diff --git a/doc/akregator/index.docbook b/doc/akregator/index.docbook index c460a0ee..f872e1de 100644 --- a/doc/akregator/index.docbook +++ b/doc/akregator/index.docbook @@ -1152,12 +1152,3 @@ Documentation copyright 2006 &documentation.index; </book> -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes: nil -sgml-general-insert-case: lower -sgml-indent-step:0 -sgml-indent-data:nil -End: --->
\ No newline at end of file diff --git a/doc/kalarm/index.docbook b/doc/kalarm/index.docbook index 0d5565c9..3362f18c 100644 --- a/doc/kalarm/index.docbook +++ b/doc/kalarm/index.docbook @@ -4158,13 +4158,3 @@ distributed with &kalarm;.</para> &documentation.index; </book> -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: ---> - diff --git a/doc/kandy/index.docbook b/doc/kandy/index.docbook index 834df10b..d5ca2cc8 100644 --- a/doc/kandy/index.docbook +++ b/doc/kandy/index.docbook @@ -334,15 +334,3 @@ Window. <function>exit()</function> closes &kandy;.</para> </appendix> </book> - -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: - -// vim:ts=2:sw=2:tw=78:noet ---> diff --git a/doc/karm/index.docbook b/doc/karm/index.docbook index b1465c75..08de3cc4 100644 --- a/doc/karm/index.docbook +++ b/doc/karm/index.docbook @@ -1224,15 +1224,3 @@ QString addtodo(QString todoname) &documentation.index; </book> - -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: - -// vim:ts=2:sw=2:tw=78:noet ---> diff --git a/doc/kleopatra/index.docbook b/doc/kleopatra/index.docbook index f7e5b610..1a534ccd 100644 --- a/doc/kleopatra/index.docbook +++ b/doc/kleopatra/index.docbook @@ -1444,15 +1444,3 @@ and &Jesper.Pedersen;., copyright 2004 &Daniel.Molkentin;, copyright 2004 Klar&a &documentation.index; </book> - -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: - -// vim:ts=2:sw=2:tw=78:noet ---> diff --git a/doc/kmail/configure.docbook b/doc/kmail/configure.docbook index 7ca07262..b48c7150 100644 --- a/doc/kmail/configure.docbook +++ b/doc/kmail/configure.docbook @@ -1053,7 +1053,7 @@ of key words can be modified.</para> <quote>read receipt</quote>. The message author requests a disposition notification to be sent and the receiver's mail program generates a reply from which the author can - learn what happened to his message. Common disposition + learn what happened to their message. Common disposition types include <quote>displayed</quote> (&ie; read), <quote>deleted</quote> and <quote>dispatched</quote> (⪚ forwarded). @@ -1099,7 +1099,7 @@ of key words can be modified.</para> notification. This is only <emphasis>slightly</emphasis> better than always sending &mdn;s. The author will still know that - the messages has been acted upon, he just cannot + the messages has been acted upon, they just cannot tell whether it was deleted or read &etc; </para> </listitem> @@ -1145,7 +1145,7 @@ of key words can be modified.</para> message-id and the original recipient is included in the &mdn; reply. This preserves enough information for the sender to find the message in - his sent messages for which this &mdn; was + their sent messages for which this &mdn; was generated. </para> </listitem> diff --git a/doc/kmail/index.docbook b/doc/kmail/index.docbook index 028c8579..877846ab 100644 --- a/doc/kmail/index.docbook +++ b/doc/kmail/index.docbook @@ -149,15 +149,3 @@ </appendix> </book> - -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: - -// vim:ts=0:sw=2:tw=78:noet ---> diff --git a/doc/kmail/using-kmail.docbook b/doc/kmail/using-kmail.docbook index 999bd6d9..8609f2e6 100644 --- a/doc/kmail/using-kmail.docbook +++ b/doc/kmail/using-kmail.docbook @@ -344,7 +344,7 @@ choose from the list of common &MIME; types. You can also select an encoding method for your file from the list of encoding options (normally, the default value works fine). Check the <guilabel>Suggest automatic display</guilabel> option if you want to suggest to the recipient the automatic (inline) display of this attachment. Whether this works or not depends on the recipient's email client -and on his settings.</para> +and on their settings.</para> <para>You can also attach public keys to the message by using the appropriate options in the <menuchoice><guimenu>Attach</guimenu></menuchoice> menu. <application>PGP</application> @@ -2014,7 +2014,7 @@ defined for the current identity to the message. Now you can send the message.</ that the receiver will get the correct key: there can be a man-in-the-middle attack, as somebody can change the key and sign the message with that other key. That is why the recipient should verify the attached key by checking the -key's fingerprint against the one he received in a secure way from you; have a look +key's fingerprint against the one they received in a secure way from you; have a look at the <application>PGP</application> documentation for further details.</para> </sect2> diff --git a/doc/knode/introduction.docbook b/doc/knode/introduction.docbook index db14ec3a..91cda142 100644 --- a/doc/knode/introduction.docbook +++ b/doc/knode/introduction.docbook @@ -37,7 +37,7 @@ is not answered in this manual.</para> Usenet</link> chapter is recommended; it is not so much about &knode; as how to move about in the Usenet with its help. In general, it is not sufficient to just master a news reader for writing news -articles: imagine a car driver who masters his car perfectly but does +articles: imagine a car driver who masters a car perfectly but does not know about the traffic rules or signs; do you want to encounter such a driver when out in traffic? So please take your time to learn at least a little about the <quote>traffic rules</quote> of the diff --git a/doc/knode/journey.docbook b/doc/knode/journey.docbook index 54dc82a3..15a4905f 100644 --- a/doc/knode/journey.docbook +++ b/doc/knode/journey.docbook @@ -158,7 +158,7 @@ newsgroup. It stands for: (R)ead (T)he (F)...ing <para>Wait, what is <acronym>BTW</acronym> now? Another often-seen acronym which means (B)y (T)he (W)ay. It is easy when you know it; to avoid you having to continuously speculate over the meaning of -acronyms there is table at he end of this section containing the +acronyms there is table at the end of this section containing the most-often-used acronyms.</para> <para>This table does not try to be complete and is based on a list by @@ -519,7 +519,7 @@ head and think of a face.</para> <title>PLONK!</title> <para>This PLONK! looks like some comic-sound, does it not? And that is -exactly what it is used for. The one who reads it knows he was just +exactly what it is used for. The one who reads it knows they were just added to the killfile of a newsreader; normally this means the recipient of the PLONK! annoyed the sender. The PLONK! is meant to play back the sound of the recipients name hitting the ground in the diff --git a/doc/knode/using-morefeatures.docbook b/doc/knode/using-morefeatures.docbook index 39892bf6..62e769ab 100644 --- a/doc/knode/using-morefeatures.docbook +++ b/doc/knode/using-morefeatures.docbook @@ -688,7 +688,7 @@ examples.</para> Test; to do this choose the <guilabel>From</guilabel> header line from the first drop-down list, choose <guilabel>is exactly the same as</guilabel> from the second -drop-down list, and enter his name in the text field. +drop-down list, and enter their name in the text field. But, before doing this you should have a look at the <glossterm>header</glossterm> of one of Theodor's articles and see what is in the <quote>From</quote> line.</para> @@ -843,13 +843,3 @@ PGP-signature</guimenuitem></menuchoice>.</para> </sect2> </sect1> -<!-- -Local Variables: -mode: sgml -sgml-omittag: nil -sgml-shorttag: t -sgml-minimize-attributes: nil -sgml-general-insert-case: lower -sgml-parent-document:("index.docbook" "chapter" "sect1") -End: ---> diff --git a/doc/knotes/index.docbook b/doc/knotes/index.docbook index 73d60ba9..723509ef 100644 --- a/doc/knotes/index.docbook +++ b/doc/knotes/index.docbook @@ -370,14 +370,3 @@ allowing you to configure the note.</para> &documentation.index; </book> -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: - -// vim:ts=2:sw=2:tw=78:noet ---> diff --git a/doc/konsolekalendar/index.docbook b/doc/konsolekalendar/index.docbook index 6e35c490..307b6be3 100644 --- a/doc/konsolekalendar/index.docbook +++ b/doc/konsolekalendar/index.docbook @@ -860,12 +860,3 @@ on the &kde; desktop.</para> &documentation.index; </book> -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: ---> diff --git a/doc/kontact/index.docbook b/doc/kontact/index.docbook index 8032da90..7829e674 100644 --- a/doc/kontact/index.docbook +++ b/doc/kontact/index.docbook @@ -972,7 +972,7 @@ The settings stored in the profile include typical Look&Feel related options <para> Two default profiles are provided by Kontact: "&kontact; Style", which contains the default &kontact; settings, and "Outlook Style", adapting &kontact; to Microsoft Outlook Look&Feel. -The user can adapt existing profiles, create new profiles from his current settings, and import and export profiles. +The user can adapt existing profiles, create new profiles from their current settings, and import and export profiles. </para> <para> @@ -1163,14 +1163,3 @@ url="http://kontact.kde.org">http://kontact.kde.org</ulink></para> &documentation.index; </book> -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: - -// vim:ts=2:sw=2:tw=78:noet ---> diff --git a/doc/korganizer/index.docbook b/doc/korganizer/index.docbook index bdb5bb51..b9dcf212 100644 --- a/doc/korganizer/index.docbook +++ b/doc/korganizer/index.docbook @@ -403,7 +403,7 @@ want to use another resource, especially if you use a supported groupware server. Please ask the server administrator for the information required to configure the groupware resource, including free/busy information publishing and retrieving. Access to free/busy information allows an event organizer to -take the attendee's calendar in consideration when adding him to the event's +take the attendee's calendar in consideration when adding them to the event's attendee list.</para> <note><para>Besides calendar storage, groupware servers typically offer contacts, @@ -694,7 +694,7 @@ and do not reload the file at regular intervals.</para> the same remote file at the same time, because the remote file resource does not offer a conflict resolution mechanism. For instance, if someone else changes (and saves) the remote file, after you loaded it, and a some time later you save -the file, his changes will be lost. +the file, their changes will be lost. </para></warning> </listitem> @@ -1734,7 +1734,7 @@ requested from the attendee.</para></listitem> <varlistentry> <term><guibutton>Select Addressee</guibutton></term> <listitem><para>If the attendee(s) are in your Address Book, you do not have to -remember or type his email address to add it to the attendee list. Just click +remember or type their email address to add it to the attendee list. Just click the <guibutton>Select Addressee...</guibutton> button and choose the attendee(s) from the list. Please note that this is the standard &kde; address book, which is also used by &kmail; and can also be called as a separate application @@ -1821,7 +1821,7 @@ by dragging it with the mouse, or resize it by moving the edges of the highlight area with the mouse.</para> <para>The free/busy information is only available if the -attendee publishes his free/busy schedule, and if &korganizer; is correctly +attendee publishes their free/busy schedule, and if &korganizer; is correctly configured to retrieve it. For more information about configuring &korganizer; to publish and retrieve free/busy information, please check the <xref linkend="config" />. Double-clicking on an attendee entry in the list @@ -4976,14 +4976,3 @@ To-do becomes very similar to an event.</para> &documentation.index; </book> -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: - -// vim:ts=2:sw=2:tw=78:noet ---> diff --git a/doc/korn/index.docbook b/doc/korn/index.docbook index 535ce323..5962ff83 100644 --- a/doc/korn/index.docbook +++ b/doc/korn/index.docbook @@ -228,11 +228,3 @@ Korn...</guimenuitem> option or above.</para> </book> -<!-- -Local Variables: -mode: sgml -sgml-omittag: nil -sgml-shorttag: t -End: ---> - diff --git a/doc/kwatchgnupg/index.docbook b/doc/kwatchgnupg/index.docbook index 6e40f6bc..894e5781 100644 --- a/doc/kwatchgnupg/index.docbook +++ b/doc/kwatchgnupg/index.docbook @@ -268,15 +268,3 @@ history manually. &documentation.index; </book> - -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: - -// vim:ts=2:sw=2:tw=78:noet ---> diff --git a/indexlib/bitio.h b/indexlib/bitio.h index 913f44ea..1ecc0cb2 100644 --- a/indexlib/bitio.h +++ b/indexlib/bitio.h @@ -32,7 +32,7 @@ */ #include <inttypes.h> -#include "boost-compat/remove_cv.hpp" +#include "boost-compat/remove_cv.h" /** * \namespace byte_io diff --git a/indexlib/bitio.tcc b/indexlib/bitio.tcc index f6dbdfc0..f1c14c77 100644 --- a/indexlib/bitio.tcc +++ b/indexlib/bitio.tcc @@ -1,5 +1,5 @@ -#include "boost-compat/static_assert.hpp" -#include "boost-compat/remove_cv.hpp" +#include "boost-compat/static_assert.h" +#include "boost-compat/remove_cv.h" #ifdef HAVE_BOOST #include <boost/type_traits/is_same.hpp> #endif diff --git a/indexlib/boost-compat/checked_delete.hpp b/indexlib/boost-compat/checked_delete.h index 9bb84e8e..db740fcb 100644 --- a/indexlib/boost-compat/checked_delete.hpp +++ b/indexlib/boost-compat/checked_delete.h @@ -1,5 +1,5 @@ -#ifndef BOOST_CHECKED_DELETE_HPP_INCLUDED -#define BOOST_CHECKED_DELETE_HPP_INCLUDED +#ifndef BOOST_CHECKED_DELETE_H_INCLUDED +#define BOOST_CHECKED_DELETE_H_INCLUDED // MS compatible compilers support #pragma once @@ -66,4 +66,4 @@ template<class T> struct checked_array_deleter } // namespace boost -#endif // #ifndef BOOST_CHECKED_DELETE_HPP_INCLUDED +#endif // #ifndef BOOST_CHECKED_DELETE_H_INCLUDED diff --git a/indexlib/boost-compat/config.hpp b/indexlib/boost-compat/config.h index 055a2785..86f12b81 100644 --- a/indexlib/boost-compat/config.hpp +++ b/indexlib/boost-compat/config.h @@ -1,4 +1,4 @@ -// Boost config.hpp configuration header file ------------------------------// +// Boost config.h configuration header file ------------------------------// // (C) Copyright John Maddock 2002. // Use, modification and distribution are subject to the @@ -7,15 +7,15 @@ // See http://www.boost.org/libs/config for most recent version. -// Boost config.hpp policy and rationale documentation has been moved to +// Boost config.h policy and rationale documentation has been moved to // http://www.boost.org/libs/config // // CAUTION: This file is intended to be completely stable - // DO NOT MODIFY THIS FILE! // -#ifndef BOOST_CONFIG_HPP -#define BOOST_CONFIG_HPP +#ifndef BOOST_CONFIG_H +#define BOOST_CONFIG_H // if we don't have a user config, then use the default location: #if !defined(BOOST_USER_CONFIG) && !defined(BOOST_NO_USER_CONFIG) @@ -56,7 +56,7 @@ // get config suffix code: #include <boost/config/suffix.hpp> -#endif // BOOST_CONFIG_HPP +#endif // BOOST_CONFIG_H diff --git a/indexlib/boost-compat/config/abi/borland_prefix.hpp b/indexlib/boost-compat/config/abi/borland_prefix.h index 49f42494..49f42494 100644 --- a/indexlib/boost-compat/config/abi/borland_prefix.hpp +++ b/indexlib/boost-compat/config/abi/borland_prefix.h diff --git a/indexlib/boost-compat/config/abi/borland_suffix.hpp b/indexlib/boost-compat/config/abi/borland_suffix.h index 940535f3..940535f3 100644 --- a/indexlib/boost-compat/config/abi/borland_suffix.hpp +++ b/indexlib/boost-compat/config/abi/borland_suffix.h diff --git a/indexlib/boost-compat/config/abi/msvc_prefix.hpp b/indexlib/boost-compat/config/abi/msvc_prefix.h index 3d3905c2..3d3905c2 100644 --- a/indexlib/boost-compat/config/abi/msvc_prefix.hpp +++ b/indexlib/boost-compat/config/abi/msvc_prefix.h diff --git a/indexlib/boost-compat/config/abi/msvc_suffix.hpp b/indexlib/boost-compat/config/abi/msvc_suffix.h index a64d783e..a64d783e 100644 --- a/indexlib/boost-compat/config/abi/msvc_suffix.hpp +++ b/indexlib/boost-compat/config/abi/msvc_suffix.h diff --git a/indexlib/boost-compat/config/abi_prefix.hpp b/indexlib/boost-compat/config/abi_prefix.h index 1733dc03..d4ddd29b 100644 --- a/indexlib/boost-compat/config/abi_prefix.hpp +++ b/indexlib/boost-compat/config/abi_prefix.h @@ -6,8 +6,8 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt). -#ifndef BOOST_CONFIG_ABI_PREFIX_HPP -# define BOOST_CONFIG_ABI_PREFIX_HPP +#ifndef BOOST_CONFIG_ABI_PREFIX_H +# define BOOST_CONFIG_ABI_PREFIX_H #else # error double inclusion of header boost/config/abi_prefix.hpp is an error #endif diff --git a/indexlib/boost-compat/config/abi_suffix.hpp b/indexlib/boost-compat/config/abi_suffix.h index 6339da63..4876507e 100644 --- a/indexlib/boost-compat/config/abi_suffix.hpp +++ b/indexlib/boost-compat/config/abi_suffix.h @@ -9,10 +9,10 @@ // This header should be #included AFTER code that was preceded by a #include // <boost/config/abi_prefix.hpp>. -#ifndef BOOST_CONFIG_ABI_PREFIX_HPP +#ifndef BOOST_CONFIG_ABI_PREFIX_H # error Header boost/config/abi_prefix.hpp must only be used after boost/config/abi_prefix.hpp #else -# undef BOOST_CONFIG_ABI_PREFIX_HPP +# undef BOOST_CONFIG_ABI_PREFIX_H #endif // the suffix header occurs after all of our code: diff --git a/indexlib/boost-compat/config/auto_link.hpp b/indexlib/boost-compat/config/auto_link.h index b4e580ff..c6d9bc90 100644 --- a/indexlib/boost-compat/config/auto_link.hpp +++ b/indexlib/boost-compat/config/auto_link.h @@ -5,7 +5,7 @@ /* * LOCATION: see http://www.boost.org for most recent version. - * FILE auto_link.hpp + * FILE auto_link.h * VERSION see <boost/version.hpp> * DESCRIPTION: Automatic library inclusion for Borland/Microsoft compilers. */ @@ -67,7 +67,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. ***************************************************************************/ #ifdef __cplusplus -# ifndef BOOST_CONFIG_HPP +# ifndef BOOST_CONFIG_H # include <boost/config.hpp> # endif #elif defined(_MSC_VER) && !defined(__MWERKS__) && !defined(__EDG_VERSION__) @@ -86,7 +86,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. || (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \ || (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200)) -#ifndef BOOST_VERSION_HPP +#ifndef BOOST_VERSION_H # include <boost/version.hpp> #endif diff --git a/indexlib/boost-compat/config/compiler/borland.hpp b/indexlib/boost-compat/config/compiler/borland.h index 531691ef..531691ef 100644 --- a/indexlib/boost-compat/config/compiler/borland.hpp +++ b/indexlib/boost-compat/config/compiler/borland.h diff --git a/indexlib/boost-compat/config/compiler/comeau.hpp b/indexlib/boost-compat/config/compiler/comeau.h index 16a1b93c..16a1b93c 100644 --- a/indexlib/boost-compat/config/compiler/comeau.hpp +++ b/indexlib/boost-compat/config/compiler/comeau.h diff --git a/indexlib/boost-compat/config/compiler/common_edg.hpp b/indexlib/boost-compat/config/compiler/common_edg.h index c7c0b56e..28b164a8 100644 --- a/indexlib/boost-compat/config/compiler/common_edg.hpp +++ b/indexlib/boost-compat/config/compiler/common_edg.h @@ -34,7 +34,7 @@ # define BOOST_NO_TEMPLATE_TEMPLATES #endif -// See also kai.hpp which checks a Kai-specific symbol for EH +// See also kai.h which checks a Kai-specific symbol for EH # if !defined(__KCC) && !defined(__EXCEPTIONS) # define BOOST_NO_EXCEPTIONS # endif diff --git a/indexlib/boost-compat/config/compiler/compaq_cxx.hpp b/indexlib/boost-compat/config/compiler/compaq_cxx.h index 3c0c6b7f..3c0c6b7f 100644 --- a/indexlib/boost-compat/config/compiler/compaq_cxx.hpp +++ b/indexlib/boost-compat/config/compiler/compaq_cxx.h diff --git a/indexlib/boost-compat/config/compiler/digitalmars.hpp b/indexlib/boost-compat/config/compiler/digitalmars.h index 32fc71fa..32fc71fa 100644 --- a/indexlib/boost-compat/config/compiler/digitalmars.hpp +++ b/indexlib/boost-compat/config/compiler/digitalmars.h diff --git a/indexlib/boost-compat/config/compiler/gcc.hpp b/indexlib/boost-compat/config/compiler/gcc.h index 4dc3f608..2c5ad198 100644 --- a/indexlib/boost-compat/config/compiler/gcc.hpp +++ b/indexlib/boost-compat/config/compiler/gcc.h @@ -14,7 +14,7 @@ // GNU C++ compiler setup: # if __GNUC__ == 2 && __GNUC_MINOR__ == 91 - // egcs 1.1 won't parse shared_ptr.hpp without this: + // egcs 1.1 won't parse shared_ptr.h without this: # define BOOST_NO_AUTO_PTR # endif # if __GNUC__ == 2 && __GNUC_MINOR__ < 95 diff --git a/indexlib/boost-compat/config/compiler/greenhills.hpp b/indexlib/boost-compat/config/compiler/greenhills.h index 038b6b2b..038b6b2b 100644 --- a/indexlib/boost-compat/config/compiler/greenhills.hpp +++ b/indexlib/boost-compat/config/compiler/greenhills.h diff --git a/indexlib/boost-compat/config/compiler/hp_acc.hpp b/indexlib/boost-compat/config/compiler/hp_acc.h index b5c587ab..b5c587ab 100644 --- a/indexlib/boost-compat/config/compiler/hp_acc.hpp +++ b/indexlib/boost-compat/config/compiler/hp_acc.h diff --git a/indexlib/boost-compat/config/compiler/intel.hpp b/indexlib/boost-compat/config/compiler/intel.h index 060338bc..060338bc 100644 --- a/indexlib/boost-compat/config/compiler/intel.hpp +++ b/indexlib/boost-compat/config/compiler/intel.h diff --git a/indexlib/boost-compat/config/compiler/kai.hpp b/indexlib/boost-compat/config/compiler/kai.h index de16f1a6..fefda9ce 100644 --- a/indexlib/boost-compat/config/compiler/kai.hpp +++ b/indexlib/boost-compat/config/compiler/kai.h @@ -16,7 +16,7 @@ # define BOOST_NO_STDC_NAMESPACE # endif -// see also common_edg.hpp which needs a special check for __KCC +// see also common_edg.h which needs a special check for __KCC # if !defined(_EXCEPTIONS) # define BOOST_NO_EXCEPTIONS # endif diff --git a/indexlib/boost-compat/config/compiler/metrowerks.hpp b/indexlib/boost-compat/config/compiler/metrowerks.h index a74cadef..a74cadef 100644 --- a/indexlib/boost-compat/config/compiler/metrowerks.hpp +++ b/indexlib/boost-compat/config/compiler/metrowerks.h diff --git a/indexlib/boost-compat/config/compiler/mpw.hpp b/indexlib/boost-compat/config/compiler/mpw.h index 8ab2aacb..8ab2aacb 100644 --- a/indexlib/boost-compat/config/compiler/mpw.hpp +++ b/indexlib/boost-compat/config/compiler/mpw.h diff --git a/indexlib/boost-compat/config/compiler/sgi_mipspro.hpp b/indexlib/boost-compat/config/compiler/sgi_mipspro.h index 689b67ee..689b67ee 100644 --- a/indexlib/boost-compat/config/compiler/sgi_mipspro.hpp +++ b/indexlib/boost-compat/config/compiler/sgi_mipspro.h diff --git a/indexlib/boost-compat/config/compiler/sunpro_cc.hpp b/indexlib/boost-compat/config/compiler/sunpro_cc.h index 8a61199f..80dc3913 100644 --- a/indexlib/boost-compat/config/compiler/sunpro_cc.hpp +++ b/indexlib/boost-compat/config/compiler/sunpro_cc.h @@ -38,7 +38,7 @@ // Requesting debug info (-g) with Boost.Python results // in an internal compiler error for "static const" // initialized in-class. - // >> Assertion: (../links/dbg_cstabs.cc, line 611) + // >> Assertion: (../links/dbg_cstabs.cpp, line 611) // while processing ../test.cpp at line 0. // (Jens Maurer according to Gottfried Ganauge 04 Mar 2002) # define BOOST_NO_INCLASS_MEMBER_INITIALIZATION diff --git a/indexlib/boost-compat/config/compiler/vacpp.hpp b/indexlib/boost-compat/config/compiler/vacpp.h index 4cf0de7c..4cf0de7c 100644 --- a/indexlib/boost-compat/config/compiler/vacpp.hpp +++ b/indexlib/boost-compat/config/compiler/vacpp.h diff --git a/indexlib/boost-compat/config/compiler/visualc.hpp b/indexlib/boost-compat/config/compiler/visualc.h index 32353260..32353260 100644 --- a/indexlib/boost-compat/config/compiler/visualc.hpp +++ b/indexlib/boost-compat/config/compiler/visualc.h diff --git a/indexlib/boost-compat/config/platform/aix.hpp b/indexlib/boost-compat/config/platform/aix.h index 894ef42c..894ef42c 100644 --- a/indexlib/boost-compat/config/platform/aix.hpp +++ b/indexlib/boost-compat/config/platform/aix.h diff --git a/indexlib/boost-compat/config/platform/amigaos.hpp b/indexlib/boost-compat/config/platform/amigaos.h index 34bcf412..34bcf412 100644 --- a/indexlib/boost-compat/config/platform/amigaos.hpp +++ b/indexlib/boost-compat/config/platform/amigaos.h diff --git a/indexlib/boost-compat/config/platform/beos.hpp b/indexlib/boost-compat/config/platform/beos.h index 48c3d8dc..48c3d8dc 100644 --- a/indexlib/boost-compat/config/platform/beos.hpp +++ b/indexlib/boost-compat/config/platform/beos.h diff --git a/indexlib/boost-compat/config/platform/bsd.hpp b/indexlib/boost-compat/config/platform/bsd.h index 4f04ed2a..4f04ed2a 100644 --- a/indexlib/boost-compat/config/platform/bsd.hpp +++ b/indexlib/boost-compat/config/platform/bsd.h diff --git a/indexlib/boost-compat/config/platform/cygwin.hpp b/indexlib/boost-compat/config/platform/cygwin.h index 0fd2ebe2..0fd2ebe2 100644 --- a/indexlib/boost-compat/config/platform/cygwin.hpp +++ b/indexlib/boost-compat/config/platform/cygwin.h diff --git a/indexlib/boost-compat/config/platform/hpux.hpp b/indexlib/boost-compat/config/platform/hpux.h index 21049059..21049059 100644 --- a/indexlib/boost-compat/config/platform/hpux.hpp +++ b/indexlib/boost-compat/config/platform/hpux.h diff --git a/indexlib/boost-compat/config/platform/irix.hpp b/indexlib/boost-compat/config/platform/irix.h index aeae49c8..aeae49c8 100644 --- a/indexlib/boost-compat/config/platform/irix.hpp +++ b/indexlib/boost-compat/config/platform/irix.h diff --git a/indexlib/boost-compat/config/platform/linux.hpp b/indexlib/boost-compat/config/platform/linux.h index 51ae1334..51ae1334 100644 --- a/indexlib/boost-compat/config/platform/linux.hpp +++ b/indexlib/boost-compat/config/platform/linux.h diff --git a/indexlib/boost-compat/config/platform/macos.hpp b/indexlib/boost-compat/config/platform/macos.h index 3a5f4130..3a5f4130 100644 --- a/indexlib/boost-compat/config/platform/macos.hpp +++ b/indexlib/boost-compat/config/platform/macos.h diff --git a/indexlib/boost-compat/config/platform/solaris.hpp b/indexlib/boost-compat/config/platform/solaris.h index 700dc3ce..700dc3ce 100644 --- a/indexlib/boost-compat/config/platform/solaris.hpp +++ b/indexlib/boost-compat/config/platform/solaris.h diff --git a/indexlib/boost-compat/config/platform/win32.hpp b/indexlib/boost-compat/config/platform/win32.h index 548bff28..548bff28 100644 --- a/indexlib/boost-compat/config/platform/win32.hpp +++ b/indexlib/boost-compat/config/platform/win32.h diff --git a/indexlib/boost-compat/config/posix_features.hpp b/indexlib/boost-compat/config/posix_features.h index 4afb476b..4afb476b 100644 --- a/indexlib/boost-compat/config/posix_features.hpp +++ b/indexlib/boost-compat/config/posix_features.h diff --git a/indexlib/boost-compat/config/requires_threads.hpp b/indexlib/boost-compat/config/requires_threads.h index cfaff230..03259ae9 100644 --- a/indexlib/boost-compat/config/requires_threads.hpp +++ b/indexlib/boost-compat/config/requires_threads.h @@ -4,10 +4,10 @@ // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_CONFIG_REQUIRES_THREADS_HPP -#define BOOST_CONFIG_REQUIRES_THREADS_HPP +#ifndef BOOST_CONFIG_REQUIRES_THREADS_H +#define BOOST_CONFIG_REQUIRES_THREADS_H -#ifndef BOOST_CONFIG_HPP +#ifndef BOOST_CONFIG_H # include <boost/config.hpp> #endif @@ -89,4 +89,4 @@ #endif // BOOST_HAS_THREADS -#endif // BOOST_CONFIG_REQUIRES_THREADS_HPP +#endif // BOOST_CONFIG_REQUIRES_THREADS_H diff --git a/indexlib/boost-compat/config/select_compiler_config.hpp b/indexlib/boost-compat/config/select_compiler_config.h index 3453f1a3..3453f1a3 100644 --- a/indexlib/boost-compat/config/select_compiler_config.hpp +++ b/indexlib/boost-compat/config/select_compiler_config.h diff --git a/indexlib/boost-compat/config/select_platform_config.hpp b/indexlib/boost-compat/config/select_platform_config.h index 5699b2a2..5699b2a2 100644 --- a/indexlib/boost-compat/config/select_platform_config.hpp +++ b/indexlib/boost-compat/config/select_platform_config.h diff --git a/indexlib/boost-compat/config/select_stdlib_config.hpp b/indexlib/boost-compat/config/select_stdlib_config.h index b7bf5914..b7bf5914 100644 --- a/indexlib/boost-compat/config/select_stdlib_config.hpp +++ b/indexlib/boost-compat/config/select_stdlib_config.h diff --git a/indexlib/boost-compat/config/stdlib/dinkumware.hpp b/indexlib/boost-compat/config/stdlib/dinkumware.h index aa214fc1..aa214fc1 100644 --- a/indexlib/boost-compat/config/stdlib/dinkumware.hpp +++ b/indexlib/boost-compat/config/stdlib/dinkumware.h diff --git a/indexlib/boost-compat/config/stdlib/libcomo.hpp b/indexlib/boost-compat/config/stdlib/libcomo.h index b2c8e440..b2c8e440 100644 --- a/indexlib/boost-compat/config/stdlib/libcomo.hpp +++ b/indexlib/boost-compat/config/stdlib/libcomo.h diff --git a/indexlib/boost-compat/config/stdlib/libstdcpp3.hpp b/indexlib/boost-compat/config/stdlib/libstdcpp3.h index 9774e876..99e711ce 100644 --- a/indexlib/boost-compat/config/stdlib/libstdcpp3.hpp +++ b/indexlib/boost-compat/config/stdlib/libstdcpp3.h @@ -45,7 +45,7 @@ #if !defined(_GLIBCPP_USE_LONG_LONG) \ && !defined(_GLIBCXX_USE_LONG_LONG)\ && defined(BOOST_HAS_LONG_LONG) -// May have been set by compiler/*.hpp, but "long long" without library +// May have been set by compiler/*.h, but "long long" without library // support is useless. # undef BOOST_HAS_LONG_LONG #endif diff --git a/indexlib/boost-compat/config/stdlib/modena.hpp b/indexlib/boost-compat/config/stdlib/modena.h index 61e31b7d..61e31b7d 100644 --- a/indexlib/boost-compat/config/stdlib/modena.hpp +++ b/indexlib/boost-compat/config/stdlib/modena.h diff --git a/indexlib/boost-compat/config/stdlib/msl.hpp b/indexlib/boost-compat/config/stdlib/msl.h index f8ad3d9a..f8ad3d9a 100644 --- a/indexlib/boost-compat/config/stdlib/msl.hpp +++ b/indexlib/boost-compat/config/stdlib/msl.h diff --git a/indexlib/boost-compat/config/stdlib/roguewave.hpp b/indexlib/boost-compat/config/stdlib/roguewave.h index ec3d881b..ec3d881b 100644 --- a/indexlib/boost-compat/config/stdlib/roguewave.hpp +++ b/indexlib/boost-compat/config/stdlib/roguewave.h diff --git a/indexlib/boost-compat/config/stdlib/sgi.hpp b/indexlib/boost-compat/config/stdlib/sgi.h index 67f7a0a4..67f7a0a4 100644 --- a/indexlib/boost-compat/config/stdlib/sgi.hpp +++ b/indexlib/boost-compat/config/stdlib/sgi.h diff --git a/indexlib/boost-compat/config/stdlib/stlport.hpp b/indexlib/boost-compat/config/stdlib/stlport.h index 4843ea59..4843ea59 100644 --- a/indexlib/boost-compat/config/stdlib/stlport.hpp +++ b/indexlib/boost-compat/config/stdlib/stlport.h diff --git a/indexlib/boost-compat/config/stdlib/vacpp.hpp b/indexlib/boost-compat/config/stdlib/vacpp.h index 8321ee0c..8321ee0c 100644 --- a/indexlib/boost-compat/config/stdlib/vacpp.hpp +++ b/indexlib/boost-compat/config/stdlib/vacpp.h diff --git a/indexlib/boost-compat/config/suffix.hpp b/indexlib/boost-compat/config/suffix.h index 77d9deca..313faea9 100644 --- a/indexlib/boost-compat/config/suffix.hpp +++ b/indexlib/boost-compat/config/suffix.h @@ -1,4 +1,4 @@ -// Boost config.hpp configuration header file ------------------------------// +// Boost config.h configuration header file ------------------------------// // (C) Copyright John Maddock 2001 - 2003. // (C) Copyright Darin Adler 2001. @@ -14,15 +14,15 @@ // See http://www.boost.org for most recent version. -// Boost config.hpp policy and rationale documentation has been moved to +// Boost config.h policy and rationale documentation has been moved to // http://www.boost.org/libs/config // // This file is intended to be stable, and relatively unchanging. // It should contain boilerplate code only - no compiler specific // code unless it is unavoidable - no changes unless unavoidable. -#ifndef BOOST_CONFIG_SUFFIX_HPP -#define BOOST_CONFIG_SUFFIX_HPP +#ifndef BOOST_CONFIG_SUFFIX_H +#define BOOST_CONFIG_SUFFIX_H // // look for long long by looking for the appropriate macros in <limits.h>. diff --git a/indexlib/boost-compat/config/user.hpp b/indexlib/boost-compat/config/user.h index 5a4a9d47..14b02c67 100644 --- a/indexlib/boost-compat/config/user.hpp +++ b/indexlib/boost-compat/config/user.h @@ -1,4 +1,4 @@ -// boost/config/user.hpp ---------------------------------------------------// +// boost/config/user.h ---------------------------------------------------// // (C) Copyright John Maddock 2001. // Use, modification and distribution are subject to the diff --git a/indexlib/boost-compat/intrusive_ptr.hpp b/indexlib/boost-compat/intrusive_ptr.h index 7efbadee..39b4b7b2 100644 --- a/indexlib/boost-compat/intrusive_ptr.hpp +++ b/indexlib/boost-compat/intrusive_ptr.h @@ -1,8 +1,8 @@ -#ifndef BOOST_INTRUSIVE_PTR_HPP_INCLUDED -#define BOOST_INTRUSIVE_PTR_HPP_INCLUDED +#ifndef BOOST_INTRUSIVE_PTR_H_INCLUDED +#define BOOST_INTRUSIVE_PTR_H_INCLUDED // -// intrusive_ptr.hpp +// intrusive_ptr.h // // Copyright (c) 2001, 2002 Peter Dimov // @@ -269,4 +269,4 @@ template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std:: # pragma warning(pop) #endif -#endif // #ifndef BOOST_INTRUSIVE_PTR_HPP_INCLUDED +#endif // #ifndef BOOST_INTRUSIVE_PTR_H_INCLUDED diff --git a/indexlib/boost-compat/next_prior.hpp b/indexlib/boost-compat/next_prior.h index e1d2e428..cdacf29c 100644 --- a/indexlib/boost-compat/next_prior.hpp +++ b/indexlib/boost-compat/next_prior.h @@ -1,4 +1,4 @@ -// Boost next_prior.hpp header file ---------------------------------------// +// Boost next_prior.h header file ---------------------------------------// // (C) Copyright Dave Abrahams and Daniel Walker 1999-2003. Distributed under the Boost // Software License, Version 1.0. (See accompanying file @@ -9,8 +9,8 @@ // Revision History // 13 Dec 2003 Added next(x, n) and prior(x, n) (Daniel Walker) -#ifndef BOOST_NEXT_PRIOR_HPP_INCLUDED -#define BOOST_NEXT_PRIOR_HPP_INCLUDED +#ifndef BOOST_NEXT_PRIOR_H_INCLUDED +#define BOOST_NEXT_PRIOR_H_INCLUDED #include <iterator> @@ -48,4 +48,4 @@ inline T prior(T x, Distance n) } // namespace boost -#endif // BOOST_NEXT_PRIOR_HPP_INCLUDED +#endif // BOOST_NEXT_PRIOR_H_INCLUDED diff --git a/indexlib/boost-compat/noncopyable.hpp b/indexlib/boost-compat/noncopyable.h index 7770bdbd..0d94ea6a 100644 --- a/indexlib/boost-compat/noncopyable.hpp +++ b/indexlib/boost-compat/noncopyable.h @@ -1,4 +1,4 @@ -// Boost noncopyable.hpp header file --------------------------------------// +// Boost noncopyable.h header file --------------------------------------// // (C) Copyright Beman Dawes 1999-2003. Distributed under the Boost // Software License, Version 1.0. (See accompanying file @@ -6,8 +6,8 @@ // See http://www.boost.org/libs/utility for documentation. -#ifndef BOOST_NONCOPYABLE_HPP_INCLUDED -#define BOOST_NONCOPYABLE_HPP_INCLUDED +#ifndef BOOST_NONCOPYABLE_H_INCLUDED +#define BOOST_NONCOPYABLE_H_INCLUDED namespace boost { @@ -33,4 +33,4 @@ typedef noncopyable_::noncopyable noncopyable; } // namespace boost -#endif // BOOST_NONCOPYABLE_HPP_INCLUDED +#endif // BOOST_NONCOPYABLE_H_INCLUDED diff --git a/indexlib/boost-compat/remove_cv.hpp b/indexlib/boost-compat/remove_cv.h index ec7c1a95..c59970a8 100644 --- a/indexlib/boost-compat/remove_cv.hpp +++ b/indexlib/boost-compat/remove_cv.h @@ -1,7 +1,7 @@ -#ifndef BOOST_TT_REMOVE_CV_HPP_INCLUDED -#define BOOST_TT_REMOVE_CV_HPP_INCLUDED -#ifndef BOOST_TT_DETAIL_CV_TRAITS_IMPL_HPP_INCLUDED -#define BOOST_TT_DETAIL_CV_TRAITS_IMPL_HPP_INCLUDED +#ifndef BOOST_TT_REMOVE_CV_H_INCLUDED +#define BOOST_TT_REMOVE_CV_H_INCLUDED +#ifndef BOOST_TT_DETAIL_CV_TRAITS_IMPL_H_INCLUDED +#define BOOST_TT_DETAIL_CV_TRAITS_IMPL_H_INCLUDED // ADAPTED (TAKEN) FROM BOOST // // (C) Copyright Dave Abrahams, Steve Cleary, Beman Dawes, Howard diff --git a/indexlib/boost-compat/scoped_ptr.hpp b/indexlib/boost-compat/scoped_ptr.h index 1260066a..60078bf1 100644 --- a/indexlib/boost-compat/scoped_ptr.hpp +++ b/indexlib/boost-compat/scoped_ptr.h @@ -1,5 +1,5 @@ -#ifndef BOOST_SCOPED_PTR_HPP_INCLUDED -#define BOOST_SCOPED_PTR_HPP_INCLUDED +#ifndef BOOST_SCOPED_PTR_H_INCLUDED +#define BOOST_SCOPED_PTR_H_INCLUDED // ADAPTED FOR indexlib @@ -13,7 +13,7 @@ // http://www.boost.org/libs/smart_ptr/scoped_ptr.htm // -#include "checked_delete.hpp" +#include "checked_delete.h" #include <memory> // for std::auto_ptr #include <assert.h> @@ -115,4 +115,4 @@ template<class T> inline T * get_pointer(scoped_ptr<T> const & p) } // namespace boost -#endif // #ifndef BOOST_SCOPED_PTR_HPP_INCLUDED +#endif // #ifndef BOOST_SCOPED_PTR_H_INCLUDED diff --git a/indexlib/boost-compat/shared_ptr.hpp b/indexlib/boost-compat/shared_ptr.h index 0a3bf6d8..c236e3bd 100644 --- a/indexlib/boost-compat/shared_ptr.hpp +++ b/indexlib/boost-compat/shared_ptr.h @@ -1,8 +1,8 @@ -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED -#define BOOST_SHARED_PTR_HPP_INCLUDED +#ifndef BOOST_SHARED_PTR_H_INCLUDED +#define BOOST_SHARED_PTR_H_INCLUDED // -// shared_ptr.hpp +// shared_ptr.h // // (C) Copyright Greg Colvin and Beman Dawes 1998, 1999. // Copyright (c) 2001, 2002, 2003 Peter Dimov @@ -470,4 +470,4 @@ template<class D, class T> D * get_deleter(shared_ptr<T> const & p) #endif // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES) -#endif // #ifndef BOOST_SHARED_PTR_HPP_INCLUDED +#endif // #ifndef BOOST_SHARED_PTR_H_INCLUDED diff --git a/indexlib/boost-compat/smart_ptr.hpp b/indexlib/boost-compat/smart_ptr.h index c10de457..578a48e4 100644 --- a/indexlib/boost-compat/smart_ptr.hpp +++ b/indexlib/boost-compat/smart_ptr.h @@ -1,8 +1,8 @@ -#ifndef LPC_SMART_PTR_HPP1119293317_INCLUDE_GUARD_ -#define LPC_SMART_PTR_HPP1119293317_INCLUDE_GUARD_ +#ifndef LPC_SMART_PTR_H1119293317_INCLUDE_GUARD_ +#define LPC_SMART_PTR_H1119293317_INCLUDE_GUARD_ // -// smart_ptr.hpp +// smart_ptr.h // // For convenience, this header includes the rest of the smart // pointer library headers. @@ -28,4 +28,4 @@ #endif -#endif /* LPC_SMART_PTR_HPP1119293317_INCLUDE_GUARD_ */ +#endif /* LPC_SMART_PTR_H1119293317_INCLUDE_GUARD_ */ diff --git a/indexlib/boost-compat/static_assert.h b/indexlib/boost-compat/static_assert.h new file mode 100644 index 00000000..1d020c9f --- /dev/null +++ b/indexlib/boost-compat/static_assert.h @@ -0,0 +1,11 @@ +#ifndef LPC_STATIC_ASSERT_H1119293317_INCLUDE_GUARD_ +#define LPC_STATIC_ASSERT_H1119293317_INCLUDE_GUARD_ + +#ifdef HAVE_BOOST +#include <boost/static_assert.hpp> +#elif !defined( BOOST_STATIC_ASSERT ) +#define BOOST_STATIC_ASSERT( x ) +#endif + + +#endif /* LPC_STATIC_ASSERT_H1119293317_INCLUDE_GUARD_ */ diff --git a/indexlib/boost-compat/static_assert.hpp b/indexlib/boost-compat/static_assert.hpp deleted file mode 100644 index 76de9c49..00000000 --- a/indexlib/boost-compat/static_assert.hpp +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef LPC_STATIC_ASSERT_HPP1119293317_INCLUDE_GUARD_ -#define LPC_STATIC_ASSERT_HPP1119293317_INCLUDE_GUARD_ - -#ifdef HAVE_BOOST -#include <boost/static_assert.hpp> -#elif !defined( BOOST_STATIC_ASSERT ) -#define BOOST_STATIC_ASSERT( x ) -#endif - - -#endif /* LPC_STATIC_ASSERT_HPP1119293317_INCLUDE_GUARD_ */ diff --git a/indexlib/boost-compat/weak_ptr.hpp b/indexlib/boost-compat/weak_ptr.h index c2385007..338e5221 100644 --- a/indexlib/boost-compat/weak_ptr.hpp +++ b/indexlib/boost-compat/weak_ptr.h @@ -1,8 +1,8 @@ -#ifndef BOOST_WEAK_PTR_HPP_INCLUDED -#define BOOST_WEAK_PTR_HPP_INCLUDED +#ifndef BOOST_WEAK_PTR_H_INCLUDED +#define BOOST_WEAK_PTR_H_INCLUDED // -// weak_ptr.hpp +// weak_ptr.h // // Copyright (c) 2001, 2002, 2003 Peter Dimov // @@ -189,4 +189,4 @@ template<class T> shared_ptr<T> make_shared(weak_ptr<T> const & r) # pragma warning(pop) #endif -#endif // #ifndef BOOST_WEAK_PTR_HPP_INCLUDED +#endif // #ifndef BOOST_WEAK_PTR_H_INCLUDED diff --git a/indexlib/configure.in.in b/indexlib/configure.in.in index 1f1a806a..b66b049c 100644 --- a/indexlib/configure.in.in +++ b/indexlib/configure.in.in @@ -19,4 +19,4 @@ if test "x$have_boost" = "xyes"; then CXXFLAGS="-DHAVE_BOOST $CXXFLAGS" fi -
\ No newline at end of file + diff --git a/indexlib/ifile.cpp b/indexlib/ifile.cpp index b71297a0..5709bb41 100644 --- a/indexlib/ifile.cpp +++ b/indexlib/ifile.cpp @@ -39,7 +39,7 @@ #include <functional> #include <string.h> #include "format.h" -#include "boost-compat/next_prior.hpp" +#include "boost-compat/next_prior.h" ifile::ifile( std::string name ): diff --git a/indexlib/index_slow.h b/indexlib/index_slow.h index bbb4f7b7..6f1dcced 100644 --- a/indexlib/index_slow.h +++ b/indexlib/index_slow.h @@ -34,7 +34,7 @@ #include "index.h" #include "slow.h" -#include "boost-compat/noncopyable.hpp" +#include "boost-compat/noncopyable.h" /** * \see class slow which should be merged into this one. diff --git a/indexlib/leafdata.cpp b/indexlib/leafdata.cpp index db61119a..c8882156 100644 --- a/indexlib/leafdata.cpp +++ b/indexlib/leafdata.cpp @@ -33,7 +33,7 @@ #include "logfile.h" #include <iostream> #include <algorithm> -#include "boost-compat/next_prior.hpp" +#include "boost-compat/next_prior.h" #include "format.h" namespace { diff --git a/indexlib/memvector.h b/indexlib/memvector.h index 446fddf9..feb96268 100644 --- a/indexlib/memvector.h +++ b/indexlib/memvector.h @@ -35,8 +35,8 @@ #include "bitio.h" #include "compat.h" #include "manager.h" -#include "boost-compat/static_assert.hpp" -#include "boost-compat/scoped_ptr.hpp" +#include "boost-compat/static_assert.h" +#include "boost-compat/scoped_ptr.h" #ifdef HAVE_BOOST #include <boost/type_traits/is_convertible.hpp> #endif diff --git a/indexlib/pointer.h b/indexlib/pointer.h index 70721918..336ede76 100644 --- a/indexlib/pointer.h +++ b/indexlib/pointer.h @@ -34,7 +34,7 @@ #include <inttypes.h> #include <iostream> -#include "boost-compat/static_assert.hpp" +#include "boost-compat/static_assert.h" #ifdef HAVE_BOOST #include <boost/type_traits.hpp> #endif diff --git a/indexlib/stringarray.h b/indexlib/stringarray.h index a928db31..6202036c 100644 --- a/indexlib/stringarray.h +++ b/indexlib/stringarray.h @@ -34,7 +34,7 @@ #include <iostream> #include <string> -#include "boost-compat/scoped_ptr.hpp" +#include "boost-compat/scoped_ptr.h" #include "manager.h" #include "memvector.h" diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h index 4ac486f7..49350be4 100644 --- a/kaddressbook/common/kabprefs.h +++ b/kaddressbook/common/kabprefs.h @@ -25,7 +25,7 @@ #define KABPREFS_H #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "kabprefs_base.h" class TDEConfig; diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h index 33bc6f76..5660fed9 100644 --- a/kaddressbook/interfaces/configurewidget.h +++ b/kaddressbook/interfaces/configurewidget.h @@ -27,7 +27,7 @@ #include <tqwidget.h> #include <tdeconfig.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { class AddressBook; diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h index 85195dd8..6927c7a8 100644 --- a/kaddressbook/interfaces/contacteditorwidget.h +++ b/kaddressbook/interfaces/contacteditorwidget.h @@ -28,7 +28,7 @@ #include <tdeabc/addressbook.h> #include <klibloader.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #define KAB_CEW_PLUGIN_VERSION 1 diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index 0132399c..6632984d 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -35,7 +35,7 @@ #include <tdeabc/field.h> #include <kcommand.h> #include <kxmlguiclient.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { class AddressBook; diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h index 3de00edd..bcffc9b8 100644 --- a/kaddressbook/interfaces/extensionwidget.h +++ b/kaddressbook/interfaces/extensionwidget.h @@ -28,7 +28,7 @@ #include <tdeabc/addressbook.h> #include <klibloader.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #define KAB_EXTENSIONWIDGET_PLUGIN_VERSION 1 diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index b0dd43e7..a2220595 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -30,7 +30,7 @@ #include <tdeabc/addresseelist.h> #include <klibloader.h> #include <kxmlguiclient.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #define KAB_XXPORT_PLUGIN_VERSION 1 diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 2a4bb2f4..40ce444e 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -33,7 +33,7 @@ #include <tqwidget.h> #include "core.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { class AddressBook; diff --git a/kaddressbook/kaddressbookiface.h b/kaddressbook/kaddressbookiface.h index b7fa5f5c..c02922d3 100644 --- a/kaddressbook/kaddressbookiface.h +++ b/kaddressbook/kaddressbookiface.h @@ -27,7 +27,7 @@ #include <dcopobject.h> #include <kurl.h> #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KDE_EXPORT KAddressBookIface : virtual public DCOPObject { diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h index 8090408d..8071b8af 100644 --- a/kaddressbook/kaddressbookview.h +++ b/kaddressbook/kaddressbookview.h @@ -31,7 +31,7 @@ #include <tdeabc/field.h> #include <klibloader.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "filter.h" #include "viewconfigurewidget.h" diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index db05432c..ce2c9973 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -31,7 +31,7 @@ #include "kcmkabconfig.h" -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp index dcbcd2c5..8905b899 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp @@ -29,7 +29,7 @@ #include <tqregexp.h> -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index 73e8c5a2..0731ae57 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -32,7 +32,7 @@ #include "kcmkabldapconfig.h" -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h index 839078e6..11957a01 100644 --- a/kaddressbook/viewconfigurewidget.h +++ b/kaddressbook/viewconfigurewidget.h @@ -25,7 +25,7 @@ #define VIEWCONFIGUREWIDGET_H #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqpixmap.h> #include "configurewidget.h" diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index 5755784a..e1be330a 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -1597,5 +1597,3 @@ bool GNOKIIXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQSt ******************************************************************************/ #include "gnokii_xxport.moc" - -/* vim: set sts=4 ts=4 sw=4: */ diff --git a/kaddressbook/xxport/pab_pablib.cpp b/kaddressbook/xxport/pab_pablib.cpp index 344647f6..bae854c2 100644 --- a/kaddressbook/xxport/pab_pablib.cpp +++ b/kaddressbook/xxport/pab_pablib.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - pablib.cxx - description + pablib.cpp - description ------------------- begin : Tue Jul 4 2000 copyright : (C) 2000 by Hans Dijkema diff --git a/kaddressbook/xxport/pab_pablib.h b/kaddressbook/xxport/pab_pablib.h index 910688cc..f7cf7645 100644 --- a/kaddressbook/xxport/pab_pablib.h +++ b/kaddressbook/xxport/pab_pablib.h @@ -1,5 +1,5 @@ /*************************************************************************** - pablib.hxx - description + pablib.h - description ------------------- begin : Tue Jul 4 2000 copyright : (C) 2000 by Hans Dijkema @@ -16,8 +16,8 @@ ***************************************************************************/ -#ifndef PAB_LIB_HXX -#define PAB_LIB_HXX +#ifndef PAB_LIB_H +#define PAB_LIB_H #include <tdelocale.h> #include <tqfile.h> diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 21070acf..59c00f82 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -67,5 +67,3 @@ TDEABC::AddresseeList PABXXPort::importContacts( const TQString& ) const } #include "pab_xxport.moc" - -// vim: ts=2 sw=2 et diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h index 3da145d4..04323636 100644 --- a/kaddressbook/xxportmanager.h +++ b/kaddressbook/xxportmanager.h @@ -29,7 +29,7 @@ #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "xxport.h" diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp index 15a4eb8d..60ec1a67 100644 --- a/kandy/src/kandyprefsdialog.cpp +++ b/kandy/src/kandyprefsdialog.cpp @@ -351,7 +351,7 @@ void KandyPrefsDialog::setupAddressbookTab() void KandyPrefsDialog::setupWindowsTab() { TQFrame *topFrame = addPage(i18n("Windows"),0, - DesktopIcon("window_list",TDEIcon::SizeMedium)); + DesktopIcon("window_duplicate",TDEIcon::SizeMedium)); TQGridLayout *topLayout = new TQGridLayout(topFrame,6,2); topLayout->setSpacing(spacingHint()); diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui index 65d0fd90..361ff510 100644 --- a/karm/csvexportdialog_base.ui +++ b/karm/csvexportdialog_base.ui @@ -407,10 +407,8 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includes> + <include location="global" impldecl="in implementation">kdateedit.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>kdateedit.h</includehint> -</includehints> </UI> diff --git a/karm/karm.tdevelop b/karm/karm.tdevelop index e0436fba..963fa7c4 100644 --- a/karm/karm.tdevelop +++ b/karm/karm.tdevelop @@ -17,7 +17,7 @@ </general> <kdevfileview> <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> + <group pattern="*.cpp;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> <group pattern="*.png" name="Icons" /> <group pattern="*.po;*.ts" name="Translations" /> diff --git a/karm/karmstorage.h b/karm/karmstorage.h index 796c42db..4087d3da 100644 --- a/karm/karmstorage.h +++ b/karm/karmstorage.h @@ -34,7 +34,7 @@ #include <calendarresources.h> #include <vector> #include "resourcecalendar.h" -#include <tdepimmacros.h> +#include <kdemacros.h> class TQDateTime; class Preferences; diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index 6db8dcab..ef40a626 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ */ diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h index c1007359..4eb88df7 100644 --- a/kdgantt/KDGanttMinimizeSplitter.h +++ b/kdgantt/KDGanttMinimizeSplitter.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ */ diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index ed4943fd..879d25e5 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ */ diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h index 4dfac98d..4f14b1ad 100644 --- a/kdgantt/KDGanttSemiSizingControl.h +++ b/kdgantt/KDGanttSemiSizingControl.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ */ diff --git a/kdgantt/KDGanttSizingControl.cpp b/kdgantt/KDGanttSizingControl.cpp index 3d174ad5..bf2b5a1c 100644 --- a/kdgantt/KDGanttSizingControl.cpp +++ b/kdgantt/KDGanttSizingControl.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ */ /**************************************************************************** diff --git a/kdgantt/KDGanttSizingControl.h b/kdgantt/KDGanttSizingControl.h index 733f6035..31ac59c0 100644 --- a/kdgantt/KDGanttSizingControl.h +++ b/kdgantt/KDGanttSizingControl.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ */ /**************************************************************************** diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 440da7a7..d490da85 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h index 9a12bceb..18e77bbc 100644 --- a/kdgantt/KDGanttView.h +++ b/kdgantt/KDGanttView.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDChart - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewEventItem.cpp b/kdgantt/KDGanttViewEventItem.cpp index f98bb0fd..d8880121 100644 --- a/kdgantt/KDGanttViewEventItem.cpp +++ b/kdgantt/KDGanttViewEventItem.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewEventItem.h b/kdgantt/KDGanttViewEventItem.h index 6bddf5a4..7bfc561c 100644 --- a/kdgantt/KDGanttViewEventItem.h +++ b/kdgantt/KDGanttViewEventItem.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp index c24a3580..70cfcedf 100644 --- a/kdgantt/KDGanttViewItem.cpp +++ b/kdgantt/KDGanttViewItem.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h index e645029d..948098fc 100644 --- a/kdgantt/KDGanttViewItem.h +++ b/kdgantt/KDGanttViewItem.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index e747beec..a708699f 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h index b793ac4b..965977e1 100644 --- a/kdgantt/KDGanttViewSubwidgets.h +++ b/kdgantt/KDGanttViewSubwidgets.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewSummaryItem.cpp b/kdgantt/KDGanttViewSummaryItem.cpp index 7c400e54..184bf3c0 100644 --- a/kdgantt/KDGanttViewSummaryItem.cpp +++ b/kdgantt/KDGanttViewSummaryItem.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewSummaryItem.h b/kdgantt/KDGanttViewSummaryItem.h index 7361adca..17fa8850 100644 --- a/kdgantt/KDGanttViewSummaryItem.h +++ b/kdgantt/KDGanttViewSummaryItem.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp index 9bdedaf8..653925c0 100644 --- a/kdgantt/KDGanttViewTaskItem.cpp +++ b/kdgantt/KDGanttViewTaskItem.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewTaskItem.h b/kdgantt/KDGanttViewTaskItem.h index aa958d2c..2c3a2377 100644 --- a/kdgantt/KDGanttViewTaskItem.h +++ b/kdgantt/KDGanttViewTaskItem.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewTaskLink.cpp b/kdgantt/KDGanttViewTaskLink.cpp index 555e70a7..f6fa6883 100644 --- a/kdgantt/KDGanttViewTaskLink.cpp +++ b/kdgantt/KDGanttViewTaskLink.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewTaskLink.h b/kdgantt/KDGanttViewTaskLink.h index ad16265b..228ccf5f 100644 --- a/kdgantt/KDGanttViewTaskLink.h +++ b/kdgantt/KDGanttViewTaskLink.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewTaskLinkGroup.cpp b/kdgantt/KDGanttViewTaskLinkGroup.cpp index 3437dcd1..6c8d542e 100644 --- a/kdgantt/KDGanttViewTaskLinkGroup.cpp +++ b/kdgantt/KDGanttViewTaskLinkGroup.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttViewTaskLinkGroup.h b/kdgantt/KDGanttViewTaskLinkGroup.h index b155b8b4..480309bc 100644 --- a/kdgantt/KDGanttViewTaskLinkGroup.h +++ b/kdgantt/KDGanttViewTaskLinkGroup.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp index af09edb4..5f181934 100644 --- a/kdgantt/KDGanttXMLTools.cpp +++ b/kdgantt/KDGanttXMLTools.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kdgantt/KDGanttXMLTools.h b/kdgantt/KDGanttXMLTools.h index b1639c92..8a7067c0 100644 --- a/kdgantt/KDGanttXMLTools.h +++ b/kdgantt/KDGanttXMLTools.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* $Id$ KDGantt - a multi-platform charting engine */ diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h index 887acfaf..ea83a213 100644 --- a/kgantt/kgantt/KGantt.h +++ b/kgantt/kgantt/KGantt.h @@ -38,7 +38,7 @@ #include <tqsplitter.h> #include <tdepopupmenu.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "KGanttItem.h" #include "xQGanttListView.h" diff --git a/kgantt/kgantt/KGanttItem.h b/kgantt/kgantt/KGanttItem.h index 99a63ee3..67c1a198 100644 --- a/kgantt/kgantt/KGanttItem.h +++ b/kgantt/kgantt/KGanttItem.h @@ -38,7 +38,7 @@ #include <tqptrlist.h> #include <tqpainter.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "KGanttRelation.h" diff --git a/kgantt/kgantt/itemedit.ui b/kgantt/kgantt/itemedit.ui index 8ebfc02b..12677e2d 100644 --- a/kgantt/kgantt/itemedit.ui +++ b/kgantt/kgantt/itemedit.ui @@ -606,7 +606,7 @@ </grid> </widget> <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/kgantt/kgantt/itemedit2.ui b/kgantt/kgantt/itemedit2.ui index 4e990183..0d308deb 100644 --- a/kgantt/kgantt/itemedit2.ui +++ b/kgantt/kgantt/itemedit2.ui @@ -323,7 +323,7 @@ </grid> </widget> <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/kitchensync/src/about/kitchensync.css b/kitchensync/src/about/kitchensync.css index 18aa0ddc..c37ba7f7 100644 --- a/kitchensync/src/about/kitchensync.css +++ b/kitchensync/src/about/kitchensync.css @@ -25,6 +25,3 @@ #subtext { font-style: italic; } - -/* vim:set sw=2 et nocindent smartindent: */ - diff --git a/kitchensync/src/about/main.html b/kitchensync/src/about/main.html index 2474a7fc..8f948ffa 100644 --- a/kitchensync/src/about/main.html +++ b/kitchensync/src/about/main.html @@ -63,4 +63,3 @@ <div id="footer"><div id="footerL"/><div id="footerR"/></div> </body> </html> -<!-- vim:set sw=2 et nocindent smartindent: --> diff --git a/kmail/about/kmail.css b/kmail/about/kmail.css index 38db9987..0444430b 100644 --- a/kmail/about/kmail.css +++ b/kmail/about/kmail.css @@ -20,6 +20,3 @@ background-repeat: no-repeat; background-position: bottom right; } - -/* vim:set sw=2 et nocindent smartindent: */ - diff --git a/kmail/about/main.html b/kmail/about/main.html index 634b5f00..52876f21 100644 --- a/kmail/about/main.html +++ b/kmail/about/main.html @@ -64,4 +64,3 @@ <div id="footer"><div id="footerL"/><div id="footerR"/></div> </body> </html> -<!-- vim:set sw=2 et nocindent smartindent: --> diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp index 91bc1607..89521c09 100644 --- a/kmail/aboutdata.cpp +++ b/kmail/aboutdata.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* aboutdata.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h index 5c5b08ae..2ae6283a 100644 --- a/kmail/aboutdata.h +++ b/kmail/aboutdata.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* aboutdata.h This file is part of KMail, the KDE mail client. @@ -33,7 +33,7 @@ #define __KMAIL_ABOUTDATA_H__ #include <tdeaboutdata.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KMail { diff --git a/kmail/accountcombobox.cpp b/kmail/accountcombobox.cpp index 7ae3d2a3..97f95b11 100644 --- a/kmail/accountcombobox.cpp +++ b/kmail/accountcombobox.cpp @@ -1,4 +1,4 @@ -/** -*- mode: C++ -*- +/* * Copyright (c) 2004 David Faure <faure@kde.org> * * This program is free software; you can redistribute it and/or modify diff --git a/kmail/accountcombobox.h b/kmail/accountcombobox.h index c2e85cf6..2fa27f39 100644 --- a/kmail/accountcombobox.h +++ b/kmail/accountcombobox.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* * Copyright (c) 2004 David Faure <faure@kde.org> * * This program is free software; you can redistribute it and/or modify diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h index bf79f096..fb15cb38 100644 --- a/kmail/accountdialog.h +++ b/kmail/accountdialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* * accountdialog.h * * kmail: KDE mail client diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h index 4afe8bb9..b1c1ef7c 100644 --- a/kmail/accountmanager.h +++ b/kmail/accountmanager.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* * kmail: KDE mail client * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org> * @@ -22,7 +22,7 @@ #include <tqobject.h> #include "kmaccount.h" -#include <tdepimmacros.h> +#include <kdemacros.h> class TQString; class TQStringList; diff --git a/kmail/actionscheduler.h b/kmail/actionscheduler.h index 54303960..4551b3d2 100644 --- a/kmail/actionscheduler.h +++ b/kmail/actionscheduler.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* Action Scheduler This file is part of KMail, the KDE mail client. diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp index 2563e4ee..f187dcd6 100644 --- a/kmail/antispamconfig.cpp +++ b/kmail/antispamconfig.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* antispamconfig.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/antispamconfig.h b/kmail/antispamconfig.h index 9c344993..922d49db 100644 --- a/kmail/antispamconfig.h +++ b/kmail/antispamconfig.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* antispamconfig.h This file is part of KMail, the KDE mail client. diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h index 7248b9e5..e93480c1 100644 --- a/kmail/antispamwizard.h +++ b/kmail/antispamwizard.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* This file is part of KMail. Copyright (c) 2003 Andreas Gungl <a.gungl@gmx.de> diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp index 526fbb54..b45140ac 100644 --- a/kmail/app_octetstream.cpp +++ b/kmail/app_octetstream.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* app_octetstream.cpp This file is part of KMail, the KDE mail client. @@ -32,7 +32,7 @@ #include "interfaces/bodypartformatter.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace { diff --git a/kmail/attachmentcollector.cpp b/kmail/attachmentcollector.cpp index b902f596..6fbab33d 100644 --- a/kmail/attachmentcollector.cpp +++ b/kmail/attachmentcollector.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* attachmentcollector.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/attachmentcollector.h b/kmail/attachmentcollector.h index 6930e07e..a0069d51 100644 --- a/kmail/attachmentcollector.h +++ b/kmail/attachmentcollector.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* attachmentcollector.h This file is part of KMail, the KDE mail client. diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp index a03cd32f..9e99e640 100644 --- a/kmail/attachmentlistview.cpp +++ b/kmail/attachmentlistview.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* attachmentlistview.cpp KMail, the KDE mail client. diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h index 881f8b28..d0a0b63e 100644 --- a/kmail/attachmentlistview.h +++ b/kmail/attachmentlistview.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* attachmentlistview.h KMail, the KDE mail client. diff --git a/kmail/attachmentstrategy.cpp b/kmail/attachmentstrategy.cpp index 87157ed4..2f12f39b 100644 --- a/kmail/attachmentstrategy.cpp +++ b/kmail/attachmentstrategy.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* attachmentstrategy.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/attachmentstrategy.h b/kmail/attachmentstrategy.h index 268a4330..66fb6b85 100644 --- a/kmail/attachmentstrategy.h +++ b/kmail/attachmentstrategy.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* attachmentstrategy.h This file is part of KMail, the KDE mail client. diff --git a/kmail/bodypartformatter.cpp b/kmail/bodypartformatter.cpp index bd6da060..8435ef25 100644 --- a/kmail/bodypartformatter.cpp +++ b/kmail/bodypartformatter.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* bodypartformatter.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/bodypartformatter.h b/kmail/bodypartformatter.h index 1c296582..2664be0d 100644 --- a/kmail/bodypartformatter.h +++ b/kmail/bodypartformatter.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* bodypartformatter.h This file is part of KMail, the KDE mail client. diff --git a/kmail/bodypartformatterfactory.cpp b/kmail/bodypartformatterfactory.cpp index 62a92953..fbae5a44 100644 --- a/kmail/bodypartformatterfactory.cpp +++ b/kmail/bodypartformatterfactory.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* bodypartformatterfactory.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/bodypartformatterfactory.h b/kmail/bodypartformatterfactory.h index dd89eb34..7606a5c1 100644 --- a/kmail/bodypartformatterfactory.h +++ b/kmail/bodypartformatterfactory.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* bodypartformatterfactory.h This file is part of KMail, the KDE mail client. diff --git a/kmail/bodypartformatterfactory_p.h b/kmail/bodypartformatterfactory_p.h index 088a17f2..60067cd7 100644 --- a/kmail/bodypartformatterfactory_p.h +++ b/kmail/bodypartformatterfactory_p.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* bodypartformatterfactory.h This file is part of KMail, the KDE mail client. diff --git a/kmail/bodyvisitor.h b/kmail/bodyvisitor.h index a436fb44..cfe43b49 100644 --- a/kmail/bodyvisitor.h +++ b/kmail/bodyvisitor.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2003 Carsten Burghardt <burghardt@kde.org> diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index e4a29d6e..bba5b1b6 100644 --- a/kmail/cachedimapjob.cpp +++ b/kmail/cachedimapjob.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2002-2004 Bo Thorsen <bo@sonofthor.dk> diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h index bdf64541..f2daa6c7 100644 --- a/kmail/cachedimapjob.h +++ b/kmail/cachedimapjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2002-2003 Bo Thorsen <bo@sonofthor.dk> diff --git a/kmail/callback.cpp b/kmail/callback.cpp index b6e0e938..66bcd12f 100644 --- a/kmail/callback.cpp +++ b/kmail/callback.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* callback.cpp This file is used by KMail's plugin interface. diff --git a/kmail/callback.h b/kmail/callback.h index a3fccc4e..2722d0ff 100644 --- a/kmail/callback.h +++ b/kmail/callback.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* callback.h This file is used by KMail's plugin interface. @@ -38,7 +38,7 @@ class KMMessage; class KMReaderWin; -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/attendee.h> // only for an enum, we are not linking diff --git a/kmail/composer.h b/kmail/composer.h index 30cf0b28..709bfb73 100644 --- a/kmail/composer.h +++ b/kmail/composer.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * KMComposeWin Header File * Author: Markus Wuebben <markus.wuebben@kde.org> */ diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 0f92eab5..3f5d3fa5 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * This file: Copyright (C) 2000 Espen Sand, espen@kde.org * Copyright (C) 2001-2003 Marc Mutz, mutz@kde.org @@ -3770,7 +3770,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * "receipt</b>. The message author requests a disposition " "notification to be sent and the receiver's mail program " "generates a reply from which the author can learn what " - "happened to his message. Common disposition types include " + "happened to their message. Common disposition types include " "<b>displayed</b> (i.e. read), <b>deleted</b> and <b>dispatched</b> " "(e.g. forwarded).</p>" "<p>The following options are available to control KMail's " @@ -3785,7 +3785,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * "<li><em>Deny</em>: Always sends a <b>denied</b> notification. This " "is only <em>slightly</em> better than always sending MDNs. " "The author will still know that the messages has been acted " - "upon, he just cannot tell whether it was deleted or read etc.</li>" + "upon, they just cannot tell whether it was deleted or read etc.</li>" "<li><em>Always send</em>: Always sends the requested " "disposition notification. That means that the author of the " "message gets to know when the message was acted upon and, " diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h index 265bc957..acd0bc5a 100644 --- a/kmail/configuredialog.h +++ b/kmail/configuredialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* * kmail: KDE mail client * This file: Copyright (C) 2000 Espen Sand, espen@kde.org * Copyright (C) 2001-2002 Marc Mutz <mutz@kde.org> diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index 6ba969de..3d8447a0 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -1,4 +1,3 @@ -// -*- c++ -*- // configuredialog_p.h: classes internal to ConfigureDialog // see configuredialog.h for details. @@ -18,7 +17,7 @@ #include <tdelistview.h> #include <tdecmodule.h> #include <tdelocale.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQPushButton; class TQLabel; diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp index e5bfb7bf..c4f58390 100644 --- a/kmail/csshelper.cpp +++ b/kmail/csshelper.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* csshelper.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/csshelper.h b/kmail/csshelper.h index 9bff99ca..cba58adc 100644 --- a/kmail/csshelper.h +++ b/kmail/csshelper.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* csshelper.h This file is part of KMail, the KDE mail client. diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 644f5fa9..5daf001d 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * This file: Copyright (C) 2006 Dmitry Morozhnikov * diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h index 1af43734..b117dd69 100644 --- a/kmail/customtemplates.h +++ b/kmail/customtemplates.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * This file: Copyright (C) 2006 Dmitry Morozhnikov * diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index 4b877aec..82d477b5 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -359,11 +359,9 @@ <includes> <include location="global" impldecl="in implementation">kactivelabel.h</include> <include location="global" impldecl="in implementation">kkeybutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kmfawidgets.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">templatesinsertcommand.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kmfawidgets.h</includehint> - <includehint>templatesinsertcommand.h</includehint> -</includehints> </UI> diff --git a/kmail/dictionarycombobox.cpp b/kmail/dictionarycombobox.cpp index 6eb1b493..be705d3d 100644 --- a/kmail/dictionarycombobox.cpp +++ b/kmail/dictionarycombobox.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* dictionarycombobox.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h index 0a8d5c0f..a6d3584a 100644 --- a/kmail/dictionarycombobox.h +++ b/kmail/dictionarycombobox.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* dictionarycombobox.h This file is part of KMail, the KDE mail client. diff --git a/kmail/expirejob.h b/kmail/expirejob.h index dbec3d52..dbdb6a3a 100644 --- a/kmail/expirejob.h +++ b/kmail/expirejob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* * Copyright (c) 2004 David Faure <faure@kde.org> * * This program is free software; you can redistribute it and/or modify diff --git a/kmail/filehtmlwriter.cpp b/kmail/filehtmlwriter.cpp index c4f2d214..abad6420 100644 --- a/kmail/filehtmlwriter.cpp +++ b/kmail/filehtmlwriter.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* filehtmlwriter.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/filehtmlwriter.h b/kmail/filehtmlwriter.h index 87914322..768e0c58 100644 --- a/kmail/filehtmlwriter.h +++ b/kmail/filehtmlwriter.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* filehtmlwriter.h This file is part of KMail, the KDE mail client. diff --git a/kmail/folderIface.cpp b/kmail/folderIface.cpp index 981e1b37..a95e3e13 100644 --- a/kmail/folderIface.cpp +++ b/kmail/folderIface.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2003 Zack Rusin <zack@kde.org> diff --git a/kmail/folderIface.h b/kmail/folderIface.h index e348ea6b..c8593d2c 100644 --- a/kmail/folderIface.h +++ b/kmail/folderIface.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2003 Zack Rusin <zack@kde.org> diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 6b2e85fc..43d15a51 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- /** * folderdiaacltab.cpp * @@ -256,7 +255,7 @@ void KMail::FolderDiaACLTab::ListViewItem::setPermissions( unsigned int permissi void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry ) { // Don't allow spaces in userids. If you need this, fix the slave->app communication, - // since it uses space as a separator (imap4.cc, look for GETACL) + // since it uses space as a separator (imap4.cpp, look for GETACL) // It's ok in distribution list names though, that's why this check is only done here // and also why there's no validator on the lineedit. if ( entry.userId.contains( ' ' ) ) diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h index bc619c4e..0a5d6465 100644 --- a/kmail/folderdiaacltab.h +++ b/kmail/folderdiaacltab.h @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- /** * folderdiaacltab.h * diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp index 3fdb308f..2fd950b2 100644 --- a/kmail/folderdiaquotatab.cpp +++ b/kmail/folderdiaquotatab.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- /** * folderdiaquotatab.cpp * diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h index 6b260035..fe7af431 100644 --- a/kmail/folderdiaquotatab.h +++ b/kmail/folderdiaquotatab.h @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- /** * folderdiaquotatab.h * diff --git a/kmail/folderjob.cpp b/kmail/folderjob.cpp index 657d1a9b..2472df3a 100644 --- a/kmail/folderjob.cpp +++ b/kmail/folderjob.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2003 Zack Rusin <zack@kde.org> diff --git a/kmail/folderjob.h b/kmail/folderjob.h index 47838044..5b7f4037 100644 --- a/kmail/folderjob.h +++ b/kmail/folderjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2003 Zack Rusin <zack@kde.org> diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h index f159c69f..4a3aa098 100644 --- a/kmail/headerlistquicksearch.h +++ b/kmail/headerlistquicksearch.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* This file is part of KMail, the KDE mail client. Copyright (c) 2004 Till Adam <adam@kde.org> diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp index afa581a1..ff2b82ae 100644 --- a/kmail/headerstrategy.cpp +++ b/kmail/headerstrategy.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* headerstrategy.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/headerstrategy.h b/kmail/headerstrategy.h index ebb61012..9f49f1ac 100644 --- a/kmail/headerstrategy.h +++ b/kmail/headerstrategy.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* headerstrategy.h This file is part of KMail, the KDE mail client. diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index f7c2973e..44f12b38 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* headerstyle.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/headerstyle.h b/kmail/headerstyle.h index ff7228d3..88143909 100644 --- a/kmail/headerstyle.h +++ b/kmail/headerstyle.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* headerstyle.h This file is part of KMail, the KDE mail client. diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp index fecda8de..61205a7f 100644 --- a/kmail/htmlstatusbar.cpp +++ b/kmail/htmlstatusbar.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* htmlstatusbar.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h index 95af5206..9a86302f 100644 --- a/kmail/htmlstatusbar.h +++ b/kmail/htmlstatusbar.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* htmlstatusbar.h This file is part of KMail, the KDE mail client. diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index 90b4ffdd..91b108c9 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* identitydialog.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h index 29b50f05..fc9b4594 100644 --- a/kmail/identitydialog.h +++ b/kmail/identitydialog.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* identitydialog.h This file is part of KMail, the KDE mail client. diff --git a/kmail/identitydrag.cpp b/kmail/identitydrag.cpp index 88df48f6..f3c6435d 100644 --- a/kmail/identitydrag.cpp +++ b/kmail/identitydrag.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* identitydrag.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h index 1c2ddb0d..295c83ad 100644 --- a/kmail/identitydrag.h +++ b/kmail/identitydrag.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* identitydrag.h This file is part of KMail, the KDE mail client. diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp index c13b9d1f..f10edf7d 100644 --- a/kmail/identitylistview.cpp +++ b/kmail/identitylistview.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* identitylistview.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h index abe12127..586767c7 100644 --- a/kmail/identitylistview.h +++ b/kmail/identitylistview.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* identitylistview.h This file is part of KMail, the KDE mail client. diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index 1350da29..40ff81f7 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -1,4 +1,4 @@ -/** -*- c++ -*- +/* * imapaccountbase.cpp * * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org> diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index 3a4c4bff..1c022044 100644 --- a/kmail/imapaccountbase.h +++ b/kmail/imapaccountbase.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* * imapaccountbase.h * * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org> diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp index dc9a98f5..1f7682b5 100644 --- a/kmail/imapjob.cpp +++ b/kmail/imapjob.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2002-2003 Zack Rusin <zack@kde.org> diff --git a/kmail/imapjob.h b/kmail/imapjob.h index c8e00e14..e348b2df 100644 --- a/kmail/imapjob.h +++ b/kmail/imapjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2002-2003 Zack Rusin <zack@kde.org> diff --git a/kmail/interfaces/bodypart.h b/kmail/interfaces/bodypart.h index 43490632..c70441cf 100644 --- a/kmail/interfaces/bodypart.h +++ b/kmail/interfaces/bodypart.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* bodypart.h This file is part of KMail's plugin interface. diff --git a/kmail/interfaces/bodypartformatter.h b/kmail/interfaces/bodypartformatter.h index 14fedc61..7fb3d19a 100644 --- a/kmail/interfaces/bodypartformatter.h +++ b/kmail/interfaces/bodypartformatter.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* bodypartformatter.h This file is part of KMail's plugin interface. diff --git a/kmail/interfaces/bodyparturlhandler.h b/kmail/interfaces/bodyparturlhandler.h index 78d566c1..885e55d0 100644 --- a/kmail/interfaces/bodyparturlhandler.h +++ b/kmail/interfaces/bodyparturlhandler.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* interfaces/bodyparturlhandler.h This file is part of KMail's plugin interface. diff --git a/kmail/interfaces/htmlwriter.h b/kmail/interfaces/htmlwriter.h index 179841c1..f7a76ad5 100644 --- a/kmail/interfaces/htmlwriter.h +++ b/kmail/interfaces/htmlwriter.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* interfaces/htmlwriter.h This file is part of KMail's plugin interface. diff --git a/kmail/interfaces/observable.h b/kmail/interfaces/observable.h index 10d14dfa..3e004ba6 100644 --- a/kmail/interfaces/observable.h +++ b/kmail/interfaces/observable.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* observable.h This file is part of KMail's plugin interface. diff --git a/kmail/interfaces/observer.h b/kmail/interfaces/observer.h index 31cbc80a..75d28c35 100644 --- a/kmail/interfaces/observer.h +++ b/kmail/interfaces/observer.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* observer.h This file is part of KMail's plugin interface. diff --git a/kmail/interfaces/rulewidgethandler.h b/kmail/interfaces/rulewidgethandler.h index 33095223..edc581b1 100644 --- a/kmail/interfaces/rulewidgethandler.h +++ b/kmail/interfaces/rulewidgethandler.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* interfaces/rulewidgethandler.h This file is part of KMail, the KDE mail client. diff --git a/kmail/interfaces/urlhandler.h b/kmail/interfaces/urlhandler.h index 1eb0e365..2ad9295e 100644 --- a/kmail/interfaces/urlhandler.h +++ b/kmail/interfaces/urlhandler.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* interfaces/urlhandler.h This file is part of KMail, the KDE mail client. diff --git a/kmail/isubject.h b/kmail/isubject.h index 8bad40c4..10fc7b37 100644 --- a/kmail/isubject.h +++ b/kmail/isubject.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2003 Carsten Burghardt <burghardt@kde.org> diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp index fa0e2fed..07dc1d72 100644 --- a/kmail/kcm_kmail.cpp +++ b/kmail/kcm_kmail.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * This file: Copyright (C) 2000 Espen Sand, espen@kde.org * Copyright (C) 2001-2003 Marc Mutz, mutz@kde.org diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp index 76d4ae8f..fcd2f279 100644 --- a/kmail/keyresolver.cpp +++ b/kmail/keyresolver.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyresolver.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/kmail/keyresolver.h b/kmail/keyresolver.h index c7bdfe25..2f7bd936 100644 --- a/kmail/keyresolver.h +++ b/kmail/keyresolver.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyresolver.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/kmail/kleo_util.h b/kmail/kleo_util.h index 663f0b63..c7cfd99b 100644 --- a/kmail/kleo_util.h +++ b/kmail/kleo_util.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kleo_util.h This file is part of KMail, the KDE mail client. diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index f0455b3b..8445d55e 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* * kmail: KDE mail client * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org> * diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h index 3e10332a..6be22c01 100644 --- a/kmail/kmacctimap.h +++ b/kmail/kmacctimap.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* * kmacctimap.h * * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org> diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp index 6b774738..dcc58e02 100644 --- a/kmail/kmaddrbook.cpp +++ b/kmail/kmaddrbook.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org> * diff --git a/kmail/kmail.antispamrc-HOWTO b/kmail/kmail.antispamrc-HOWTO index 9edcabb0..a107d81c 100644 --- a/kmail/kmail.antispamrc-HOWTO +++ b/kmail/kmail.antispamrc-HOWTO @@ -49,7 +49,7 @@ General options - Priority: Specifies the priority of the filter. This value is used to place faster filters before the slower ones in the selection list. If the - user chooses the top item, he gets the fastest filter. Provider sided + user chooses the top item, they get the fastest filter. Provider sided "filters" (which produce headers tough) like the GMX filter have a prio at about 70, they are very fast as they don't consume time on the client side. Since CRM114 is almost as fast it gets 65 ;-). diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg index 0b73f2f2..922e295c 100644 --- a/kmail/kmail.kcfg +++ b/kmail/kmail.kcfg @@ -83,8 +83,7 @@ <group name="ConfigurationDialogRestrictions"> <entry name="MinimumCheckInterval" type="Int"> <default>1</default> - <whatsthis>This setting allows administrators to set a minimum delay between two mail checks." - "The user will not be able to choose a value smaller than the value set here.</whatsthis> + <whatsthis>This setting allows administrators to set a minimum delay between two mail checks. The user will not be able to choose a value smaller than the value set here.</whatsthis> </entry> </group> @@ -241,10 +240,7 @@ <entry name="ShowOnlyGroupwareFoldersForGroupwareAccount" type="Bool"> <default>false</default> - <whatsthis><p>If the account used for storing groupware information " - "is not used to manage normal mail, set this option to make KMail only " - "show groupware folders in it. This is useful if you are handling regular " - "mail via an additional online IMAP account.</p></whatsthis> + <whatsthis><p>If the account used for storing groupware information is not used to manage normal mail, set this option to make KMail only show groupware folders in it. This is useful if you are handling regular mail via an additional online IMAP account.</p></whatsthis> </entry> <entry name="TheIMAPResourceStorageFormat" type="Enum"> diff --git a/kmail/kmail_options.h b/kmail/kmail_options.h index c0489b7f..e5b327ec 100644 --- a/kmail/kmail_options.h +++ b/kmail/kmail_options.h @@ -1,4 +1,3 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- */ #ifndef KMAIL_OPTIONS_H #define KMAIL_OPTIONS_H diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index 23918a04..4d665422 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -1,5 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- - +/* This file is part of KMail. Copyright (c) 2002-2003 Don Sanders <sanders@kde.org>, Copyright (c) 2003 Zack Rusin <zack@kde.org>, diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index 34a6e8d5..3738aed7 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -35,7 +35,7 @@ #include <tdeparts/part.h> #include <tqwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEInstance; class TDEAboutData; diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp index 4d9fc42d..d6a9c4c4 100644 --- a/kmail/kmatmlistview.cpp +++ b/kmail/kmatmlistview.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmatmlistview.cpp // Author: Markus Wuebben <markus.wuebben@kde.org> // This code is published under the GPL. diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h index f4d86595..30f0bd5f 100644 --- a/kmail/kmatmlistview.h +++ b/kmail/kmatmlistview.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * KMAtmListViewItem Header File * Author: Markus Wuebben <markus.wuebben@kde.org> */ diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index a6185013..9aef6e62 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* This file is part of KMail, the KDE mail client. Copyright (c) 2002 Don Sanders <sanders@kde.org> diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 25c0a117..24e42524 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -1,5 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- - #ifndef KMCommands_h #define KMCommands_h @@ -13,7 +11,7 @@ #include <tdeio/job.h> #include "kmmsgbase.h" // for KMMsgStatus #include <mimelib/string.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kservice.h> #include <tdetempfile.h> diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 2add2b3a..692df779 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmcomposewin.cpp // Author: Markus Wuebben <markus.wuebben@kde.org> // This code is published under the GPL. diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 123f112b..b9fbe1c7 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * KMComposeWin Header File * Author: Markus Wuebben <markus.wuebben@kde.org> */ diff --git a/kmail/kmdebug.h b/kmail/kmdebug.h index 46262aeb..142d0b9e 100644 --- a/kmail/kmdebug.h +++ b/kmail/kmdebug.h @@ -1,5 +1,3 @@ -// -*- c++ -*- convenience wrappers around kdDebug/kdWarning/etc - #ifndef __KMAIL_KMDEBUG_H__ #define __KMAIL_KMDEBUG_H__ diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index afe854de..1fe54648 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmcomposewin.cpp // Author: Markus Wuebben <markus.wuebben@kde.org> // This code is published under the GPL. diff --git a/kmail/kmedit.h b/kmail/kmedit.h index f545a136..c42734dc 100644 --- a/kmail/kmedit.h +++ b/kmail/kmedit.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * KMComposeWin Header File * Author: Markus Wuebben <markus.wuebben@kde.org> */ diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp index d681c6a6..df6a5543 100644 --- a/kmail/kmfilter.cpp +++ b/kmail/kmfilter.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org> * diff --git a/kmail/kmfilter.h b/kmail/kmfilter.h index 35fdecda..fd993e3c 100644 --- a/kmail/kmfilter.h +++ b/kmail/kmfilter.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org> * diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index d9065f6d..b1bbb9ab 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmfilterdlg.cpp // Author: Marc Mutz <Marc@Mutz.com> // based on work by Stefan Taferner <taferner@kde.org> diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp index e91a44a6..8c47afc0 100644 --- a/kmail/kmfiltermgr.cpp +++ b/kmail/kmfiltermgr.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmfiltermgr.cpp // my header diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index 45738939..b1b9c261 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org> * diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h index dd04d9f2..e8de8207 100644 --- a/kmail/kmfolder.h +++ b/kmail/kmfolder.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* * kmail: KDE mail client * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org> * diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index 265b1ee9..d34c731b 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- /** * kmfolderdia.cpp * @@ -542,8 +541,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, "and should see the alarms for the events or tasks in this folder. " "The setting applies to Calendar and Task folders only " "(for tasks, this setting is only used for alarms).\n\n" - "Example use cases: if the boss shares a folder with his secretary, " - "only the boss should be marked as busy for his meetings, so he should " + "Example use cases: if the boss shares a folder with their secretary, " + "only the boss should be marked as busy for their meetings, so they should " "select \"Admins\", since the secretary has no admin rights on the folder.\n" "On the other hand if a working group shares a Calendar for " "group meetings, all readers of the folders should be marked " diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h index 5f3ea967..e7c6b1d1 100644 --- a/kmail/kmfolderdia.h +++ b/kmail/kmfolderdia.h @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- /** * kmfolderdia.h * diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp index 7bb77f0d..9b60b25c 100644 --- a/kmail/kmfolderindex.cpp +++ b/kmail/kmfolderindex.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* This file is part of KMail, the KDE mail client. Copyright (c) 2000 Don Sanders <sanders@kde.org> diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h index 8a8176e6..ae67d7db 100644 --- a/kmail/kmfolderindex.h +++ b/kmail/kmfolderindex.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* This file is part of KMail, the KDE mail client. Copyright (c) 2000 Don Sanders <sanders@kde.org> diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 5242060a..29f9aacc 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmfoldermaildir.cpp // Author: Kurt Granroth <granroth@kde.org> diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index 6692f54c..43c9a913 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -1,4 +1,4 @@ -/* -*- c-basic-offset: 2 -*- +/* * kmail: KDE mail client * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org> * diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h index 11e7584f..d5780a89 100644 --- a/kmail/kmfoldertree.h +++ b/kmail/kmfoldertree.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* This file is part of the KDE libraries This library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include "foldertreebase.h" #include <tdelocale.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqguardedptr.h> #include <tqwidget.h> diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 3196e627..1b29fd29 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmheaders.cpp #include <config.h> diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h index 423ec3dc..112b1cde 100644 --- a/kmail/kmheaders.h +++ b/kmail/kmheaders.h @@ -1,5 +1,3 @@ -// -*- mode: C++ -*- - #ifndef __KMHEADERS #define __KMHEADERS diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index f998a74c..cfb28ab2 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -1,4 +1,3 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- */ #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index 610ab476..b8055340 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -1,5 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- - #ifndef _KMCONTROL #define _KMCONTROL @@ -13,7 +11,7 @@ #include <tdeconfig.h> #include <tdeversion.h> #include <tdeimproxy.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #ifdef __TDE_HAVE_TDEHWLIB # include <tdenetworkconnections.h> diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index 20421ec9..45585147 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmcomposewin.cpp // Author: Markus Wuebben <markus.wuebben@kde.org> // This code is published under the GPL. diff --git a/kmail/kmlineeditspell.h b/kmail/kmlineeditspell.h index 536d3158..06bfce5e 100644 --- a/kmail/kmlineeditspell.h +++ b/kmail/kmlineeditspell.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * KMComposeWin Header File * Author: Markus Wuebben <markus.wuebben@kde.org> */ diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 0d845225..c868c582 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmmainwidget.cpp //#define MALLOC_DEBUG 1 @@ -1387,7 +1386,7 @@ void KMMainWidget::slotOverrideHtmlLoadExt() } mFolderHtmlLoadExtPref = !mFolderHtmlLoadExtPref; if (mMsgView) { - mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref); mMsgView->update( true ); } } @@ -2085,7 +2084,7 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) if (mMsgView) { mMsgView->setHtmlOverride(mFolderHtmlPref); - mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref); } mHeaders->setFolder( mFolder, forceJumpToUnread ); updateMessageActions(); @@ -2141,7 +2140,8 @@ void KMMainWidget::slotMsgSelected(KMMessage *msg) } // reset HTML override to the folder setting mMsgView->setHtmlOverride(mFolderHtmlPref); - mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtOverride(false); mMsgView->setDecryptMessageOverwrite( false ); mMsgView->setShowSignatureDetails( false ); } diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h index f790ff0f..d90dda24 100644 --- a/kmail/kmmainwidget.h +++ b/kmail/kmmainwidget.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* This file is part of KMail, the KDE mail client. Copyright (c) 2002 Don Sanders <sanders@kde.org> diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index d9961478..f9a7f388 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmmessage.cpp // if you do not want GUI elements in here then set ALLOW_GUI to 0. diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h index 3a61a11f..dfe96116 100644 --- a/kmail/kmmessage.h +++ b/kmail/kmmessage.h @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- /* kmmessage.h: Mime Message Class * */ diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index 200e7736..779fffd4 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmmimeparttree.h A MIME part tree viwer. This file is part of KMail, the KDE mail client. diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h index 395694fe..1b4fc4f5 100644 --- a/kmail/kmmimeparttree.h +++ b/kmail/kmmimeparttree.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmmimeparttree.cpp A MIME part tree viwer. This file is part of KMail, the KDE mail client. @@ -28,10 +28,6 @@ you do not wish to do so, delete this exception statement from your version. */ - - - -// -*- c++ -*- #ifndef KMMIMEPARTTREE_H #define KMMIMEPARTTREE_H diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h index 4994800b..452114d4 100644 --- a/kmail/kmmsgpart.h +++ b/kmail/kmmsgpart.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* * kmail: KDE mail client * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org> * diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index 6694ba3f..06f6c771 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -50,7 +50,7 @@ #include "kmreadermainwin.h" -KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, +KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtDefault, char *name ) : KMail::SecondaryWindow( name ? name : "readerwindow#" ), mMsg( 0 ) @@ -59,7 +59,7 @@ KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, //mReaderWin->setShowCompleteMessage( true ); mReaderWin->setAutoDelete( true ); mReaderWin->setHtmlOverride( htmlOverride ); - mReaderWin->setHtmlLoadExtOverride( htmlLoadExtOverride ); + mReaderWin->setHtmlLoadExtDefault( htmlLoadExtDefault ); mReaderWin->setDecryptMessageOverwrite( true ); mReaderWin->setShowSignatureDetails( false ); initKMReaderMainWin(); diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h index 2fa3462f..976f1066 100644 --- a/kmail/kmreadermainwin.h +++ b/kmail/kmreadermainwin.h @@ -1,5 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- - #ifndef KMReaderMainWin_h #define KMReaderMainWin_h @@ -28,7 +26,7 @@ class KMReaderMainWin : public KMail::SecondaryWindow public: - KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, char *name = 0 ); + KMReaderMainWin( bool htmlOverride, bool htmlLoadExtDefault, char *name = 0 ); KMReaderMainWin( char *name = 0 ); KMReaderMainWin(KMMessagePart* aMsgPart, bool aHTML, const TQString& aFileName, const TQString& pname, diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index b3c43570..512f7ca8 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmreaderwin.cpp // Author: Markus Wuebben <markus.wuebben@kde.org> @@ -463,6 +462,7 @@ KMReaderWin::KMReaderWin(TQWidget *aParent, readConfig(); mHtmlOverride = false; + mHtmlLoadExtDefault = false; mHtmlLoadExtOverride = false; mLevelQuote = GlobalSettings::self()->collapseQuoteLevelSpin() - 1; @@ -896,7 +896,6 @@ void KMReaderWin::readConfig(void) mToggleFixFontAction->setChecked( mUseFixedFont ); mHtmlMail = reader.readBoolEntry( "htmlMail", false ); - mHtmlLoadExternal = reader.readBoolEntry( "htmlLoadExternal", false ); setHeaderStyleAndStrategy( HeaderStyle::create( reader.readEntry( "header-style", "fancy" ) ), HeaderStrategy::create( reader.readEntry( "header-set-displayed", "rich" ) ) ); @@ -1402,8 +1401,6 @@ void KMReaderWin::updateReaderWin() { if (!mMsgDisplay) return; - mViewer->setOnlyLocalReferences(!htmlLoadExternal()); - htmlWriter()->reset(); KMFolder* folder = 0; @@ -1566,6 +1563,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg) // - this can only be done *after* calling parseObjectTree() KMMsgEncryptionState encryptionState = mRootNode->overallEncryptionState(); KMMsgSignatureState signatureState = mRootNode->overallSignatureState(); + mViewer->setOnlyLocalReferences(!htmlLoadExternal()); // Don't crash when switching message while GPG passphrase entry dialog is shown #53185 if (aMsg != message()) { displayMessage(); @@ -2473,11 +2471,14 @@ void KMReaderWin::setHtmlOverride(bool override) //----------------------------------------------------------------------------- -void KMReaderWin::setHtmlLoadExtOverride(bool override) +void KMReaderWin::setHtmlLoadExtDefault(bool loadExtDefault) +{ + mHtmlLoadExtDefault = loadExtDefault; +} + +void KMReaderWin::setHtmlLoadExtOverride(bool loadExtOverride) { - mHtmlLoadExtOverride = override; - //if (message()) - // message()->setDecodeHTML(htmlMail()); + mHtmlLoadExtOverride = loadExtOverride; } @@ -2491,8 +2492,19 @@ bool KMReaderWin::htmlMail() //----------------------------------------------------------------------------- bool KMReaderWin::htmlLoadExternal() { - return ((mHtmlLoadExternal && !mHtmlLoadExtOverride) || - (!mHtmlLoadExternal && mHtmlLoadExtOverride)); + if (!mRootNode) + { + return mHtmlLoadExtOverride; + } + + // when displaying an encrypted message, only load external resources on explicit request + if (mRootNode->overallEncryptionState() != KMMsgNotEncrypted) + { + return mHtmlLoadExtOverride; + } + + return ((mHtmlLoadExtDefault && !mHtmlLoadExtOverride) || + (!mHtmlLoadExtDefault && mHtmlLoadExtOverride)); } diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index 81256e8c..a3da9762 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // Header for kmreaderwin the kmail reader // written by Markus Wuebben <markus.wuebben@kde.org> @@ -200,9 +199,22 @@ public: bool htmlOverride() const { return mHtmlOverride; } void setHtmlOverride( bool override ); - /** Override default load external references setting */ + /** Get the load external references override setting */ bool htmlLoadExtOverride() const { return mHtmlLoadExtOverride; } - void setHtmlLoadExtOverride( bool override ); + + /** Default behavior for loading external references. + * Use this for specifying the external reference loading behavior as + * specified in the user settings. + * @see setHtmlLoadExtOverride + */ + void setHtmlLoadExtDefault(bool loadExtDefault); + + /** Override default load external references setting + * @warning This must only be called when the user has explicitly + * been asked to retrieve external references! + * @see setHtmlLoadExtDefault + */ + void setHtmlLoadExtOverride(bool loadExtOverride); /** Is html mail to be supported? Takes into account override */ bool htmlMail(); @@ -541,7 +553,7 @@ private: TQString renderAttachments( partNode *node, const TQColor &bgColor ); private: - bool mHtmlMail, mHtmlLoadExternal, mHtmlOverride, mHtmlLoadExtOverride; + bool mHtmlMail, mHtmlLoadExtDefault, mHtmlOverride, mHtmlLoadExtOverride; int mAtmCurrent; TQString mAtmCurrentName; KMMessage *mMessage; diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp index d1d47daf..114f4e8d 100644 --- a/kmail/kmsearchpattern.cpp +++ b/kmail/kmsearchpattern.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmsearchpattern.cpp // Author: Marc Mutz <Marc@Mutz.com> // This code is under GPL! diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h index 9b521c1f..9d517fdf 100644 --- a/kmail/kmsearchpattern.h +++ b/kmail/kmsearchpattern.h @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmsearchpattern.h // Author: Marc Mutz <Marc@Mutz.com> // This code is under GPL! diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp index 88f3609b..21ade7b2 100644 --- a/kmail/kmsearchpatternedit.cpp +++ b/kmail/kmsearchpatternedit.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmsearchpatternedit.cpp // Author: Marc Mutz <Marc@Mutz.com> // This code is under GPL diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h index 77089df4..86d890bb 100644 --- a/kmail/kmsearchpatternedit.h +++ b/kmail/kmsearchpatternedit.h @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kmfilterrulesedit.h // Author: Marc Mutz <Marc@Mutz.com> // This code is under GPL diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index 9a8ae5be..e63add04 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -483,6 +483,9 @@ void KMSender::doSendMsg() msgTransport = mCurrentMsg->headerField("X-KMail-Transport"); } if ( msgTransport.isEmpty() ) { + msgTransport = GlobalSettings::self()->defaultTransport(); + } + if ( msgTransport.isEmpty() ) { const TQStringList sl = KMTransportInfo::availableTransports(); if (!sl.empty()) msgTransport = sl.front(); } diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp index 446c739e..5c11f075 100644 --- a/kmail/kmservertest.cpp +++ b/kmail/kmservertest.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmservertest.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/kmservertest.h b/kmail/kmservertest.h index 5d5cddf1..db8535a0 100644 --- a/kmail/kmservertest.h +++ b/kmail/kmservertest.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmservertest.h This file is part of KMail, the KDE mail client. diff --git a/kmail/kmstartup.h b/kmail/kmstartup.h index 456a39a4..11c840e6 100644 --- a/kmail/kmstartup.h +++ b/kmail/kmstartup.h @@ -18,7 +18,7 @@ #ifndef KMSTARTUP #define KMSTARTUP -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index f3ff58a4..1d1ce933 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- /*************************************************************************** kmsystemtray.cpp - description ------------------- diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp index c2d4e555..2f6e839e 100644 --- a/kmail/localsubscriptiondialog.cpp +++ b/kmail/localsubscriptiondialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* localsubscriptiondialog.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/localsubscriptiondialog.h b/kmail/localsubscriptiondialog.h index 601a8463..eb977908 100644 --- a/kmail/localsubscriptiondialog.h +++ b/kmail/localsubscriptiondialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* localsubscriptiondialog.h This file is part of KMail, the KDE mail client. diff --git a/kmail/maildirjob.cpp b/kmail/maildirjob.cpp index b507d927..4c3b520c 100644 --- a/kmail/maildirjob.cpp +++ b/kmail/maildirjob.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2003 Zack Rusin <zack@kde.org> diff --git a/kmail/maildirjob.h b/kmail/maildirjob.h index 1d5a9710..878c5d78 100644 --- a/kmail/maildirjob.h +++ b/kmail/maildirjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2003 Zack Rusin <zack@kde.org> diff --git a/kmail/mailinglist-magic.cpp b/kmail/mailinglist-magic.cpp index 1f927084..37600d50 100644 --- a/kmail/mailinglist-magic.cpp +++ b/kmail/mailinglist-magic.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/kmail/mailinglist-magic.h b/kmail/mailinglist-magic.h index eaa64592..8eed4f8f 100644 --- a/kmail/mailinglist-magic.h +++ b/kmail/mailinglist-magic.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- #ifndef MAILINGLIST_MAGIC_H #define MAILINGLIST_MAGIC_H diff --git a/kmail/mailserviceimpl.cpp b/kmail/mailserviceimpl.cpp index f5b810a3..79af5eaf 100644 --- a/kmail/mailserviceimpl.cpp +++ b/kmail/mailserviceimpl.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2003 Zack Rusin <zack@kde.org> diff --git a/kmail/mailserviceimpl.h b/kmail/mailserviceimpl.h index 6dc5224a..842b4e4e 100644 --- a/kmail/mailserviceimpl.h +++ b/kmail/mailserviceimpl.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2003 Zack Rusin <zack@kde.org> diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp index eff69cce..7a06f970 100644 --- a/kmail/mailsourceviewer.cpp +++ b/kmail/mailsourceviewer.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * diff --git a/kmail/mailsourceviewer.h b/kmail/mailsourceviewer.h index 0c29175b..68f82c23 100644 --- a/kmail/mailsourceviewer.h +++ b/kmail/mailsourceviewer.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * diff --git a/kmail/main.cpp b/kmail/main.cpp index bb3e0a8a..8b40e555 100644 --- a/kmail/main.cpp +++ b/kmail/main.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org> * diff --git a/kmail/mboxjob.cpp b/kmail/mboxjob.cpp index 7fb22ddb..df25a8ad 100644 --- a/kmail/mboxjob.cpp +++ b/kmail/mboxjob.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2003 Zack Rusin <zack@kde.org> diff --git a/kmail/mboxjob.h b/kmail/mboxjob.h index 9b1d2dea..c9b1e37c 100644 --- a/kmail/mboxjob.h +++ b/kmail/mboxjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * Copyright (c) 2003 Zack Rusin <zack@kde.org> diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp index 7f4c53b3..9a5f5e99 100644 --- a/kmail/networkaccount.cpp +++ b/kmail/networkaccount.cpp @@ -1,4 +1,4 @@ -/** -*- c++ -*- +/* * networkaccount.cpp * * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org> diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h index 1c5dde6e..2ed8e452 100644 --- a/kmail/networkaccount.h +++ b/kmail/networkaccount.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* * networkaccount.h * * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org> diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 2b736d2c..2d3ed968 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* objecttreeparser.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/objecttreeparser.h b/kmail/objecttreeparser.h index f9e71427..cd4adfae 100644 --- a/kmail/objecttreeparser.h +++ b/kmail/objecttreeparser.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* objecttreeparser.h This file is part of KMail, the KDE mail client. diff --git a/kmail/objecttreeparser_p.cpp b/kmail/objecttreeparser_p.cpp index a645b398..683d3c4c 100644 --- a/kmail/objecttreeparser_p.cpp +++ b/kmail/objecttreeparser_p.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* objecttreeparser_p.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/objecttreeparser_p.h b/kmail/objecttreeparser_p.h index 44a1e9af..04e1c2c3 100644 --- a/kmail/objecttreeparser_p.h +++ b/kmail/objecttreeparser_p.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* objecttreeparser_p.h This file is part of KMail, the KDE mail client. diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp index 012c6e18..b39bc65f 100644 --- a/kmail/partNode.cpp +++ b/kmail/partNode.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* partNode.cpp A node in a MIME tree. This file is part of KMail, the KDE mail client. diff --git a/kmail/partNode.h b/kmail/partNode.h index 20328dde..918f3f31 100644 --- a/kmail/partNode.h +++ b/kmail/partNode.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* partNode.h A node in a MIME tree. This file is part of KMail, the KDE mail client. diff --git a/kmail/partmetadata.h b/kmail/partmetadata.h index ee6f51d3..e5b060b9 100644 --- a/kmail/partmetadata.h +++ b/kmail/partmetadata.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* partmetadata.h KMail, the KDE mail client. diff --git a/kmail/partnodebodypart.cpp b/kmail/partnodebodypart.cpp index 45ce2862..4f095ee8 100644 --- a/kmail/partnodebodypart.cpp +++ b/kmail/partnodebodypart.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* partnodebodypart.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/partnodebodypart.h b/kmail/partnodebodypart.h index 3591286e..6ce17615 100644 --- a/kmail/partnodebodypart.h +++ b/kmail/partnodebodypart.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* partnodebodypart.h This file is part of KMail, the KDE mail client. diff --git a/kmail/popaccount.h b/kmail/popaccount.h index f8cb0e92..f6acfee7 100644 --- a/kmail/popaccount.h +++ b/kmail/popaccount.h @@ -1,4 +1,3 @@ -// -*- c++ -*- #ifndef KMAcctExpPop_h #define KMAcctExpPop_h diff --git a/kmail/protocols.h b/kmail/protocols.h index ab5aa38d..f24730f8 100644 --- a/kmail/protocols.h +++ b/kmail/protocols.h @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- /** * protocols.h * diff --git a/kmail/redirectdialog.h b/kmail/redirectdialog.h index aa46404f..b4893298 100644 --- a/kmail/redirectdialog.h +++ b/kmail/redirectdialog.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* This file is part of KMail. Copyright (c) 2003 Andreas Gungl <a.gungl@gmx.de> diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp index 1b14fb4f..1ce0237b 100644 --- a/kmail/regexplineedit.cpp +++ b/kmail/regexplineedit.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* regexplineedit.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/regexplineedit.h b/kmail/regexplineedit.h index 4db2e922..732f5449 100644 --- a/kmail/regexplineedit.h +++ b/kmail/regexplineedit.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* regexplineedit.h This file is part of KMail, the KDE mail client. diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp index fac482ee..ae04af88 100644 --- a/kmail/rulewidgethandlermanager.cpp +++ b/kmail/rulewidgethandlermanager.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* rulewidgethandlermanager.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/rulewidgethandlermanager.h b/kmail/rulewidgethandlermanager.h index 431731e4..8043243c 100644 --- a/kmail/rulewidgethandlermanager.h +++ b/kmail/rulewidgethandlermanager.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* rulewidgethandlermanager.h This file is part of KMail, the KDE mail client. diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index bc97de04..68d64a82 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -189,7 +189,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, object = list->first(); delete list; if (!searchFolder && object && ::tqqt_cast<TQComboBox*>(object)) - static_cast<TQComboBox*>(TQT_TQWIDGET(object))->setCurrentText("Subject"); + static_cast<TQComboBox*>(TQT_TQWIDGET(object))->setCurrentText(i18n("Subject")); vbl->addWidget( mPatternEdit ); diff --git a/kmail/secondarywindow.cpp b/kmail/secondarywindow.cpp index 5a689633..a421209a 100644 --- a/kmail/secondarywindow.cpp +++ b/kmail/secondarywindow.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* secondarywindow.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h index 560b707d..cd7e6f45 100644 --- a/kmail/secondarywindow.h +++ b/kmail/secondarywindow.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* secondarywindow.h This file is part of KMail, the KDE mail client. diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp index ff3e156d..a787e06a 100644 --- a/kmail/sieveconfig.cpp +++ b/kmail/sieveconfig.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* sieveconfig.cpp KMail, the KDE mail client. diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h index ac296375..d7b9b8dc 100644 --- a/kmail/sieveconfig.h +++ b/kmail/sieveconfig.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* sieveconfig.h KMail, the KDE mail client. diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp index 96f0a608..290e2d71 100644 --- a/kmail/sievejob.cpp +++ b/kmail/sievejob.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* sievejob.h KMail, the KDE mail client. @@ -290,6 +290,3 @@ namespace KMail { } // namespace KMail #include "sievejob.moc" - -// vim: set noet sts=2 ts=8 sw=2: - diff --git a/kmail/sievejob.h b/kmail/sievejob.h index fb1d3a90..d57e7176 100644 --- a/kmail/sievejob.h +++ b/kmail/sievejob.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* sievejob.h KMail, the KDE mail client. @@ -127,6 +127,3 @@ namespace KMail { } // namespace KMail #endif // __KMAIL_SIEVE_JOB_H__ - -// vim: set noet sts=2 ts=8 sw=2: - diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index 81131956..209e18c1 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* signatureconfigurator.cpp KMail, the KDE mail client. diff --git a/kmail/signatureconfigurator.h b/kmail/signatureconfigurator.h index 48e6c5d6..222a2a98 100644 --- a/kmail/signatureconfigurator.h +++ b/kmail/signatureconfigurator.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* signatureconfigurator.cpp KMail, the KDE mail client. diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp index b96a1ad8..c37ea13f 100644 --- a/kmail/simplestringlisteditor.cpp +++ b/kmail/simplestringlisteditor.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* simplestringlisteditor.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h index cb28d57b..a2361c32 100644 --- a/kmail/simplestringlisteditor.h +++ b/kmail/simplestringlisteditor.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* simplestringlisteditor.h This file is part of KMail, the KDE mail client. diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui index 14be08e9..2034ebe4 100644 --- a/kmail/snippetsettingsbase.ui +++ b/kmail/snippetsettingsbase.ui @@ -92,9 +92,6 @@ <property name="text"> <string>Single dialog for each variable within a snippet</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -109,9 +106,6 @@ <property name="text"> <string>One dialog for all variables within a snippet</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>false</bool> </property> diff --git a/kmail/spamheaderanalyzer.cpp b/kmail/spamheaderanalyzer.cpp index 427aa4d1..debc64b0 100644 --- a/kmail/spamheaderanalyzer.cpp +++ b/kmail/spamheaderanalyzer.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* spamheaderanalyzer.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/spamheaderanalyzer.h b/kmail/spamheaderanalyzer.h index ddb9bf1b..391edbcf 100644 --- a/kmail/spamheaderanalyzer.h +++ b/kmail/spamheaderanalyzer.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* spamheaderanalyzer.h This file is part of KMail, the KDE mail client. diff --git a/kmail/stl_util.h b/kmail/stl_util.h index 8a273895..f72512c5 100644 --- a/kmail/stl_util.h +++ b/kmail/stl_util.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* stl_util.h This file is part of KMail, the KDE mail client. diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp index cf4572b2..93f92a79 100644 --- a/kmail/subscriptiondialog.cpp +++ b/kmail/subscriptiondialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* subscriptiondialog.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/subscriptiondialog.h b/kmail/subscriptiondialog.h index 30a06d9f..bfae617c 100644 --- a/kmail/subscriptiondialog.h +++ b/kmail/subscriptiondialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* subscriptiondialog.h This file is part of KMail, the KDE mail client. diff --git a/kmail/tdehtmlparthtmlwriter.cpp b/kmail/tdehtmlparthtmlwriter.cpp index 5450509e..2fcf29ba 100644 --- a/kmail/tdehtmlparthtmlwriter.cpp +++ b/kmail/tdehtmlparthtmlwriter.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* tdehtmlparthtmlwriter.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/tdehtmlparthtmlwriter.h b/kmail/tdehtmlparthtmlwriter.h index 5d9af2e1..dc07b578 100644 --- a/kmail/tdehtmlparthtmlwriter.h +++ b/kmail/tdehtmlparthtmlwriter.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* tdehtmlparthtmlwriter.h This file is part of KMail, the KDE mail client. diff --git a/kmail/teehtmlwriter.cpp b/kmail/teehtmlwriter.cpp index b162059e..339eea28 100644 --- a/kmail/teehtmlwriter.cpp +++ b/kmail/teehtmlwriter.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* teehtmlwriter.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/teehtmlwriter.h b/kmail/teehtmlwriter.h index a55fd589..2aaa20d5 100644 --- a/kmail/teehtmlwriter.h +++ b/kmail/teehtmlwriter.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* teehtmlwriter.h This file is part of KMail, the KDE mail client. diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index f94be954..d2dbd318 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * This file: Copyright (C) 2006 Dmitry Morozhnikov <dmiceman@mail.ru> * diff --git a/kmail/templateparser.h b/kmail/templateparser.h index c7551c0f..ae0f9f84 100644 --- a/kmail/templateparser.h +++ b/kmail/templateparser.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * This file: Copyright (C) 2006 Dmitry Morozhnikov <dmiceman@mail.ru> * diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp index 9a90ca5a..1b79c521 100644 --- a/kmail/templatesconfiguration.cpp +++ b/kmail/templatesconfiguration.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * This file: Copyright (C) 2006 Dmitry Morozhnikov * diff --git a/kmail/templatesconfiguration.h b/kmail/templatesconfiguration.h index a0196c8e..6a268c60 100644 --- a/kmail/templatesconfiguration.h +++ b/kmail/templatesconfiguration.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * This file: Copyright (C) 2006 Dmitry Morozhnikov * diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui index 683c7e86..1023dea7 100644 --- a/kmail/templatesconfiguration_base.ui +++ b/kmail/templatesconfiguration_base.ui @@ -329,8 +329,6 @@ <include location="global" impldecl="in implementation">kactivelabel.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">templatesinsertcommand.h</include> </includes> -<includehints> - <includehint>templatesinsertcommand.h</includehint> -</includehints> </UI> diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp index b89fd2a1..2b195c6d 100644 --- a/kmail/templatesinsertcommand.cpp +++ b/kmail/templatesinsertcommand.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * This file: Copyright (C) 2006 Dmitry Morozhnikov <dmiceman@mail.ru> * diff --git a/kmail/templatesinsertcommand.h b/kmail/templatesinsertcommand.h index 437ad8bd..c928dd67 100644 --- a/kmail/templatesinsertcommand.h +++ b/kmail/templatesinsertcommand.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * kmail: KDE mail client * This file: Copyright (C) 2006 Dmitry Morozhnikov <dmiceman@mail.ru> * diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index c17c1859..32469118 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* urlhandlermanager.cpp This file is part of KMail, the KDE mail client. diff --git a/kmail/urlhandlermanager.h b/kmail/urlhandlermanager.h index 2e0959ed..191213b0 100644 --- a/kmail/urlhandlermanager.h +++ b/kmail/urlhandlermanager.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* urlhandlermanager.h This file is part of KMail, the KDE mail client. diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp index 3066b559..383daa94 100644 --- a/kmail/vacation.cpp +++ b/kmail/vacation.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* vacation.cpp KMail, the KDE mail client. diff --git a/kmail/vacation.h b/kmail/vacation.h index eac3bd9d..2bf55d3e 100644 --- a/kmail/vacation.h +++ b/kmail/vacation.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* vacation.cpp KMail, the KDE mail client. diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp index 19229895..6e74ab5b 100644 --- a/kmail/vacationdialog.cpp +++ b/kmail/vacationdialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* vacationdialog.cpp KMail, the KDE mail client. diff --git a/kmail/vacationdialog.h b/kmail/vacationdialog.h index d38c75d0..9d80e5f7 100644 --- a/kmail/vacationdialog.h +++ b/kmail/vacationdialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* vacationdialog.h KMail, the KDE mail client. diff --git a/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h index e6530714..c107299f 100644 --- a/kmail/xfaceconfigurator.h +++ b/kmail/xfaceconfigurator.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* xfaceconfigurator.cpp KMail, the KDE mail client. diff --git a/kmailcvt/CMakeL10n.txt b/kmailcvt/CMakeL10n.txt index cf11083b..a5d59794 100644 --- a/kmailcvt/CMakeL10n.txt +++ b/kmailcvt/CMakeL10n.txt @@ -1,6 +1,3 @@ ##### create translation templates ############## -tde_l10n_create_template( - CATALOG "kmailcvt" - SOURCES "." "*.cxx" "*.hxx" -) +tde_l10n_create_template( "kmailcvt" ) diff --git a/kmailcvt/CMakeLists.txt b/kmailcvt/CMakeLists.txt index 9a566690..ac96928a 100644 --- a/kmailcvt/CMakeLists.txt +++ b/kmailcvt/CMakeLists.txt @@ -38,12 +38,12 @@ install( tde_add_executable( kmailcvt AUTOMOC SOURCES kimportpagedlg.ui kimportpage.cpp kselfilterpagedlg.ui - kselfilterpage.cpp filters.cxx filter_oe.cxx kmailcvt.cpp main.cpp - filter_pmail.cxx filter_plain.cxx filter_outlook.cxx filter_mbox.cxx - filter_evolution.cxx filter_mailapp.cxx filter_evolution_v2.cxx - filter_opera.cxx filter_thunderbird.cxx filter_kmail_maildir.cxx - filter_sylpheed.cxx filter_thebat.cxx filter_lnotes.cxx - filter_kmail_archive.cxx + kselfilterpage.cpp filters.cpp filter_oe.cpp kmailcvt.cpp main.cpp + filter_pmail.cpp filter_plain.cpp filter_outlook.cpp filter_mbox.cpp + filter_evolution.cpp filter_mailapp.cpp filter_evolution_v2.cpp + filter_opera.cpp filter_thunderbird.cpp filter_kmail_maildir.cpp + filter_sylpheed.cpp filter_thebat.cpp filter_lnotes.cpp + filter_kmail_archive.cpp LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kmailcvt/Makefile.am b/kmailcvt/Makefile.am index 7c49b36a..46a25870 100644 --- a/kmailcvt/Makefile.am +++ b/kmailcvt/Makefile.am @@ -1,32 +1,32 @@ bin_PROGRAMS = kmailcvt kmailcvt_SOURCES = kimportpagedlg.ui kimportpage.cpp kselfilterpagedlg.ui \ - kselfilterpage.cpp filters.cxx filter_oe.cxx kmailcvt.cpp \ - main.cpp filter_pmail.cxx filter_plain.cxx filter_outlook.cxx \ - filter_mbox.cxx filter_evolution.cxx filter_mailapp.cxx \ - filter_evolution_v2.cxx filter_opera.cxx filter_thunderbird.cxx \ - filter_kmail_maildir.cxx filter_sylpheed.cxx filter_thebat.cxx \ - filter_lnotes.cxx filter_kmail_archive.cxx + kselfilterpage.cpp filters.cpp filter_oe.cpp kmailcvt.cpp \ + main.cpp filter_pmail.cpp filter_plain.cpp filter_outlook.cpp \ + filter_mbox.cpp filter_evolution.cpp filter_mailapp.cpp \ + filter_evolution_v2.cpp filter_opera.cpp filter_thunderbird.cpp \ + filter_kmail_maildir.cpp filter_sylpheed.cpp filter_thebat.cpp \ + filter_lnotes.cpp filter_kmail_archive.cpp kmailcvt_LDADD = $(LIB_TDEFILE) EXTRA_DIST = main.cpp kmailcvt.cpp kimportpage.cpp kimportpage.h \ kselfilterpage.cpp kselfilterpage.h kmailcvt.h \ - kmailcvt.desktop filter_oe.cxx filter_oe.hxx \ - filters.cxx filters.hxx \ + kmailcvt.desktop filter_oe.cpp filter_oe.h \ + filters.cpp filters.h \ PAB_format.html sv9429424.gif \ - filter_pmail.cxx filter_pmail.hxx \ - filter_plain.cxx filter_plain.hxx \ - filter_mbox.cxx filter_mbox.hxx \ - filter_evolution.cxx filter_evolution.hxx \ - filter_mailapp.hxx filter_mailapp.cxx \ - filter_opera.hxx filter_opera.cxx \ - filter_evolution_v2.hxx filter_evolution_v2.cxx \ - filter_thunderbird.hxx filter_thunderbird.cxx \ - filter_kmail_maildir.hxx filter_kmail_maildir.cxx \ - filter_sylpheed.hxx filter_sylpheed.cxx \ - filter_thebat.hxx filter_thebat.cxx filter_lnotes.hxx filter_lnotes.cxx \ - filter_kmail_archive.cxx fitler_kmail_archive.hxx + filter_pmail.cpp filter_pmail.h \ + filter_plain.cpp filter_plain.h \ + filter_mbox.cpp filter_mbox.h \ + filter_evolution.cpp filter_evolution.h \ + filter_mailapp.h filter_mailapp.cpp \ + filter_opera.h filter_opera.cpp \ + filter_evolution_v2.h filter_evolution_v2.cpp \ + filter_thunderbird.h filter_thunderbird.cpp \ + filter_kmail_maildir.h filter_kmail_maildir.cpp \ + filter_sylpheed.h filter_sylpheed.cpp \ + filter_thebat.h filter_thebat.cpp filter_lnotes.h filter_lnotes.cpp \ + filter_kmail_archive.cpp fitler_kmail_archive.h install-data-local: uninstall.desktop $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Utilities @@ -45,7 +45,7 @@ kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) KDE_ICON=AUTO messages: rc.cpp - LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \ + LIST=`find . -name \*.h -o -name \*.cpp`; \ if test -n "$$LIST"; then \ $(XGETTEXT) $$LIST -o $(podir)/kmailcvt.pot; \ fi diff --git a/kmailcvt/README b/kmailcvt/README index d8322ed4..d1105fe4 100644 --- a/kmailcvt/README +++ b/kmailcvt/README @@ -7,9 +7,9 @@ with KMail via its DCOP interface to add messages. Writing a filter ---------------- -...is very easy. Create two files filter_myformat.cxx and filter_myformat.hxx -and add "filter_myformat.cxx" to the end of the kmailcvt_SOURCES line in -Makefile.am and "filter_myformat.cxx filter_myformat.hxx" to the end of the +...is very easy. Create two files filter_myformat.cpp and filter_myformat.h +and add "filter_myformat.cpp" to the end of the kmailcvt_SOURCES line in +Makefile.am and "filter_myformat.cpp filter_myformat.h" to the end of the EXTRA_DIST line in Makefile.am. Now run "make -f Makefile.cvs; ./configure" in your tdepim source directory. diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cpp index b4443d14..a372058e 100644 --- a/kmailcvt/filter_evolution.cxx +++ b/kmailcvt/filter_evolution.cpp @@ -1,5 +1,5 @@ /* - * filter_evolution.cxx + * filter_evolution.cpp * Author : Simon MARTIN <simartin@users.sourceforge.net> * Copyright (c) 2004 Simon MARTIN * @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "filter_evolution.hxx" +#include "filter_evolution.h" #include <config.h> #include <tdelocale.h> diff --git a/kmailcvt/filter_evolution.hxx b/kmailcvt/filter_evolution.h index 1aa5184f..83fb4155 100644 --- a/kmailcvt/filter_evolution.hxx +++ b/kmailcvt/filter_evolution.h @@ -1,5 +1,5 @@ /* - * filter_evolution.hxx + * filter_evolution.h * Author : Simon MARTIN <simartin@users.sourceforge.net> * Copyright (c) 2004 Simon MARTIN * @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef FILTER_EVOLUTION_HXX -#define FILTER_EVOLUTION_HXX +#ifndef FILTER_EVOLUTION_H +#define FILTER_EVOLUTION_H -#include "filters.hxx" +#include "filters.h" /** * Imports Evolution mboxes recursively, keeping the folder structure. diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cpp index b6ee8a57..a4c6203c 100644 --- a/kmailcvt/filter_evolution_v2.cxx +++ b/kmailcvt/filter_evolution_v2.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_evolution_v2.cxx - Evolution 2.0.x mail import + filter_evolution_v2.cpp - Evolution 2.0.x mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -16,7 +16,7 @@ * * ***************************************************************************/ -#include "filter_evolution_v2.hxx" +#include "filter_evolution_v2.h" #include <config.h> #include <tdelocale.h> diff --git a/kmailcvt/filter_evolution_v2.hxx b/kmailcvt/filter_evolution_v2.h index da58b4fe..2c93bba8 100644 --- a/kmailcvt/filter_evolution_v2.hxx +++ b/kmailcvt/filter_evolution_v2.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_evolution_v2.hxx - Evolution 2.0.x mail import + filter_evolution_v2.h - Evolution 2.0.x mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -16,10 +16,10 @@ * * ***************************************************************************/ -#ifndef FILTER_EVOLUTION_V2_HXX -#define FILTER_EVOLUTION_V2_HXX +#ifndef FILTER_EVOLUTION_V2_H +#define FILTER_EVOLUTION_V2_H -#include "filters.hxx" +#include "filters.h" /** * Imports Evolution v2.x mail folder recursively, keeping the folder structure. diff --git a/kmailcvt/filter_kmail_archive.cxx b/kmailcvt/filter_kmail_archive.cpp index 3c7c20d0..49325d2a 100644 --- a/kmailcvt/filter_kmail_archive.cxx +++ b/kmailcvt/filter_kmail_archive.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "filter_kmail_archive.hxx" +#include "filter_kmail_archive.h" #include <tdelocale.h> diff --git a/kmailcvt/filter_kmail_archive.hxx b/kmailcvt/filter_kmail_archive.h index 755d3cc2..a1f74925 100644 --- a/kmailcvt/filter_kmail_archive.hxx +++ b/kmailcvt/filter_kmail_archive.h @@ -16,10 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef FILTER_KMAIL_ARCHIVE_HXX -#define FILTER_KMAIL_ARCHIVE_HXX +#ifndef FILTER_KMAIL_ARCHIVE_H +#define FILTER_KMAIL_ARCHIVE_H -#include "filters.hxx" +#include "filters.h" class FilterKMailArchive : public Filter { diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cpp index 9d642814..f24ef7af 100644 --- a/kmailcvt/filter_kmail_maildir.cxx +++ b/kmailcvt/filter_kmail_maildir.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_kmail_maildir.cxx - Kmail maildir mail import + filter_kmail_maildir.cpp - Kmail maildir mail import ------------------- begin : April 06 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include "filter_kmail_maildir.hxx" +#include "filter_kmail_maildir.h" #include <config.h> #include <tdelocale.h> diff --git a/kmailcvt/filter_kmail_maildir.hxx b/kmailcvt/filter_kmail_maildir.h index 66f44490..f0d8c6ac 100644 --- a/kmailcvt/filter_kmail_maildir.hxx +++ b/kmailcvt/filter_kmail_maildir.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_kmail_maildir.hxx - Kmail maildir mail import + filter_kmail_maildir.h - Kmail maildir mail import ------------------- begin : April 06 2005 copyright : (C) 2005 by Danny Kukawka @@ -14,10 +14,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef FILTER_KMAIL_MAILDIR_HXX -#define FILTER_KMAIL_MAILDIR_HXX +#ifndef FILTER_KMAIL_MAILDIR_H +#define FILTER_KMAIL_MAILDIR_H -#include "filters.hxx" +#include "filters.h" /** * Imports KMail mail folder with maildir format recursively, recreating the folder structure. diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cpp index af92e1b4..7733c1c1 100644 --- a/kmailcvt/filter_lnotes.cxx +++ b/kmailcvt/filter_lnotes.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_lnotes.cxx - Lotus Notes Structured Text mail import + filter_lnotes.cpp - Lotus Notes Structured Text mail import ------------------- begin : Wed Feb 16, 2005 copyright : (C) 2005 by Robert Rockers @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tqfileinfo.h> -#include "filter_lnotes.hxx" +#include "filter_lnotes.h" /** Default constructor. */ FilterLNotes::FilterLNotes() : @@ -57,7 +57,7 @@ void FilterLNotes::import(FilterInfo *info) { totalFiles = filenames.count(); inf->setOverall(0); - // See filter_mbox.cxx for better reference. + // See filter_mbox.cpp for better reference. for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename ) { ++currentFile; @@ -75,7 +75,7 @@ void FilterLNotes::import(FilterInfo *info) { */ void FilterLNotes::ImportLNotes(const TQString& file) { - // See Filter_pmail.cxx for better reference + // See Filter_pmail.cpp for better reference // Format of a Lotus Notes 5 Structured Text Document w form feed // Each email begins with a custom Header Principal: diff --git a/kmailcvt/filter_lnotes.hxx b/kmailcvt/filter_lnotes.h index 430ae83e..bf5cd91c 100644 --- a/kmailcvt/filter_lnotes.hxx +++ b/kmailcvt/filter_lnotes.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_lnotes.hxx - Lotus Notes Structured Text mail import + filter_lnotes.h - Lotus Notes Structured Text mail import ------------------- begin : Wed Feb 16, 2005 copyright : (C) 2005 by Robert Rockers @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_LNOTES_HXX -#define FILTER_LNOTES_HXX +#ifndef FILTER_LNOTES_H +#define FILTER_LNOTES_H -#include "filters.hxx" +#include "filters.h" /**imports Lotus Notes Structured Text Archives and archvies messages into KMail *@author Robert Rockers diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cpp index fded411d..1da632ec 100644 --- a/kmailcvt/filter_mailapp.cxx +++ b/kmailcvt/filter_mailapp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_mailapp.cxx - OS X Mail App import + filter_mailapp.cpp - OS X Mail App import ------------------- copyright : (C) 2004 by Chris Howells email : howells@kde.org @@ -26,7 +26,7 @@ #include <tdetempfile.h> #include <kdebug.h> -#include "filter_mailapp.hxx" +#include "filter_mailapp.h" FilterMailApp::FilterMailApp() : Filter( i18n("Import From OS X Mail"), diff --git a/kmailcvt/filter_mailapp.hxx b/kmailcvt/filter_mailapp.h index 571f77ff..e562dbf7 100644 --- a/kmailcvt/filter_mailapp.hxx +++ b/kmailcvt/filter_mailapp.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_mailapp.hxx - OS X Mail App import + filter_mailapp.h - OS X Mail App import ------------------- copyright : (C) 2004 by Chris Howells email : howells@kde.org @@ -10,10 +10,10 @@ ***************************************************************************/ -#ifndef FILTER_MAILAPP_HXX -#define FILTER_MAILAPP_HXX +#ifndef FILTER_MAILAPP_H +#define FILTER_MAILAPP_H -#include "filters.hxx" +#include "filters.h" /** *imports mbox archives messages into KMail diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cpp index 19afccf2..c5f87e51 100644 --- a/kmailcvt/filter_mbox.cxx +++ b/kmailcvt/filter_mbox.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_mbox.cxx - mbox mail import + filter_mbox.cpp - mbox mail import ------------------- begin : Sat Apr 5 2003 copyright : (C) 2003 by Laurence Anderson @@ -21,7 +21,7 @@ #include <tdetempfile.h> #include <kdebug.h> -#include "filter_mbox.hxx" +#include "filter_mbox.h" FilterMBox::FilterMBox() : diff --git a/kmailcvt/filter_mbox.hxx b/kmailcvt/filter_mbox.h index e1c5e967..f1f376de 100644 --- a/kmailcvt/filter_mbox.hxx +++ b/kmailcvt/filter_mbox.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_mbox.hxx - mbox mail import + filter_mbox.h - mbox mail import ------------------- begin : Sat Apr 5 2003 copyright : (C) 2003 by Laurence Anderson @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_MBOX_HXX -#define FILTER_MBOX_HXX +#ifndef FILTER_MBOX_H +#define FILTER_MBOX_H -#include "filters.hxx" +#include "filters.h" /** * imports mbox archives messages into KMail diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cpp index afd96527..47002d96 100644 --- a/kmailcvt/filter_oe.cxx +++ b/kmailcvt/filter_oe.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_oe.cxx - Outlook Express mail import + filter_oe.cpp - Outlook Express mail import ------------------- begin : Sat Feb 1 2003 copyright : (C) 2003 by Laurence Anderson @@ -25,7 +25,7 @@ #include <tdetempfile.h> #include <kdebug.h> -#include "filter_oe.hxx" +#include "filter_oe.h" #define OE4_SIG_1 0x36464d4a #define OE4_SIG_2 0x00010003 diff --git a/kmailcvt/filter_oe.hxx b/kmailcvt/filter_oe.h index 821aa5df..2a46854f 100644 --- a/kmailcvt/filter_oe.hxx +++ b/kmailcvt/filter_oe.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_oe.hxx - Outlook Express mail import + filter_oe.h - Outlook Express mail import ------------------- begin : Sat Feb 1 2003 copyright : (C) 2003 by Laurence Anderson @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_OE_HXX -#define FILTER_OE_HXX +#ifndef FILTER_OE_H +#define FILTER_OE_H -#include "filters.hxx" +#include "filters.h" /** *imports outlook text messages into KMail diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cpp index 90aef382..ff537695 100644 --- a/kmailcvt/filter_opera.cxx +++ b/kmailcvt/filter_opera.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_opera.cxx - Opera mail import + filter_opera.cpp - Opera mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -21,7 +21,7 @@ #include <tdetempfile.h> #include <kdebug.h> -#include "filter_opera.hxx" +#include "filter_opera.h" FilterOpera::FilterOpera() : diff --git a/kmailcvt/filter_opera.hxx b/kmailcvt/filter_opera.h index 27ded4cc..7da80afa 100644 --- a/kmailcvt/filter_opera.hxx +++ b/kmailcvt/filter_opera.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_opera.hxx - Opera mail import + filter_opera.h - Opera mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_OPERA_HXX -#define FILTER_OPERA_HXX +#ifndef FILTER_OPERA_H +#define FILTER_OPERA_H -#include "filters.hxx" +#include "filters.h" /** *imports opera account-archives into KMail diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cpp index 10483d09..bb395918 100644 --- a/kmailcvt/filter_outlook.cxx +++ b/kmailcvt/filter_outlook.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_opera.cxx - Outlook mail import + filter_opera.cpp - Outlook mail import ------------------- begin : February 01 2005 copyright : (C) 2005 by Danny Kukawka @@ -22,7 +22,7 @@ #include <tdetempfile.h> #include <kdebug.h> -#include "filter_outlook.hxx" +#include "filter_outlook.h" FilterOutlook::FilterOutlook() : Filter( i18n("Import Outlook Emails"), diff --git a/kmailcvt/filter_outlook.hxx b/kmailcvt/filter_outlook.h index bad7d5ee..ec762066 100644 --- a/kmailcvt/filter_outlook.hxx +++ b/kmailcvt/filter_outlook.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_opera.hxx - Outlook mail import + filter_opera.h - Outlook mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_OUTLOOK_HXX -#define FILTER_OUTLOOK_HXX +#ifndef FILTER_OUTLOOK_H +#define FILTER_OUTLOOK_H -#include "filters.hxx" +#include "filters.h" /** * imports mails from Outlook pst-files into KMail diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cpp index 9f78b939..01554c87 100644 --- a/kmailcvt/filter_plain.cxx +++ b/kmailcvt/filter_plain.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - FilterPlain.cxx - Plain mail import + FilterPlain.cpp - Plain mail import ------------------- begin : Fri Jun 14 2002 copyright : (C) 2002 by Laurence Anderson @@ -20,7 +20,7 @@ #include <tdefiledialog.h> #include <libgen.h> -#include "filter_plain.hxx" +#include "filter_plain.h" FilterPlain::FilterPlain() : diff --git a/kmailcvt/filter_plain.hxx b/kmailcvt/filter_plain.h index ddd9d494..2319e888 100644 --- a/kmailcvt/filter_plain.hxx +++ b/kmailcvt/filter_plain.h @@ -1,5 +1,5 @@ /*************************************************************************** - FilterPlain.hxx - Plain mail import + FilterPlain.h - Plain mail import ------------------- begin : Fri Jun 24 2002 copyright : (C) 2002 by Laurence Anderson @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_PLAIN_HXX -#define FILTER_PLAIN_HXX +#ifndef FILTER_PLAIN_H +#define FILTER_PLAIN_H -#include "filters.hxx" +#include "filters.h" /** *imports Plain text messages into KMail diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cpp index e48e062d..b45a0be4 100644 --- a/kmailcvt/filter_pmail.cxx +++ b/kmailcvt/filter_pmail.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - FilterPMail.cxx - Pegasus-Mail import + FilterPMail.cpp - Pegasus-Mail import ------------------- begin : Sat Jan 6 2001 copyright : (C) 2001 by Holger Schurig @@ -24,7 +24,7 @@ #include <tdetempfile.h> #include <kdebug.h> -#include "filter_pmail.hxx" +#include "filter_pmail.h" FilterPMail::FilterPMail() : diff --git a/kmailcvt/filter_pmail.hxx b/kmailcvt/filter_pmail.h index 664fdcc1..07f62a36 100644 --- a/kmailcvt/filter_pmail.hxx +++ b/kmailcvt/filter_pmail.h @@ -1,5 +1,5 @@ /*************************************************************************** - FilterPMail.hxx - Pegasus-Mail import + FilterPMail.h - Pegasus-Mail import ------------------- begin : Sat Jan 6 2001 copyright : (C) 2001 by Holger Schurig @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#ifndef FILTER_PMAIL_HXX -#define FILTER_PMAIL_HXX +#ifndef FILTER_PMAIL_H +#define FILTER_PMAIL_H #include <tqdir.h> #include <tqvaluelist.h> -#include "filters.hxx" +#include "filters.h" class FilterPMail : public Filter { diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cpp index 1fc008d4..e8f4a66a 100644 --- a/kmailcvt/filter_sylpheed.cxx +++ b/kmailcvt/filter_sylpheed.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_sylpheed.hxx - Sylpheed maildir mail import + filter_sylpheed.h - Sylpheed maildir mail import ------------------- begin : April 07 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include "filter_sylpheed.hxx" +#include "filter_sylpheed.h" #include <config.h> #include <tdelocale.h> diff --git a/kmailcvt/filter_sylpheed.hxx b/kmailcvt/filter_sylpheed.h index fcc3af85..1d92adf0 100644 --- a/kmailcvt/filter_sylpheed.hxx +++ b/kmailcvt/filter_sylpheed.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_sylpheed.hxx - Sylpheed maildir mail import + filter_sylpheed.h - Sylpheed maildir mail import ------------------- begin : April 07 2005 copyright : (C) 2005 by Danny Kukawka @@ -14,12 +14,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef FILTER_SYLPHEED_HXX -#define FILTER_SYLPHEED_HXX +#ifndef FILTER_SYLPHEED_H +#define FILTER_SYLPHEED_H #include <tqdict.h> -#include "filters.hxx" +#include "filters.h" /** * Imports Sylpheed mail folder with maildir format recursively, recreating the folder structure. diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cpp index eaf16461..a255f352 100644 --- a/kmailcvt/filter_thebat.cxx +++ b/kmailcvt/filter_thebat.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_thebat.hxx - TheBat! mail import + filter_thebat.h - TheBat! mail import ------------------- begin : April 07 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include "filter_thebat.hxx" +#include "filter_thebat.h" #include <config.h> diff --git a/kmailcvt/filter_thebat.hxx b/kmailcvt/filter_thebat.h index 7d62018d..ef69c231 100644 --- a/kmailcvt/filter_thebat.hxx +++ b/kmailcvt/filter_thebat.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_thebat.hxx - TheBat! mail import + filter_thebat.h - TheBat! mail import ------------------- begin : April 07 2005 copyright : (C) 2005 by Danny Kukawka @@ -14,10 +14,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef FILTER_THEBAT_HXX -#define FILTER_THEBAT_HXX +#ifndef FILTER_THEBAT_H +#define FILTER_THEBAT_H -#include "filters.hxx" +#include "filters.h" /** * Imports The Bat! mail folder recursively, recreating the folder structure. diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cpp index 50f6355f..e5f21d14 100644 --- a/kmailcvt/filter_thunderbird.cxx +++ b/kmailcvt/filter_thunderbird.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filter_thunderbird.cxx - Thunderbird mail import + filter_thunderbird.cpp - Thunderbird mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include "filter_thunderbird.hxx" +#include "filter_thunderbird.h" #include <config.h> #include <tdelocale.h> diff --git a/kmailcvt/filter_thunderbird.hxx b/kmailcvt/filter_thunderbird.h index d3bcd7f9..333e2380 100644 --- a/kmailcvt/filter_thunderbird.hxx +++ b/kmailcvt/filter_thunderbird.h @@ -1,5 +1,5 @@ /*************************************************************************** - filter_thunderbird.hxx - Thunderbird mail import + filter_thunderbird.h - Thunderbird mail import ------------------- begin : Januar 26 2005 copyright : (C) 2005 by Danny Kukawka @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#ifndef FILTER_THUNDERBIRD_HXX -#define FILTER_THUNDERBIRD_HXX +#ifndef FILTER_THUNDERBIRD_H +#define FILTER_THUNDERBIRD_H -#include "filters.hxx" +#include "filters.h" /** * Imports Thinderbird mail folder recursively, keeping the folder structure. diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cpp index d7af7705..2c43ff43 100644 --- a/kmailcvt/filters.cxx +++ b/kmailcvt/filters.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filters.cxx - description + filters.cpp - description ------------------- begin : Fri Jun 30 2000 copyright : (C) 2000 by Hans Dijkema @@ -22,7 +22,7 @@ #include <kurl.h> #include <kdebug.h> -#include "filters.hxx" +#include "filters.h" #include "kmailcvt.h" @@ -214,5 +214,3 @@ bool Filter::needsSecondPage() { return true; } - -// vim: ts=2 sw=2 et diff --git a/kmailcvt/filters.hxx b/kmailcvt/filters.h index d6c33f42..f9261bcb 100644 --- a/kmailcvt/filters.hxx +++ b/kmailcvt/filters.h @@ -1,5 +1,5 @@ /*************************************************************************** - filters.hxx - description + filters.h - description ------------------- begin : Fri Jun 30 2000 copyright : (C) 2000 by Hans Dijkema @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef FILTERS_HXX -#define FILTERS_HXX +#ifndef FILTERS_H +#define FILTERS_H #ifndef MAX_LINE #define MAX_LINE 4096 diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp index d34e0641..39ba423e 100644 --- a/kmailcvt/kmailcvt.cpp +++ b/kmailcvt/kmailcvt.cpp @@ -20,7 +20,7 @@ #include <dcopclient.h> #include <dcopref.h> #include <kdebug.h> -#include "filters.hxx" +#include "filters.h" KMailCVT::KMailCVT(TQWidget *parent, const char *name) : KWizard(parent, name, true) { diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp index 7d97fcfd..118124f7 100644 --- a/kmailcvt/kselfilterpage.cpp +++ b/kmailcvt/kselfilterpage.cpp @@ -19,23 +19,23 @@ #include <tqtextedit.h> #include <tqcheckbox.h> #include <tdelocale.h> -#include "filters.hxx" +#include "filters.h" -#include "filter_mbox.hxx" -#include "filter_oe.hxx" -#include "filter_outlook.hxx" -#include "filter_pmail.hxx" -#include "filter_plain.hxx" -#include "filter_evolution.hxx" -#include "filter_mailapp.hxx" -#include "filter_evolution_v2.hxx" -#include "filter_opera.hxx" -#include "filter_thunderbird.hxx" -#include "filter_kmail_maildir.hxx" -#include "filter_kmail_archive.hxx" -#include "filter_sylpheed.hxx" -#include "filter_thebat.hxx" -#include "filter_lnotes.hxx" +#include "filter_mbox.h" +#include "filter_oe.h" +#include "filter_outlook.h" +#include "filter_pmail.h" +#include "filter_plain.h" +#include "filter_evolution.h" +#include "filter_mailapp.h" +#include "filter_evolution_v2.h" +#include "filter_opera.h" +#include "filter_thunderbird.h" +#include "filter_kmail_maildir.h" +#include "filter_kmail_archive.h" +#include "filter_sylpheed.h" +#include "filter_thebat.h" +#include "filter_lnotes.h" #include "kselfilterpage.h" diff --git a/kmobile/kmobileclient.h b/kmobile/kmobileclient.h index 72bf6605..df46600a 100644 --- a/kmobile/kmobileclient.h +++ b/kmobile/kmobileclient.h @@ -6,7 +6,7 @@ #define _KMOBILECLIENT_H_ #include <dcopclient.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KDE_EXPORT KMobileClient : public DCOPClient { diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 78fc50e8..546a6a11 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <tqmutex.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <klibloader.h> #include <tdeabc/addressee.h> diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h index 166b8eb9..fb50ce5c 100644 --- a/kmobile/kmobileview.h +++ b/kmobile/kmobileview.h @@ -9,7 +9,7 @@ #include "kmobileiface.h" -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEConfig; class KMobileItem; diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp index e5324e9e..f3e8b8a2 100644 --- a/kmobile/systemtray.cpp +++ b/kmobile/systemtray.cpp @@ -102,5 +102,3 @@ void SystemTray::setToolTip(const TQString &tip) } #include "systemtray.moc" - -// vim: ts=8 diff --git a/kmobile/tdeioslave/tdeio_mobile.cpp b/kmobile/tdeioslave/tdeio_mobile.cpp index db531417..7b254410 100644 --- a/kmobile/tdeioslave/tdeio_mobile.cpp +++ b/kmobile/tdeioslave/tdeio_mobile.cpp @@ -33,7 +33,7 @@ #include "tdeio_mobile.h" -#include <tdepimmacros.h> +#include <kdemacros.h> using namespace TDEIO; diff --git a/knode/aboutdata.h b/knode/aboutdata.h index 528e75b0..50faa6dc 100644 --- a/knode/aboutdata.h +++ b/knode/aboutdata.h @@ -15,7 +15,7 @@ */ #include <tdeaboutdata.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #ifndef KNODE_ABOUTDATA_H #define KNODE_ABOUTDATA_H diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index 9e801a6e..78d39149 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -1107,5 +1107,3 @@ void KNSendErrorDialog::slotHighlighted(int idx) //------------------------------- #include "knarticlefactory.moc" - -// kate: space-indent on; indent-width 2; diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp index 90cf0e7d..53b81089 100644 --- a/knode/knarticlewindow.cpp +++ b/knode/knarticlewindow.cpp @@ -1,4 +1,3 @@ -// -*- c-basic-offset: 2 -*- /* KNode, the KDE newsreader Copyright (c) 1999-2005 the KNode authors. diff --git a/knode/kncleanup.cpp b/knode/kncleanup.cpp index 33714840..8b2849a9 100644 --- a/knode/kncleanup.cpp +++ b/knode/kncleanup.cpp @@ -315,5 +315,3 @@ void KNCleanUp::ProgressDialog::closeEvent(TQCloseEvent *) { // do nothing => prevent that the user closes the window } - -// kate: space-indent on; indent-width 2; diff --git a/knode/kncleanup.h b/knode/kncleanup.h index 60a81516..d765dc15 100644 --- a/knode/kncleanup.h +++ b/knode/kncleanup.h @@ -68,5 +68,3 @@ class KNCleanUp { }; #endif - -// kate: space-indent on; indent-width 2; diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index c13027a7..8695048e 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -2657,5 +2657,3 @@ void KNComposer::AttachmentPropertiesDlg::slotMimeTypeTextChanged(const TQString //-------------------------------- #include "kncomposer.moc" - -// kate: space-indent on; indent-width 2; diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp index 237ff41b..d9f21878 100644 --- a/knode/knconfigpages.cpp +++ b/knode/knconfigpages.cpp @@ -23,7 +23,7 @@ #include "knconfigpages.h" #include "knconfigwidgets.h" -#include <tdepimmacros.h> +#include <kdemacros.h> // // common config page with tabs (code mostly taken from kmail) diff --git a/knode/knconvert.h b/knode/knconvert.h index 59b23c9c..3f87a25e 100644 --- a/knode/knconvert.h +++ b/knode/knconvert.h @@ -21,7 +21,7 @@ #include <tqglobal.h> #include <tqvaluelist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQListBox; class TQLabel; diff --git a/knode/knglobals.h b/knode/knglobals.h index f361f3bb..c2eca4b8 100644 --- a/knode/knglobals.h +++ b/knode/knglobals.h @@ -20,7 +20,7 @@ #include <tdeconfig.h> #include "resource.h" -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEInstance; class KNConfigManager; diff --git a/knode/kngroup.h b/knode/kngroup.h index fef5c6d6..15f26839 100644 --- a/knode/kngroup.h +++ b/knode/kngroup.h @@ -196,5 +196,3 @@ class KNGroup : public KNArticleCollection , public KNJobItem { }; #endif - -// kate: space-indent on; indent-width 2; diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp index 706e9d9b..b429bd6c 100644 --- a/knode/kngroupmanager.cpp +++ b/knode/kngroupmanager.cpp @@ -700,5 +700,3 @@ void KNGroupManager::slotCheckForNewGroups(KNNntpAccount *a, TQDate date) //-------------------------------- #include "kngroupmanager.moc" - -// kate: space-indent on; indent-width 2; diff --git a/knode/kngrouppropdlg.h b/knode/kngrouppropdlg.h index 0c640bea..c7c408b7 100644 --- a/knode/kngrouppropdlg.h +++ b/knode/kngrouppropdlg.h @@ -55,5 +55,3 @@ class KNGroupPropDlg : public KDialogBase { }; #endif - -// kate: space-indent on; indent-width 2; diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h index c90e697d..418e0d3e 100644 --- a/knode/knmainwidget.h +++ b/knode/knmainwidget.h @@ -21,7 +21,7 @@ #include "resource.h" #include <tqglobal.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQListViewItem; diff --git a/knode/knnntpaccount.h b/knode/knnntpaccount.h index 23567077..852fa9ab 100644 --- a/knode/knnntpaccount.h +++ b/knode/knnntpaccount.h @@ -114,5 +114,3 @@ class KNNntpAccount : public KNCollection , public KNServerInfo { }; #endif - -// kate: space-indent on; indent-width 2; diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp index ba594a9f..20c62f1d 100644 --- a/knode/knstringfilter.cpp +++ b/knode/knstringfilter.cpp @@ -161,5 +161,3 @@ void KNStringFilterWidget::setStartFocus() // -----------------------------------------------------------------------------+ #include "knstringfilter.moc" - -// kate: space-indent on; indent-width 2; diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui index 702ce90d..e0afff0a 100644 --- a/knode/smtpaccountwidget_base.ui +++ b/knode/smtpaccountwidget_base.ui @@ -143,9 +143,6 @@ <property name="text"> <string>None</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQRadioButton"> <property name="name"> @@ -154,9 +151,6 @@ <property name="text"> <string>SSL</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQRadioButton"> <property name="name"> @@ -165,9 +159,6 @@ <property name="text"> <string>TLS</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </vbox> </widget> diff --git a/knotes/resourcenotes.h b/knotes/resourcenotes.h index d33b3423..9ea668a0 100644 --- a/knotes/resourcenotes.h +++ b/knotes/resourcenotes.h @@ -34,7 +34,7 @@ #define RESOURCENOTES_H #include <tderesources/resource.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/alarm.h> class TDEConfig; diff --git a/kode/automakefile.h b/kode/automakefile.h index 418851ad..1a593732 100644 --- a/kode/automakefile.h +++ b/kode/automakefile.h @@ -26,7 +26,7 @@ #include <tqmap.h> #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { diff --git a/kode/class.h b/kode/class.h index f3f44114..aab15d27 100644 --- a/kode/class.h +++ b/kode/class.h @@ -26,7 +26,7 @@ #include "membervariable.h" #include "typedef.h" -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> diff --git a/kode/code.h b/kode/code.h index 97a1b8d3..2b1da631 100644 --- a/kode/code.h +++ b/kode/code.h @@ -26,7 +26,7 @@ #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { class KDE_EXPORT Code diff --git a/kode/enum.h b/kode/enum.h index 56681724..d4566bba 100644 --- a/kode/enum.h +++ b/kode/enum.h @@ -22,7 +22,7 @@ #define KODE_ENUM_H #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { diff --git a/kode/file.h b/kode/file.h index f4fe555e..7a899154 100644 --- a/kode/file.h +++ b/kode/file.h @@ -28,7 +28,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { diff --git a/kode/function.h b/kode/function.h index 305838eb..6d928f4f 100644 --- a/kode/function.h +++ b/kode/function.h @@ -26,7 +26,7 @@ #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { diff --git a/kode/kwsdl/creator.cpp b/kode/kwsdl/creator.cpp index e31808ad..4564c365 100644 --- a/kode/kwsdl/creator.cpp +++ b/kode/kwsdl/creator.cpp @@ -58,7 +58,7 @@ void Creator::create( const KODE::Class::List &list ) } KODE::AutoMakefile::Target libTarget( "bin_PROGRAMS", "kwsdl" ); - libTarget.setSources( "main.cc " + cppFiles.join( " " ) ); + libTarget.setSources( "main.cpp " + cppFiles.join( " " ) ); libTarget.setLdFlags( "$(all_libraries) $(KDE_RPATH)" ); libTarget.setLdAdd( "-ltdecore -ltdeio" ); diff --git a/kode/kwsdl/tests/google/Makefile.am b/kode/kwsdl/tests/google/Makefile.am index 68f084a3..5c706193 100644 --- a/kode/kwsdl/tests/google/Makefile.am +++ b/kode/kwsdl/tests/google/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO bin_PROGRAMS = googletest -googletest_SOURCES = main.cc googlesearch.cc transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp +googletest_SOURCES = main.cpp googlesearch.cpp transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp googletest_LDADD = -ltdecore -ltdeio googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/kode/kwsdl/tests/google/README b/kode/kwsdl/tests/google/README index cfe83159..46ef2ff0 100644 --- a/kode/kwsdl/tests/google/README +++ b/kode/kwsdl/tests/google/README @@ -1,7 +1,7 @@ This application shows how easy it is to use a web service with code, generated by kwsdl_compiler. -Only the files main.cc, googlesearch.cc and googlesearch.hh are +Only the files main.cpp, googlesearch.cpp and googlesearch.h are written manually, all other files were created by kwsdl_compiler -d kwsdl/tests/google/ GoogleSearch.wsdl diff --git a/kode/kwsdl/tests/google/googlesearch.cc b/kode/kwsdl/tests/google/googlesearch.cpp index 690b9a11..fcea9d75 100644 --- a/kode/kwsdl/tests/google/googlesearch.cc +++ b/kode/kwsdl/tests/google/googlesearch.cpp @@ -22,7 +22,7 @@ without including the source code for TQt in the source distribution. */ -#include "googlesearch.hh" +#include "googlesearch.h" #include "resultelement.h" #include "resultelementarray.h" diff --git a/kode/kwsdl/tests/google/googlesearch.hh b/kode/kwsdl/tests/google/googlesearch.h index b6400616..b6400616 100644 --- a/kode/kwsdl/tests/google/googlesearch.hh +++ b/kode/kwsdl/tests/google/googlesearch.h diff --git a/kode/kwsdl/tests/google/main.cc b/kode/kwsdl/tests/google/main.cpp index 38c64594..130a9cc6 100644 --- a/kode/kwsdl/tests/google/main.cc +++ b/kode/kwsdl/tests/google/main.cpp @@ -3,7 +3,7 @@ #include <tdecmdlineargs.h> #include <kmdcodec.h> -#include "googlesearch.hh" +#include "googlesearch.h" int main( int argc, char **argv ) { diff --git a/kode/license.h b/kode/license.h index 6474babc..e73be134 100644 --- a/kode/license.h +++ b/kode/license.h @@ -22,7 +22,7 @@ #define KODE_LICENSE_H #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { diff --git a/kode/membervariable.h b/kode/membervariable.h index fe5e889d..f75ab0f1 100644 --- a/kode/membervariable.h +++ b/kode/membervariable.h @@ -25,7 +25,7 @@ #include <tqvaluelist.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { diff --git a/kode/printer.h b/kode/printer.h index 1d3f103e..ceb0f7a9 100644 --- a/kode/printer.h +++ b/kode/printer.h @@ -26,7 +26,7 @@ #include "style.h" #include "automakefile.h" -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqvaluelist.h> #include <tqstring.h> #include <tqstringlist.h> diff --git a/kode/statemachine.h b/kode/statemachine.h index 5c977293..a3490592 100644 --- a/kode/statemachine.h +++ b/kode/statemachine.h @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { diff --git a/kode/style.h b/kode/style.h index 26921f71..42b5fe18 100644 --- a/kode/style.h +++ b/kode/style.h @@ -27,7 +27,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { diff --git a/kode/typedef.h b/kode/typedef.h index 9cc69635..a985c5fb 100644 --- a/kode/typedef.h +++ b/kode/typedef.h @@ -22,7 +22,7 @@ #define KODE_TYPEDEF_H #include <tqvaluelist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { diff --git a/kode/variable.h b/kode/variable.h index 1eda384f..252d7b40 100644 --- a/kode/variable.h +++ b/kode/variable.h @@ -24,7 +24,7 @@ #include <tqvaluelist.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KODE { diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index edaf86da..3c270aa8 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -126,4 +126,3 @@ TQString Core::lastErrorMessage() const } #include "core.moc" -// vim: sw=2 sts=2 et tw=80 diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h index 65e939b9..c76406d5 100644 --- a/kontact/interfaces/core.h +++ b/kontact/interfaces/core.h @@ -24,7 +24,7 @@ #define KONTACT_CORE_H #include <tqdatetime.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeparts/mainwindow.h> #include <tdeparts/part.h> @@ -99,5 +99,3 @@ class KDE_EXPORT Core : public KParts::MainWindow } #endif - -// vim: sw=2 sts=2 et tw=80 diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index ed81dcb6..3b63466c 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -255,5 +255,3 @@ void Plugin::virtual_hook( int, void* ) { } #include "plugin.moc" - -// vim: sw=2 et sts=2 tw=80 diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index 3d8c66cf..70c8a7e2 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -26,7 +26,7 @@ #include <tqobject.h> #include <kxmlguiclient.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqptrlist.h> class TQStringList; diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index 961c4b07..dba346e2 100644 --- a/kontact/interfaces/summary.h +++ b/kontact/interfaces/summary.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include <tqpixmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KStatusBar; diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h index 6ecc2381..025bb8b8 100644 --- a/kontact/interfaces/uniqueapphandler.h +++ b/kontact/interfaces/uniqueapphandler.h @@ -24,7 +24,7 @@ #include <dcopobject.h> #include <plugin.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kontact { diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index d4852e80..d6db8112 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -213,5 +213,3 @@ int KABUniqueAppHandler::newInstance() } #include "kaddressbook_plugin.moc" - -// vim: sw=2 sts=2 tw=80 et diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 497e2780..e2f9126f 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -37,7 +37,7 @@ #include "kcmkmailsummary.h" -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 9ac18602..924938a0 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -1,5 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- - +/* This file is part of Kontact. Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 0f17435c..b8c7a0cd 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -37,7 +37,7 @@ #include "kcmkorgsummary.h" -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 577bc992..179baed3 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -45,7 +45,7 @@ #include "newsfeeds.h" -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index 93c7bd8b..b2d1a45d 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -39,7 +39,7 @@ #include "kcmsdsummary.h" -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 3877827d..65bd13e5 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -39,7 +39,7 @@ #include "kcmkontactsummary.h" -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/kontact/src/about/kontact.css b/kontact/src/about/kontact.css index 47188fe5..d599a630 100644 --- a/kontact/src/about/kontact.css +++ b/kontact/src/about/kontact.css @@ -23,6 +23,3 @@ #subtext { font-style: italic; } - -/* vim:set sw=2 et nocindent smartindent: */ - diff --git a/kontact/src/about/main.html b/kontact/src/about/main.html index c2e10ec2..8460249c 100644 --- a/kontact/src/about/main.html +++ b/kontact/src/about/main.html @@ -64,4 +64,3 @@ <div id="footer"><div id="footerL"/><div id="footerR"/></div> </body> </html> -<!-- vim:set sw=2 et nocindent smartindent: --> diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index 39deb330..338aeb8d 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -599,5 +599,3 @@ void IconSidePane::indicateForegrunding( Kontact::Plugin *plugin ) } #include "iconsidepane.moc" - -// vim: sw=2 sts=2 et tw=80 diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 622d597b..4e6e4407 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -38,7 +38,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h index 57df05c0..e5d66378 100644 --- a/kontact/src/mainwindow.h +++ b/kontact/src/mainwindow.h @@ -174,4 +174,3 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont } #endif -// vim: sw=2 sts=2 et diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h index 0edf9811..9edf278a 100644 --- a/korganizer/aboutdata.h +++ b/korganizer/aboutdata.h @@ -25,7 +25,7 @@ #define KORG_ABOUTDATA_H #include <tdeaboutdata.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KOrg { diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h index 3494ecff..ebfed515 100644 --- a/korganizer/actionmanager.h +++ b/korganizer/actionmanager.h @@ -30,7 +30,7 @@ #include <tqobject.h> #include <kurl.h> #include <korganizer/part.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "kcalendariface.h" diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 469eddaf..e9b3d672 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -31,7 +31,7 @@ #include <tdefile.h> #include <korganizer/koeventviewer.h> #include <libkcal/scheduler.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "koglobals.h" #include "interfaces/korganizer/calendarviewbase.h" diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui index d0f43c94..a44124b5 100644 --- a/korganizer/filteredit_base.ui +++ b/korganizer/filteredit_base.ui @@ -234,9 +234,6 @@ <property name="text"> <string>Show all except selected</string> </property> - <property name="accel"> - <string></string> - </property> <property name="buttonGroupId"> <number>1</number> </property> @@ -251,9 +248,6 @@ <property name="text"> <string>Show only selected</string> </property> - <property name="accel"> - <string></string> - </property> <property name="buttonGroupId"> <number>0</number> </property> @@ -268,9 +262,6 @@ <property name="text"> <string>Change...</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </grid> </widget> @@ -281,9 +272,6 @@ <property name="text"> <string>Hide to-dos not assigned to me</string> </property> - <property name="accel"> - <string></string> - </property> <property name="whatsThis" stdset="0"> <string>This option hides all to-dos from your list which are assigned to someone else.<br> Only to-dos which have least one attendee will be checked. If you are not in the list of attendees the to-do will be hidden.</string> diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h index a8ca0c58..fa47ab7a 100644 --- a/korganizer/interfaces/korganizer/baseview.h +++ b/korganizer/interfaces/korganizer/baseview.h @@ -29,7 +29,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "korganizer/incidencechangerbase.h" #include "printplugin.h" diff --git a/korganizer/kocore.h b/korganizer/kocore.h index d160f68d..f5dd7c97 100644 --- a/korganizer/kocore.h +++ b/korganizer/kocore.h @@ -29,7 +29,7 @@ #include <korganizer/part.h> #include <korganizer/printplugin.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <ktrader.h> namespace KPIM { class IdentityManager; } diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui index a5f89cc1..b7a61b60 100644 --- a/korganizer/koeditoralarms_base.ui +++ b/korganizer/koeditoralarms_base.ui @@ -662,11 +662,9 @@ <includes> <include location="global" impldecl="in declaration">addresseelineedit.h</include> <include location="global" impldecl="in declaration">kurlrequester.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">libtdepim/addresseelineedit.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>libtdepim/addresseelineedit.h</includehint> -</includehints> </UI> diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index 91fb0d4d..5aa897ac 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h @@ -24,7 +24,7 @@ #ifndef KOEVENTVIEWER_H #define KOEVENTVIEWER_H -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeconfig.h> #include <tqtextbrowser.h> diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h index f66ecafd..4c6a8f37 100644 --- a/korganizer/koeventviewerdialog.h +++ b/korganizer/koeventviewerdialog.h @@ -25,7 +25,7 @@ #define KOEVENTVIEWERDIALOG_H #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "koeventviewer.h" namespace KCal { diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h index 678426fd..b6f48cf7 100644 --- a/korganizer/koglobals.h +++ b/korganizer/koglobals.h @@ -23,7 +23,7 @@ #ifndef KORG_GLOBALS_H #define KORG_GLOBALS_H -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqwidget.h> class TQDate; diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui index 6adb3cbc..83c5799f 100644 --- a/korganizer/kogroupwareprefspage.ui +++ b/korganizer/kogroupwareprefspage.ui @@ -617,7 +617,7 @@ For security reasons, it is not recommended to store your password in the config <tabstop>retrieveSavePassword</tabstop> </tabstops> <includes> - <include location="global" impldecl="in declaration">tdepimmacros.h</include> + <include location="global" impldecl="in declaration">kdemacros.h</include> <include location="local" impldecl="in implementation">kogroupwareprefspage.ui.h</include> </includes> <Q_SIGNALS> diff --git a/korganizer/kohelper.h b/korganizer/kohelper.h index 329de2a6..e7348421 100644 --- a/korganizer/kohelper.h +++ b/korganizer/kohelper.h @@ -25,7 +25,7 @@ #ifndef KOHELPER_H #define KOHELPER_H -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { class Calendar; diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 0fa1eb21..3e57a77c 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -26,7 +26,7 @@ #include <tqdict.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "koprefs_base.h" diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 08763b63..3e4f98bf 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -77,7 +77,7 @@ #include "ktimeedit.h" #include "koglobals.h" #include "stdcalendar.h" -#include <tdepimmacros.h> +#include <kdemacros.h> KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name ) diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index cc0bb283..b38e6a79 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -544,7 +544,21 @@ void AlarmDialog::wakeUp() } if ( activeReminders ) + { + DCOPRef screensaver("kdesktop", "KScreensaverIface"); + DCOPReply reply = screensaver.call("isBlanked"); + bool res = true; + if (reply.isValid()) { + reply.get(res); + } show(); + if (res) + { + // Lower the dialog if the screensaver is active or its status unknown. + // This prevents reminders to show on a locked screen. + lower(); + } + } setTimer(); showDetails(); emit reminderCount( activeCount() ); diff --git a/korganizer/korganizerifaceimpl.h b/korganizer/korganizerifaceimpl.h index 4873ef63..c91a715e 100644 --- a/korganizer/korganizerifaceimpl.h +++ b/korganizer/korganizerifaceimpl.h @@ -34,7 +34,7 @@ #include "korganizeriface.h" #include <tqobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class ActionManager; diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui index 6868729b..7239719e 100644 --- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui +++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui @@ -194,8 +194,7 @@ <tabstop>mToDate</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kdateedit.h</includehint> - <includehint>kdateedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdateedit.h</include> +</includes> </UI> diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui index a3d4fb69..13922223 100644 --- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui +++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui @@ -169,8 +169,7 @@ <tabstop>mToDate</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kdateedit.h</includehint> - <includehint>kdateedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdateedit.h</include> +</includes> </UI> diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui index b9c070eb..a13bc130 100644 --- a/korganizer/printing/calprintdayconfig_base.ui +++ b/korganizer/printing/calprintdayconfig_base.ui @@ -248,10 +248,7 @@ </tabstops> <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> + <include location="global" impldecl="in implementation">libtdepim/kdateedit.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>libtdepim/kdateedit.h</includehint> - <includehint>libtdepim/kdateedit.h</includehint> -</includehints> </UI> diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h index 29b925a6..ae62d75a 100644 --- a/korganizer/printing/calprinter.h +++ b/korganizer/printing/calprinter.h @@ -31,7 +31,7 @@ #include <kdialogbase.h> #include <korganizer/baseview.h> #include <korganizer/printplugin.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KOrg { class CoreHelper; diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index 9eecda39..c094ad84 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -38,7 +38,7 @@ #ifndef KORG_NOPRINTER -inline int round(const double x) +inline int roundToInt(const double x) { return int(x > 0.0 ? x + 0.5 : x - 0.5); } @@ -1178,7 +1178,7 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect // Fill the remaining space (if a month has less days than others) with a crossed-out pattern if ( daysinmonth<maxdays ) { - TQRect dayBox( box.left(), daysBox.top() + round(dayheight*daysinmonth), box.width(), 0 ); + TQRect dayBox( box.left(), daysBox.top() + roundToInt(dayheight*daysinmonth), box.width(), 0 ); dayBox.setBottom( daysBox.bottom() ); p.fillRect( dayBox, TQt::DiagCrossPattern ); } @@ -1187,9 +1187,9 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect for ( d = 0; d < daysinmonth; ++d ) { TQDate day; calsys->setYMD( day, dt.year(), dt.month(), d+1 ); - TQRect dayBox( daysBox.left()/*+rand()%50*/, daysBox.top() + round(dayheight*d), daysBox.width()/*-rand()%50*/, 0 ); + TQRect dayBox( daysBox.left()/*+rand()%50*/, daysBox.top() + roundToInt(dayheight*d), daysBox.width()/*-rand()%50*/, 0 ); // FIXME: When using a border width of 0 for event boxes, don't let the rectangles overlap, i.e. subtract 1 from the top or bottom! - dayBox.setBottom( daysBox.top()+round(dayheight*(d+1)) - 1 ); + dayBox.setBottom( daysBox.top()+roundToInt(dayheight*(d+1)) - 1 ); p.setBrush( isWorkingDay( day )?workdayColor:holidayColor ); p.drawRect( dayBox ); @@ -1314,9 +1314,9 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect int minsToEnd = starttime.secsTo( placeItem->end() )/60; TQRect eventBox( xstartcont + placeItem->subCell()*17, - daysBox.top() + round( double( minsToStart*daysBox.height()) / double(maxdays*24*60) ), + daysBox.top() + roundToInt( double( minsToStart*daysBox.height()) / double(maxdays*24*60) ), 14, 0 ); - eventBox.setBottom( daysBox.top() + round( double( minsToEnd*daysBox.height()) / double(maxdays*24*60) ) ); + eventBox.setBottom( daysBox.top() + roundToInt( double( minsToEnd*daysBox.height()) / double(maxdays*24*60) ) ); drawVerticalBox( p, 0, eventBox, placeItem->event()->summary() ); newxstartcont = TQMAX( newxstartcont, eventBox.right() ); } @@ -1327,9 +1327,9 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect for ( int d=0; d<daysinmonth; ++d ) { TQStringList dayEvents( textEvents[d+1] ); TQString txt = dayEvents.join(", "); - TQRect dayBox( xstartcont, daysBox.top()+round(dayheight*d), 0, 0 ); + TQRect dayBox( xstartcont, daysBox.top()+roundToInt(dayheight*d), 0, 0 ); dayBox.setRight( box.right() ); - dayBox.setBottom( daysBox.top()+round(dayheight*(d+1)) ); + dayBox.setBottom( daysBox.top()+roundToInt(dayheight*(d+1)) ); printEventString(p, dayBox, txt, TQt::AlignTop | TQt::AlignLeft | TQt::BreakAnywhere ); } p.setFont( oldfont ); diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h index 3684e2f1..7b9e52e0 100644 --- a/korganizer/printing/calprintpluginbase.h +++ b/korganizer/printing/calprintpluginbase.h @@ -30,7 +30,7 @@ #include <tqdatetime.h> #include <kprinter.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/calendar.h> #include <libkcal/event.h> #include <libkcal/todo.h> diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui index 106ffd7d..031c45dd 100644 --- a/korganizer/printing/calprinttodoconfig_base.ui +++ b/korganizer/printing/calprinttodoconfig_base.ui @@ -245,9 +245,6 @@ <property name="text"> <string>Due date</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -446,10 +443,7 @@ </tabstops> <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> + <include location="global" impldecl="in implementation">libtdepim/kdateedit.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>libtdepim/kdateedit.h</includehint> - <includehint>libtdepim/kdateedit.h</includehint> -</includehints> </UI> diff --git a/korganizer/printing/calprintweetdeconfig_base.ui b/korganizer/printing/calprintweetdeconfig_base.ui index 0be844ab..079bd164 100644 --- a/korganizer/printing/calprintweetdeconfig_base.ui +++ b/korganizer/printing/calprintweetdeconfig_base.ui @@ -291,10 +291,7 @@ </tabstops> <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> + <include location="global" impldecl="in implementation">libtdepim/kdateedit.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>libtdepim/kdateedit.h</includehint> - <includehint>libtdepim/kdateedit.h</includehint> -</includehints> </UI> diff --git a/korganizer/printing/cellitem.h b/korganizer/printing/cellitem.h index e4a37da0..4d8206bc 100644 --- a/korganizer/printing/cellitem.h +++ b/korganizer/printing/cellitem.h @@ -27,7 +27,7 @@ #include <tqstring.h> #include <tqptrlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KOrg { diff --git a/korganizer/urihandler.h b/korganizer/urihandler.h index 572a67a5..ccf8338f 100644 --- a/korganizer/urihandler.h +++ b/korganizer/urihandler.h @@ -24,7 +24,7 @@ #ifndef URIHANDLER_H #define URIHANDLER_H -#include <tdepimmacros.h> +#include <kdemacros.h> class TQString; class TQWidget; diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui index 74c525b7..be877365 100644 --- a/korn/kornaccountcfg.ui +++ b/korn/kornaccountcfg.ui @@ -239,10 +239,8 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <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> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui index c70fef90..1ae40345 100644 --- a/korn/kornboxcfg.ui +++ b/korn/kornboxcfg.ui @@ -1680,11 +1680,9 @@ <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">keditlistbox.h</include> <include location="global" impldecl="in implementation">kicondialog.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>keditlistbox.h</includehint> -</includehints> </UI> diff --git a/ktnef/gui/ktnefview.h b/ktnef/gui/ktnefview.h index 0ddec104..34b84867 100644 --- a/ktnef/gui/ktnefview.h +++ b/ktnef/gui/ktnefview.h @@ -20,7 +20,7 @@ #include <tdelistview.h> #include <tqptrlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KTNEFAttach; diff --git a/ktnef/ktnef/ktnefattach.h b/ktnef/ktnef/ktnefattach.h index 280c862f..24a14c2d 100644 --- a/ktnef/ktnef/ktnefattach.h +++ b/ktnef/ktnef/ktnefattach.h @@ -22,7 +22,7 @@ #include <tqmap.h> #include <tqvariant.h> #include <ktnef/ktnefpropertyset.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KTNEFProperty; diff --git a/ktnef/ktnef/ktnefmessage.h b/ktnef/ktnef/ktnefmessage.h index afc372e2..48d397c4 100644 --- a/ktnef/ktnef/ktnefmessage.h +++ b/ktnef/ktnef/ktnefmessage.h @@ -20,7 +20,7 @@ #include <ktnef/ktnefpropertyset.h> #include <tqptrlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KTNEFAttach; diff --git a/ktnef/ktnef/ktnefparser.h b/ktnef/ktnef/ktnefparser.h index fc93391c..ea098dd6 100644 --- a/ktnef/ktnef/ktnefparser.h +++ b/ktnef/ktnef/ktnefparser.h @@ -21,7 +21,7 @@ #include <tqptrlist.h> #include <tqstring.h> #include <tqmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KTNEFAttach; class KTNEFMessage; diff --git a/ktnef/ktnef/ktnefproperty.h b/ktnef/ktnef/ktnefproperty.h index 7b9d9d20..c0af8d94 100644 --- a/ktnef/ktnef/ktnefproperty.h +++ b/ktnef/ktnef/ktnefproperty.h @@ -20,7 +20,7 @@ #include <tqvariant.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KDE_EXPORT KTNEFProperty { diff --git a/ktnef/ktnef/ktnefpropertyset.h b/ktnef/ktnef/ktnefpropertyset.h index 44166e31..c35aa0e3 100644 --- a/ktnef/ktnef/ktnefpropertyset.h +++ b/ktnef/ktnef/ktnefpropertyset.h @@ -20,7 +20,7 @@ #include <tqmap.h> #include <tqvariant.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KTNEFProperty; diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp index 03999f87..d44897be 100644 --- a/libemailfunctions/email.cpp +++ b/libemailfunctions/email.cpp @@ -1,5 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- - +/* This file is part of tdepim. Copyright (c) 2004 TDEPIM developers diff --git a/libemailfunctions/email.h b/libemailfunctions/email.h index 6c2a522d..6f5f44e0 100644 --- a/libemailfunctions/email.h +++ b/libemailfunctions/email.h @@ -1,5 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- - +/* This file is part of tdepim. Copyright (c) 2004 TDEPIM developers @@ -25,7 +24,7 @@ #include <tqstringlist.h> #include <tqcstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> /** @file */ diff --git a/libemailfunctions/idmapper.h b/libemailfunctions/idmapper.h index 7c6c98cf..4dc5b3d6 100644 --- a/libemailfunctions/idmapper.h +++ b/libemailfunctions/idmapper.h @@ -25,7 +25,7 @@ #include <tqmap.h> #include <tqvariant.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPIM { diff --git a/libemailfunctions/kasciistringtools.cpp b/libemailfunctions/kasciistringtools.cpp index a9e6fb60..9d7590af 100644 --- a/libemailfunctions/kasciistringtools.cpp +++ b/libemailfunctions/kasciistringtools.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kasciistringtools.cpp This file is part of libtdepim. diff --git a/libemailfunctions/kasciistringtools.h b/libemailfunctions/kasciistringtools.h index ac19960d..c67e5c31 100644 --- a/libemailfunctions/kasciistringtools.h +++ b/libemailfunctions/kasciistringtools.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kasciistringtools.h This file is part of libtdepim. diff --git a/libkcal/alarm.h b/libkcal/alarm.h index 09de14f0..01969cae 100644 --- a/libkcal/alarm.h +++ b/libkcal/alarm.h @@ -33,7 +33,7 @@ #include "listbase.h" #include "libkcal_export.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { diff --git a/libkcal/assignmentvisitor.cpp b/libkcal/assignmentvisitor.cpp index 023df857..c5599e93 100644 --- a/libkcal/assignmentvisitor.cpp +++ b/libkcal/assignmentvisitor.cpp @@ -119,5 +119,3 @@ bool AssignmentVisitor::visit( FreeBusy *freebusy ) *freebusy = *source; return true; } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/libkcal/assignmentvisitor.h b/libkcal/assignmentvisitor.h index 2be0215c..12d6daac 100644 --- a/libkcal/assignmentvisitor.h +++ b/libkcal/assignmentvisitor.h @@ -119,4 +119,3 @@ class AssignmentVisitor : public IncidenceBase::Visitor } #endif -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/libkcal/calendar.h b/libkcal/calendar.h index 08255938..eeccff92 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h @@ -39,7 +39,7 @@ #include "kcalversion.h" #include "person.h" -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqobject.h> #include <tqstring.h> diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h index a77238e4..e021a9b6 100644 --- a/libkcal/calendarlocal.h +++ b/libkcal/calendarlocal.h @@ -24,7 +24,7 @@ #include "calendar.h" #include <tqdict.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { diff --git a/libkcal/confirmsavedialog.h b/libkcal/confirmsavedialog.h index f92d4ae5..bc0fcb09 100644 --- a/libkcal/confirmsavedialog.h +++ b/libkcal/confirmsavedialog.h @@ -23,7 +23,7 @@ #include <libkcal/incidence.h> #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEListView; diff --git a/libkcal/customproperties.h b/libkcal/customproperties.h index e1b020dc..de6b8bd7 100644 --- a/libkcal/customproperties.h +++ b/libkcal/customproperties.h @@ -24,7 +24,7 @@ #include <tqstring.h> #include <tqmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "libkcal_export.h" diff --git a/libkcal/event.h b/libkcal/event.h index 9bd217e1..ba0780fb 100644 --- a/libkcal/event.h +++ b/libkcal/event.h @@ -22,7 +22,7 @@ #define KCAL_EVENT_H #include "incidence.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h index 8da2868a..f277b14a 100644 --- a/libkcal/icalformat.h +++ b/libkcal/icalformat.h @@ -26,7 +26,7 @@ #include "scheduler.h" #include "calformat.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { diff --git a/libkcal/incidence.h b/libkcal/incidence.h index 20579ce7..f5fedc34 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h @@ -32,7 +32,7 @@ #include "libkcal_export.h" #include "incidencebase.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { diff --git a/libkcal/journal.h b/libkcal/journal.h index a3289d57..d2ca83c4 100644 --- a/libkcal/journal.h +++ b/libkcal/journal.h @@ -23,7 +23,7 @@ #define KCAL_JOURNAL_H #include "incidence.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { diff --git a/libkcal/kcalversion.h b/libkcal/kcalversion.h index 13422197..8eac5f4c 100644 --- a/libkcal/kcalversion.h +++ b/libkcal/kcalversion.h @@ -21,6 +21,8 @@ #ifndef KCAL_KCALVERSION_H #define KCAL_KCALVERSION_H +#include <tdeversion.h> + #define LIBKCAL_IS_VERSION( a,b,c ) ( LIBKCAL_VERSION >= TDE_MAKE_VERSION(a,b,c) ) #define LIBKCAL_VERSION TDE_MAKE_VERSION(1,3,0) #define LIBKCAL_VERSIONSTR "1.3" diff --git a/libkcal/libical/src/libical/icalattach.c b/libkcal/libical/src/libical/icalattach.c index 106096bf..a2c1bd4c 100644 --- a/libkcal/libical/src/libical/icalattach.c +++ b/libkcal/libical/src/libical/icalattach.c @@ -1,4 +1,4 @@ -/* -*- Mode: C -*- +/* ====================================================================== FILE: icalattach.c CREATOR: acampi 28 May 02 diff --git a/libkcal/libkcal_export.h b/libkcal/libkcal_export.h index 88f270d0..7fca2dbe 100644 --- a/libkcal/libkcal_export.h +++ b/libkcal/libkcal_export.h @@ -21,7 +21,7 @@ #ifndef KCAL_KCALEXPORT_H #define KCAL_KCALEXPORT_H -#include <tdepimmacros.h> +#include <kdemacros.h> #define LIBKCAL_EXPORT KDE_EXPORT diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h index 94c00ae4..f890d265 100644 --- a/libkcal/resourcecached.h +++ b/libkcal/resourcecached.h @@ -34,7 +34,7 @@ #include <tqdatetime.h> #include <tqtimer.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h index 0ee57793..de63c2b6 100644 --- a/libkcal/resourcecachedconfig.h +++ b/libkcal/resourcecachedconfig.h @@ -22,7 +22,7 @@ #define KCAL_RESOURCECACHEDCONFIG_H #include <tqwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQButtonGroup; class TQSpinBox; diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index f33b7da4..ebb6a8b9 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -41,7 +41,7 @@ #include <tderesources/resource.h> #include <tderesources/manager.h> #include <tdeabc/lock.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h index d13ed2d8..5b47d5ea 100644 --- a/libkcal/resourcelocal.h +++ b/libkcal/resourcelocal.h @@ -27,7 +27,7 @@ #include <kurl.h> #include <kdirwatch.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEConfig; #include "calendarlocal.h" diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h index 7a1e7f72..d8b0c6c1 100644 --- a/libkcal/resourcelocalconfig.h +++ b/libkcal/resourcelocalconfig.h @@ -28,7 +28,7 @@ #include <tderesources/resource.h> #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "libkcal_export.h" diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h index 6826da6b..2f1bbec3 100644 --- a/libkcal/resourcelocaldir.h +++ b/libkcal/resourcelocaldir.h @@ -23,7 +23,7 @@ #include <kurl.h> #include <kdirwatch.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "resourcecached.h" diff --git a/libkholidays/CMakeLists.txt b/libkholidays/CMakeLists.txt index 7bd4dc9e..c4ef09f0 100644 --- a/libkholidays/CMakeLists.txt +++ b/libkholidays/CMakeLists.txt @@ -11,6 +11,8 @@ project( libkholidays ) +include( ConfigureChecks.cmake ) + add_subdirectory( holidays ) include_directories( @@ -27,12 +29,30 @@ link_directories( ##### kholidays (shared) ######################## +add_custom_command( + OUTPUT parseholiday.c parseholiday.h + COMMAND ${BISON_EXECUTABLE} -p kcal -d -o parseholiday.c ${CMAKE_CURRENT_SOURCE_DIR}/parseholiday.y +) + +add_custom_command( + OUTPUT scanholiday.c + COMMAND ${FLEX_EXECUTABLE} -Pkcal -B -i -o scanholiday.c ${CMAKE_CURRENT_SOURCE_DIR}/scanholiday.lex +) + +add_custom_target( + libkholiday_file_generation + DEPENDS + ${CMAKE_CURRENT_BINARY_DIR}/parseholiday.c + ${CMAKE_CURRENT_BINARY_DIR}/parseholiday.h + ${CMAKE_CURRENT_BINARY_DIR}/scanholiday.c +) tde_add_library( kholidays SHARED AUTOMOC SOURCES kholidays.cpp scanholiday.c parseholiday.h parseholiday.c lunarphase.cpp VERSION 1.0.0 LINK tdecore-shared + DEPENDENCIES libkholiday_file_generation DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libkholidays/ConfigureChecks.cmake b/libkholidays/ConfigureChecks.cmake new file mode 100644 index 00000000..c4e75c27 --- /dev/null +++ b/libkholidays/ConfigureChecks.cmake @@ -0,0 +1,13 @@ +############################################ +# # +# Improvements and feedbacks are welcome # +# # +# This file is released under GPL >= 3 # +# # +############################################ + + +##### check for yacc (bison) and lex (flex) + +find_program( BISON_EXECUTABLE bison ) +find_program( FLEX_EXECUTABLE NAMES flex lex ) diff --git a/libkholidays/kholidays.h b/libkholidays/kholidays.h index b2e31b87..19805377 100644 --- a/libkholidays/kholidays.h +++ b/libkholidays/kholidays.h @@ -25,7 +25,7 @@ #include <tqdatetime.h> #include <tqvaluelist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> struct KHoliday { TQString text; diff --git a/libkholidays/parseholiday.c b/libkholidays/parseholiday.c deleted file mode 100644 index 1923d955..00000000 --- a/libkholidays/parseholiday.c +++ /dev/null @@ -1,2653 +0,0 @@ -/* A Bison parser, made by GNU Bison 2.3. */ - -/* Skeleton implementation for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - - 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, 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. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* C LALR(1) parser skeleton written by Richard Stallman, by - simplifying the original so-called "semantic" parser. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -/* Identify Bison output. */ -#define YYBISON 1 - -/* Bison version. */ -#define YYBISON_VERSION "2.3" - -/* Skeleton name. */ -#define YYSKELETON_NAME "yacc.c" - -/* Pure parsers. */ -#define YYPURE 0 - -/* Using locations. */ -#define YYLSP_NEEDED 0 - -/* Substitute the variable and function names. */ -#define yyparse kcalparse -#define yylex kcallex -#define yyerror kcalerror -#define yylval kcallval -#define yychar kcalchar -#define yydebug kcaldebug -#define yynerrs kcalnerrs - - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - NUMBER = 258, - MONTH = 259, - WDAY = 260, - COLOR = 261, - STRING = 262, - IN = 263, - PLUS = 264, - MINUS = 265, - SMALL = 266, - CYEAR = 267, - LEAPYEAR = 268, - SHIFT = 269, - IF = 270, - LENGTH = 271, - EASTER = 272, - EQ = 273, - NE = 274, - LE = 275, - GE = 276, - LT = 277, - GT = 278, - PASCHA = 279, - OR = 280, - AND = 281, - UMINUS = 282 - }; -#endif -/* Tokens. */ -#define NUMBER 258 -#define MONTH 259 -#define WDAY 260 -#define COLOR 261 -#define STRING 262 -#define IN 263 -#define PLUS 264 -#define MINUS 265 -#define SMALL 266 -#define CYEAR 267 -#define LEAPYEAR 268 -#define SHIFT 269 -#define IF 270 -#define LENGTH 271 -#define EASTER 272 -#define EQ 273 -#define NE 274 -#define LE 275 -#define GE 276 -#define LT 277 -#define GT 278 -#define PASCHA 279 -#define OR 280 -#define AND 281 -#define UMINUS 282 - - - - -/* Copy the first part of user declarations. */ -#line 1 "parseholiday.y" - -/* - * deals with the holiday file. A yacc parser is used to parse the file. - * All the holidays of the specified year are calculated at once and stored - * in two arrays that have one entry for each day of the year. The day - * drawing routines just use the julian date to index into these arrays. - * There are two arrays because holidays can be printed either on a full - * line under the day number, or as a small line to the right of the day - * number. It's convenient to have both. - * - * parse_holidays(year, force) read the holiday file and evaluate - * all the holiday definitions for - * <year>. Sets holiday and sm_holiday - * arrays. If force is set, re-eval even - * if year is the same as last time. - * - * Taken from plan by Thomas Driemeyer <thomas@bitrot.de> - * Adapted for use in KOrganizer by Preston Brown <pbrown@kde.org> and - * Reinhold Kainhofer <reinhold@kainhofer.com> - */ - -#include <config.h> - -#include <stdio.h> -#include <unistd.h> -#include <time.h> -#include <stdlib.h> -#include <pwd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <string.h> - -#include <limits.h> - -/*** Macro definitions and constants ***/ -/* - * Before you mail and complain that the following macro is incorrect, - * please consider that this is one of the main battlegrounds of the - * Annual Usenet Flame Wars. 2000 is a leap year. Just trust me on this :-) - */ - -#define ISLEAPYEAR(y) !((y)&3) -#define JULIAN(m,d) (monthbegin[m] + (d)-1+((m)>1 && ISLEAPYEAR(parse_year))) -#define LAST 999 -#define ANY 0 -#define BEFORE -1 -#define AFTER -2 -/**** Public forward declarations ****/ -char *parse_holidays(const char *holidays, int year, short force); - -/**** Private forward declarations ****/ -extern int kcallex(void); /* external lexical analyzer */ -static void kcalerror(const char *s); -static time_t date_to_time(int day, int month, int year, - int *wkday, int *julian, int *weeknum); -static time_t tm_to_time(struct tm *tm); -static int day_from_name(char *str); -static int day_from_easter(void); -static int day_from_monthday(int month, int day); -static int day_from_wday(int day, int wday, int num); -static void monthday_from_day(int day, int *m, int *d, int *y); -static int calc_easter(int year); -static int calc_pascha(int year); -static void setliteraldate(int month, int day, int off, int *ddup); -static void seteaster(int off, int length, int pascha); -static void setdate(int month, int day, int year, int off, int conditionaloff, int length); -static void setwday(int num, int wday, int month, int off, int length); -static void setdoff(int wday, int rel, int month, int day, - int year, int off, int length); -/*** Variables and structures ***/ -static int m, d, y; -int kcallineno; /* current line # being parsed */ -FILE *kcalin; /* file currently being processed */ -int yacc_small; /* small string or on its own line? */ -int yacc_stringcolor; /* color of holiday name text, 1..8 */ -char *yacc_string; /* holiday name text */ -int yacc_daycolor; /* color of day number, 1..8 */ -char *progname; /* argv[0] */ -int parse_year = -1; /* year being parsed, 0=1970..99=2069*/ -static const char *filename; /* holiday filename */ -static char errormsg[PATH_MAX+200];/* error message if any, or "" */ -static int easter_julian; /* julian date of Easter Sunday */ -static int pascha_julian; /* julian date of Pascha Sunday */ -static char *holiday_name; /* strdup'd yacc_string */ -short monthlen[12] = { 31, 28, 31, 30, - 31, 30, 31, 31, - 30, 31, 30, 31 }; -short monthbegin[12] = { 0, 31, 59, 90, - 120, 151, 181, - 212, 243, 273, - 304, 334 }; - -/* struct holiday;*/ -struct holiday { - char *string; /* name of holiday, 0=not a holiday */ - int color; - unsigned short dup; /* reference count */ - struct holiday *next; -}; - -struct holiday holidays[366]; /* info for each day, separate for */ -/*struct holiday sm_holiday[366];*/ /* full-line texts under, and small */ - /* texts next to day number */ -static int initialized=0; - - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 -#endif - -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 -#endif - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 111 "parseholiday.y" -{ int ival; char *sval; } -/* Line 193 of yacc.c. */ -#line 270 "parseholiday.c" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 -#endif - - - -/* Copy the second part of user declarations. */ - - -/* Line 216 of yacc.c. */ -#line 283 "parseholiday.c" - -#ifdef short -# undef short -#endif - -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; -#endif - -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; -#else -typedef short int yytype_int8; -#endif - -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; -#else -typedef unsigned short int yytype_uint16; -#endif - -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; -#else -typedef short int yytype_int16; -#endif - -#ifndef YYSIZE_T -# ifdef __SIZE_TYPE__ -# define YYSIZE_T __SIZE_TYPE__ -# elif defined size_t -# define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# else -# define YYSIZE_T unsigned int -# endif -#endif - -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) - -#ifndef YY_ -# if YYENABLE_NLS -# if ENABLE_NLS -# include <libintl.h> /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) -# endif -# endif -# ifndef YY_ -# define YY_(msgid) msgid -# endif -#endif - -/* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) -#else -# define YYUSE(e) /* empty */ -#endif - -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int i) -#else -static int -YYID (i) - int i; -#endif -{ - return i; -} -#endif - -#if ! defined yyoverflow || YYERROR_VERBOSE - -/* The parser invokes alloca or malloc; define the necessary symbols. */ - -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include <alloca.h> /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include <malloc.h> /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else -# define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# endif -# endif -# endif - -# ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ -# endif -# else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM -# endif -# if (defined __cplusplus && ! defined _STDLIB_H \ - && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) -# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifndef YYFREE -# define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - - -#if (! defined yyoverflow \ - && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) - -/* A type that is properly aligned for any stack member. */ -union yyalloc -{ - yytype_int16 yyss; - YYSTYPE yyvs; - }; - -/* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) - -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ - + YYSTACK_GAP_MAXIMUM) - -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) - -#endif - -/* YYFINAL -- State number of the termination state. */ -#define YYFINAL 2 -/* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 278 - -/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 41 -/* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 16 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 70 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 132 - -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -#define YYUNDEFTOK 2 -#define YYMAXUTOK 282 - -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) - -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const yytype_uint8 yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 32, 2, 2, 2, 31, 2, 2, - 39, 40, 29, 28, 2, 27, 36, 30, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 35, 2, - 2, 2, 2, 34, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 37, 2, 38, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 33 -}; - -#if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint8 yyprhs[] = -{ - 0, 0, 3, 4, 5, 13, 14, 16, 17, 19, - 23, 27, 32, 36, 41, 48, 54, 55, 58, 61, - 62, 67, 68, 70, 74, 75, 78, 82, 87, 93, - 97, 103, 106, 110, 113, 117, 122, 124, 126, 128, - 132, 137, 141, 144, 147, 151, 156, 158, 160, 162, - 166, 170, 174, 178, 182, 186, 190, 194, 198, 202, - 206, 210, 214, 220, 223, 227, 231, 233, 235, 238, - 240 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 42, 0, -1, -1, -1, 42, 44, 45, 7, 45, - 43, 46, -1, -1, 11, -1, -1, 6, -1, 17, - 47, 50, -1, 24, 47, 50, -1, 51, 47, 48, - 50, -1, 5, 47, 50, -1, 55, 5, 47, 50, - -1, 55, 5, 8, 53, 47, 50, -1, 5, 55, - 51, 47, 50, -1, -1, 9, 54, -1, 10, 54, - -1, -1, 14, 49, 15, 49, -1, -1, 5, -1, - 5, 25, 49, -1, -1, 16, 54, -1, 55, 36, - 53, -1, 55, 36, 53, 36, -1, 55, 36, 53, - 36, 54, -1, 53, 30, 55, -1, 53, 30, 55, - 30, 55, -1, 4, 55, -1, 4, 55, 55, -1, - 55, 4, -1, 55, 4, 55, -1, 55, 36, 4, - 55, -1, 55, -1, 7, -1, 17, -1, 55, 36, - 53, -1, 55, 36, 53, 36, -1, 53, 30, 55, - -1, 55, 4, -1, 4, 55, -1, 5, 55, 55, - -1, 55, 5, 8, 53, -1, 4, -1, 55, -1, - 55, -1, 54, 25, 54, -1, 54, 26, 54, -1, - 54, 18, 54, -1, 54, 19, 54, -1, 54, 20, - 54, -1, 54, 21, 54, -1, 54, 22, 54, -1, - 54, 23, 54, -1, 54, 28, 54, -1, 54, 27, - 54, -1, 54, 29, 54, -1, 54, 30, 54, -1, - 54, 31, 54, -1, 54, 34, 54, 35, 54, -1, - 32, 54, -1, 37, 52, 38, -1, 39, 54, 40, - -1, 56, -1, 3, -1, 27, 3, -1, 12, -1, - 13, 55, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const yytype_uint8 yyrline[] = -{ - 0, 130, 130, 131, 131, 137, 138, 141, 142, 145, - 146, 147, 148, 149, 150, 151, 154, 155, 156, 159, - 160, 163, 164, 165, 168, 169, 172, 173, 174, 175, - 176, 177, 178, 179, 180, 181, 182, 186, 187, 188, - 190, 192, 194, 196, 198, 200, 206, 206, 208, 209, - 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, - 220, 221, 222, 223, 224, 227, 228, 231, 232, 233, - 234 -}; -#endif - -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ -static const char *const yytname[] = -{ - "$end", "error", "$undefined", "NUMBER", "MONTH", "WDAY", "COLOR", - "STRING", "IN", "PLUS", "MINUS", "SMALL", "CYEAR", "LEAPYEAR", "SHIFT", - "IF", "LENGTH", "EASTER", "EQ", "NE", "LE", "GE", "LT", "GT", "PASCHA", - "OR", "AND", "'-'", "'+'", "'*'", "'/'", "'%'", "'!'", "UMINUS", "'?'", - "':'", "'.'", "'['", "']'", "'('", "')'", "$accept", "list", "@1", - "small", "color", "entry", "offset", "conditionaloffset", - "wdaycondition", "length", "date", "reldate", "month", "expr", "pexpr", - "number", 0 -}; -#endif - -# ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ -static const yytype_uint16 yytoknum[] = -{ - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 45, 43, 42, - 47, 37, 33, 282, 63, 58, 46, 91, 93, 40, - 41 -}; -# endif - -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 41, 42, 43, 42, 44, 44, 45, 45, 46, - 46, 46, 46, 46, 46, 46, 47, 47, 47, 48, - 48, 49, 49, 49, 50, 50, 51, 51, 51, 51, - 51, 51, 51, 51, 51, 51, 51, 52, 52, 52, - 52, 52, 52, 52, 52, 52, 53, 53, 54, 54, - 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, - 54, 54, 54, 54, 54, 55, 55, 56, 56, 56, - 56 -}; - -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 0, 0, 7, 0, 1, 0, 1, 3, - 3, 4, 3, 4, 6, 5, 0, 2, 2, 0, - 4, 0, 1, 3, 0, 2, 3, 4, 5, 3, - 5, 2, 3, 2, 3, 4, 1, 1, 1, 3, - 4, 3, 2, 2, 3, 4, 1, 1, 1, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 5, 2, 3, 3, 1, 1, 2, 1, - 2 -}; - -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 2, 5, 1, 6, 7, 8, 0, 7, 3, 0, - 67, 46, 16, 69, 0, 16, 16, 0, 0, 4, - 16, 0, 36, 66, 31, 0, 0, 24, 0, 70, - 24, 24, 68, 0, 0, 0, 48, 19, 0, 33, - 16, 0, 32, 17, 18, 0, 12, 16, 36, 9, - 10, 63, 46, 0, 37, 38, 0, 0, 47, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 65, 21, 24, 29, 34, 0, 24, - 46, 26, 47, 25, 24, 43, 0, 64, 0, 42, - 0, 0, 51, 52, 53, 54, 55, 56, 49, 50, - 58, 57, 59, 60, 61, 0, 22, 0, 11, 0, - 46, 16, 13, 35, 27, 15, 44, 41, 0, 39, - 0, 21, 21, 30, 24, 28, 45, 40, 62, 23, - 20, 14 -}; - -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 1, 9, 4, 6, 19, 27, 75, 107, 46, - 20, 56, 21, 35, 36, 23 -}; - -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -88 -static const yytype_int16 yypact[] = -{ - -88, 10, -88, -88, -5, -88, -3, -5, -88, 103, - -88, 122, 36, -88, 122, 13, 13, 11, 15, -88, - 13, -14, 32, -88, 122, 15, 15, 4, 125, -88, - 4, 4, -88, 15, 119, 169, -88, 12, 122, 122, - 145, 144, -88, 210, 210, 15, -88, 13, 37, -88, - -88, 19, 122, 122, -88, -88, 17, 1, 2, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, -88, 52, 4, 29, -88, 147, 4, - 122, 28, -88, 210, 4, -88, 122, -88, 122, -88, - 58, 147, 244, 244, 244, 244, 244, 244, 227, 244, - 83, 83, 19, 19, 19, 192, 47, 61, -88, 122, - -88, 13, -88, -88, 15, -88, -88, -88, 147, 42, - 15, 52, 52, -88, 4, 210, -88, -88, -88, -88, - -88, -88 -}; - -/* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = -{ - -88, -88, -88, -88, 73, -88, -7, -88, -87, -19, - 53, -88, -17, 25, -9, -88 -}; - -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -48 -static const yytype_int16 yytable[] = -{ - 22, 5, 24, 28, 7, 29, 89, 90, 30, 31, - 2, 49, 50, 37, 32, 42, 38, 57, 10, 48, - 45, 3, 25, 26, 81, 58, 74, 13, 14, 76, - 77, 88, 82, 79, 129, 130, 39, 40, 91, 10, - 84, 39, 17, 85, 86, 25, 26, 33, 13, 14, - 43, 44, 34, 72, 18, 87, 108, 106, 51, 109, - 112, 111, -47, 17, 114, 115, 118, -47, 41, 82, - 83, 113, 121, 41, 119, 18, 122, 116, 127, 117, - 8, 47, 82, 0, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 0, 0, - 123, 126, 0, 0, 124, 131, 10, 11, 12, 82, - 0, 0, 69, 70, 71, 13, 14, 72, 0, 0, - 15, 0, 10, 52, 53, 10, 54, 16, 10, 11, - 17, 13, 14, 0, 13, 14, 55, 13, 14, 125, - 0, 0, 18, 0, 0, 128, 17, 10, 80, 17, - 10, 110, 17, 78, 25, 26, 13, 14, 18, 13, - 14, 18, 0, 0, 18, 0, 0, 0, 0, 0, - 0, 17, 0, 0, 17, 0, 0, 0, 0, 0, - 0, 0, 0, 18, 0, 0, 18, 59, 60, 61, - 62, 63, 64, 0, 65, 66, 67, 68, 69, 70, - 71, 0, 0, 72, 0, 0, 0, 0, 0, 73, - 59, 60, 61, 62, 63, 64, 0, 65, 66, 67, - 68, 69, 70, 71, 0, 0, 72, 120, 59, 60, - 61, 62, 63, 64, 0, 65, 66, 67, 68, 69, - 70, 71, 0, 0, 72, 59, 60, 61, 62, 63, - 64, 0, 0, 66, 67, 68, 69, 70, 71, 0, - 0, 72, 59, 60, 61, 62, 63, 64, 0, 0, - 0, 67, 68, 69, 70, 71, 0, 0, 72 -}; - -static const yytype_int8 yycheck[] = -{ - 9, 6, 11, 12, 7, 14, 4, 5, 15, 16, - 0, 30, 31, 20, 3, 24, 30, 34, 3, 28, - 16, 11, 9, 10, 41, 34, 14, 12, 13, 38, - 39, 30, 41, 40, 121, 122, 4, 5, 36, 3, - 47, 4, 27, 52, 53, 9, 10, 32, 12, 13, - 25, 26, 37, 34, 39, 38, 75, 5, 33, 30, - 79, 78, 30, 27, 36, 84, 8, 30, 36, 78, - 45, 80, 25, 36, 91, 39, 15, 86, 36, 88, - 7, 28, 91, -1, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 68, 69, 70, 71, 72, -1, -1, - 109, 118, -1, -1, 111, 124, 3, 4, 5, 118, - -1, -1, 29, 30, 31, 12, 13, 34, -1, -1, - 17, -1, 3, 4, 5, 3, 7, 24, 3, 4, - 27, 12, 13, -1, 12, 13, 17, 12, 13, 114, - -1, -1, 39, -1, -1, 120, 27, 3, 4, 27, - 3, 4, 27, 8, 9, 10, 12, 13, 39, 12, - 13, 39, -1, -1, 39, -1, -1, -1, -1, -1, - -1, 27, -1, -1, 27, -1, -1, -1, -1, -1, - -1, -1, -1, 39, -1, -1, 39, 18, 19, 20, - 21, 22, 23, -1, 25, 26, 27, 28, 29, 30, - 31, -1, -1, 34, -1, -1, -1, -1, -1, 40, - 18, 19, 20, 21, 22, 23, -1, 25, 26, 27, - 28, 29, 30, 31, -1, -1, 34, 35, 18, 19, - 20, 21, 22, 23, -1, 25, 26, 27, 28, 29, - 30, 31, -1, -1, 34, 18, 19, 20, 21, 22, - 23, -1, -1, 26, 27, 28, 29, 30, 31, -1, - -1, 34, 18, 19, 20, 21, 22, 23, -1, -1, - -1, 27, 28, 29, 30, 31, -1, -1, 34 -}; - -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = -{ - 0, 42, 0, 11, 44, 6, 45, 7, 45, 43, - 3, 4, 5, 12, 13, 17, 24, 27, 39, 46, - 51, 53, 55, 56, 55, 9, 10, 47, 55, 55, - 47, 47, 3, 32, 37, 54, 55, 47, 30, 4, - 5, 36, 55, 54, 54, 16, 50, 51, 55, 50, - 50, 54, 4, 5, 7, 17, 52, 53, 55, 18, - 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, - 30, 31, 34, 40, 14, 48, 55, 55, 8, 47, - 4, 53, 55, 54, 47, 55, 55, 38, 30, 4, - 5, 36, 54, 54, 54, 54, 54, 54, 54, 54, - 54, 54, 54, 54, 54, 54, 5, 49, 50, 30, - 4, 53, 50, 55, 36, 50, 55, 55, 8, 53, - 35, 25, 15, 55, 47, 54, 53, 36, 54, 49, - 49, 50 -}; - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ - -#define YYFAIL goto yyerrlab - -#define YYRECOVERING() (!!yyerrstatus) - -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - - -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - - -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ - -#ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif - - -/* YYLEX -- calling `yylex' with the right arguments. */ - -#ifdef YYLEX_PARAM -# define YYLEX yylex (YYLEX_PARAM) -#else -# define YYLEX yylex () -#endif - -/* Enable debugging if requested. */ -#if YYDEBUG - -# ifndef YYFPRINTF -# include <stdio.h> /* INFRINGES ON USER NAME SPACE */ -# define YYFPRINTF fprintf -# endif - -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif -{ - if (!yyvaluep) - return; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); -# endif - switch (yytype) - { - default: - break; - } -} - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif -{ - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); -} - -/*------------------------------------------------------------------. -| yy_stack_print -- Print the state stack from its BOTTOM up to its | -| TOP (included). | -`------------------------------------------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) -#else -static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; -#endif -{ - YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); - YYFPRINTF (stderr, "\n"); -} - -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) - - -/*------------------------------------------------. -| Report that the YYRULE is going to be reduced. | -`------------------------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else -static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif -{ - int yynrhs = yyr2[yyrule]; - int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); - /* The symbols being reduced. */ - for (yyi = 0; yyi < yynrhs; yyi++) - { - fprintf (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); - fprintf (stderr, "\n"); - } -} - -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) - -/* Nonzero means print parse trace. It is left uninitialized so that - multiple parsers can coexist. */ -int yydebug; -#else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) -# define YY_STACK_PRINT(Bottom, Top) -# define YY_REDUCE_PRINT(Rule) -#endif /* !YYDEBUG */ - - -/* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH -# define YYINITDEPTH 200 -#endif - -/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only - if the built-in stack extension method is used). - - Do not make this value too large; the results are undefined if - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) - evaluated with infinite-precision integer arithmetic. */ - -#ifndef YYMAXDEPTH -# define YYMAXDEPTH 10000 -#endif - - - -#if YYERROR_VERBOSE - -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static YYSIZE_T -yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif - -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static char * -yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif -{ - char *yyd = yydest; - const char *yys = yysrc; - - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -# endif - -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) -{ - int yyn = yypact[yystate]; - - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else - { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; - } -} -#endif /* YYERROR_VERBOSE */ - - -/*-----------------------------------------------. -| Release the memory associated to this symbol. | -`-----------------------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else -static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif -{ - YYUSE (yyvaluep); - - if (!yymsg) - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - - switch (yytype) - { - - default: - break; - } -} - - -/* Prevent warnings from -Wmissing-prototypes. */ - -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ - - - -/* The look-ahead symbol. */ -int yychar; - -/* The semantic value of the look-ahead symbol. */ -YYSTYPE yylval; - -/* Number of syntax errors so far. */ -int yynerrs; - - - -/*----------. -| yyparse. | -`----------*/ - -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void) -#else -int -yyparse () - -#endif -#endif -{ - - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; - - - -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) - - YYSIZE_T yystacksize = YYINITDEPTH; - - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; - - - /* The number of symbols on the RHS of the reduced rule. - Keep to zero when no symbol should be popped. */ - int yylen = 0; - - YYDPRINTF ((stderr, "Starting parse\n")); - - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss; - yyvsp = yyvs; - - goto yysetstate; - -/*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | -`------------------------------------------------------------*/ - yynewstate: - /* In all cases, when you get here, the value and location stacks - have just been pushed. So pushing a state here evens the stacks. */ - yyssp++; - - yysetstate: - *yyssp = yystate; - - if (yyss + yystacksize - 1 <= yyssp) - { - /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; - -#ifdef yyoverflow - { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; - } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else - /* Extend the stack our own way. */ - if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; - yystacksize *= 2; - if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; - - { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - -# undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); - } -# endif -#endif /* no yyoverflow */ - - yyssp = yyss + yysize - 1; - yyvsp = yyvs + yysize - 1; - - - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); - - if (yyss + yystacksize - 1 <= yyssp) - YYABORT; - } - - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - - goto yybackup; - -/*-----------. -| yybackup. | -`-----------*/ -yybackup: - - /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ - - /* First try to decide what to do without reference to look-ahead token. */ - yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) - goto yydefault; - - /* Not known => get a look-ahead token if don't already have one. */ - - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ - if (yychar == YYEMPTY) - { - YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; - } - - if (yychar <= YYEOF) - { - yychar = yytoken = YYEOF; - YYDPRINTF ((stderr, "Now at end of input.\n")); - } - else - { - yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); - } - - /* If the proper action on seeing token YYTOKEN is to reduce or to - detect an error, take that action. */ - yyn += yytoken; - if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) - goto yydefault; - yyn = yytable[yyn]; - if (yyn <= 0) - { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; - yyn = -yyn; - goto yyreduce; - } - - if (yyn == YYFINAL) - YYACCEPT; - - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; - - /* Shift the look-ahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - - yystate = yyn; - *++yyvsp = yylval; - - goto yynewstate; - - -/*-----------------------------------------------------------. -| yydefault -- do the default action for the current state. | -`-----------------------------------------------------------*/ -yydefault: - yyn = yydefact[yystate]; - if (yyn == 0) - goto yyerrlab; - goto yyreduce; - - -/*-----------------------------. -| yyreduce -- Do a reduction. | -`-----------------------------*/ -yyreduce: - /* yyn is the number of a rule to reduce with. */ - yylen = yyr2[yyn]; - - /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. - - Otherwise, the following line sets YYVAL to garbage. - This behavior is undocumented and Bison - users should not rely upon it. Assigning to YYVAL - unconditionally makes the parser a bit smaller, and it avoids a - GCC warning that YYVAL may be used uninitialized. */ - yyval = yyvsp[1-yylen]; - - - YY_REDUCE_PRINT (yyn); - switch (yyn) - { - case 3: -#line 131 "parseholiday.y" - { yacc_stringcolor = (yyvsp[(3) - (5)].ival); - yacc_string = (yyvsp[(4) - (5)].sval); - yacc_daycolor = (yyvsp[(5) - (5)].ival); ;} - break; - - case 4: -#line 134 "parseholiday.y" - { free(yacc_string); ;} - break; - - case 5: -#line 137 "parseholiday.y" - { yacc_small = 0; ;} - break; - - case 6: -#line 138 "parseholiday.y" - { yacc_small = 1; ;} - break; - - case 7: -#line 141 "parseholiday.y" - { (yyval.ival) = 0; ;} - break; - - case 8: -#line 142 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (1)].ival); ;} - break; - - case 9: -#line 145 "parseholiday.y" - { seteaster((yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival), 0); ;} - break; - - case 10: -#line 146 "parseholiday.y" - { seteaster((yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival), 1); ;} - break; - - case 11: -#line 147 "parseholiday.y" - { setdate( m, d, y, (yyvsp[(2) - (4)].ival), (yyvsp[(3) - (4)].ival), (yyvsp[(4) - (4)].ival));;} - break; - - case 12: -#line 148 "parseholiday.y" - { setwday( 0, (yyvsp[(1) - (3)].ival), 0, (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival));;} - break; - - case 13: -#line 149 "parseholiday.y" - { setwday((yyvsp[(1) - (4)].ival), (yyvsp[(2) - (4)].ival), 0, (yyvsp[(3) - (4)].ival), (yyvsp[(4) - (4)].ival));;} - break; - - case 14: -#line 150 "parseholiday.y" - { setwday((yyvsp[(1) - (6)].ival), (yyvsp[(2) - (6)].ival), (yyvsp[(4) - (6)].ival), (yyvsp[(5) - (6)].ival), (yyvsp[(6) - (6)].ival));;} - break; - - case 15: -#line 151 "parseholiday.y" - { setdoff((yyvsp[(1) - (5)].ival), (yyvsp[(2) - (5)].ival),m,d,y,(yyvsp[(4) - (5)].ival),(yyvsp[(5) - (5)].ival));;} - break; - - case 16: -#line 154 "parseholiday.y" - { (yyval.ival) = 0; ;} - break; - - case 17: -#line 155 "parseholiday.y" - { (yyval.ival) = (yyvsp[(2) - (2)].ival); ;} - break; - - case 18: -#line 156 "parseholiday.y" - { (yyval.ival) = -(yyvsp[(2) - (2)].ival); ;} - break; - - case 19: -#line 159 "parseholiday.y" - { (yyval.ival) = 0; ;} - break; - - case 20: -#line 160 "parseholiday.y" - { (yyval.ival) = ((yyvsp[(2) - (4)].ival)<<8) | (yyvsp[(4) - (4)].ival);printf("Shift to %i if %i\n", (yyvsp[(2) - (4)].ival), (yyvsp[(4) - (4)].ival)); ;} - break; - - case 21: -#line 163 "parseholiday.y" - { (yyval.ival) = 0; ;} - break; - - case 22: -#line 164 "parseholiday.y" - { (yyval.ival) = (1<<(yyvsp[(1) - (1)].ival)); ;} - break; - - case 23: -#line 165 "parseholiday.y" - { (yyval.ival) = (1<<(yyvsp[(1) - (3)].ival)) | (yyvsp[(3) - (3)].ival); ;} - break; - - case 24: -#line 168 "parseholiday.y" - { (yyval.ival) = 1; ;} - break; - - case 25: -#line 169 "parseholiday.y" - { (yyval.ival) = (yyvsp[(2) - (2)].ival); ;} - break; - - case 26: -#line 172 "parseholiday.y" - { m = (yyvsp[(3) - (3)].ival); d = (yyvsp[(1) - (3)].ival); y = 0; ;} - break; - - case 27: -#line 173 "parseholiday.y" - { m = (yyvsp[(3) - (4)].ival); d = (yyvsp[(1) - (4)].ival); y = 0; ;} - break; - - case 28: -#line 174 "parseholiday.y" - { m = (yyvsp[(3) - (5)].ival); d = (yyvsp[(1) - (5)].ival); y = (yyvsp[(5) - (5)].ival); ;} - break; - - case 29: -#line 175 "parseholiday.y" - { m = (yyvsp[(1) - (3)].ival); d = (yyvsp[(3) - (3)].ival); y = 0; ;} - break; - - case 30: -#line 176 "parseholiday.y" - { m = (yyvsp[(1) - (5)].ival); d = (yyvsp[(3) - (5)].ival); y = (yyvsp[(5) - (5)].ival); ;} - break; - - case 31: -#line 177 "parseholiday.y" - { m = (yyvsp[(1) - (2)].ival); d = (yyvsp[(2) - (2)].ival); y = 0; ;} - break; - - case 32: -#line 178 "parseholiday.y" - { m = (yyvsp[(1) - (3)].ival); d = (yyvsp[(2) - (3)].ival); y = (yyvsp[(3) - (3)].ival); ;} - break; - - case 33: -#line 179 "parseholiday.y" - { m = (yyvsp[(2) - (2)].ival); d = (yyvsp[(1) - (2)].ival); y = 0; ;} - break; - - case 34: -#line 180 "parseholiday.y" - { m = (yyvsp[(2) - (3)].ival); d = (yyvsp[(1) - (3)].ival); y = (yyvsp[(3) - (3)].ival); ;} - break; - - case 35: -#line 181 "parseholiday.y" - { m = (yyvsp[(3) - (4)].ival); d = (yyvsp[(1) - (4)].ival); y = (yyvsp[(4) - (4)].ival); ;} - break; - - case 36: -#line 182 "parseholiday.y" - { monthday_from_day((yyvsp[(1) - (1)].ival), - &m, &d, &y); ;} - break; - - case 37: -#line 186 "parseholiday.y" - { (yyval.ival) = day_from_name((yyvsp[(1) - (1)].sval)); ;} - break; - - case 38: -#line 187 "parseholiday.y" - { (yyval.ival) = day_from_easter(); ;} - break; - - case 39: -#line 188 "parseholiday.y" - { (yyval.ival) = day_from_monthday - ((yyvsp[(3) - (3)].ival), (yyvsp[(1) - (3)].ival)); ;} - break; - - case 40: -#line 190 "parseholiday.y" - { (yyval.ival) = day_from_monthday - ((yyvsp[(3) - (4)].ival), (yyvsp[(1) - (4)].ival)); ;} - break; - - case 41: -#line 192 "parseholiday.y" - { (yyval.ival) = day_from_monthday - ((yyvsp[(1) - (3)].ival), (yyvsp[(3) - (3)].ival)); ;} - break; - - case 42: -#line 194 "parseholiday.y" - { (yyval.ival) = day_from_monthday - ((yyvsp[(2) - (2)].ival), (yyvsp[(1) - (2)].ival)); ;} - break; - - case 43: -#line 196 "parseholiday.y" - { (yyval.ival) = day_from_monthday - ((yyvsp[(1) - (2)].ival), (yyvsp[(2) - (2)].ival)); ;} - break; - - case 44: -#line 198 "parseholiday.y" - { (yyval.ival) = day_from_wday((yyvsp[(3) - (3)].ival), (yyvsp[(1) - (3)].ival), - (yyvsp[(2) - (3)].ival) == -1 ? -1 : 0); ;} - break; - - case 45: -#line 200 "parseholiday.y" - { int day=day_from_monthday((yyvsp[(4) - (4)].ival),1); - (yyval.ival) = (yyvsp[(1) - (4)].ival) == 999 - ? day_from_wday(day+1,(yyvsp[(2) - (4)].ival),-1) - : day_from_wday(day,(yyvsp[(2) - (4)].ival),(yyvsp[(1) - (4)].ival)-1);;} - break; - - case 48: -#line 208 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (1)].ival); ;} - break; - - case 49: -#line 209 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (3)].ival) || (yyvsp[(3) - (3)].ival); ;} - break; - - case 50: -#line 210 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (3)].ival) && (yyvsp[(3) - (3)].ival); ;} - break; - - case 51: -#line 211 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (3)].ival) == (yyvsp[(3) - (3)].ival); ;} - break; - - case 52: -#line 212 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (3)].ival) != (yyvsp[(3) - (3)].ival); ;} - break; - - case 53: -#line 213 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (3)].ival) <= (yyvsp[(3) - (3)].ival); ;} - break; - - case 54: -#line 214 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (3)].ival) >= (yyvsp[(3) - (3)].ival); ;} - break; - - case 55: -#line 215 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (3)].ival) < (yyvsp[(3) - (3)].ival); ;} - break; - - case 56: -#line 216 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (3)].ival) > (yyvsp[(3) - (3)].ival); ;} - break; - - case 57: -#line 217 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (3)].ival) + (yyvsp[(3) - (3)].ival); ;} - break; - - case 58: -#line 218 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (3)].ival) - (yyvsp[(3) - (3)].ival); ;} - break; - - case 59: -#line 219 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (3)].ival) * (yyvsp[(3) - (3)].ival); ;} - break; - - case 60: -#line 220 "parseholiday.y" - { (yyval.ival) = (yyvsp[(3) - (3)].ival) ? (yyvsp[(1) - (3)].ival) / (yyvsp[(3) - (3)].ival) : 0; ;} - break; - - case 61: -#line 221 "parseholiday.y" - { (yyval.ival) = (yyvsp[(3) - (3)].ival) ? (yyvsp[(1) - (3)].ival) % (yyvsp[(3) - (3)].ival) : 0; ;} - break; - - case 62: -#line 222 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (5)].ival) ? (yyvsp[(3) - (5)].ival) : (yyvsp[(5) - (5)].ival); ;} - break; - - case 63: -#line 223 "parseholiday.y" - { (yyval.ival) = !(yyvsp[(2) - (2)].ival); ;} - break; - - case 64: -#line 224 "parseholiday.y" - { (yyval.ival) = (yyvsp[(2) - (3)].ival); ;} - break; - - case 65: -#line 227 "parseholiday.y" - { (yyval.ival) = (yyvsp[(2) - (3)].ival); ;} - break; - - case 66: -#line 228 "parseholiday.y" - { (yyval.ival) = (yyvsp[(1) - (1)].ival); ;} - break; - - case 68: -#line 232 "parseholiday.y" - { (yyval.ival) = -(yyvsp[(2) - (2)].ival); ;} - break; - - case 69: -#line 233 "parseholiday.y" - { (yyval.ival) = parse_year; ;} - break; - - case 70: -#line 234 "parseholiday.y" - { (yyval.ival) = !(((yyvsp[(2) - (2)].ival)) & 3); ;} - break; - - -/* Line 1267 of yacc.c. */ -#line 1959 "parseholiday.c" - default: break; - } - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); - - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - - *++yyvsp = yyval; - - - /* Now `shift' the result of the reduction. Determine what state - that goes to, based on the state we popped back to and the rule - number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; - - goto yynewstate; - - -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ -yyerrlab: - /* If not already recovering from an error, report this error. */ - if (!yyerrstatus) - { - ++yynerrs; -#if ! YYERROR_VERBOSE - yyerror (YY_("syntax error")); -#else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } -#endif - } - - - - if (yyerrstatus == 3) - { - /* If just tried and failed to reuse look-ahead token after an - error, discard it. */ - - if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } - else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } - } - - /* Else will try to reuse look-ahead token after shifting the error - token. */ - goto yyerrlab1; - - -/*---------------------------------------------------. -| yyerrorlab -- error raised explicitly by YYERROR. | -`---------------------------------------------------*/ -yyerrorlab: - - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - - /* Do not reclaim the symbols of the rule which action triggered - this YYERROR. */ - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - yystate = *yyssp; - goto yyerrlab1; - - -/*-------------------------------------------------------------. -| yyerrlab1 -- common code for both syntax error and YYERROR. | -`-------------------------------------------------------------*/ -yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ - - for (;;) - { - yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } - - /* Pop the current state because it cannot handle the error token. */ - if (yyssp == yyss) - YYABORT; - - - yydestruct ("Error: popping", - yystos[yystate], yyvsp); - YYPOPSTACK (1); - yystate = *yyssp; - YY_STACK_PRINT (yyss, yyssp); - } - - if (yyn == YYFINAL) - YYACCEPT; - - *++yyvsp = yylval; - - - /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); - - yystate = yyn; - goto yynewstate; - - -/*-------------------------------------. -| yyacceptlab -- YYACCEPT comes here. | -`-------------------------------------*/ -yyacceptlab: - yyresult = 0; - goto yyreturn; - -/*-----------------------------------. -| yyabortlab -- YYABORT comes here. | -`-----------------------------------*/ -yyabortlab: - yyresult = 1; - goto yyreturn; - -#ifndef yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ -yyexhaustedlab: - yyerror (YY_("memory exhausted")); - yyresult = 2; - /* Fall through. */ -#endif - -yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - /* Do not reclaim the symbols of the rule which action triggered - this YYABORT or YYACCEPT. */ - YYPOPSTACK (yylen); - YY_STACK_PRINT (yyss, yyssp); - while (yyssp != yyss) - { - yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); - YYPOPSTACK (1); - } -#ifndef yyoverflow - if (yyss != yyssa) - YYSTACK_FREE (yyss); -#endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif - /* Make sure YYID is used. */ - return YYID (yyresult); -} - - -#line 236 "parseholiday.y" - - -/*** Private Yacc callbacks and helper functions ***/ -static void kcalerror(const char *msg) -{ - fprintf(stderr, "%s: %s in line %d of %s\n", progname, - msg, kcallineno+1, filename); - if (!*errormsg) - snprintf(errormsg,sizeof(errormsg), - "Problem with holiday file %s:\n%.80s in line %d", - filename, msg, kcallineno+1); -} - -static time_t date_to_time(int day, int month, int year, - int *wkday, int *julian, int *weeknum) -{ - struct tm tm; - time_t ttime; - - tm.tm_sec = 0; - tm.tm_min = 0; - tm.tm_hour = 0; - tm.tm_mday = day; - tm.tm_mon = month; - tm.tm_year = year; - ttime = tm_to_time(&tm); - if (wkday) - *wkday = tm.tm_wday; - if (julian) - *julian = tm.tm_yday; - if (weeknum) - *weeknum = 0 - ? tm.tm_yday / 7 - : tm.tm_yday ? ((tm.tm_yday - 1) /7) + 1 : 0; - return(ttime == -1 || day != tm.tm_mday ? 0 : ttime); -} - -static time_t tm_to_time(struct tm *tm) -{ - time_t t; /* return value */ - - t = monthbegin[tm->tm_mon] /* full months */ - + tm->tm_mday-1 /* full days */ - + (!(tm->tm_year & 3) && tm->tm_mon > 1); /* leap day this year*/ - tm->tm_yday = t; - t += 365 * (tm->tm_year - 70) /* full years */ - + (tm->tm_year - 69)/4; /* past leap days */ - tm->tm_wday = (t + 4) % 7; - - t = t*86400 + tm->tm_hour*3600 + tm->tm_min*60 + tm->tm_sec; - if (tm->tm_mday > monthlen[tm->tm_mon] + - (!(tm->tm_year & 3) && tm->tm_mon == 1)) - return((time_t)-1); - return(t); -} - -/* - * set holiday by weekday (monday..sunday). The expression is - * "every <num>-th <wday> of <month> plus <off> days". num and month - * can be ANY or LAST. - */ - -static void setwday(int num, int wday, int month, int off, int length) -{ - int min_month = 0, max_month = 11; - int min_num = 0, max_num = 4; - int mn, n, dy, l, mlen, wday1; - int ddup = 0; - - if (month != ANY) - min_month = max_month = month-1; - if (month == LAST) - min_month = max_month = 11; - if (num != ANY) - min_num = max_num = num-1; - - holiday_name = yacc_string; - for (mn=min_month; mn <= max_month; mn++) { - (void)date_to_time(1, mn, parse_year, &wday1, 0, 0); - dy = (wday-1 - (wday1-1) +7) % 7 + 1; - mlen = monthlen[mn] + (mn==1 && ISLEAPYEAR(parse_year)); - if (num == LAST) - for (l=0; l < length; l++) - setliteraldate(mn, dy+28<=mlen ? dy+28 : dy+21, - off+l, &ddup); - else - for (dy+=min_num*7, n=min_num; n <= max_num; n++, dy+=7) - if (dy >= 1 && dy <= mlen) - for (l=0; l < length; l++) - setliteraldate(mn,dy,off+l,&ddup); - } -} - -/* - * set holiday by weekday (monday..sunday) date offset. The expression is - * "every <wday> before/after <date> plus <off> days". - * (This routine contributed by Peter Littlefield <plittle@sofkin.ca>) - */ - -static void setdoff(int wday, int rel, int month, int day, - int year, int off, int length) -{ - int min_month = 0, max_month = 11; - int min_day = 1, max_day = 31; - int mn, dy, nd, l, wday1; - int ddup = 0; - - if (year != ANY) { - year %= 100; - if (year < 70) year += 100; - if (year != parse_year) - return; - } - if (month != ANY) - min_month = max_month = month-1; - if (month == LAST) - min_month = max_month = 11; - if (day != ANY) - min_day = max_day = day; - - holiday_name = yacc_string; - for (mn=min_month; mn <= max_month; mn++) - if (day == LAST) { - (void)date_to_time(monthlen[mn], mn, parse_year, - &wday1, 0, 0); - nd = (((wday - wday1 + 7) % 7) - - ((rel == BEFORE) ? 7 : 0)) % 7; - for (l=0; l < length; l++) - setliteraldate(mn,monthlen[mn]+nd, off+l, &ddup); - } else - for (dy=min_day; dy <= max_day; dy++) { - (void)date_to_time(dy, mn, parse_year, - &wday1, 0, 0); - nd = (((wday - wday1 + 7) % 7) - - ((rel == BEFORE) ? 7 : 0)) % 7; - for (l=0; l < length; l++) - setliteraldate(mn, dy+nd, off+l, &ddup); - } -} - -static int conditionalOffset( int day, int month, int year, int cond ) -{ - int off = 0; - int wday = 0; - (void)date_to_time( day, month, year, &wday, 0, 0); - if ( wday == 0 ) { wday = 7; } /* sunday is 7, not 0 */ - if ( cond & (1<<wday) ) { - /* condition matches -> higher 8 bits contain the possible days to shift to */ - int to = (cond >> 8); - while ( !(to & (1<<((wday+off)%7))) && (off < 8) ) { - ++off; - } - } - if ( off >= 8 ) return 0; - else return off; -} - -/* - * set holiday by date. Ignore holidays in the wrong year. The code is - * complicated by expressions such as "any/last/any" (every last day of - * the month). - */ - -static void setdate(int month, int day, int year, int off, int conditionaloff, int length) -{ - int min_month = 0, max_month = 11; - int min_day = 1, max_day = 31; - int mn, dy, l; - int ddup = 0; - - if (year != ANY) { - year %= 100; - if (year < 70) year += 100; - if (year != parse_year) - return; - } - if (month != ANY) - min_month = max_month = month-1; - if (month == LAST) - min_month = max_month = 11; - if (day != ANY) - min_day = max_day = day; - - holiday_name = yacc_string; - /** TODO: Include the conditionaloff variable. */ - /** The encoding of the conditional offset is: - 8 lower bits: conditions to shift (bit-register, bit 1=mon, ..., bit 7=sun) - 8 higher bits: weekday to shift to (bit-register, bit 1=mon, ..., bit 7=sun) - */ - for (mn=min_month; mn <= max_month; mn++) { - if (day == LAST) { - int newoff = off + conditionalOffset( monthlen[mn], mn, parse_year, conditionaloff ); - for (l=0; l < length; l++) - setliteraldate(mn, monthlen[mn], newoff+l, &ddup); - } else { - for (dy=min_day; dy <= max_day; dy++) { - int newoff = off + conditionalOffset( dy, mn, parse_year, conditionaloff ); - for (l=0; l < length; l++) - setliteraldate(mn, dy, newoff+l, &ddup); - } - } - } -} - - -/* - * After the two routines above have removed ambiguities (ANY) and resolved - * weekday specifications, this routine registers the holiday in the holiday - * array. There are two of these, for full-line holidays (they take away one - * appointment line in the month calendar daybox) and "small" holidays, which - * appear next to the day number. If the day is already some other holiday, - * add a new item to the singly-linked list and insert the holiday there. - * <ddup> is information stored for parse_holidays(), it - * will free() the holiday name only if its dup field is 0 (because many - * string fields can point to the same string, which was allocated only once - * by the lexer, and should therefore only be freed once). - */ - -static void setliteraldate(int month, int day, int off, int *ddup) -{ - int julian = JULIAN(month, day) + off; - /* struct holiday *hp = yacc_small ? &sm_holiday[julian] - : &holiday[julian]; */ - struct holiday *hp = 0; - - if (julian >= 0 && julian <= 365 ) { - hp = &holidays[julian]; - if ( hp->string ) { - while (hp->next) { hp = hp->next; } - hp->next = malloc( sizeof(struct holiday)*2 ); - hp = hp->next; - hp->next = 0; - } - if (!*ddup) - holiday_name = strdup(holiday_name); - hp->string = holiday_name; - hp->color = (yacc_stringcolor == 0) ? yacc_daycolor : yacc_stringcolor; - hp->dup = (*ddup)++; - - } -} - - -/* - * set a holiday relative to Easter - */ - -static void seteaster(int off, int length, int pascha /*0=Easter, 1=Pascha*/) -{ - int ddup = 0; /* flag for later free() */ - int julian = (pascha ? pascha_julian : easter_julian) + off; - /* struct holiday *hp = yacc_small ? &sm_holiday[julian] - : &holidays[julian];*/ - struct holiday *hp = 0; - - holiday_name = yacc_string; - while (length-- > 0) { - if (julian >= 0 && julian <= 365 ) { - hp = &holidays[julian]; - if ( hp->string ) { - while (hp->next) { hp = hp->next; } - hp->next = malloc( sizeof(struct holiday)*2 ); - hp = hp->next; - hp->next = 0; - } - if (!ddup) - holiday_name = strdup(holiday_name); - hp->string = holiday_name; - hp->color = (yacc_stringcolor == 0) ? yacc_daycolor : yacc_stringcolor; - hp->dup = ddup++; - } - julian++; - } -} - - -/* - * calculate Easter Sunday as a julian date. I got this from Armin Liebl - * <liebla@informatik.tu-muenchen.de>, who got it from Knuth. I hope I got - * all this right... - */ - -static int calc_easter(int year) -{ - int golden, cent, grcor, clcor, extra, epact, easter; - - golden = (year/19)*(-19); - golden += year+1; - cent = year/100+1; - grcor = (cent*3)/(-4)+12; - clcor = ((cent-18)/(-25)+cent-16)/3; - extra = (year*5)/4+grcor-10; - epact = golden*11+20+clcor+grcor; - epact += (epact/30)*(-30); - if (epact<=0) - epact += 30; - if (epact==25) { - if (golden>11) - epact += 1; - } else { - if (epact==24) - epact += 1; - } - easter = epact*(-1)+44; - if (easter<21) - easter += 30; - extra += easter; - extra += (extra/7)*(-7); - extra *= -1; - easter += extra+7; - easter += 31+28+!(year&3)-1; - return(easter); -} - - -/* - * set a holiday relative to Pascha, which is the Christian Orthodox Easter. - * Algorithm provided by Efthimios Mavrogeorgiadis <emav@enl.auth.gr>. - * Changed 12.9.99 by Efthimios Mavrogeorgiadis <emav@enl.auth.gr>. - */ - -static int calc_pascha(int year) /* Pascha in which year? */ -{ - int a = year % 19; - int b = (19 * a + 15) % 30; - int c = (year + (year - (year % 4))/4 + b) % 7; - int dd = b - c; - int e = dd-3 - (2 - (year-(year%100))/100 + (year-(year%400))/400); - int f = (e - (e % 31))/31; - int day = e - 30 * f; - return(31 + 28+!(year&3) + 31 + (f ? 30 : 0) + day-1); -} - - -/* - * functions used for [] syntax: (Erwin Hugo Achermann <acherman@inf.ethz.ch>) - * - * day_from_name (str) gets day from symbolic name - * day_from_easter () gets day as easter sunday - * day_from_monthday (month, day) gets <day> from <month/day> - * day_from_wday (day, wday, num) gets num-th day (wday) after <day> day - * monthday_from_day (day, *m, *d, *y) gets month/day/cur_year from <day> - */ - -static int day_from_name(char *str) -{ - int i; - char *name; - - for (i=0; i < 366; i++) { - name = holidays[i].string; - if (name && !strcmp(str, name)) - return(i); - } - return(-1); -} - - -static int day_from_easter(void) -{ - return(easter_julian); -} - - -static int day_from_monthday(int month, int day) -{ - if (month == 13) - return(365 + ISLEAPYEAR(parse_year)); - return(JULIAN(month - 1, day)); -} - - -static void monthday_from_day(int day, int *mn, int *dy, int *yr) -{ - int i, len; - - *yr = parse_year; - *mn = 0; - *dy = 0; - if (day < 0) - return; - for (i=0; i < 12; i++) { - len = monthlen[i] + (i == 1 && ISLEAPYEAR(parse_year)); - if (day < len) { - *mn = i + 1; - *dy = day + 1; - break; - } - day -= len; - } -} - - -static int day_from_wday(int day, int wday, int num) -{ - int wkday, yday, weeknum; - - (void)date_to_time(1, 0, parse_year, &wkday, &yday, &weeknum); - day += (wday - wkday - day + 1001) % 7; - day += num * 7; - return (day); -} - -static void initialize() -{ - struct holiday *hp; - int dy; - initialized = 1; - for (hp=holidays, dy=0; dy < 366; dy++, hp++) - { - hp->color = 0; - hp->dup = 0; - hp->string = 0; - hp->next = 0; - } -} - -/*** Public Functions ***/ -/* - * parse the holiday text file, and set up the holiday arrays for a year. - * If year is -1, re-parse the last year parsed (this is used when the - * holiday file changes). If there is a CPP_PATH, check if the executable - * really exists, and if so, pipe the holioday files through it. - * Return an error message if an error occurred, 0 otherwise. - */ - -char *parse_holidays(const char *holidayfile, int year, short force) -{ - struct holiday *hp; - int dy; - short piped = 0; - if (!initialized) - initialize(); - - if (year == parse_year && !force) - return(0); - if (year < 0) - year = parse_year; - parse_year = year; - easter_julian = calc_easter(year + 1900); - pascha_julian = calc_pascha(year + 1900); - - for (hp=holidays, dy=0; dy < 366; dy++, hp++) - { - hp->color = 0; - if (hp->string) { - if (!hp->dup ) - free(hp->string); - hp->string = 0; - } - { - struct holiday *nx = hp->next; - hp->next = 0; - while (nx) { - struct holiday *nxtmp; - if ( nx->string && !nx->dup ) { - free( nx->string ); - } - nxtmp=nx; - nx = nxtmp->next; - free( nxtmp ); - } - } - } - /* for (hp=sm_holiday, d=0; d < 366; d++, hp++) - if (hp->string) { - if (!hp->dup) - free(hp->string); - hp->string = 0; - }*/ - - filename = holidayfile; - if (access(filename, R_OK)) return(0); - kcalin = fopen(filename, "r"); - if (!kcalin) return(0); - *errormsg = 0; - kcallineno = 0; - kcalparse(); - if (piped) pclose(kcalin); - else fclose(kcalin); - if (*errormsg) return(errormsg); - - return(0); -} - diff --git a/libkholidays/parseholiday.h b/libkholidays/parseholiday.h deleted file mode 100644 index 709aa567..00000000 --- a/libkholidays/parseholiday.h +++ /dev/null @@ -1,112 +0,0 @@ -/* A Bison parser, made by GNU Bison 2.3. */ - -/* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - - 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, 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. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - NUMBER = 258, - MONTH = 259, - WDAY = 260, - COLOR = 261, - STRING = 262, - IN = 263, - PLUS = 264, - MINUS = 265, - SMALL = 266, - CYEAR = 267, - LEAPYEAR = 268, - SHIFT = 269, - IF = 270, - LENGTH = 271, - EASTER = 272, - EQ = 273, - NE = 274, - LE = 275, - GE = 276, - LT = 277, - GT = 278, - PASCHA = 279, - OR = 280, - AND = 281, - UMINUS = 282 - }; -#endif -/* Tokens. */ -#define NUMBER 258 -#define MONTH 259 -#define WDAY 260 -#define COLOR 261 -#define STRING 262 -#define IN 263 -#define PLUS 264 -#define MINUS 265 -#define SMALL 266 -#define CYEAR 267 -#define LEAPYEAR 268 -#define SHIFT 269 -#define IF 270 -#define LENGTH 271 -#define EASTER 272 -#define EQ 273 -#define NE 274 -#define LE 275 -#define GE 276 -#define LT 277 -#define GT 278 -#define PASCHA 279 -#define OR 280 -#define AND 281 -#define UMINUS 282 - - - - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 111 "parseholiday.y" -{ int ival; char *sval; } -/* Line 1529 of yacc.c. */ -#line 105 "parseholiday.h" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 -#endif - -extern YYSTYPE kcallval; - diff --git a/libkholidays/parseholiday.y b/libkholidays/parseholiday.y index 50e80cb9..380a6ebc 100644 --- a/libkholidays/parseholiday.y +++ b/libkholidays/parseholiday.y @@ -69,8 +69,8 @@ static void setdoff(int wday, int rel, int month, int day, int year, int off, int length); /*** Variables and structures ***/ static int m, d, y; -int kcallineno; /* current line # being parsed */ -FILE *kcalin; /* file currently being processed */ +extern int kcallineno; /* current line # being parsed */ +extern FILE *kcalin; /* file currently being processed */ int yacc_small; /* small string or on its own line? */ int yacc_stringcolor; /* color of holiday name text, 1..8 */ char *yacc_string; /* holiday name text */ diff --git a/libkholidays/scanholiday.c b/libkholidays/scanholiday.c deleted file mode 100644 index f5a96c03..00000000 --- a/libkholidays/scanholiday.c +++ /dev/null @@ -1,2036 +0,0 @@ -#define yy_create_buffer kcal_create_buffer -#define yy_delete_buffer kcal_delete_buffer -#define yy_scan_buffer kcal_scan_buffer -#define yy_scan_string kcal_scan_string -#define yy_scan_bytes kcal_scan_bytes -#define yy_flex_debug kcal_flex_debug -#define yy_init_buffer kcal_init_buffer -#define yy_flush_buffer kcal_flush_buffer -#define yy_load_buffer_state kcal_load_buffer_state -#define yy_switch_to_buffer kcal_switch_to_buffer -#define yyleng kcalleng -#define yylex kcallex -#define yyout kcalout -#define yyrestart kcalrestart -#define yytext kcaltext - -#line 19 "scanholiday.c" -/* A lexical scanner generated by flex*/ - -/* Scanner skeleton version: - * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ - */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 - -#include <stdio.h> -#include <unistd.h> - - -/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ -#ifdef c_plusplus -#ifndef __cplusplus -#define __cplusplus -#endif -#endif - - -#ifdef __cplusplus - -#include <stdlib.h> - -/* Use prototypes in function declarations. */ -#define YY_USE_PROTOS - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -#if __STDC__ - -#define YY_USE_PROTOS -#define YY_USE_CONST - -#endif /* __STDC__ */ -#endif /* ! __cplusplus */ - -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include <io.h> -#include <stdlib.h> -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - -#ifdef YY_USE_CONST -#define yyconst const -#else -#define yyconst -#endif - - -#ifdef YY_USE_PROTOS -#define YY_PROTO(proto) proto -#else -#define YY_PROTO(proto) () -#endif - -/* Returned upon end-of-file. */ -#define YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. - */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN yy_start = 1 + 2 * - -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The YYSTATE alias is for lex - * compatibility. - */ -#define YY_START ((yy_start - 1) / 2) -#define YYSTATE YY_START - -/* Action number for EOF rule of a given start state. */ -#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - -/* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin ) - -#define YY_END_OF_BUFFER_CHAR 0 - -/* Size of default input buffer. */ -#define YY_BUF_SIZE 16384 - -typedef struct yy_buffer_state *YY_BUFFER_STATE; - -extern int yyleng; -extern FILE *yyin, *yyout; - -#define EOB_ACT_CONTINUE_SCAN 0 -#define EOB_ACT_END_OF_FILE 1 -#define EOB_ACT_LAST_MATCH 2 - -/* The funky do-while in the following #define is used to turn the definition - * int a single C statement (which needs a semi-colon terminator). This - * avoids problems with code like: - * - * if ( condition_holds ) - * yyless( 5 ); - * else - * do_something_else(); - * - * Prior to using the do-while the compiler would get upset at the - * "else" because it interpreted the "if" statement as being all - * done when it reached the ';' after the yyless() call. - */ - -/* Return all but the first 'n' matched characters back to the input stream. */ - -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - *yy_cp = yy_hold_char; \ - YY_RESTORE_YY_MORE_OFFSET \ - yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ - } \ - while ( 0 ) - -#define unput(c) yyunput( c, yytext_ptr ) - -/* Some routines like yy_flex_realloc() are emitted as static but are - not called by all lexers. This generates warnings in some compilers, - notably GCC. Arrange to suppress these. */ -#ifdef __GNUC__ -#define YY_MAY_BE_UNUSED __attribute__((unused)) -#else -#define YY_MAY_BE_UNUSED -#endif - -/* The following is because we cannot portably get our hands on size_t - * (without autoconf's help, which isn't available because we want - * flex-generated scanners to compile on their own). - */ -typedef unsigned int yy_size_t; - - -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - yy_size_t yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - int yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; -#define YY_BUFFER_NEW 0 -#define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. - */ -#define YY_BUFFER_EOF_PENDING 2 - }; - -static YY_BUFFER_STATE yy_current_buffer = 0; - -/* We provide macros for accessing buffer states in case in the - * future we want to put the buffer states in a more general - * "scanner state". - */ -#define YY_CURRENT_BUFFER yy_current_buffer - - -/* yy_hold_char holds the character lost when yytext is formed. */ -static char yy_hold_char; - -static int yy_n_chars; /* number of characters read into yy_ch_buf */ - - -int yyleng; - -/* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; -static int yy_init = 1; /* whether we need to initialize */ -static int yy_start = 0; /* start state number */ - -/* Flag which is used to allow yywrap()'s to do buffer switches - * instead of setting up a fresh yyin. A bit of a hack ... - */ -static int yy_did_buffer_switch_on_eof; - -void yyrestart YY_PROTO(( FILE *input_file )); - -void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); -void yy_load_buffer_state YY_PROTO(( void )); -YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); -void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); -void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); -void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); -#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) - -YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); -YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); -YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); - -static void *yy_flex_alloc YY_PROTO(( yy_size_t )); -static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED; -static void yy_flex_free YY_PROTO(( void * )); - -#define yy_new_buffer yy_create_buffer - -#define yy_set_interactive(is_interactive) \ - { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_is_interactive = is_interactive; \ - } - -#define yy_set_bol(at_bol) \ - { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_at_bol = at_bol; \ - } - -#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) - - -#define yywrap() 1 -#define YY_SKIP_YYWRAP -typedef unsigned char YY_CHAR; -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; -typedef int yy_state_type; -extern char *yytext; -#define yytext_ptr yytext - -static yy_state_type yy_get_previous_state YY_PROTO(( void )); -static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); -static int yy_get_next_buffer YY_PROTO(( void )); -static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); - -/* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. - */ -#define YY_DO_BEFORE_ACTION \ - yytext_ptr = yy_bp; \ - yyleng = (int) (yy_cp - yy_bp); \ - yy_hold_char = *yy_cp; \ - *yy_cp = '\0'; \ - yy_c_buf_p = yy_cp; - -#define YY_NUM_RULES 69 -#define YY_END_OF_BUFFER 70 -static yyconst short int yy_accept[280] = - { 0, - 0, 0, 70, 68, 3, 3, 4, 68, 68, 4, - 68, 33, 33, 33, 33, 33, 33, 64, 68, 65, - 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 4, 61, 0, 34, 0, 1, 66, 33, 0, 0, - 0, 0, 0, 62, 60, 63, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 41, 40, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 39, 0, 0, 0, 0, 67, 0, - - 2, 24, 25, 26, 27, 28, 0, 30, 0, 0, - 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 9, 0, 0, 0, 0, 0, 0, 52, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, - 57, 37, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 11, 10, 29, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 45, 0, 32, - - 8, 0, 0, 51, 0, 0, 35, 0, 0, 0, - 53, 0, 0, 0, 0, 7, 43, 0, 0, 0, - 0, 0, 0, 0, 50, 44, 0, 0, 0, 0, - 0, 58, 0, 12, 31, 0, 47, 0, 21, 0, - 0, 49, 0, 17, 0, 0, 48, 0, 0, 23, - 0, 0, 0, 0, 54, 0, 0, 5, 0, 56, - 0, 14, 0, 0, 0, 18, 0, 59, 16, 6, - 46, 15, 22, 0, 20, 0, 13, 19, 0 - } ; - -static yyconst int yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, - 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 4, 5, 6, 1, 7, 8, 1, 7, - 7, 7, 7, 1, 7, 7, 7, 9, 10, 11, - 12, 13, 14, 9, 9, 9, 9, 15, 1, 16, - 17, 18, 7, 1, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 1, 35, 36, 37, 38, 39, 40, 1, 41, 1, - 7, 1, 7, 1, 1, 1, 19, 20, 21, 22, - - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 1, 35, 36, 37, 38, 39, 40, 1, - 41, 1, 1, 42, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static yyconst int yy_meta[43] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, - 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, - 1, 1 - } ; - -static yyconst short int yy_base[284] = - { 0, - 0, 292, 306, 308, 308, 308, 288, 299, 300, 308, - 294, 34, 265, 17, 15, 18, 263, 282, 281, 280, - 28, 33, 255, 38, 39, 41, 260, 35, 46, 50, - 52, 261, 49, 53, 270, 63, 54, 65, 269, 249, - 287, 308, 284, 308, 285, 308, 308, 86, 250, 264, - 263, 258, 257, 308, 308, 308, 245, 240, 245, 254, - 254, 71, 258, 235, 254, 238, 250, 252, 69, 233, - 243, 246, 308, 308, 236, 45, 231, 83, 78, 234, - 233, 225, 226, 308, 226, 223, 238, 222, 84, 231, - 238, 224, 79, 308, 232, 85, 227, 91, 308, 250, - - 308, 308, 308, 308, 308, 308, 229, 308, 224, 212, - 216, 227, 224, 214, 209, 221, 206, 207, 206, 203, - 203, 203, 215, 213, 197, 193, 210, 195, 197, 205, - 206, 207, 308, 189, 204, 202, 191, 202, 186, 308, - 183, 187, 182, 194, 187, 194, 180, 179, 177, 180, - 182, 173, 174, 178, 172, 176, 169, 169, 174, 308, - 308, 308, 171, 178, 159, 161, 172, 160, 159, 176, - 162, 174, 308, 308, 308, 151, 154, 158, 163, 152, - 168, 155, 165, 158, 308, 148, 150, 158, 143, 149, - 159, 155, 140, 153, 151, 150, 149, 308, 138, 308, - - 308, 133, 146, 308, 148, 132, 308, 147, 139, 123, - 308, 128, 139, 135, 123, 308, 308, 118, 138, 134, - 137, 133, 132, 122, 308, 308, 111, 129, 131, 113, - 116, 308, 107, 308, 308, 123, 308, 110, 308, 103, - 124, 308, 123, 308, 118, 105, 308, 120, 118, 308, - 118, 95, 113, 112, 308, 98, 91, 308, 96, 308, - 95, 308, 88, 105, 79, 308, 97, 308, 308, 308, - 308, 308, 308, 79, 308, 71, 308, 308, 308, 121, - 123, 109, 125 - } ; - -static yyconst short int yy_def[284] = - { 0, - 279, 1, 279, 279, 279, 279, 279, 280, 281, 279, - 279, 279, 282, 282, 282, 282, 16, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 283, 279, 280, 279, 281, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 283, - - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 0, 279, - 279, 279, 279 - } ; - -static yyconst short int yy_nxt[351] = - { 0, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 10, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 4, 28, 29, 4, 30, - 31, 32, 33, 34, 35, 36, 37, 4, 4, 38, - 39, 40, 48, 48, 48, 48, 48, 48, 50, 51, - 279, 57, 279, 279, 52, 61, 64, 66, 73, 58, - 65, 59, 62, 68, 75, 60, 74, 69, 77, 83, - 79, 85, 78, 70, 126, 71, 127, 67, 80, 93, - 84, 88, 86, 76, 81, 89, 94, 96, 90, 112, - 97, 95, 120, 91, 48, 48, 48, 48, 48, 48, - - 92, 129, 131, 121, 142, 147, 150, 151, 113, 153, - 48, 278, 132, 277, 130, 276, 148, 143, 133, 275, - 154, 43, 43, 45, 45, 100, 100, 274, 273, 272, - 271, 270, 269, 268, 267, 266, 265, 264, 263, 262, - 261, 260, 259, 258, 257, 256, 255, 254, 253, 252, - 251, 250, 249, 103, 248, 247, 246, 245, 244, 243, - 242, 241, 240, 239, 105, 238, 237, 236, 235, 234, - 233, 232, 231, 230, 229, 228, 104, 227, 226, 225, - 224, 223, 222, 221, 220, 219, 218, 217, 216, 215, - 214, 213, 212, 211, 210, 209, 102, 106, 208, 207, - - 206, 205, 204, 203, 202, 201, 200, 199, 198, 197, - 196, 195, 194, 193, 192, 191, 190, 189, 188, 187, - 186, 185, 184, 183, 182, 181, 180, 179, 178, 177, - 176, 175, 174, 173, 172, 171, 170, 169, 168, 167, - 166, 165, 164, 163, 162, 161, 160, 159, 158, 157, - 156, 155, 101, 152, 149, 146, 145, 144, 141, 140, - 139, 138, 137, 136, 135, 134, 128, 125, 124, 123, - 122, 119, 118, 117, 116, 115, 114, 111, 110, 109, - 108, 107, 106, 105, 104, 103, 102, 46, 44, 101, - 99, 98, 87, 82, 72, 63, 56, 55, 54, 53, - - 49, 47, 46, 44, 42, 279, 41, 3, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279 - } ; - -static yyconst short int yy_chk[351] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 12, 12, 12, 12, 12, 12, 14, 15, - 15, 21, 14, 16, 16, 22, 24, 25, 28, 21, - 24, 21, 22, 26, 29, 21, 28, 26, 30, 33, - 31, 34, 30, 26, 76, 26, 76, 25, 31, 37, - 33, 36, 34, 29, 31, 36, 37, 38, 36, 62, - 38, 37, 69, 36, 48, 48, 48, 48, 48, 48, - - 36, 78, 79, 69, 89, 93, 96, 96, 62, 98, - 282, 276, 79, 274, 78, 267, 93, 89, 79, 265, - 98, 280, 280, 281, 281, 283, 283, 264, 263, 261, - 259, 257, 256, 254, 253, 252, 251, 249, 248, 246, - 245, 243, 241, 240, 238, 236, 233, 231, 230, 229, - 228, 227, 224, 223, 222, 221, 220, 219, 218, 215, - 214, 213, 212, 210, 209, 208, 206, 205, 203, 202, - 199, 197, 196, 195, 194, 193, 192, 191, 190, 189, - 188, 187, 186, 184, 183, 182, 181, 180, 179, 178, - 177, 176, 172, 171, 170, 169, 168, 167, 166, 165, - - 164, 163, 159, 158, 157, 156, 155, 154, 153, 152, - 151, 150, 149, 148, 147, 146, 145, 144, 143, 142, - 141, 139, 138, 137, 136, 135, 134, 132, 131, 130, - 129, 128, 127, 126, 125, 124, 123, 122, 121, 120, - 119, 118, 117, 116, 115, 114, 113, 112, 111, 110, - 109, 107, 100, 97, 95, 92, 91, 90, 88, 87, - 86, 85, 83, 82, 81, 80, 77, 75, 72, 71, - 70, 68, 67, 66, 65, 64, 63, 61, 60, 59, - 58, 57, 53, 52, 51, 50, 49, 45, 43, 41, - 40, 39, 35, 32, 27, 23, 20, 19, 18, 17, - - 13, 11, 9, 8, 7, 3, 2, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - 279, 279, 279, 279, 279, 279, 279, 279, 279, 279 - } ; - -static yy_state_type yy_last_accepting_state; -static char *yy_last_accepting_cpos; - -/* The intent behind this definition is that it'll catch - * any uses of REJECT which flex missed. - */ -#define REJECT reject_used_but_not_detected -#define yymore() yymore_used_but_not_detected -#define YY_MORE_ADJ 0 -#define YY_RESTORE_YY_MORE_OFFSET -char *yytext; -#line 1 "scanholiday.lex" -#define INITIAL 0 -#line 2 "scanholiday.lex" -#include <string.h> -#include "parseholiday.h" -#define YY_NO_UNPUT -#define YY_MAIN 0 -#define YY_NEVER_INTERACTIVE 1 -#define YY_ALWAYS_INTERACTIVE 0 -#define YY_STACK_USED 0 -#line 568 "scanholiday.c" - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap YY_PROTO(( void )); -#else -extern int yywrap YY_PROTO(( void )); -#endif -#endif - -#ifndef YY_NO_UNPUT -static void yyunput YY_PROTO(( int c, char *buf_ptr )); -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen YY_PROTO(( yyconst char * )); -#endif - -#ifndef YY_NO_INPUT -#ifdef __cplusplus -static int yyinput YY_PROTO(( void )); -#else -static int input YY_PROTO(( void )); -#endif -#endif - -#if YY_STACK_USED -static int yy_start_stack_ptr = 0; -static int yy_start_stack_depth = 0; -static int *yy_start_stack = 0; -#ifndef YY_NO_PUSH_STATE -static void yy_push_state YY_PROTO(( int new_state )); -#endif -#ifndef YY_NO_POP_STATE -static void yy_pop_state YY_PROTO(( void )); -#endif -#ifndef YY_NO_TOP_STATE -static int yy_top_state YY_PROTO(( void )); -#endif - -#else -#define YY_NO_PUSH_STATE 1 -#define YY_NO_POP_STATE 1 -#define YY_NO_TOP_STATE 1 -#endif - -#ifdef YY_MALLOC_DECL -YY_MALLOC_DECL -#else -#if __STDC__ -#ifndef __cplusplus -#include <stdlib.h> -#endif -#else -/* Just try to get by without declaring the routines. This will fail - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) - * or sizeof(void*) != sizeof(int). - */ -#endif -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#define YY_READ_BUF_SIZE 8192 -#endif - -/* Copy whatever the last rule matched to the standard output. */ - -#ifndef ECHO -/* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ -#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) -#endif - -/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, - * is returned in "result". - */ -#ifndef YY_INPUT -#define YY_INPUT(buf,result,max_size) \ - if ( yy_current_buffer->yy_is_interactive ) \ - { \ - int c = '*', n; \ - for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (char) c; \ - if ( c == '\n' ) \ - buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - result = n; \ - } \ - else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ - && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); -#endif - -/* No semi-colon after return; correct usage is to write "yyterminate();" - - * we don't want an extra ';' after the "return" because that will cause - * some compilers to complain about unreachable statements. - */ -#ifndef yyterminate -#define yyterminate() return YY_NULL -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Report a fatal error. */ -#ifndef YY_FATAL_ERROR -#define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) -#endif - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL int yylex YY_PROTO(( void )) -#endif - -/* Code executed at the beginning of each rule, after yytext and yyleng - * have been set up. - */ -#ifndef YY_USER_ACTION -#define YY_USER_ACTION -#endif - -/* Code executed at the end of each rule. */ -#ifndef YY_BREAK -#define YY_BREAK break; -#endif - -#define YY_RULE_SETUP \ - if ( yyleng > 0 ) \ - yy_current_buffer->yy_at_bol = \ - (yytext[yyleng - 1] == '\n'); \ - YY_USER_ACTION - -YY_DECL - { - yy_state_type yy_current_state; - char *yy_cp = NULL, *yy_bp = NULL; - int yy_act; - -#line 13 "scanholiday.lex" - - -#line 725 "scanholiday.c" - - if ( yy_init ) - { - yy_init = 0; - -#ifdef YY_USER_INIT - YY_USER_INIT; -#endif - - if ( ! yy_start ) - yy_start = 1; /* first start state */ - - if ( ! yyin ) - yyin = stdin; - - if ( ! yyout ) - yyout = stdout; - - if ( ! yy_current_buffer ) - yy_current_buffer = - yy_create_buffer( yyin, YY_BUF_SIZE ); - - yy_load_buffer_state(); - } - - while ( 1 ) /* loops until end-of-file is reached */ - { - yy_cp = yy_c_buf_p; - - /* Support of yytext. */ - *yy_cp = yy_hold_char; - - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; - - yy_current_state = yy_start; - yy_current_state += YY_AT_BOL(); -yy_match: - do - { - YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; - if ( yy_accept[yy_current_state] ) - { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 280 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - ++yy_cp; - } - while ( yy_current_state != 279 ); - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; - -yy_find_action: - yy_act = yy_accept[yy_current_state]; - - YY_DO_BEFORE_ACTION; - - -do_action: /* This label is used only to access EOF actions. */ - - - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yy_hold_char; - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; - goto yy_find_action; - -case 1: -YY_RULE_SETUP -#line 15 "scanholiday.lex" -; - YY_BREAK -case 2: -YY_RULE_SETUP -#line 16 "scanholiday.lex" -; - YY_BREAK -case 3: -YY_RULE_SETUP -#line 17 "scanholiday.lex" -; - YY_BREAK -case 4: -YY_RULE_SETUP -#line 18 "scanholiday.lex" -{ return(*kcaltext); } - YY_BREAK -case 5: -YY_RULE_SETUP -#line 20 "scanholiday.lex" -{ kcallval.ival = 1; return(MONTH); } - YY_BREAK -case 6: -YY_RULE_SETUP -#line 21 "scanholiday.lex" -{ kcallval.ival = 2; return(MONTH); } - YY_BREAK -case 7: -YY_RULE_SETUP -#line 22 "scanholiday.lex" -{ kcallval.ival = 3; return(MONTH); } - YY_BREAK -case 8: -YY_RULE_SETUP -#line 23 "scanholiday.lex" -{ kcallval.ival = 4; return(MONTH); } - YY_BREAK -case 9: -YY_RULE_SETUP -#line 24 "scanholiday.lex" -{ kcallval.ival = 5; return(MONTH); } - YY_BREAK -case 10: -YY_RULE_SETUP -#line 25 "scanholiday.lex" -{ kcallval.ival = 6; return(MONTH); } - YY_BREAK -case 11: -YY_RULE_SETUP -#line 26 "scanholiday.lex" -{ kcallval.ival = 7; return(MONTH); } - YY_BREAK -case 12: -YY_RULE_SETUP -#line 27 "scanholiday.lex" -{ kcallval.ival = 8; return(MONTH); } - YY_BREAK -case 13: -YY_RULE_SETUP -#line 28 "scanholiday.lex" -{ kcallval.ival = 9; return(MONTH); } - YY_BREAK -case 14: -YY_RULE_SETUP -#line 29 "scanholiday.lex" -{ kcallval.ival = 10; return(MONTH); } - YY_BREAK -case 15: -YY_RULE_SETUP -#line 30 "scanholiday.lex" -{ kcallval.ival = 11; return(MONTH); } - YY_BREAK -case 16: -YY_RULE_SETUP -#line 31 "scanholiday.lex" -{ kcallval.ival = 12; return(MONTH); } - YY_BREAK -case 17: -YY_RULE_SETUP -#line 33 "scanholiday.lex" -{ kcallval.ival = 1; return(WDAY); } - YY_BREAK -case 18: -YY_RULE_SETUP -#line 34 "scanholiday.lex" -{ kcallval.ival = 2; return(WDAY); } - YY_BREAK -case 19: -YY_RULE_SETUP -#line 35 "scanholiday.lex" -{ kcallval.ival = 3; return(WDAY); } - YY_BREAK -case 20: -YY_RULE_SETUP -#line 36 "scanholiday.lex" -{ kcallval.ival = 4; return(WDAY); } - YY_BREAK -case 21: -YY_RULE_SETUP -#line 37 "scanholiday.lex" -{ kcallval.ival = 5; return(WDAY); } - YY_BREAK -case 22: -YY_RULE_SETUP -#line 38 "scanholiday.lex" -{ kcallval.ival = 6; return(WDAY); } - YY_BREAK -case 23: -YY_RULE_SETUP -#line 39 "scanholiday.lex" -{ kcallval.ival = 7; return(WDAY); } - YY_BREAK -case 24: -YY_RULE_SETUP -#line 41 "scanholiday.lex" -{ kcallval.ival = 1; return(NUMBER); } - YY_BREAK -case 25: -YY_RULE_SETUP -#line 42 "scanholiday.lex" -{ kcallval.ival = 2; return(NUMBER); } - YY_BREAK -case 26: -YY_RULE_SETUP -#line 43 "scanholiday.lex" -{ kcallval.ival = 3; return(NUMBER); } - YY_BREAK -case 27: -YY_RULE_SETUP -#line 44 "scanholiday.lex" -{ kcallval.ival = 4; return(NUMBER); } - YY_BREAK -case 28: -YY_RULE_SETUP -#line 45 "scanholiday.lex" -{ kcallval.ival = 5; return(NUMBER); } - YY_BREAK -case 29: -YY_RULE_SETUP -#line 46 "scanholiday.lex" -{ kcallval.ival = 999; return(NUMBER); } - YY_BREAK -case 30: -YY_RULE_SETUP -#line 47 "scanholiday.lex" -{ kcallval.ival = 0; return(NUMBER); } - YY_BREAK -case 31: -YY_RULE_SETUP -#line 49 "scanholiday.lex" -{ kcallval.ival = -1; return(NUMBER); } - YY_BREAK -case 32: -YY_RULE_SETUP -#line 50 "scanholiday.lex" -{ kcallval.ival = -2; return(NUMBER); } - YY_BREAK -case 33: -YY_RULE_SETUP -#line 52 "scanholiday.lex" -{ kcallval.ival = atoi(kcaltext); return(NUMBER); } - YY_BREAK -case 34: -YY_RULE_SETUP -#line 54 "scanholiday.lex" -{ kcallval.sval = strdup(kcaltext+1); - kcallval.sval[strlen(kcallval.sval)-1] = 0; - return(STRING); } - YY_BREAK -case 35: -YY_RULE_SETUP -#line 58 "scanholiday.lex" -; - YY_BREAK -case 36: -YY_RULE_SETUP -#line 59 "scanholiday.lex" -; - YY_BREAK -case 37: -YY_RULE_SETUP -#line 60 "scanholiday.lex" -; - YY_BREAK -case 38: -YY_RULE_SETUP -#line 61 "scanholiday.lex" -; - YY_BREAK -case 39: -YY_RULE_SETUP -#line 62 "scanholiday.lex" -; - YY_BREAK -case 40: -YY_RULE_SETUP -#line 63 "scanholiday.lex" -{ return(IN); } - YY_BREAK -case 41: -YY_RULE_SETUP -#line 64 "scanholiday.lex" -{ return(IF); } - YY_BREAK -case 42: -YY_RULE_SETUP -#line 65 "scanholiday.lex" -{ return(PLUS); } - YY_BREAK -case 43: -YY_RULE_SETUP -#line 66 "scanholiday.lex" -{ return(MINUS); } - YY_BREAK -case 44: -YY_RULE_SETUP -#line 67 "scanholiday.lex" -{ return(SMALL); } - YY_BREAK -case 45: -YY_RULE_SETUP -#line 68 "scanholiday.lex" -{ return(CYEAR); } - YY_BREAK -case 46: -YY_RULE_SETUP -#line 69 "scanholiday.lex" -{ return(LEAPYEAR); } - YY_BREAK -case 47: -YY_RULE_SETUP -#line 70 "scanholiday.lex" -{ return(EASTER); } - YY_BREAK -case 48: -YY_RULE_SETUP -#line 71 "scanholiday.lex" -{ return(PASCHA); } - YY_BREAK -case 49: -YY_RULE_SETUP -#line 72 "scanholiday.lex" -{ return(LENGTH); } - YY_BREAK -case 50: -YY_RULE_SETUP -#line 73 "scanholiday.lex" -{ return(SHIFT); } - YY_BREAK -case 51: -YY_RULE_SETUP -#line 75 "scanholiday.lex" -{ kcallval.ival = 1; return(COLOR); } - YY_BREAK -case 52: -YY_RULE_SETUP -#line 76 "scanholiday.lex" -{ kcallval.ival = 2; return(COLOR); } - YY_BREAK -case 53: -YY_RULE_SETUP -#line 77 "scanholiday.lex" -{ kcallval.ival = 3; return(COLOR); } - YY_BREAK -case 54: -YY_RULE_SETUP -#line 78 "scanholiday.lex" -{ kcallval.ival = 4; return(COLOR); } - YY_BREAK -case 55: -YY_RULE_SETUP -#line 79 "scanholiday.lex" -{ kcallval.ival = 5; return(COLOR); } - YY_BREAK -case 56: -YY_RULE_SETUP -#line 80 "scanholiday.lex" -{ kcallval.ival = 6; return(COLOR); } - YY_BREAK -case 57: -YY_RULE_SETUP -#line 81 "scanholiday.lex" -{ kcallval.ival = 7; return(COLOR); } - YY_BREAK -case 58: -YY_RULE_SETUP -#line 82 "scanholiday.lex" -{ kcallval.ival = 8; return(COLOR); } - YY_BREAK -case 59: -YY_RULE_SETUP -#line 83 "scanholiday.lex" -{ kcallval.ival = 9; return(COLOR); } - YY_BREAK -case 60: -YY_RULE_SETUP -#line 85 "scanholiday.lex" -{ return(EQ); } - YY_BREAK -case 61: -YY_RULE_SETUP -#line 86 "scanholiday.lex" -{ return(NE); } - YY_BREAK -case 62: -YY_RULE_SETUP -#line 87 "scanholiday.lex" -{ return(LE); } - YY_BREAK -case 63: -YY_RULE_SETUP -#line 88 "scanholiday.lex" -{ return(GE); } - YY_BREAK -case 64: -YY_RULE_SETUP -#line 89 "scanholiday.lex" -{ return(LT); } - YY_BREAK -case 65: -YY_RULE_SETUP -#line 90 "scanholiday.lex" -{ return(GT); } - YY_BREAK -case 66: -YY_RULE_SETUP -#line 91 "scanholiday.lex" -{ return(AND);} - YY_BREAK -case 67: -YY_RULE_SETUP -#line 92 "scanholiday.lex" -{ return(OR); } - YY_BREAK -case 68: -YY_RULE_SETUP -#line 94 "scanholiday.lex" -{ printf("holiday: bad char: %s \n", kcaltext); } - YY_BREAK -case 69: -YY_RULE_SETUP -#line 96 "scanholiday.lex" -ECHO; - YY_BREAK -#line 1152 "scanholiday.c" -case YY_STATE_EOF(INITIAL): - yyterminate(); - - case YY_END_OF_BUFFER: - { - /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; - - /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yy_hold_char; - YY_RESTORE_YY_MORE_OFFSET - - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between yy_current_buffer and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - yy_n_chars = yy_current_buffer->yy_n_chars; - yy_current_buffer->yy_input_file = yyin; - yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL; - } - - /* Note that here we test for yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). - */ - if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) - { /* This was really a NUL. */ - yy_state_type yy_next_state; - - yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state(); - - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). - */ - - yy_next_state = yy_try_NUL_trans( yy_current_state ); - - yy_bp = yytext_ptr + YY_MORE_ADJ; - - if ( yy_next_state ) - { - /* Consume the NUL. */ - yy_cp = ++yy_c_buf_p; - yy_current_state = yy_next_state; - goto yy_match; - } - - else - { - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; - goto yy_find_action; - } - } - - else switch ( yy_get_next_buffer() ) - { - case EOB_ACT_END_OF_FILE: - { - yy_did_buffer_switch_on_eof = 0; - - if ( yywrap() ) - { - /* Note: because we've taken care in - * yy_get_next_buffer() to have set up - * yytext, we can now set up - * yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * YY_NULL, it'll still work - another - * YY_NULL will get returned. - */ - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; - - yy_act = YY_STATE_EOF(YY_START); - goto do_action; - } - - else - { - if ( ! yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = - yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state(); - - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; - goto yy_match; - - case EOB_ACT_LAST_MATCH: - yy_c_buf_p = - &yy_current_buffer->yy_ch_buf[yy_n_chars]; - - yy_current_state = yy_get_previous_state(); - - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; - goto yy_find_action; - } - break; - } - - default: - YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); - } /* end of action switch */ - } /* end of scanning one token */ - } /* end of yylex */ - - -/* yy_get_next_buffer - try to read in a new buffer - * - * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file - */ - -static int yy_get_next_buffer() - { - char *dest = yy_current_buffer->yy_ch_buf; - char *source = yytext_ptr; - int number_to_move, i; - int ret_val; - - if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) - YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); - - if ( yy_current_buffer->yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } - - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } - - /* Try to read more data. */ - - /* First move last chars to start of buffer. */ - number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1; - - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); - - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - yy_current_buffer->yy_n_chars = yy_n_chars = 0; - - else - { - int num_to_read = - yy_current_buffer->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) - { /* Not enough room in the buffer - grow it. */ -#ifdef YY_USES_REJECT - YY_FATAL_ERROR( -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); -#else - - /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = yy_current_buffer; - - int yy_c_buf_p_offset = - (int) (yy_c_buf_p - b->yy_ch_buf); - - if ( b->yy_is_our_buffer ) - { - int new_size = b->yy_buf_size * 2; - - if ( new_size <= 0 ) - b->yy_buf_size += b->yy_buf_size / 8; - else - b->yy_buf_size *= 2; - - b->yy_ch_buf = (char *) - /* Include room in for 2 EOB chars. */ - yy_flex_realloc( (void *) b->yy_ch_buf, - b->yy_buf_size + 2 ); - } - else - /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; - - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); - - yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; - - num_to_read = yy_current_buffer->yy_buf_size - - number_to_move - 1; -#endif - } - - if ( num_to_read > YY_READ_BUF_SIZE ) - num_to_read = YY_READ_BUF_SIZE; - - /* Read in more data. */ - YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), - yy_n_chars, num_to_read ); - - yy_current_buffer->yy_n_chars = yy_n_chars; - } - - if ( yy_n_chars == 0 ) - { - if ( number_to_move == YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin ); - } - - else - { - ret_val = EOB_ACT_LAST_MATCH; - yy_current_buffer->yy_buffer_status = - YY_BUFFER_EOF_PENDING; - } - } - - else - ret_val = EOB_ACT_CONTINUE_SCAN; - - yy_n_chars += number_to_move; - yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; - yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; - - yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; - - return ret_val; - } - - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - -static yy_state_type yy_get_previous_state() - { - yy_state_type yy_current_state; - char *yy_cp; - - yy_current_state = yy_start; - yy_current_state += YY_AT_BOL(); - - for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) - { - YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); - if ( yy_accept[yy_current_state] ) - { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 280 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - } - - return yy_current_state; - } - - -/* yy_try_NUL_trans - try to make a transition on the NUL character - * - * synopsis - * next_state = yy_try_NUL_trans( current_state ); - */ - -#ifdef YY_USE_PROTOS -static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state ) -#else -static yy_state_type yy_try_NUL_trans( yy_current_state ) -yy_state_type yy_current_state; -#endif - { - int yy_is_jam; - char *yy_cp = yy_c_buf_p; - - YY_CHAR yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 280 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 279); - - return yy_is_jam ? 0 : yy_current_state; - } - - -#ifndef YY_NO_UNPUT -#ifdef YY_USE_PROTOS -static void yyunput( int c, char *yy_bp ) -#else -static void yyunput( c, yy_bp ) -int c; -char *yy_bp; -#endif - { - char *yy_cp = yy_c_buf_p; - - /* undo effects of setting up yytext */ - *yy_cp = yy_hold_char; - - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) - { /* need to shift things up to make room */ - /* +2 for EOB chars. */ - int number_to_move = yy_n_chars + 2; - char *dest = &yy_current_buffer->yy_ch_buf[ - yy_current_buffer->yy_buf_size + 2]; - char *source = - &yy_current_buffer->yy_ch_buf[number_to_move]; - - while ( source > yy_current_buffer->yy_ch_buf ) - *--dest = *--source; - - yy_cp += (int) (dest - source); - yy_bp += (int) (dest - source); - yy_current_buffer->yy_n_chars = - yy_n_chars = yy_current_buffer->yy_buf_size; - - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) - YY_FATAL_ERROR( "flex scanner push-back overflow" ); - } - - *--yy_cp = (char) c; - - - yytext_ptr = yy_bp; - yy_hold_char = *yy_cp; - yy_c_buf_p = yy_cp; - } -#endif /* ifndef YY_NO_UNPUT */ - - -#ifndef YY_NO_INPUT -#ifdef __cplusplus -static int yyinput() -#else -static int input() -#endif - { - int c; - - *yy_c_buf_p = yy_hold_char; - - if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) - { - /* yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) - /* This was really a NUL. */ - *yy_c_buf_p = '\0'; - - else - { /* need more input */ - int offset = yy_c_buf_p - yytext_ptr; - ++yy_c_buf_p; - - switch ( yy_get_next_buffer() ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ - - /* Reset buffer status. */ - yyrestart( yyin ); - - /* fall through */ - - case EOB_ACT_END_OF_FILE: - { - if ( yywrap() ) - return EOF; - - if ( ! yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; -#ifdef __cplusplus - return yyinput(); -#else - return input(); -#endif - } - - case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = yytext_ptr + offset; - break; - } - } - } - - c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ - *yy_c_buf_p = '\0'; /* preserve yytext */ - yy_hold_char = *++yy_c_buf_p; - - yy_current_buffer->yy_at_bol = (c == '\n'); - - return c; - } -#endif /* YY_NO_INPUT */ - -#ifdef YY_USE_PROTOS -void yyrestart( FILE *input_file ) -#else -void yyrestart( input_file ) -FILE *input_file; -#endif - { - if ( ! yy_current_buffer ) - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); - - yy_init_buffer( yy_current_buffer, input_file ); - yy_load_buffer_state(); - } - - -#ifdef YY_USE_PROTOS -void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) -#else -void yy_switch_to_buffer( new_buffer ) -YY_BUFFER_STATE new_buffer; -#endif - { - if ( yy_current_buffer == new_buffer ) - return; - - if ( yy_current_buffer ) - { - /* Flush out information for old buffer. */ - *yy_c_buf_p = yy_hold_char; - yy_current_buffer->yy_buf_pos = yy_c_buf_p; - yy_current_buffer->yy_n_chars = yy_n_chars; - } - - yy_current_buffer = new_buffer; - yy_load_buffer_state(); - - /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe - * to go ahead and always set it. - */ - yy_did_buffer_switch_on_eof = 1; - } - - -#ifdef YY_USE_PROTOS -void yy_load_buffer_state( void ) -#else -void yy_load_buffer_state() -#endif - { - yy_n_chars = yy_current_buffer->yy_n_chars; - yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos; - yyin = yy_current_buffer->yy_input_file; - yy_hold_char = *yy_c_buf_p; - } - - -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) -#else -YY_BUFFER_STATE yy_create_buffer( file, size ) -FILE *file; -int size; -#endif - { - YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_buf_size = size; - - /* yy_ch_buf has to be 2 characters longer than the size given because - * we need to put in 2 end-of-buffer characters. - */ - b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_is_our_buffer = 1; - - yy_init_buffer( b, file ); - - return b; - } - - -#ifdef YY_USE_PROTOS -void yy_delete_buffer( YY_BUFFER_STATE b ) -#else -void yy_delete_buffer( b ) -YY_BUFFER_STATE b; -#endif - { - if ( ! b ) - return; - - if ( b == yy_current_buffer ) - yy_current_buffer = (YY_BUFFER_STATE) 0; - - if ( b->yy_is_our_buffer ) - yy_flex_free( (void *) b->yy_ch_buf ); - - yy_flex_free( (void *) b ); - } - - - -#ifdef YY_USE_PROTOS -void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) -#else -void yy_init_buffer( b, file ) -YY_BUFFER_STATE b; -FILE *file; -#endif - - - { - yy_flush_buffer( b ); - - b->yy_input_file = file; - b->yy_fill_buffer = 1; - -#if YY_ALWAYS_INTERACTIVE - b->yy_is_interactive = 1; -#else -#if YY_NEVER_INTERACTIVE - b->yy_is_interactive = 0; -#else - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; -#endif -#endif - } - - -#ifdef YY_USE_PROTOS -void yy_flush_buffer( YY_BUFFER_STATE b ) -#else -void yy_flush_buffer( b ) -YY_BUFFER_STATE b; -#endif - - { - if ( ! b ) - return; - - b->yy_n_chars = 0; - - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - - b->yy_buf_pos = &b->yy_ch_buf[0]; - - b->yy_at_bol = 1; - b->yy_buffer_status = YY_BUFFER_NEW; - - if ( b == yy_current_buffer ) - yy_load_buffer_state(); - } - - -#ifndef YY_NO_SCAN_BUFFER -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) -#else -YY_BUFFER_STATE yy_scan_buffer( base, size ) -char *base; -yy_size_t size; -#endif - { - YY_BUFFER_STATE b; - - if ( size < 2 || - base[size-2] != YY_END_OF_BUFFER_CHAR || - base[size-1] != YY_END_OF_BUFFER_CHAR ) - /* They forgot to leave room for the EOB's. */ - return 0; - - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ - b->yy_buf_pos = b->yy_ch_buf = base; - b->yy_is_our_buffer = 0; - b->yy_input_file = 0; - b->yy_n_chars = b->yy_buf_size; - b->yy_is_interactive = 0; - b->yy_at_bol = 1; - b->yy_fill_buffer = 0; - b->yy_buffer_status = YY_BUFFER_NEW; - - yy_switch_to_buffer( b ); - - return b; - } -#endif - - -#ifndef YY_NO_SCAN_STRING -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) -#else -YY_BUFFER_STATE yy_scan_string( yy_str ) -yyconst char *yy_str; -#endif - { - int len; - for ( len = 0; yy_str[len]; ++len ) - ; - - return yy_scan_bytes( yy_str, len ); - } -#endif - - -#ifndef YY_NO_SCAN_BYTES -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) -#else -YY_BUFFER_STATE yy_scan_bytes( bytes, len ) -yyconst char *bytes; -int len; -#endif - { - YY_BUFFER_STATE b; - char *buf; - yy_size_t n; - int i; - - /* Get memory for full buffer, including space for trailing EOB's. */ - n = len + 2; - buf = (char *) yy_flex_alloc( n ); - if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - - for ( i = 0; i < len; ++i ) - buf[i] = bytes[i]; - - buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; - - b = yy_scan_buffer( buf, n ); - if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); - - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->yy_is_our_buffer = 1; - - return b; - } -#endif - - -#ifndef YY_NO_PUSH_STATE -#ifdef YY_USE_PROTOS -static void yy_push_state( int new_state ) -#else -static void yy_push_state( new_state ) -int new_state; -#endif - { - if ( yy_start_stack_ptr >= yy_start_stack_depth ) - { - yy_size_t new_size; - - yy_start_stack_depth += YY_START_STACK_INCR; - new_size = yy_start_stack_depth * sizeof( int ); - - if ( ! yy_start_stack ) - yy_start_stack = (int *) yy_flex_alloc( new_size ); - - else - yy_start_stack = (int *) yy_flex_realloc( - (void *) yy_start_stack, new_size ); - - if ( ! yy_start_stack ) - YY_FATAL_ERROR( - "out of memory expanding start-condition stack" ); - } - - yy_start_stack[yy_start_stack_ptr++] = YY_START; - - BEGIN(new_state); - } -#endif - - -#ifndef YY_NO_POP_STATE -static void yy_pop_state() - { - if ( --yy_start_stack_ptr < 0 ) - YY_FATAL_ERROR( "start-condition stack underflow" ); - - BEGIN(yy_start_stack[yy_start_stack_ptr]); - } -#endif - - -#ifndef YY_NO_TOP_STATE -static int yy_top_state() - { - return yy_start_stack[yy_start_stack_ptr - 1]; - } -#endif - -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif - -#ifdef YY_USE_PROTOS -static void yy_fatal_error( yyconst char msg[] ) -#else -static void yy_fatal_error( msg ) -char msg[]; -#endif - { - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); - } - - - -/* Redefine yyless() so it works in section 3 code. */ - -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - yytext[yyleng] = yy_hold_char; \ - yy_c_buf_p = yytext + n; \ - yy_hold_char = *yy_c_buf_p; \ - *yy_c_buf_p = '\0'; \ - yyleng = n; \ - } \ - while ( 0 ) - - -/* Internal utility routines. */ - -#ifndef yytext_ptr -#ifdef YY_USE_PROTOS -static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) -#else -static void yy_flex_strncpy( s1, s2, n ) -char *s1; -yyconst char *s2; -int n; -#endif - { - int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; - } -#endif - -#ifdef YY_NEED_STRLEN -#ifdef YY_USE_PROTOS -static int yy_flex_strlen( yyconst char *s ) -#else -static int yy_flex_strlen( s ) -yyconst char *s; -#endif - { - int n; - for ( n = 0; s[n]; ++n ) - ; - - return n; - } -#endif - - -#ifdef YY_USE_PROTOS -static void *yy_flex_alloc( yy_size_t size ) -#else -static void *yy_flex_alloc( size ) -yy_size_t size; -#endif - { - return (void *) malloc( size ); - } - -#ifdef YY_USE_PROTOS -static void *yy_flex_realloc( void *ptr, yy_size_t size ) -#else -static void *yy_flex_realloc( ptr, size ) -void *ptr; -yy_size_t size; -#endif - { - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return (void *) realloc( (char *) ptr, size ); - } - -#ifdef YY_USE_PROTOS -static void yy_flex_free( void *ptr ) -#else -static void yy_flex_free( ptr ) -void *ptr; -#endif - { - free( ptr ); - } - -#if YY_MAIN -int main() - { - yylex(); - return 0; - } -#endif -#line 96 "scanholiday.lex" - diff --git a/libkmime/boolflags.h b/libkmime/boolflags.h index ccd4e852..0964c19a 100644 --- a/libkmime/boolflags.h +++ b/libkmime/boolflags.h @@ -17,7 +17,7 @@ #ifndef __KMIME_BOOLFLAGS_H__ #define __KMIME_BOOLFLAGS_H__ -#include <tdepimmacros.h> +#include <kdemacros.h> /** This class stores boolean values in single bytes. It provides a similar functionality as TQBitArray diff --git a/libkmime/kmime_charfreq.h b/libkmime/kmime_charfreq.h index 014cae6e..64a6e213 100644 --- a/libkmime/kmime_charfreq.h +++ b/libkmime/kmime_charfreq.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_charfreq.h KMime, the KDE internet mail/usenet news message library. @@ -16,7 +16,7 @@ #define __KMIME_CHARFREQ_H__ #include <tqcstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #undef None namespace KMime { diff --git a/libkmime/kmime_codec_base64.cpp b/libkmime/kmime_codec_base64.cpp index e1c4d499..4b4020cb 100644 --- a/libkmime/kmime_codec_base64.cpp +++ b/libkmime/kmime_codec_base64.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_base64.cpp This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_base64.h b/libkmime/kmime_codec_base64.h index 6d80d9b9..6d9b867f 100644 --- a/libkmime/kmime_codec_base64.h +++ b/libkmime/kmime_codec_base64.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_base64.h This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_identity.cpp b/libkmime/kmime_codec_identity.cpp index 27fe8f42..39792a21 100644 --- a/libkmime/kmime_codec_identity.cpp +++ b/libkmime/kmime_codec_identity.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_identity.cpp This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_identity.h b/libkmime/kmime_codec_identity.h index a18cfd1f..4ded0f8b 100644 --- a/libkmime/kmime_codec_identity.h +++ b/libkmime/kmime_codec_identity.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_identity.h This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_qp.cpp b/libkmime/kmime_codec_qp.cpp index 149b01f2..b625346f 100644 --- a/libkmime/kmime_codec_qp.cpp +++ b/libkmime/kmime_codec_qp.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_qp.cpp This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_qp.h b/libkmime/kmime_codec_qp.h index a80226f5..28bb79f7 100644 --- a/libkmime/kmime_codec_qp.h +++ b/libkmime/kmime_codec_qp.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_qp.h This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_uuencode.cpp b/libkmime/kmime_codec_uuencode.cpp index fe5acf4f..ada9416d 100644 --- a/libkmime/kmime_codec_uuencode.cpp +++ b/libkmime/kmime_codec_uuencode.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_uuencode.cpp This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codec_uuencode.h b/libkmime/kmime_codec_uuencode.h index 80288b41..0477c93c 100644 --- a/libkmime/kmime_codec_uuencode.h +++ b/libkmime/kmime_codec_uuencode.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codec_uuencode.h This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codecs.cpp b/libkmime/kmime_codecs.cpp index 93e41288..1d0053f9 100644 --- a/libkmime/kmime_codecs.cpp +++ b/libkmime/kmime_codecs.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codecs.cpp This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_codecs.h b/libkmime/kmime_codecs.h index 27ad5b78..76b82aca 100644 --- a/libkmime/kmime_codecs.h +++ b/libkmime/kmime_codecs.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_codecs.h This file is part of KMime, the KDE internet mail/usenet news message library. @@ -40,7 +40,7 @@ #include <tqcstring.h> // TQByteArray #include <kdebug.h> // for kdFatal() -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KMime { diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp index 5c9423b7..1e900702 100644 --- a/libkmime/kmime_header_parsing.cpp +++ b/libkmime/kmime_header_parsing.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_header_parsing.cpp This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_header_parsing.h b/libkmime/kmime_header_parsing.h index d567e5fe..c4c69945 100644 --- a/libkmime/kmime_header_parsing.h +++ b/libkmime/kmime_header_parsing.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_header_parsing.h This file is part of KMime, the KDE internet mail/usenet news message library. @@ -38,7 +38,7 @@ #include <time.h> -#include <tdepimmacros.h> +#include <kdemacros.h> template <typename K, typename V> class TQMap; class TQStringList; diff --git a/libkmime/kmime_headers.h b/libkmime/kmime_headers.h index 4c2b7313..02d0ad6a 100644 --- a/libkmime/kmime_headers.h +++ b/libkmime/kmime_headers.h @@ -1,4 +1,4 @@ -/* -*- c++ -* +/* kmime_headers.h KMime, the KDE internet mail/usenet news message library. @@ -35,7 +35,7 @@ #include <time.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KMime { diff --git a/libkmime/kmime_headers_obs.h b/libkmime/kmime_headers_obs.h index a167e1f8..8905d1c5 100644 --- a/libkmime/kmime_headers_obs.h +++ b/libkmime/kmime_headers_obs.h @@ -20,7 +20,7 @@ #error You cannot use this file with the new header classes! #endif -#include <tdepimmacros.h> +#include <kdemacros.h> /** Represents a "Message-Id" header */ class KDE_EXPORT MessageID : public Base { diff --git a/libkmime/kmime_mdn.cpp b/libkmime/kmime_mdn.cpp index 4040d893..60142120 100644 --- a/libkmime/kmime_mdn.cpp +++ b/libkmime/kmime_mdn.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_mdn.cpp This file is part of KMime, the KDE internet mail/usenet news message library. diff --git a/libkmime/kmime_mdn.h b/libkmime/kmime_mdn.h index 30fa238a..c261b5fd 100644 --- a/libkmime/kmime_mdn.h +++ b/libkmime/kmime_mdn.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_mdn.h This file is part of KMime, the KDE internet mail/usenet news message library. @@ -35,7 +35,7 @@ #include <tqvaluelist.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQCString; diff --git a/libkmime/kmime_newsarticle.h b/libkmime/kmime_newsarticle.h index bbca34d8..accb8f5c 100644 --- a/libkmime/kmime_newsarticle.h +++ b/libkmime/kmime_newsarticle.h @@ -18,7 +18,7 @@ #include "kmime_message.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KMime { diff --git a/libkmime/kmime_util.h b/libkmime/kmime_util.h index 4619446a..7acc861c 100644 --- a/libkmime/kmime_util.h +++ b/libkmime/kmime_util.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kmime_util.h KMime, the KDE internet mail/usenet news message library. @@ -21,7 +21,7 @@ #include "tqcstring.h" #include "tqvaluelist.h" #include "time.h" -#include <tdepimmacros.h> +#include <kdemacros.h> typedef TQValueList<TQCString> QCStringList; diff --git a/libkmime/kqcstringsplitter.h b/libkmime/kqcstringsplitter.h index 117f0510..cc992a48 100644 --- a/libkmime/kqcstringsplitter.h +++ b/libkmime/kqcstringsplitter.h @@ -19,7 +19,7 @@ #include <tqcstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KDE_EXPORT KTQCStringSplitter { diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp index 293b3681..07edfa3a 100644 --- a/libkpgp/kpgp.cpp +++ b/libkpgp/kpgp.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgp.cpp Copyright (C) 2001,2002 the KPGP authors diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h index 6628f41e..8442e3c3 100644 --- a/libkpgp/kpgp.h +++ b/libkpgp/kpgp.h @@ -36,7 +36,7 @@ #include <kdialogbase.h> #include "kpgpkey.h" -#include <tdepimmacros.h> +#include <kdemacros.h> class TQLineEdit; class TQCursor; diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h index 82001a1d..a1df95bf 100644 --- a/libkpgp/kpgpblock.h +++ b/libkpgp/kpgpblock.h @@ -23,7 +23,7 @@ #include <tqstring.h> #include <tqstrlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> //#include <tqstringlist.h> class TQStringList; diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h index 57c13fba..5cc2d497 100644 --- a/libkpgp/kpgpui.h +++ b/libkpgp/kpgpui.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kpgpui.h Copyright (C) 2001,2002 the KPGP authors @@ -29,7 +29,7 @@ #include "kpgp.h" -#include <tdepimmacros.h> +#include <kdemacros.h> class TQString; class TQRegExp; diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h index e55b2243..9cd0f576 100644 --- a/libkpimexchange/core/exchangeaccount.h +++ b/libkpimexchange/core/exchangeaccount.h @@ -26,7 +26,7 @@ #include <tqobject.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kurl.h> #include <tdeio/job.h> diff --git a/libkpimexchange/core/exchangeclient.h b/libkpimexchange/core/exchangeclient.h index 6c994c02..0feab87e 100644 --- a/libkpimexchange/core/exchangeclient.h +++ b/libkpimexchange/core/exchangeclient.h @@ -26,7 +26,7 @@ #include <tqhostaddress.h> #include <tqptrlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { class Event; diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h index 03b06690..f8d8d102 100644 --- a/libkpimexchange/core/exchangedelete.h +++ b/libkpimexchange/core/exchangedelete.h @@ -24,7 +24,7 @@ #include <tqwidget.h> #include <tdeio/job.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/calendar.h> #include <libkcal/event.h> diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp index 58bf236e..de7da39b 100644 --- a/libkpimexchange/core/exchangedownload.cpp +++ b/libkpimexchange/core/exchangedownload.cpp @@ -582,7 +582,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) if ( mCalendar ) { KCal::Event *oldEvent = mCalendar->event( event->uid() ); if ( oldEvent ) { - kdWarning() << "Already got his event, replace it..." << endl; + kdWarning() << "Already got the event, replace it..." << endl; mCalendar->deleteEvent( oldEvent ); } kdDebug() << "ADD EVENT" << endl; diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h index 85753b2c..bbc5b8cf 100644 --- a/libkpimexchange/core/exchangeupload.h +++ b/libkpimexchange/core/exchangeupload.h @@ -24,7 +24,7 @@ #include <tqwidget.h> #include <tdeio/job.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/calendar.h> #include <libkcal/event.h> diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp index c43620ea..f81bc3b1 100644 --- a/libkpimidentities/identity.cpp +++ b/libkpimidentities/identity.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // tdemidentity.cpp // License: GPL diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h index c1af97e1..6a6c972f 100644 --- a/libkpimidentities/identity.h +++ b/libkpimidentities/identity.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * User identity information * * Author: Stefan Taferner <taferner@kde.org> @@ -9,7 +9,7 @@ #include <kleo/enum.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqstring.h> #include <tqcstring.h> diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp index adc79efd..8644cb5a 100644 --- a/libkpimidentities/identitycombo.cpp +++ b/libkpimidentities/identitycombo.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* identitycombo.cpp This file is part of KMail, the KDE mail client. diff --git a/libkpimidentities/identitycombo.h b/libkpimidentities/identitycombo.h index 1644f9c2..e6304607 100644 --- a/libkpimidentities/identitycombo.h +++ b/libkpimidentities/identitycombo.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* identitycombo.h This file is part of KMail, the KDE mail client. @@ -34,7 +34,7 @@ #include <tqcombobox.h> #include <tqvaluelist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQString; diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index c7b97216..35414502 100644 --- a/libkpimidentities/identitymanager.cpp +++ b/libkpimidentities/identitymanager.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* identitymanager.cpp This file is part of KMail, the KDE mail client. diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h index b0aee59d..0162df4c 100644 --- a/libkpimidentities/identitymanager.h +++ b/libkpimidentities/identitymanager.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* identitymanager.h This file is part of KMail, the KDE mail client. @@ -35,7 +35,7 @@ #include <tqvaluelist.h> #include <dcopobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEConfigBase; class TDEConfig; diff --git a/libksieve/impl/lexer.h b/libksieve/impl/lexer.h index f25abdd5..ee64745b 100644 --- a/libksieve/impl/lexer.h +++ b/libksieve/impl/lexer.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* impl/lexer.h Internal header file. Subject to change without notice. DO NOT USE. diff --git a/libksieve/impl/parser.h b/libksieve/impl/parser.h index dd8b8228..3fdb8b72 100644 --- a/libksieve/impl/parser.h +++ b/libksieve/impl/parser.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* impl/parser.h Internal header file. Subject to change without notice. DO NOT USE. diff --git a/libksieve/impl/utf8validator.h b/libksieve/impl/utf8validator.h index e0f11222..c193b56b 100644 --- a/libksieve/impl/utf8validator.h +++ b/libksieve/impl/utf8validator.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* impl/utf8validator.h This file is part of KSieve, diff --git a/libksieve/ksieve/error.h b/libksieve/ksieve/error.h index d2adcd8b..762c49e7 100644 --- a/libksieve/ksieve/error.h +++ b/libksieve/ksieve/error.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* ksieve/error.h This file is part of KSieve, @@ -35,7 +35,7 @@ #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #ifdef None // X headers # undef None diff --git a/libksieve/ksieve/lexer.h b/libksieve/ksieve/lexer.h index d4dc7a97..4fce631c 100644 --- a/libksieve/ksieve/lexer.h +++ b/libksieve/ksieve/lexer.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* ksieve/lexer.h This file is part of KSieve, diff --git a/libksieve/ksieve/parser.h b/libksieve/ksieve/parser.h index 88bb9418..22e6ebf3 100644 --- a/libksieve/ksieve/parser.h +++ b/libksieve/ksieve/parser.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* ksieve/parser.h This file is part of KSieve, @@ -33,7 +33,7 @@ #ifndef __KSIEVE_PARSING_H__ #define __KSIEVE_PARSING_H__ -#include <tdepimmacros.h> +#include <kdemacros.h> class TQString; diff --git a/libksieve/ksieve/scriptbuilder.h b/libksieve/ksieve/scriptbuilder.h index f365adfa..9da7ce78 100644 --- a/libksieve/ksieve/scriptbuilder.h +++ b/libksieve/ksieve/scriptbuilder.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* ksieve/interfaces/scriptbuilder.h This file is part of KSieve, diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp index 93c5732a..4b0ebf4f 100644 --- a/libksieve/parser/lexer.cpp +++ b/libksieve/parser/lexer.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* parser/lexer.cpp This file is part of KSieve, diff --git a/libksieve/parser/parser.cpp b/libksieve/parser/parser.cpp index c0459975..68718c32 100644 --- a/libksieve/parser/parser.cpp +++ b/libksieve/parser/parser.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* parser/parser.cpp This file is part of KSieve, diff --git a/libksieve/parser/utf8validator.cpp b/libksieve/parser/utf8validator.cpp index b8600e7b..5204383a 100644 --- a/libksieve/parser/utf8validator.cpp +++ b/libksieve/parser/utf8validator.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* utf8validator.cpp This file is part of KSieve, diff --git a/libksieve/shared/error.cpp b/libksieve/shared/error.cpp index 400587c3..a39e7de9 100644 --- a/libksieve/shared/error.cpp +++ b/libksieve/shared/error.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* error.cpp This file is part of KSieve, diff --git a/libksieve/tests/lexertest.cpp b/libksieve/tests/lexertest.cpp index 43d641fc..d3e54ba6 100644 --- a/libksieve/tests/lexertest.cpp +++ b/libksieve/tests/lexertest.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* tests/lexertest.cpp This file is part of the testsuite of KSieve, diff --git a/libksieve/tests/parsertest.cpp b/libksieve/tests/parsertest.cpp index ea718e4d..a671b821 100644 --- a/libksieve/tests/parsertest.cpp +++ b/libksieve/tests/parsertest.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* tests/parsertest.cpp This file is part of the testsuite of KSieve, diff --git a/libtdenetwork/gpgmepp/context.h b/libtdenetwork/gpgmepp/context.h index 054f8bee..2eaee660 100644 --- a/libtdenetwork/gpgmepp/context.h +++ b/libtdenetwork/gpgmepp/context.h @@ -16,8 +16,6 @@ You should have received a copy of the GNU General Public License along with GPGME++; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- #ifndef __GPGMEPP_CONTEXT_H__ #define __GPGMEPP_CONTEXT_H__ @@ -27,7 +25,7 @@ #include <utility> #include <iosfwd> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { diff --git a/libtdenetwork/gpgmepp/context_p.h b/libtdenetwork/gpgmepp/context_p.h index dfff5863..5d44ba7c 100644 --- a/libtdenetwork/gpgmepp/context_p.h +++ b/libtdenetwork/gpgmepp/context_p.h @@ -16,9 +16,6 @@ You should have received a copy of the GNU General Public License along with GPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - - -// -*- c++ -*- #ifndef __GPGMEPP_CONTEXT_P_H__ #define __GPGMEPP_CONTEXT_P_H__ diff --git a/libtdenetwork/gpgmepp/data.h b/libtdenetwork/gpgmepp/data.h index e1206472..b1c76029 100644 --- a/libtdenetwork/gpgmepp/data.h +++ b/libtdenetwork/gpgmepp/data.h @@ -25,7 +25,7 @@ #include <sys/types.h> // for size_t, off_t #include <cstdio> // FILE -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { diff --git a/libtdenetwork/gpgmepp/data_p.h b/libtdenetwork/gpgmepp/data_p.h index 38981cce..7f2c83fc 100644 --- a/libtdenetwork/gpgmepp/data_p.h +++ b/libtdenetwork/gpgmepp/data_p.h @@ -1,4 +1,4 @@ -/* data_p.h - wraps a gpgme data object, private part -*- c++ -*- +/* Copyright (C) 2003,2004 Klarlvdalens Datakonsult AB This file is part of GPGME++. diff --git a/libtdenetwork/gpgmepp/decryptionresult.h b/libtdenetwork/gpgmepp/decryptionresult.h index da4833bb..1721a19e 100644 --- a/libtdenetwork/gpgmepp/decryptionresult.h +++ b/libtdenetwork/gpgmepp/decryptionresult.h @@ -26,7 +26,7 @@ #include <iosfwd> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { diff --git a/libtdenetwork/gpgmepp/encryptionresult.h b/libtdenetwork/gpgmepp/encryptionresult.h index 4339bef5..44ea09a6 100644 --- a/libtdenetwork/gpgmepp/encryptionresult.h +++ b/libtdenetwork/gpgmepp/encryptionresult.h @@ -27,7 +27,7 @@ #include <vector> #include <iosfwd> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { diff --git a/libtdenetwork/gpgmepp/engineinfo.h b/libtdenetwork/gpgmepp/engineinfo.h index c07d2817..5dcd2f83 100644 --- a/libtdenetwork/gpgmepp/engineinfo.h +++ b/libtdenetwork/gpgmepp/engineinfo.h @@ -24,7 +24,7 @@ #include <gpgmepp/gpgmefw.h> #include <gpgmepp/context.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { diff --git a/libtdenetwork/gpgmepp/eventloopinteractor.h b/libtdenetwork/gpgmepp/eventloopinteractor.h index c3688833..37acc0f8 100644 --- a/libtdenetwork/gpgmepp/eventloopinteractor.h +++ b/libtdenetwork/gpgmepp/eventloopinteractor.h @@ -16,12 +16,10 @@ You should have received a copy of the GNU General Public License along with GPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- #ifndef __GPGMEPP_EVENTLOOPINTERACTOR_H__ #define __GPGMEPP_EVENTLOOPINTERACTOR_H__ -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { diff --git a/libtdenetwork/gpgmepp/importresult.h b/libtdenetwork/gpgmepp/importresult.h index 020ed0c4..87f9aaf9 100644 --- a/libtdenetwork/gpgmepp/importresult.h +++ b/libtdenetwork/gpgmepp/importresult.h @@ -25,7 +25,7 @@ #include <gpgmepp/result.h> #include <vector> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { diff --git a/libtdenetwork/gpgmepp/interfaces/dataprovider.h b/libtdenetwork/gpgmepp/interfaces/dataprovider.h index 34dd4a7e..be926446 100644 --- a/libtdenetwork/gpgmepp/interfaces/dataprovider.h +++ b/libtdenetwork/gpgmepp/interfaces/dataprovider.h @@ -23,7 +23,7 @@ #include <sys/types.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { diff --git a/libtdenetwork/gpgmepp/key.h b/libtdenetwork/gpgmepp/key.h index f05d372d..4bbd24be 100644 --- a/libtdenetwork/gpgmepp/key.h +++ b/libtdenetwork/gpgmepp/key.h @@ -16,8 +16,6 @@ You should have received a copy of the GNU General Public License along with GPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- #ifndef __GPGMEPP_KEY_H__ #define __GPGMEPP_KEY_H__ @@ -27,7 +25,7 @@ #include <sys/time.h> #include <vector> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { diff --git a/libtdenetwork/gpgmepp/keygenerationresult.h b/libtdenetwork/gpgmepp/keygenerationresult.h index 7b2d98e8..2cf8c8a7 100644 --- a/libtdenetwork/gpgmepp/keygenerationresult.h +++ b/libtdenetwork/gpgmepp/keygenerationresult.h @@ -23,7 +23,7 @@ #include <gpgmepp/gpgmefw.h> #include <gpgmepp/result.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Error; diff --git a/libtdenetwork/gpgmepp/keylistresult.h b/libtdenetwork/gpgmepp/keylistresult.h index 068210c0..064539cf 100644 --- a/libtdenetwork/gpgmepp/keylistresult.h +++ b/libtdenetwork/gpgmepp/keylistresult.h @@ -23,7 +23,7 @@ #include <gpgmepp/gpgmefw.h> #include <gpgmepp/result.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { diff --git a/libtdenetwork/gpgmepp/shared.h b/libtdenetwork/gpgmepp/shared.h index f9c79e0c..e263d8f1 100644 --- a/libtdenetwork/gpgmepp/shared.h +++ b/libtdenetwork/gpgmepp/shared.h @@ -1,4 +1,4 @@ -/* shared.h - internal tool for refcounting -*- c++ -*- +/* Copyright (C) 2003 Klarlvdalens Datakonsult AB This file is part of GPGME++. diff --git a/libtdenetwork/gpgmepp/signingresult.h b/libtdenetwork/gpgmepp/signingresult.h index 1ee7a8de..a31b2928 100644 --- a/libtdenetwork/gpgmepp/signingresult.h +++ b/libtdenetwork/gpgmepp/signingresult.h @@ -30,7 +30,7 @@ #include <vector> #include <iosfwd> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { diff --git a/libtdenetwork/gpgmepp/trustitem.h b/libtdenetwork/gpgmepp/trustitem.h index 61c74617..aa1850b5 100644 --- a/libtdenetwork/gpgmepp/trustitem.h +++ b/libtdenetwork/gpgmepp/trustitem.h @@ -16,8 +16,6 @@ You should have received a copy of the GNU General Public License along with GPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- #ifndef __GPGMEPP_TRUSTITEM_H__ #define __GPGMEPP_TRUSTITEM_H__ diff --git a/libtdenetwork/gpgmepp/util.h b/libtdenetwork/gpgmepp/util.h index 8246cfc3..088a81c4 100644 --- a/libtdenetwork/gpgmepp/util.h +++ b/libtdenetwork/gpgmepp/util.h @@ -16,8 +16,6 @@ You should have received a copy of the GNU General Public License along with GPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- #ifndef __GPGMEPP_UTIL_H__ #define __GPGMEPP_UTIL_H__ diff --git a/libtdenetwork/gpgmepp/verificationresult.h b/libtdenetwork/gpgmepp/verificationresult.h index e572ecfe..70269df3 100644 --- a/libtdenetwork/gpgmepp/verificationresult.h +++ b/libtdenetwork/gpgmepp/verificationresult.h @@ -29,7 +29,7 @@ #include <vector> #include <iosfwd> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { diff --git a/libtdenetwork/qgpgme/dataprovider.cpp b/libtdenetwork/qgpgme/dataprovider.cpp index 308fbc12..af3bc715 100644 --- a/libtdenetwork/qgpgme/dataprovider.cpp +++ b/libtdenetwork/qgpgme/dataprovider.cpp @@ -16,9 +16,6 @@ You should have received a copy of the GNU General Public License along with TQGPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- - #include <config.h> #include <qgpgme/dataprovider.h> diff --git a/libtdenetwork/qgpgme/dataprovider.h b/libtdenetwork/qgpgme/dataprovider.h index 58c097d1..e3613a25 100644 --- a/libtdenetwork/qgpgme/dataprovider.h +++ b/libtdenetwork/qgpgme/dataprovider.h @@ -16,15 +16,13 @@ You should have received a copy of the GNU General Public License along with TQGPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- #ifndef __TQGPGME_DATAPROVIDER_H__ #define __TQGPGME_DATAPROVIDER_H__ #include <gpgmepp/interfaces/dataprovider.h> #include <tqcstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace QGpgME { diff --git a/libtdenetwork/qgpgme/eventloopinteractor.cpp b/libtdenetwork/qgpgme/eventloopinteractor.cpp index b6d9830d..3e75bf89 100644 --- a/libtdenetwork/qgpgme/eventloopinteractor.cpp +++ b/libtdenetwork/qgpgme/eventloopinteractor.cpp @@ -16,9 +16,6 @@ You should have received a copy of the GNU General Public License along with TQGPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- - #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/libtdenetwork/qgpgme/eventloopinteractor.h b/libtdenetwork/qgpgme/eventloopinteractor.h index b89b1841..9c75fcb0 100644 --- a/libtdenetwork/qgpgme/eventloopinteractor.h +++ b/libtdenetwork/qgpgme/eventloopinteractor.h @@ -16,15 +16,13 @@ You should have received a copy of the GNU General Public License along with TQGPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- #ifndef __TQGPGME_EVENTLOOPINTERACTOR_H__ #define __TQGPGME_EVENTLOOPINTERACTOR_H__ #include <gpgmepp/eventloopinteractor.h> #include <tqobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Context; diff --git a/libtdenetwork/qgpgme/tests/dataprovidertest.cpp b/libtdenetwork/qgpgme/tests/dataprovidertest.cpp index 675c85ea..c72ac36c 100644 --- a/libtdenetwork/qgpgme/tests/dataprovidertest.cpp +++ b/libtdenetwork/qgpgme/tests/dataprovidertest.cpp @@ -16,9 +16,6 @@ You should have received a copy of the GNU General Public License along with TQGPGME; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -// -*- c++ -*- - #ifdef NDEBUG #undef NDEBUG #endif diff --git a/libtdepim/CMakeLists.txt b/libtdepim/CMakeLists.txt index 15394c1e..f96611f3 100644 --- a/libtdepim/CMakeLists.txt +++ b/libtdepim/CMakeLists.txt @@ -38,9 +38,7 @@ link_directories( ##### headers ################################### -install( FILES - tdepimmacros.h kpimprefs.h - DESTINATION ${INCLUDE_INSTALL_DIR} ) +install( FILES kpimprefs.h DESTINATION ${INCLUDE_INSTALL_DIR} ) ##### other data ################################ diff --git a/libtdepim/Makefile.am b/libtdepim/Makefile.am index cbee9ed6..25beabe5 100644 --- a/libtdepim/Makefile.am +++ b/libtdepim/Makefile.am @@ -48,7 +48,7 @@ libtdepim_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ $(LIB_TDEIO) $(LIB_TDEABC) $(LIB_TDEPARTS) $(LIB_TDEIMPROXY) $(LIB_POLL) $(LIB_QUI) # $top_builddir)/libtdepim/resources/libkpimresources.la -include_HEADERS = tdepimmacros.h kpimprefs.h +include_HEADERS = kpimprefs.h AM_CXXFLAGS = -DQT_PLUGIN kde_widget_LTLIBRARIES = tdepimwidgets.la diff --git a/libtdepim/about/kde_infopage.css b/libtdepim/about/kde_infopage.css index e943b888..93452a7d 100644 --- a/libtdepim/about/kde_infopage.css +++ b/libtdepim/about/kde_infopage.css @@ -324,5 +324,3 @@ body {margin: 0px; padding: 0px; background-color: #003070; background-image: ur height: 100px; z-index: -1; } - -/* vim:set sw=2 et nocindent smartindent: */ diff --git a/libtdepim/about/kde_infopage_rtl.css b/libtdepim/about/kde_infopage_rtl.css index 00333019..5be37526 100644 --- a/libtdepim/about/kde_infopage_rtl.css +++ b/libtdepim/about/kde_infopage_rtl.css @@ -7,5 +7,3 @@ body {direction: rtl} #nextlink { text-align: left; } - -/* vim:set sw=2 et nocindent smartindent: */ diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h index 278c8e08..34439202 100644 --- a/libtdepim/addresseelineedit.h +++ b/libtdepim/addresseelineedit.h @@ -37,7 +37,7 @@ #include "clicklineedit.h" #include "kmailcompletion.h" #include <dcopobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEConfig; diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h index 2fa40f4e..101cc6e6 100644 --- a/libtdepim/addresseeselector.h +++ b/libtdepim/addresseeselector.h @@ -26,7 +26,7 @@ #include <tdeabc/distributionlist.h> #include <tdeabc/resource.h> #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqbitarray.h> #include <tqpixmap.h> diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h index 15cc7490..6ee83268 100644 --- a/libtdepim/addresseeview.h +++ b/libtdepim/addresseeview.h @@ -27,7 +27,7 @@ #include <tdeabc/addressee.h> #include <ktextbrowser.h> #include <tdeimproxy.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEIO { class Job; diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index d764b376..e0071ef0 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of libtdepim. * diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h index 1cc383b2..55b29231 100644 --- a/libtdepim/addressesdialog.h +++ b/libtdepim/addressesdialog.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of libtdepim. * @@ -31,7 +31,7 @@ #include <tqstringlist.h> #include <tqptrlist.h> #include <tqptrdict.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPIM { diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui index 704b3d58..a37369aa 100644 --- a/libtdepim/addresspicker.ui +++ b/libtdepim/addresspicker.ui @@ -299,9 +299,6 @@ <property name="text"> <string>Save as &Distribution List...</string> </property> - <property name="accel"> - <string>Alt+D</string> - </property> </widget> <widget class="TQPushButton" row="3" column="0"> <property name="name"> diff --git a/libtdepim/broadcaststatus.h b/libtdepim/broadcaststatus.h index fc9eb607..af8b383c 100644 --- a/libtdepim/broadcaststatus.h +++ b/libtdepim/broadcaststatus.h @@ -14,7 +14,7 @@ #include <tqobject.h> #include <tqmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #undef None diff --git a/libtdepim/categoryeditdialog.h b/libtdepim/categoryeditdialog.h index 86cd8e32..67d8aa15 100644 --- a/libtdepim/categoryeditdialog.h +++ b/libtdepim/categoryeditdialog.h @@ -23,7 +23,7 @@ #define KPIM_CATEGORYEDITDIALOG_H #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KPimPrefs; diff --git a/libtdepim/categoryselectdialog.h b/libtdepim/categoryselectdialog.h index ca501ddc..6a4bfb40 100644 --- a/libtdepim/categoryselectdialog.h +++ b/libtdepim/categoryselectdialog.h @@ -23,7 +23,7 @@ #define KPIM_CATEGORYSELECTDIALOG_H #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KPimPrefs; class CategorySelectDialog_base; diff --git a/libtdepim/clicklineedit.h b/libtdepim/clicklineedit.h index ca832b5e..e8c181ce 100644 --- a/libtdepim/clicklineedit.h +++ b/libtdepim/clicklineedit.h @@ -22,7 +22,7 @@ #define CLICKLINEEDIT_H #include <klineedit.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPIM { diff --git a/libtdepim/collectingprocess.h b/libtdepim/collectingprocess.h index 962fe15d..5aad3f07 100644 --- a/libtdepim/collectingprocess.h +++ b/libtdepim/collectingprocess.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* collectingprocess.h This file is part of libtdepim. @@ -34,7 +34,7 @@ #define __KPIM_COLLECTINGPROCESS_H__ #include <kprocess.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPIM { diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp index 924a669a..bc6f8839 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -1,4 +1,4 @@ -/** -*- c++ -*- +/* * completionordereditor.cpp * * Copyright (c) 2004 David Faure <faure@kde.org> diff --git a/libtdepim/completionordereditor.h b/libtdepim/completionordereditor.h index 53061f04..f7ac8044 100644 --- a/libtdepim/completionordereditor.h +++ b/libtdepim/completionordereditor.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* * completionordereditor.h * * Copyright (c) 2004 David Faure <faure@kde.org> diff --git a/libtdepim/configmanager.h b/libtdepim/configmanager.h index 37147843..b00fb7e5 100644 --- a/libtdepim/configmanager.h +++ b/libtdepim/configmanager.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* configmanager.h KMail, the KDE mail client. @@ -19,7 +19,7 @@ #include <tqobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KMKernel; diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp index bb4d8ea9..8ed060da 100644 --- a/libtdepim/csshelper.cpp +++ b/libtdepim/csshelper.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* csshelper.cpp This file is part of KMail, the KDE mail client. diff --git a/libtdepim/csshelper.h b/libtdepim/csshelper.h index ab9190cf..0d5b1a44 100644 --- a/libtdepim/csshelper.h +++ b/libtdepim/csshelper.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* csshelper.h This file is part of KMail, the KDE mail client. diff --git a/libtdepim/designerfields.h b/libtdepim/designerfields.h index dd05b336..ab709621 100644 --- a/libtdepim/designerfields.h +++ b/libtdepim/designerfields.h @@ -28,7 +28,7 @@ #include <tqpair.h> #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPIM { diff --git a/libtdepim/diffalgo.h b/libtdepim/diffalgo.h index 513db7e3..a437d9d5 100644 --- a/libtdepim/diffalgo.h +++ b/libtdepim/diffalgo.h @@ -23,7 +23,7 @@ #define DIFFALGO_H #include <tqvaluelist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPIM { diff --git a/libtdepim/embeddedurlpage.h b/libtdepim/embeddedurlpage.h index 0a24b206..bb302d9e 100644 --- a/libtdepim/embeddedurlpage.h +++ b/libtdepim/embeddedurlpage.h @@ -22,7 +22,7 @@ #define KPIM_EMBEDDEDURLPAGE_H #include <tqwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kurl.h> namespace KParts { class ReadOnlyPart; } diff --git a/libtdepim/htmldiffalgodisplay.h b/libtdepim/htmldiffalgodisplay.h index 35d95f5c..e38b7a60 100644 --- a/libtdepim/htmldiffalgodisplay.h +++ b/libtdepim/htmldiffalgodisplay.h @@ -25,7 +25,7 @@ #include "diffalgo.h" #include <ktextbrowser.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPIM { diff --git a/libtdepim/infoextension.h b/libtdepim/infoextension.h index f1d43a52..6ee5efe4 100644 --- a/libtdepim/infoextension.h +++ b/libtdepim/infoextension.h @@ -23,7 +23,7 @@ #define INFOEXTENSION_H #include <tqobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQWidget; diff --git a/libtdepim/interfaces/AddressBookServiceIface.h b/libtdepim/interfaces/AddressBookServiceIface.h index e07ac3e7..e39b8fc7 100644 --- a/libtdepim/interfaces/AddressBookServiceIface.h +++ b/libtdepim/interfaces/AddressBookServiceIface.h @@ -27,7 +27,7 @@ #include <kurl.h> #include <tqstring.h> #include <tqcstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPIM { diff --git a/libtdepim/interfaces/MailTransportServiceIface.h b/libtdepim/interfaces/MailTransportServiceIface.h index d256775a..3a69f83b 100644 --- a/libtdepim/interfaces/MailTransportServiceIface.h +++ b/libtdepim/interfaces/MailTransportServiceIface.h @@ -28,7 +28,7 @@ #include <tqstring.h> #include <tqcstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPim { diff --git a/libtdepim/kaccount.cpp b/libtdepim/kaccount.cpp index 86cf4cfc..292365db 100644 --- a/libtdepim/kaccount.cpp +++ b/libtdepim/kaccount.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kaccount.cpp This file is part of KMail, the KDE mail client. diff --git a/libtdepim/kaccount.h b/libtdepim/kaccount.h index 559a3c03..e5ec2d79 100644 --- a/libtdepim/kaccount.h +++ b/libtdepim/kaccount.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kaccount.h This file is part of KMail, the KDE mail client. @@ -33,7 +33,7 @@ #define __KACCOUNT #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEConfig; diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp index c0122923..b32b017e 100644 --- a/libtdepim/kaddrbook.cpp +++ b/libtdepim/kaddrbook.cpp @@ -1,4 +1,3 @@ -// -*- mode: C++; c-file-style: "gnu" -*- // kaddrbook.cpp // Author: Stefan Taferner <taferner@kde.org> // This code is under GPL diff --git a/libtdepim/kaddrbook.h b/libtdepim/kaddrbook.h index a9e2c8c5..bd44e25a 100644 --- a/libtdepim/kaddrbook.h +++ b/libtdepim/kaddrbook.h @@ -9,7 +9,7 @@ #include <tdeversion.h> #include <tdeabc/addressee.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { class AddressBook; diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h index 8ab57541..abf3c183 100644 --- a/libtdepim/kcmdesignerfields.h +++ b/libtdepim/kcmdesignerfields.h @@ -23,7 +23,7 @@ #define KPIM_KCMDESIGNERFIELDS_H #include <tdecmodule.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEListView; diff --git a/libtdepim/kdateedit.h b/libtdepim/kdateedit.h index ee5bf8d6..3cab1fe4 100644 --- a/libtdepim/kdateedit.h +++ b/libtdepim/kdateedit.h @@ -28,7 +28,7 @@ #include <tqdatetime.h> #include <tqmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "kdatepickerpopup.h" diff --git a/libtdepim/kdatepickerpopup.h b/libtdepim/kdatepickerpopup.h index 38b947ad..ba9d551f 100644 --- a/libtdepim/kdatepickerpopup.h +++ b/libtdepim/kdatepickerpopup.h @@ -24,7 +24,7 @@ #include <tqdatetime.h> #include <tqpopupmenu.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kdatepicker.h> /** diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp index f353c4d3..58e35858 100644 --- a/libtdepim/kfoldertree.cpp +++ b/libtdepim/kfoldertree.cpp @@ -1,6 +1,5 @@ -// -*- c-basic-offset: 2 -*- - #include "kfoldertree.h" +#include <tdeversion.h> #include <tdelocale.h> #include <tdeio/global.h> #include <kiconloader.h> diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h index bec5e030..a69e80d5 100644 --- a/libtdepim/kfoldertree.h +++ b/libtdepim/kfoldertree.h @@ -1,5 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- - +/* This file is part of libtdepim. Copyright (C) 2002 Carsten Burghardt <burghardt@kde.org> @@ -27,7 +26,7 @@ #include <tqdragobject.h> #include <tqcolor.h> #include <tdelistview.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KFolderTree; diff --git a/libtdepim/komposer/core/attachment.cpp b/libtdepim/komposer/core/attachment.cpp index df803de6..6d5017e9 100644 --- a/libtdepim/komposer/core/attachment.cpp +++ b/libtdepim/komposer/core/attachment.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- /** * attachment.cpp * diff --git a/libtdepim/komposer/core/attachment.h b/libtdepim/komposer/core/attachment.h index 5c4e1ebf..8344c8d7 100644 --- a/libtdepim/komposer/core/attachment.h +++ b/libtdepim/komposer/core/attachment.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- /** * attachment.h * diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp index fa8e1dc1..2616f8e2 100644 --- a/libtdepim/komposer/core/core.cpp +++ b/libtdepim/komposer/core/core.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- /** * core.cpp * diff --git a/libtdepim/komposer/core/core.h b/libtdepim/komposer/core/core.h index 92235a18..482ee1db 100644 --- a/libtdepim/komposer/core/core.h +++ b/libtdepim/komposer/core/core.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- /** * core.h * diff --git a/libtdepim/komposer/core/corewidget.cpp b/libtdepim/komposer/core/corewidget.cpp index c6589376..d9130f53 100644 --- a/libtdepim/komposer/core/corewidget.cpp +++ b/libtdepim/komposer/core/corewidget.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- /** * corewidget.cpp * diff --git a/libtdepim/komposer/core/corewidget.h b/libtdepim/komposer/core/corewidget.h index dbe1d674..c2a6a0e7 100644 --- a/libtdepim/komposer/core/corewidget.h +++ b/libtdepim/komposer/core/corewidget.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- /** * corewidget.h * diff --git a/libtdepim/komposer/core/editor.cpp b/libtdepim/komposer/core/editor.cpp index 5dada393..83b11b0e 100644 --- a/libtdepim/komposer/core/editor.cpp +++ b/libtdepim/komposer/core/editor.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- /** * editor.cpp * diff --git a/libtdepim/komposer/core/editor.h b/libtdepim/komposer/core/editor.h index a1845f6f..4e595b3f 100644 --- a/libtdepim/komposer/core/editor.h +++ b/libtdepim/komposer/core/editor.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- /** * editor.h * diff --git a/libtdepim/komposer/core/plugin.cpp b/libtdepim/komposer/core/plugin.cpp index 41af47cd..133d203d 100644 --- a/libtdepim/komposer/core/plugin.cpp +++ b/libtdepim/komposer/core/plugin.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- /** * plugin.cpp * diff --git a/libtdepim/komposer/core/plugin.h b/libtdepim/komposer/core/plugin.h index c14bcc6b..ac0b5498 100644 --- a/libtdepim/komposer/core/plugin.h +++ b/libtdepim/komposer/core/plugin.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- /** * plugin.h * diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index 2e5aa4f6..9a33b990 100644 --- a/libtdepim/komposer/core/pluginmanager.cpp +++ b/libtdepim/komposer/core/pluginmanager.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 2; -*- /** * pluginmanager.cpp * Most of this code has been lifted from Martijn's KopetePluginManager class diff --git a/libtdepim/komposer/core/pluginmanager.h b/libtdepim/komposer/core/pluginmanager.h index eae6d49a..d9366b3f 100644 --- a/libtdepim/komposer/core/pluginmanager.h +++ b/libtdepim/komposer/core/pluginmanager.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- /** * pluginmanager.h * diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp index 3070b165..abacd0eb 100644 --- a/libtdepim/komposer/core/prefsmodule.cpp +++ b/libtdepim/komposer/core/prefsmodule.cpp @@ -31,7 +31,7 @@ #include <tqlabel.h> #include <tqbuttongroup.h> -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/libtdepim/kpimprefs.h b/libtdepim/kpimprefs.h index dd180c97..b67d2491 100644 --- a/libtdepim/kpimprefs.h +++ b/libtdepim/kpimprefs.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <tdeconfigskeleton.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQString; diff --git a/libtdepim/kpimurlrequesterdlg.h b/libtdepim/kpimurlrequesterdlg.h index 6a00cf4e..8679923d 100644 --- a/libtdepim/kpimurlrequesterdlg.h +++ b/libtdepim/kpimurlrequesterdlg.h @@ -20,7 +20,7 @@ #ifndef KPIMURLREQUESTDLG_H_INCLUDED #define KPIMURLREQUESTDLG_H_INCLUDED -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kurl.h> #include <tqstring.h> diff --git a/libtdepim/kpixmapregionselectordialog.h b/libtdepim/kpixmapregionselectordialog.h index ee864391..2f77ab89 100644 --- a/libtdepim/kpixmapregionselectordialog.h +++ b/libtdepim/kpixmapregionselectordialog.h @@ -25,7 +25,7 @@ #include <kdialogbase.h> #include <libtdepim/kpixmapregionselectorwidget.h> #include <tqimage.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPIM { diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h index 3e331b18..86c7b81f 100644 --- a/libtdepim/kprefsdialog.h +++ b/libtdepim/kprefsdialog.h @@ -32,7 +32,7 @@ #include <tdecmodule.h> #include <tdeconfigskeleton.h> #include <tdefile.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KColorButton; diff --git a/libtdepim/kregexp3.cpp b/libtdepim/kregexp3.cpp index d60946c2..006872ec 100644 --- a/libtdepim/kregexp3.cpp +++ b/libtdepim/kregexp3.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kregexp3.cpp This file is part of libtdenetwork. diff --git a/libtdepim/kregexp3.h b/libtdepim/kregexp3.h index 4622e16d..909e6bfa 100644 --- a/libtdepim/kregexp3.h +++ b/libtdepim/kregexp3.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kregexp3.h This file is part of libtdenetwork. @@ -34,7 +34,7 @@ #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> /** @short A TQRegExp (TQt3.x) with a replace() method. diff --git a/libtdepim/kresourceprefs.h b/libtdepim/kresourceprefs.h index 1954f19c..398490a1 100644 --- a/libtdepim/kresourceprefs.h +++ b/libtdepim/kresourceprefs.h @@ -23,7 +23,7 @@ #define KRESOURCEPREFS_H #include <tdeconfigskeleton.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQString; diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h index cfa924f3..877c2c8f 100644 --- a/libtdepim/krsqueezedtextlabel.h +++ b/libtdepim/krsqueezedtextlabel.h @@ -22,7 +22,7 @@ #define KRSQUEEZEDTEXTLABEL_H #include <tqlabel.h> -#include <tdepimmacros.h> +#include <kdemacros.h> /** * @short A replacement for TQLabel that squeezes its text diff --git a/libtdepim/kscoring.h b/libtdepim/kscoring.h index a345ba14..d901d0bf 100644 --- a/libtdepim/kscoring.h +++ b/libtdepim/kscoring.h @@ -38,7 +38,7 @@ #include <klineedit.h> #include <knuminput.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQDomNode; class TQDomDocument; diff --git a/libtdepim/kscoringeditor.h b/libtdepim/kscoringeditor.h index 0160a9e4..33677662 100644 --- a/libtdepim/kscoringeditor.h +++ b/libtdepim/kscoringeditor.h @@ -25,7 +25,7 @@ #include "kwidgetlister.h" -#include <tdepimmacros.h> +#include <kdemacros.h> class KComboBox; class KLineEdit; diff --git a/libtdepim/ksubscription.h b/libtdepim/ksubscription.h index 0fb5209c..27b5695c 100644 --- a/libtdepim/ksubscription.h +++ b/libtdepim/ksubscription.h @@ -29,7 +29,7 @@ #include <tqcheckbox.h> #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "kfoldertree.h" class KSubscription; diff --git a/libtdepim/ktimeedit.h b/libtdepim/ktimeedit.h index 1bb307f8..554128b6 100644 --- a/libtdepim/ktimeedit.h +++ b/libtdepim/ktimeedit.h @@ -32,7 +32,7 @@ #include <tqcombobox.h> #include <tdeapplication.h> -#include <tdepimmacros.h> +#include <kdemacros.h> /** This is a class that provides an easy, user friendly way to edit times. diff --git a/libtdepim/kvcarddrag.h b/libtdepim/kvcarddrag.h index 40263ac5..8ac98042 100644 --- a/libtdepim/kvcarddrag.h +++ b/libtdepim/kvcarddrag.h @@ -27,7 +27,7 @@ #include <tdeabc/addressee.h> #include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define -#include <tdepimmacros.h> +#include <kdemacros.h> class KVCardDragPrivate; diff --git a/libtdepim/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp index dc4e8a62..d279c8bc 100644 --- a/libtdepim/kwidgetlister.cpp +++ b/libtdepim/kwidgetlister.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kwidgetlister.cpp This file is part of libtdenetwork. diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h index 4eb189c2..95716430 100644 --- a/libtdepim/kwidgetlister.h +++ b/libtdepim/kwidgetlister.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kwidgetlister.h This file is part of libtdenetwork. @@ -34,7 +34,7 @@ #include <tqwidget.h> #include <tqptrlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQPushButton; class TQVBoxLayout; diff --git a/libtdepim/kxface.h b/libtdepim/kxface.h index 7d472560..a78f411d 100644 --- a/libtdepim/kxface.h +++ b/libtdepim/kxface.h @@ -30,7 +30,7 @@ #include <tqobject.h> #include <setjmp.h> -#include <tdepimmacros.h> +#include <kdemacros.h> // #define WIDTH 48 // #define HEIGHT WIDTH diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h index 41c44e11..b1d8814c 100644 --- a/libtdepim/ldapclient.h +++ b/libtdepim/ldapclient.h @@ -35,7 +35,7 @@ #include <tdeabc/ldif.h> #include <tdeconfig.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPIM { diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp index f740c194..1de43268 100644 --- a/libtdepim/linklocator.cpp +++ b/libtdepim/linklocator.cpp @@ -22,6 +22,7 @@ #include "linklocator.h" #include "pimemoticons.h" +#include <tdeversion.h> #include <tdeglobal.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> diff --git a/libtdepim/linklocator.h b/libtdepim/linklocator.h index 4597d836..3fb3330b 100644 --- a/libtdepim/linklocator.h +++ b/libtdepim/linklocator.h @@ -26,7 +26,7 @@ #include <tqstring.h> #include <tqmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> /** * LinkLocator assists in identifying sections of text that can diff --git a/libtdepim/maillistdrag.h b/libtdepim/maillistdrag.h index 130ec29f..c0a95c8a 100644 --- a/libtdepim/maillistdrag.h +++ b/libtdepim/maillistdrag.h @@ -27,7 +27,7 @@ #include "tqglobal.h" #include "time.h" -#include <tdepimmacros.h> +#include <kdemacros.h> /** * TDEPIM classes for drag and drop of mails diff --git a/libtdepim/overlaywidget.cpp b/libtdepim/overlaywidget.cpp index 338a6c42..7c72883c 100644 --- a/libtdepim/overlaywidget.cpp +++ b/libtdepim/overlaywidget.cpp @@ -1,4 +1,4 @@ -/** -*- c++ -*- +/* * overlaywidget.h * * Copyright (c) 2004 David Faure <faure@kde.org> diff --git a/libtdepim/overlaywidget.h b/libtdepim/overlaywidget.h index c25f00d7..7ba8d4d8 100644 --- a/libtdepim/overlaywidget.h +++ b/libtdepim/overlaywidget.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* * overlaywidget.h * * Copyright (c) 2004 David Faure <faure@kde.org> diff --git a/libtdepim/pluginloader.h b/libtdepim/pluginloader.h index c6b80555..1ec8dc6f 100644 --- a/libtdepim/pluginloader.h +++ b/libtdepim/pluginloader.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* This file is part of libtdepim. Copyright (c) 2002,2004 Marc Mutz <mutz@kde.org> diff --git a/libtdepim/pluginloaderbase.cpp b/libtdepim/pluginloaderbase.cpp index 911fbba6..090c2fb7 100644 --- a/libtdepim/pluginloaderbase.cpp +++ b/libtdepim/pluginloaderbase.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* This file is part of libtdepim. Copyright (c) 2002,2004 Marc Mutz <mutz@kde.org> diff --git a/libtdepim/pluginloaderbase.h b/libtdepim/pluginloaderbase.h index 919a3121..6edc61be 100644 --- a/libtdepim/pluginloaderbase.h +++ b/libtdepim/pluginloaderbase.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* This file is part of libtdepim. Copyright (c) 2002,2004 Marc Mutz <mutz@kde.org> @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLibrary; class TQStringList; diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp index 061ea781..d3a37003 100644 --- a/libtdepim/progressdialog.cpp +++ b/libtdepim/progressdialog.cpp @@ -1,4 +1,4 @@ -/** -*- c++ -*- +/* * progressdialog.cpp * * Copyright (c) 2004 Till Adam <adam@kde.org>, diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h index 70d4034c..051d12b3 100644 --- a/libtdepim/progressdialog.h +++ b/libtdepim/progressdialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* * progressdialog.h * * Copyright (c) 2004 Till Adam <adam@kde.org> @@ -38,7 +38,7 @@ #include <tqlabel.h> #include <tqvbox.h> #include "overlaywidget.h" -#include <tdepimmacros.h> +#include <kdemacros.h> class TQProgressBar; class TQScrollView; diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h index 04491965..4ec17567 100644 --- a/libtdepim/progressmanager.h +++ b/libtdepim/progressmanager.h @@ -28,7 +28,7 @@ #include <tqdict.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPIM { diff --git a/libtdepim/qutf7codec.h b/libtdepim/qutf7codec.h index ef7000ff..01e97494 100644 --- a/libtdepim/qutf7codec.h +++ b/libtdepim/qutf7codec.h @@ -27,7 +27,7 @@ #include "tqtextcodec.h" -#include <tdepimmacros.h> +#include <kdemacros.h> #ifndef TQT_NO_TEXTCODEC diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp index a3ed83d7..7ba218c2 100644 --- a/libtdepim/recentaddresses.cpp +++ b/libtdepim/recentaddresses.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * Copyright (c) 2001-2003 Carsten Pfeiffer <pfeiffer@kde.org> * Copyright (c) 2003 Zack Rusin <zack@kde.org> diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h index 4207105b..f9f6a6ce 100644 --- a/libtdepim/recentaddresses.h +++ b/libtdepim/recentaddresses.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * Copyright (c) 2001-2003 Carsten Pfeiffer <pfeiffer@kde.org> * Copyright (c) 2003 Zack Rusin <zack@kde.org> @@ -35,7 +35,7 @@ #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEConfig; class KEditListBox; diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h index 54a2843c..e1213e3e 100644 --- a/libtdepim/resourceabc.h +++ b/libtdepim/resourceabc.h @@ -27,7 +27,7 @@ #include <tdeabc/resource.h> #include <tqmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> // This is here because it can't go to tdelibs/tdeabc yet, but ultimately // it should probably go there (maybe redesigned to have a real object diff --git a/libtdepim/sidebarextension.cpp b/libtdepim/sidebarextension.cpp index 86279281..9c5113db 100644 --- a/libtdepim/sidebarextension.cpp +++ b/libtdepim/sidebarextension.cpp @@ -36,5 +36,3 @@ SideBarExtension::~SideBarExtension() } #include "sidebarextension.moc" - -// vim: ts=2 sw=2 et diff --git a/libtdepim/sidebarextension.h b/libtdepim/sidebarextension.h index a8cf13df..67211499 100644 --- a/libtdepim/sidebarextension.h +++ b/libtdepim/sidebarextension.h @@ -22,7 +22,7 @@ #define SIDEBAREXTENSION_H #include <tqobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQWidget; @@ -65,5 +65,3 @@ namespace KParts }; } #endif // SIDEBAREXTENSION_H - -// vim: ts=2 sw=2 et diff --git a/libtdepim/spellingfilter.h b/libtdepim/spellingfilter.h index 4178a888..d0a8d884 100644 --- a/libtdepim/spellingfilter.h +++ b/libtdepim/spellingfilter.h @@ -27,7 +27,7 @@ #include <tqstringlist.h> #include "linklocator.h" -#include <tdepimmacros.h> +#include <kdemacros.h> class KDE_EXPORT SpellingFilter { diff --git a/libtdepim/ssllabel.cpp b/libtdepim/ssllabel.cpp index fc876fad..946b68f1 100644 --- a/libtdepim/ssllabel.cpp +++ b/libtdepim/ssllabel.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * diff --git a/libtdepim/ssllabel.h b/libtdepim/ssllabel.h index 03a841be..c4105fbe 100644 --- a/libtdepim/ssllabel.h +++ b/libtdepim/ssllabel.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* * * This file is part of KMail, the KDE mail client. * diff --git a/libtdepim/statusbarprogresswidget.h b/libtdepim/statusbarprogresswidget.h index 87271d69..f09c14b5 100644 --- a/libtdepim/statusbarprogresswidget.h +++ b/libtdepim/statusbarprogresswidget.h @@ -36,7 +36,7 @@ * tdeio_littleprogress_dlg (it looks similar) */ -#include <tdepimmacros.h> +#include <kdemacros.h> class KMMainWidget; class KProgress; diff --git a/libtdepim/tdeabcresourcecached.h b/libtdepim/tdeabcresourcecached.h index b86108b4..f67abc61 100644 --- a/libtdepim/tdeabcresourcecached.h +++ b/libtdepim/tdeabcresourcecached.h @@ -22,7 +22,7 @@ #define TDEABC_RESOURCECACHED_H #include <tdeabc/resource.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqdatetime.h> #include <tqtimer.h> diff --git a/libtdepim/tdeconfigpropagator.h b/libtdepim/tdeconfigpropagator.h index 32d50e9d..94a0bff8 100644 --- a/libtdepim/tdeconfigpropagator.h +++ b/libtdepim/tdeconfigpropagator.h @@ -26,7 +26,7 @@ #include <tqdom.h> #include <tqptrlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEConfigSkeleton; class TDEConfigSkeletonItem; diff --git a/libtdepim/tdeconfigwizard.h b/libtdepim/tdeconfigwizard.h index 67b76d9c..93221a85 100644 --- a/libtdepim/tdeconfigwizard.h +++ b/libtdepim/tdeconfigwizard.h @@ -22,7 +22,7 @@ #define TDECONFIGWIZARD_H #include <tdeconfigpropagator.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kdialogbase.h> class TQListView; diff --git a/libtdepim/tdefileio.cpp b/libtdepim/tdefileio.cpp index 14fc458e..ec798a72 100644 --- a/libtdepim/tdefileio.cpp +++ b/libtdepim/tdefileio.cpp @@ -21,7 +21,7 @@ #include <sys/stat.h> #include <sys/types.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPIM { diff --git a/libtdepim/tdefileio.h b/libtdepim/tdefileio.h index e9045131..f0cd8d8d 100644 --- a/libtdepim/tdefileio.h +++ b/libtdepim/tdefileio.h @@ -11,7 +11,7 @@ #include <tqcstring.h> #include <tqwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQString; diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp index 2801a9d3..74d7329b 100644 --- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp +++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp @@ -24,7 +24,7 @@ #include <kmimetype.h> #include <tqlayout.h> #include <tdeapplication.h> -#include <tdepimmacros.h> +#include <kdemacros.h> KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name ) : TQWidget( parentWidget, name ), m_part( 0 ) diff --git a/libtdepim/tdepimmacros.h b/libtdepim/tdepimmacros.h deleted file mode 100644 index 5336af1b..00000000 --- a/libtdepim/tdepimmacros.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - This file is part of libtdepim. - - Copyright (c) 2002-2003 KDE Team - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -// WARNING Don't add include guards here, they were removed on purpose - -#include <tdeversion.h> -#include <kdemacros.h> - -#if KDE_IS_VERSION( 3,3,90 ) -/* life is great */ -#else -/* workaround typo that breaks compilation with newer gcc */ -#undef KDE_EXPORT -#define KDE_EXPORT -#undef KDE_NO_EXPORT -#define KDE_NO_EXPORT -#endif diff --git a/libtdepim/weaver.cpp b/libtdepim/weaver.cpp index b1dba8de..5743b57b 100644 --- a/libtdepim/weaver.cpp +++ b/libtdepim/weaver.cpp @@ -1,5 +1,4 @@ -/* -*- C++ -*- - +/* This file implements the Weaver, Job and Thread classes. $ Author: Mirko Boehm $ diff --git a/libtdepim/weaver.h b/libtdepim/weaver.h index d914d980..20e076f4 100644 --- a/libtdepim/weaver.h +++ b/libtdepim/weaver.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- - +/* This file declares the Weaver, Job and Thread classes. $ Author: Mirko Boehm $ @@ -30,7 +29,7 @@ extern "C" #include <tqmutex.h> #include <tqevent.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KPIM { namespace ThreadWeaver { diff --git a/libtdepim/weaverextensions.cpp b/libtdepim/weaverextensions.cpp index 9859b6d6..ad5b144c 100644 --- a/libtdepim/weaverextensions.cpp +++ b/libtdepim/weaverextensions.cpp @@ -1,5 +1,4 @@ -/* -*- C++ -*- - +/* This file implements the Weaver Extensions basics. $ Author: Mirko Boehm $ diff --git a/libtdepim/weaverextensions.h b/libtdepim/weaverextensions.h index 7c2cf170..b107378e 100644 --- a/libtdepim/weaverextensions.h +++ b/libtdepim/weaverextensions.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- - +/* This file declares the Weaver Extensions basics. $ Author: Mirko Boehm $ diff --git a/libtdepim/weaverlogger.cpp b/libtdepim/weaverlogger.cpp index e5164c80..0a1b5a95 100644 --- a/libtdepim/weaverlogger.cpp +++ b/libtdepim/weaverlogger.cpp @@ -1,5 +1,4 @@ -/* -*- C++ -*- - +/* This file implements the Thread Logger. $ Author: Mirko Boehm $ diff --git a/libtdepim/weaverlogger.h b/libtdepim/weaverlogger.h index 962968a1..54e7e010 100644 --- a/libtdepim/weaverlogger.h +++ b/libtdepim/weaverlogger.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- - +/* This file declares the Thread Logger. $ Author: Mirko Boehm $ diff --git a/mimelib/Changes b/mimelib/Changes index ce961cce..4f1d7467 100644 --- a/mimelib/Changes +++ b/mimelib/Changes @@ -97,7 +97,7 @@ o Added utility functions for doing end-of-line marker conversions: Jan 25, 1997 -o Parsers for entities (entity.cc) and bodies (body.cc) changed to handle +o Parsers for entities (entity.cpp) and bodies (body.cpp) changed to handle CR LF end-of-line (DOS and MIME) in addition to LF end-of-line (UNIX and C). @@ -169,7 +169,7 @@ o Added member function CreateFieldBody() to DwField. o Improvements to the wrapper classes used in the examples. -o New wrapper class MessageWithAttachments, used in Example 5 (exampl05.cc). +o New wrapper class MessageWithAttachments, used in Example 5 (exampl05.cpp). o The documentation now includes a tutorial. diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index bfe78c61..da28a1f0 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -80,7 +80,7 @@ #include <tqdir.h> #include <tqtextstream.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index 3f0f9014..c5e1297a 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* text_vcard.cpp This file is part of KMail, the KDE mail client. @@ -63,7 +63,7 @@ using TDEABC::Addressee; #include "addresseeview.h" using KPIM::AddresseeView; -#include <tdepimmacros.h> +#include <kdemacros.h> namespace { diff --git a/tdefile-plugins/palm-databases/tdefile_palm.cpp b/tdefile-plugins/palm-databases/tdefile_palm.cpp index e995b136..e0a4db02 100644 --- a/tdefile-plugins/palm-databases/tdefile_palm.cpp +++ b/tdefile-plugins/palm-databases/tdefile_palm.cpp @@ -115,7 +115,7 @@ bool KPalmPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ ) { // int pi_file_set_info((struct pi_file * pf, struct DBInfo * infop)); //info["tuteTextTechnical"].value("An integer").toInt() -// Do the stuff with low-level functions. See lines 1119-1142 of pi-file.cc for writing, 244-273 for reading. +// Do the stuff with low-level functions. See lines 1119-1142 of pi-file.cpp for writing, 244-273 for reading. }*/ #include "tdefile_palm.moc" diff --git a/tdeioslave/imap4/CMakeLists.txt b/tdeioslave/imap4/CMakeLists.txt index 6316fe32..041aeffc 100644 --- a/tdeioslave/imap4/CMakeLists.txt +++ b/tdeioslave/imap4/CMakeLists.txt @@ -38,9 +38,9 @@ tde_create_translated_desktop( tde_add_kpart( tdeio_imap4 SOURCES - imapcommand.cc imaplist.cc mailaddress.cc mimeheader.cc - rfcdecoder.cc imap4.cc imapinfo.cc imapparser.cc - mailheader.cc mimehdrline.cc mimeio.cc + imapcommand.cpp imaplist.cpp mailaddress.cpp mimeheader.cpp + rfcdecoder.cpp imap4.cpp imapinfo.cpp imapparser.cpp + mailheader.cpp mimehdrline.cpp mimeio.cpp LINK emailfunctions-static kmime-shared tdeio-shared ${SASL_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeioslave/imap4/Makefile.am b/tdeioslave/imap4/Makefile.am index f52af2c6..34497bf6 100644 --- a/tdeioslave/imap4/Makefile.am +++ b/tdeioslave/imap4/Makefile.am @@ -7,9 +7,9 @@ INCLUDES= -I$(top_srcdir)/libkmime \ kde_module_LTLIBRARIES = tdeio_imap4.la -tdeio_imap4_la_SOURCES = imapcommand.cc imaplist.cc mailaddress.cc \ - mimeheader.cc rfcdecoder.cc imap4.cc imapinfo.cc imapparser.cc mailheader.cc \ - mimehdrline.cc mimeio.cc +tdeio_imap4_la_SOURCES = imapcommand.cpp imaplist.cpp mailaddress.cpp \ + mimeheader.cpp rfcdecoder.cpp imap4.cpp imapinfo.cpp imapparser.cpp mailheader.cpp \ + mimehdrline.cpp mimeio.cpp tdeio_imap4_la_LIBADD = $(LIB_TDEIO) $(SASL2_LIBS) ../../libkmime/libkmime.la \ ../../libemailfunctions/libemailfunctions.la tdeio_imap4_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) @@ -21,6 +21,6 @@ kdelnk_DATA = imap4.protocol imaps.protocol kdelnkdir = $(kde_servicesdir) messages: - $(XGETTEXT) *.cc -o $(podir)/tdeio_imap4.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_imap4.pot include $(top_srcdir)/admin/Doxyfile.am diff --git a/tdeioslave/imap4/imap4.cc b/tdeioslave/imap4/imap4.cpp index 7dea2c5d..449711de 100644 --- a/tdeioslave/imap4/imap4.cc +++ b/tdeioslave/imap4/imap4.cpp @@ -1,6 +1,6 @@ /********************************************************************** * - * imap4.cc - IMAP4rev1 KIOSlave + * imap4.cpp - IMAP4rev1 KIOSlave * Copyright (C) 2001-2002 Michael Haeckel <haeckel@kde.org> * Copyright (C) 1999 John Corey <jcorey@fruity.ath.cx> * @@ -92,7 +92,7 @@ extern "C" { #include <kmimetype.h> #include <kmdcodec.h> -#include "tdepimmacros.h" +#include <kdemacros.h> #define IMAP_PROTOCOL "imap" #define IMAP_SSL_PROTOCOL "imaps" diff --git a/tdeioslave/imap4/imapcommand.cc b/tdeioslave/imap4/imapcommand.cpp index e3e68fa8..97d0a91c 100644 --- a/tdeioslave/imap4/imapcommand.cc +++ b/tdeioslave/imap4/imapcommand.cpp @@ -1,6 +1,6 @@ /********************************************************************** * - * imapcommand.cc - IMAP4rev1 command handler + * imapcommand.cpp - IMAP4rev1 command handler * Copyright (C) 2000 Sven Carstens <s.carstens@gmx.de> * * This program is free software; you can redistribute it and/or modify diff --git a/tdeioslave/imap4/imapinfo.cc b/tdeioslave/imap4/imapinfo.cpp index 3e21ee77..453808e7 100644 --- a/tdeioslave/imap4/imapinfo.cc +++ b/tdeioslave/imap4/imapinfo.cpp @@ -1,6 +1,6 @@ /********************************************************************** * - * imapinfo.cc - IMAP4rev1 SELECT / EXAMINE handler + * imapinfo.cpp - IMAP4rev1 SELECT / EXAMINE handler * Copyright (C) 2000 Sven Carstens <s.carstens@gmx.de> * * This program is free software; you can redistribute it and/or modify diff --git a/tdeioslave/imap4/imaplist.cc b/tdeioslave/imap4/imaplist.cpp index f9113bda..51062c47 100644 --- a/tdeioslave/imap4/imaplist.cc +++ b/tdeioslave/imap4/imaplist.cpp @@ -1,6 +1,6 @@ /********************************************************************** * - * imapinfo.cc - IMAP4rev1 EXAMINE / SELECT handler + * imapinfo.cpp - IMAP4rev1 EXAMINE / SELECT handler * Copyright (C) 2000 Sven Carstens <s.carstens@gmx.de> * * This program is free software; you can redistribute it and/or modify diff --git a/tdeioslave/imap4/imapparser.cc b/tdeioslave/imap4/imapparser.cpp index eb154cc5..d833b639 100644 --- a/tdeioslave/imap4/imapparser.cc +++ b/tdeioslave/imap4/imapparser.cpp @@ -1,6 +1,6 @@ /********************************************************************** * - * imapparser.cc - IMAP4rev1 Parser + * imapparser.cpp - IMAP4rev1 Parser * Copyright (C) 2001-2002 Michael Haeckel <haeckel@kde.org> * Copyright (C) 2000 s.carstens@gmx.de * diff --git a/tdeioslave/imap4/mailaddress.cc b/tdeioslave/imap4/mailaddress.cpp index 38a1a330..8bb5831e 100644 --- a/tdeioslave/imap4/mailaddress.cc +++ b/tdeioslave/imap4/mailaddress.cpp @@ -1,6 +1,6 @@ /********************************************************************** * - * mailaddress.cc - mail address parser + * mailaddress.cpp - mail address parser * Copyright (C) 2000 Sven Carstens <s.carstens@gmx.de> * * This program is free software; you can redistribute it and/or modify diff --git a/tdeioslave/imap4/mailheader.cc b/tdeioslave/imap4/mailheader.cpp index c520b909..28eec1f0 100644 --- a/tdeioslave/imap4/mailheader.cc +++ b/tdeioslave/imap4/mailheader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - mailheader.cc - description + mailheader.cpp - description ------------------- begin : Tue Oct 24 2000 copyright : (C) 2000 by Sven Carstens diff --git a/tdeioslave/imap4/mimehdrline.cc b/tdeioslave/imap4/mimehdrline.cpp index 9646ed26..591d3386 100644 --- a/tdeioslave/imap4/mimehdrline.cc +++ b/tdeioslave/imap4/mimehdrline.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - mimehdrline.cc - description + mimehdrline.cpp - description ------------------- begin : Wed Oct 11 2000 copyright : (C) 2000 by Sven Carstens diff --git a/tdeioslave/imap4/mimeheader.cc b/tdeioslave/imap4/mimeheader.cpp index d0916ba5..d9d2c7d2 100644 --- a/tdeioslave/imap4/mimeheader.cc +++ b/tdeioslave/imap4/mimeheader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - mimeheader.cc - description + mimeheader.cpp - description ------------------- begin : Fri Oct 20 2000 copyright : (C) 2000 by Sven Carstens diff --git a/tdeioslave/imap4/mimeio.cc b/tdeioslave/imap4/mimeio.cpp index 757c11a4..a3315c26 100644 --- a/tdeioslave/imap4/mimeio.cc +++ b/tdeioslave/imap4/mimeio.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - mimeio.cc - description + mimeio.cpp - description ------------------- begin : Wed Oct 25 2000 copyright : (C) 2000 by Sven Carstens diff --git a/tdeioslave/imap4/rfcdecoder.cc b/tdeioslave/imap4/rfcdecoder.cpp index 41a50ec1..36111bf1 100644 --- a/tdeioslave/imap4/rfcdecoder.cc +++ b/tdeioslave/imap4/rfcdecoder.cpp @@ -1,6 +1,6 @@ /********************************************************************** * - * rfcdecoder.cc - handler for various rfc/mime encodings + * rfcdecoder.cpp - handler for various rfc/mime encodings * Copyright (C) 2000 s.carstens@gmx.de * * This program is free software; you can redistribute it and/or modify diff --git a/tdeioslave/mbox/CMakeLists.txt b/tdeioslave/mbox/CMakeLists.txt index 70da626f..27e51538 100644 --- a/tdeioslave/mbox/CMakeLists.txt +++ b/tdeioslave/mbox/CMakeLists.txt @@ -34,7 +34,7 @@ tde_create_translated_desktop( tde_add_kpart( tdeio_mbox SOURCES - mbox.cc mboxfile.cc readmbox.cc stat.cc urlinfo.cc + mbox.cpp mboxfile.cpp readmbox.cpp stat.cpp urlinfo.cpp LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeioslave/mbox/Makefile.am b/tdeioslave/mbox/Makefile.am index 4dea4644..ff09d9f9 100644 --- a/tdeioslave/mbox/Makefile.am +++ b/tdeioslave/mbox/Makefile.am @@ -7,11 +7,11 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = tdeio_mbox.la tdeio_mbox_la_SOURCES = \ - mbox.cc \ - mboxfile.cc \ - readmbox.cc \ - stat.cc \ - urlinfo.cc + mbox.cpp \ + mboxfile.cpp \ + readmbox.cpp \ + stat.cpp \ + urlinfo.cpp tdeio_mbox_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) tdeio_mbox_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) diff --git a/tdeioslave/mbox/mbox.cc b/tdeioslave/mbox/mbox.cpp index 5742baff..8f45dcaf 100644 --- a/tdeioslave/mbox/mbox.cc +++ b/tdeioslave/mbox/mbox.cpp @@ -34,7 +34,7 @@ #include <stdlib.h> -#include "tdepimmacros.h" +#include <kdemacros.h> #include "mbox.h" diff --git a/tdeioslave/mbox/mboxfile.cc b/tdeioslave/mbox/mboxfile.cpp index 7297457e..7297457e 100644 --- a/tdeioslave/mbox/mboxfile.cc +++ b/tdeioslave/mbox/mboxfile.cpp diff --git a/tdeioslave/mbox/readmbox.cc b/tdeioslave/mbox/readmbox.cpp index 942f369e..942f369e 100644 --- a/tdeioslave/mbox/readmbox.cc +++ b/tdeioslave/mbox/readmbox.cpp diff --git a/tdeioslave/mbox/stat.cc b/tdeioslave/mbox/stat.cpp index 99267ca7..99267ca7 100644 --- a/tdeioslave/mbox/stat.cc +++ b/tdeioslave/mbox/stat.cpp diff --git a/tdeioslave/mbox/urlinfo.cc b/tdeioslave/mbox/urlinfo.cpp index 4b359e40..4b359e40 100644 --- a/tdeioslave/mbox/urlinfo.cc +++ b/tdeioslave/mbox/urlinfo.cpp diff --git a/tdeioslave/opengroupware/opengroupware.cpp b/tdeioslave/opengroupware/opengroupware.cpp index 304ff225..882b4c6b 100644 --- a/tdeioslave/opengroupware/opengroupware.cpp +++ b/tdeioslave/opengroupware/opengroupware.cpp @@ -45,7 +45,7 @@ #include <unistd.h> #include <stdlib.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { diff --git a/tdeioslave/sieve/sieve.cpp b/tdeioslave/sieve/sieve.cpp index b3633640..0925b515 100644 --- a/tdeioslave/sieve/sieve.cpp +++ b/tdeioslave/sieve/sieve.cpp @@ -49,7 +49,7 @@ using std::exit; #include <sys/stat.h> #include <cassert> -#include <tdepimmacros.h> +#include <kdemacros.h> static const int debugArea = 7122; diff --git a/tderesources/birthdays/resourcetdeabc.h b/tderesources/birthdays/resourcetdeabc.h index 5ba80ca1..35271c1d 100644 --- a/tderesources/birthdays/resourcetdeabc.h +++ b/tderesources/birthdays/resourcetdeabc.h @@ -33,7 +33,7 @@ #include "libkcal/resourcecalendar.h" -#include "libtdepim/tdepimmacros.h" +#include <kdemacros.h> namespace TDEIO { class FileCopyJob; diff --git a/tderesources/blogging/kcal_resourceblogging.h b/tderesources/blogging/kcal_resourceblogging.h index 4e850d14..56d3cad2 100644 --- a/tderesources/blogging/kcal_resourceblogging.h +++ b/tderesources/blogging/kcal_resourceblogging.h @@ -22,7 +22,7 @@ #define KCAL_RESOURCEBLOGGING_H #include <kcal_resourcegroupwarebase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KBlog { class APIBlog; diff --git a/tderesources/blogging/kcal_resourcebloggingconfig.h b/tderesources/blogging/kcal_resourcebloggingconfig.h index b7584167..d2062d76 100644 --- a/tderesources/blogging/kcal_resourcebloggingconfig.h +++ b/tderesources/blogging/kcal_resourcebloggingconfig.h @@ -20,7 +20,7 @@ #ifndef KCAL_RESOURCEBLOGGINGCONFIG_H #define KCAL_RESOURCEBLOGGINGCONFIG_H -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kcal_resourcegroupwarebaseconfig.h> namespace KCal { diff --git a/tderesources/blogging/resourcebloggingsettings.ui b/tderesources/blogging/resourcebloggingsettings.ui index 7d7e0227..ce5b7a25 100644 --- a/tderesources/blogging/resourcebloggingsettings.ui +++ b/tderesources/blogging/resourcebloggingsettings.ui @@ -314,17 +314,10 @@ <tabstop>mCloseCategory</tabstop> </tabstops> <layoutdefaults spacing="5" margin="5"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.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">kurlrequester.h</include> +</includes> </UI> diff --git a/tderesources/blogging/xmlrpcjob.h b/tderesources/blogging/xmlrpcjob.h index d5838448..c03346a6 100644 --- a/tderesources/blogging/xmlrpcjob.h +++ b/tderesources/blogging/xmlrpcjob.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com> Based on the davjob: diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h index 2d0c3ec0..96f88a45 100644 --- a/tderesources/caldav/resource.h +++ b/tderesources/caldav/resource.h @@ -26,7 +26,7 @@ #include <tdeabc/locknull.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeconfig.h> namespace KCal { diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h index caec0d07..a24b12a7 100644 --- a/tderesources/carddav/resource.h +++ b/tderesources/carddav/resource.h @@ -25,7 +25,7 @@ #include <tdeabc/locknull.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeconfig.h> namespace TDEABC { diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h index 27199581..6b7f829b 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.h +++ b/tderesources/egroupware/kcal_resourcexmlrpc.h @@ -29,7 +29,7 @@ #include <tdeconfig.h> #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "libkcal/calendarlocal.h" #include "libkcal/incidence.h" diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h index 2790717f..b99bca73 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KIntSpinBox; class KLineEdit; diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h index 3550aed4..f99281e9 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.h +++ b/tderesources/egroupware/knotes_resourcexmlrpc.h @@ -27,7 +27,7 @@ #include <tdeconfig.h> #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "libkcal/calendarlocal.h" #include "libkcal/journal.h" diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h index e087dbe2..e6b05bee 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KIntSpinBox; class KLineEdit; diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h index 719c35c0..bed5cf21 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.h +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h @@ -22,7 +22,7 @@ #define TDEABC_RESOURCEXMLRPC_H #include <tqmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "libtdepim/tdeabcresourcecached.h" diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h index f4893c84..57773483 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class KURLRequester; diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h index 2d492897..c86d18bc 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.h +++ b/tderesources/featureplan/kcal_resourcefeatureplan.h @@ -29,7 +29,7 @@ #include <tdeabc/locknull.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeconfig.h> namespace KCal { diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h index aa00123f..917ce52e 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h +++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h @@ -23,7 +23,7 @@ #define RESOURCEFEATUREPLANCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class KURLRequester; diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h index 36b0456c..7aa82f71 100644 --- a/tderesources/groupdav/tdeabc_resourcegroupdav.h +++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h @@ -23,7 +23,7 @@ #define TDEABC_RESOURCEGROUPDAV_H #include "tdeabc_resourcegroupwarebase.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h index c4b330df..5743a282 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.h +++ b/tderesources/groupwise/kcal_resourcegroupwise.h @@ -30,7 +30,7 @@ #include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class ngwt__Settings; diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h index cea6ad69..87447e0a 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h @@ -21,7 +21,7 @@ #define KCALRESOURCEGROUPWISECONFIG_H #include <kurlrequester.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp index 6bf74da5..2f085cf2 100644 --- a/tderesources/groupwise/soap/ksslsocket.cpp +++ b/tderesources/groupwise/soap/ksslsocket.cpp @@ -161,7 +161,7 @@ TQString KSSLSocket::metaData( const TQString &key ) } /* -I basically copied the below from tcpTDEIO::SlaveBase.hpp, with some modificaions and formatting. +I basically copied the below from tcpTDEIO::SlaveBase.h, with some modificaions and formatting. * Copyright (C) 2000 Alex Zepeda <zipzippy@sonic.net * Copyright (C) 2001-2003 George Staikos <staikos@kde.org> diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h index fb1d075a..b57c36e8 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h @@ -23,7 +23,7 @@ #include "soap/groupwiseserver.h" #include <tdeabcresourcecached.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libtdepim/progressmanager.h> diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h index df62753a..233743f8 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h @@ -23,7 +23,7 @@ #include "soap/groupwiseserver.h" #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqmap.h> diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index 56021e68..c51fa4e4 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -44,7 +44,7 @@ #include <unistd.h> #include <stdlib.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "groupwise.h" diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h index 357c9804..8a4da37c 100644 --- a/tderesources/kolab/kcal/resourcekolab.h +++ b/tderesources/kolab/kcal/resourcekolab.h @@ -37,7 +37,7 @@ #include <tqtimer.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecalendar.h> diff --git a/tderesources/kolab/knotes/resourcekolab.h b/tderesources/kolab/knotes/resourcekolab.h index fb0d191b..5f205b16 100644 --- a/tderesources/kolab/knotes/resourcekolab.h +++ b/tderesources/kolab/knotes/resourcekolab.h @@ -39,7 +39,7 @@ #include <libkcal/calendarlocal.h> #include "../shared/resourcekolabbase.h" #include "../shared/subresource.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kolab { diff --git a/tderesources/kolab/tdeabc/contact.cpp b/tderesources/kolab/tdeabc/contact.cpp index 21583eb3..7d594735 100644 --- a/tderesources/kolab/tdeabc/contact.cpp +++ b/tderesources/kolab/tdeabc/contact.cpp @@ -33,6 +33,7 @@ #include "contact.h" #include "resourcekolab.h" +#include <tdeversion.h> #include <tdeabc/addressee.h> #include <tdeabc/stdaddressbook.h> #include <libkcal/freebusyurlstore.h> diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h index a19dfbaa..9b4b4a17 100644 --- a/tderesources/kolab/tdeabc/resourcekolab.h +++ b/tderesources/kolab/tdeabc/resourcekolab.h @@ -38,7 +38,7 @@ #include "../shared/resourcekolabbase.h" #include "../shared/subresource.h" #include <kmail/kmailicalIface.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h index a1a43f0e..5a754bc6 100644 --- a/tderesources/lib/addressbookadaptor.h +++ b/tderesources/lib/addressbookadaptor.h @@ -26,7 +26,7 @@ #include "groupwaredataadaptor.h" #include <tdeabc/addressee.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kurl.h> namespace TDEABC { diff --git a/tderesources/lib/calendaradaptor.h b/tderesources/lib/calendaradaptor.h index 354a2795..7a2567e3 100644 --- a/tderesources/lib/calendaradaptor.h +++ b/tderesources/lib/calendaradaptor.h @@ -27,7 +27,7 @@ #include <libkcal/incidence.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kurl.h> namespace KPIM { diff --git a/tderesources/lib/davaddressbookadaptor.h b/tderesources/lib/davaddressbookadaptor.h index 883d1510..fcb16afa 100644 --- a/tderesources/lib/davaddressbookadaptor.h +++ b/tderesources/lib/davaddressbookadaptor.h @@ -24,7 +24,7 @@ #include "addressbookadaptor.h" #include "folderlister.h" #include <tqdom.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { diff --git a/tderesources/lib/davcalendaradaptor.h b/tderesources/lib/davcalendaradaptor.h index 998a9cc7..ab1c9757 100644 --- a/tderesources/lib/davcalendaradaptor.h +++ b/tderesources/lib/davcalendaradaptor.h @@ -24,7 +24,7 @@ #include "calendaradaptor.h" #include "folderlister.h" #include <tqdom.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { diff --git a/tderesources/lib/folderconfig.h b/tderesources/lib/folderconfig.h index a9b4c714..e027095d 100644 --- a/tderesources/lib/folderconfig.h +++ b/tderesources/lib/folderconfig.h @@ -24,7 +24,7 @@ #define KPIM_FOLDERCONFIG_H #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqwidget.h> // class TDEListView; diff --git a/tderesources/lib/folderlister.h b/tderesources/lib/folderlister.h index a1d3f2eb..ac99d516 100644 --- a/tderesources/lib/folderlister.h +++ b/tderesources/lib/folderlister.h @@ -26,7 +26,7 @@ // #include "tderesources_groupwareprefs.h" /*#include "groupwareresourcejob.h"*/ #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqvaluelist.h> #include <tqstring.h> diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp index 4659bd46..c9e03daa 100644 --- a/tderesources/lib/folderlistview.cpp +++ b/tderesources/lib/folderlistview.cpp @@ -293,4 +293,3 @@ void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, i //END #include "folderlistview.moc" -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/tderesources/lib/folderlistview.h b/tderesources/lib/folderlistview.h index ce6243df..08cadce6 100644 --- a/tderesources/lib/folderlistview.h +++ b/tderesources/lib/folderlistview.h @@ -126,5 +126,3 @@ class FolderListItem : public TQCheckListItem #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/tderesources/lib/groupwaredataadaptor.h b/tderesources/lib/groupwaredataadaptor.h index b7bd6e33..0370aa6f 100644 --- a/tderesources/lib/groupwaredataadaptor.h +++ b/tderesources/lib/groupwaredataadaptor.h @@ -29,7 +29,7 @@ #include <tqstring.h> #include <libkcal/listbase.h> #include <tqobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEIO { diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h index 51263e26..18586455 100644 --- a/tderesources/lib/kcal_cachesettingsdlg.h +++ b/tderesources/lib/kcal_cachesettingsdlg.h @@ -23,7 +23,7 @@ #define KCAL_CACHESETTINGSDLG_H #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KRES { diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h index 80a1d460..f7f80435 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.h +++ b/tderesources/lib/kcal_resourcegroupwarebase.h @@ -25,7 +25,7 @@ #include <kurl.h> #include <libkcal/resourcecached.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeabc/locknull.h> namespace TDEIO { diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h index 7639b562..940ba61b 100644 --- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h @@ -23,7 +23,7 @@ #define KCAL_RESOURCEGROUPWAREBASECONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KPushButton; class KLineEdit; diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h index 7835d3d2..9d122fe4 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebase.h +++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h @@ -24,7 +24,7 @@ #include <kurl.h> #include <tdeabcresourcecached.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEConfig; diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h index 7b832623..37e98ef4 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h @@ -23,7 +23,7 @@ #define TDEABC_RESOURCEGROUPWAREBASECONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class KURLRequester; diff --git a/tderesources/lib/webdavhandler.h b/tderesources/lib/webdavhandler.h index 0bfb33e9..a2de509d 100644 --- a/tderesources/lib/webdavhandler.h +++ b/tderesources/lib/webdavhandler.h @@ -27,7 +27,7 @@ #include <tqdom.h> #include <tqdatetime.h> #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KDE_EXPORT WebdavHandler { diff --git a/tderesources/newexchange/exchangeconvertercontact.cpp b/tderesources/newexchange/exchangeconvertercontact.cpp index 5551516e..c6f3599f 100644 --- a/tderesources/newexchange/exchangeconvertercontact.cpp +++ b/tderesources/newexchange/exchangeconvertercontact.cpp @@ -21,6 +21,7 @@ #include "exchangeconvertercontact.h" #include <libkcal/freebusyurlstore.h> #include <webdavhandler.h> +#include <tdeversion.h> #include <kdebug.h> diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h index 84e213ae..ec7be921 100644 --- a/tderesources/remote/resourceremote.h +++ b/tderesources/remote/resourceremote.h @@ -28,7 +28,7 @@ #include <kurl.h> #include <tdeconfig.h> #include <kdirwatch.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libtdepim/progressmanager.h> diff --git a/tderesources/remote/resourceremoteconfig.h b/tderesources/remote/resourceremoteconfig.h index a05171ee..fdf26203 100644 --- a/tderesources/remote/resourceremoteconfig.h +++ b/tderesources/remote/resourceremoteconfig.h @@ -30,7 +30,7 @@ #include <tderesources/resource.h> #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { diff --git a/tderesources/scalix/kcal/resourcescalix.h b/tderesources/scalix/kcal/resourcescalix.h index b58eee85..d4e564c0 100644 --- a/tderesources/scalix/kcal/resourcescalix.h +++ b/tderesources/scalix/kcal/resourcescalix.h @@ -36,7 +36,7 @@ #include <tqtimer.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecalendar.h> diff --git a/tderesources/scalix/knotes/resourcescalix.h b/tderesources/scalix/knotes/resourcescalix.h index 6a3676c1..ab40b707 100644 --- a/tderesources/scalix/knotes/resourcescalix.h +++ b/tderesources/scalix/knotes/resourcescalix.h @@ -38,7 +38,7 @@ #include <libkcal/calendarlocal.h> #include "../shared/resourcescalixbase.h" #include "../shared/subresource.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Scalix { diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h index f9d4c309..f5c8ffe6 100644 --- a/tderesources/scalix/tdeabc/resourcescalix.h +++ b/tderesources/scalix/tdeabc/resourcescalix.h @@ -39,7 +39,7 @@ #include "../shared/resourcescalixbase.h" #include "../shared/subresource.h" #include <kmail/kmailicalIface.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index 5ce8dca1..0af6c466 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -28,7 +28,7 @@ #include <tdeio/global.h> #include <tdelocale.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <stdlib.h> diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h index 39a2757e..cfad65ed 100644 --- a/tderesources/slox/kcalresourceslox.h +++ b/tderesources/slox/kcalresourceslox.h @@ -31,7 +31,7 @@ #include <kurl.h> #include <tdeconfig.h> #include <kdirwatch.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/incidence.h> #include <libkcal/todo.h> diff --git a/tderesources/slox/kcalresourcesloxconfig.h b/tderesources/slox/kcalresourcesloxconfig.h index e2a666c0..f5784f84 100644 --- a/tderesources/slox/kcalresourcesloxconfig.h +++ b/tderesources/slox/kcalresourcesloxconfig.h @@ -21,7 +21,7 @@ #define KCALRESOURCESLOXCONFIG_H #include <kurlrequester.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h index 2e9d1289..1af80586 100644 --- a/tderesources/slox/sloxaccounts.h +++ b/tderesources/slox/sloxaccounts.h @@ -21,7 +21,7 @@ #define SLOXACCOUNTS_H #include <tdeabc/addressee.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqobject.h> namespace TDEIO { diff --git a/tderesources/slox/sloxbase.h b/tderesources/slox/sloxbase.h index 8e9309c9..dc3c9c53 100644 --- a/tderesources/slox/sloxbase.h +++ b/tderesources/slox/sloxbase.h @@ -21,7 +21,7 @@ #define SLOXUTILS_H #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KRES { class Resource; diff --git a/tderesources/slox/sloxfolder.h b/tderesources/slox/sloxfolder.h index 6f6a6c93..06f08003 100644 --- a/tderesources/slox/sloxfolder.h +++ b/tderesources/slox/sloxfolder.h @@ -21,7 +21,7 @@ #define SLOXFOLDER_H #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEListViewItem; diff --git a/tderesources/slox/sloxfoldermanager.h b/tderesources/slox/sloxfoldermanager.h index f31c212c..3907dab7 100644 --- a/tderesources/slox/sloxfoldermanager.h +++ b/tderesources/slox/sloxfoldermanager.h @@ -25,7 +25,7 @@ #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEIO { class Job; diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp index 248e3f39..79036abd 100644 --- a/tderesources/slox/tdeabcresourceslox.cpp +++ b/tderesources/slox/tdeabcresourceslox.cpp @@ -21,6 +21,7 @@ #include <tqapplication.h> +#include <tdeversion.h> #include <tdeabc/picture.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h index 35a71be2..a37f17d6 100644 --- a/tderesources/slox/tdeabcresourceslox.h +++ b/tderesources/slox/tdeabcresourceslox.h @@ -24,7 +24,7 @@ #include "webdavhandler.h" #include <libtdepim/tdeabcresourcecached.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeabc/addressee.h> #include <tqmap.h> diff --git a/tderesources/slox/tdeabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h index 6bbaf6ae..36e02126 100644 --- a/tderesources/slox/tdeabcresourcesloxconfig.h +++ b/tderesources/slox/tdeabcresourcesloxconfig.h @@ -21,7 +21,7 @@ #define RESOURCESLOXCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQCheckBox; class KLineEdit; diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h index c7c93222..6d98fd52 100644 --- a/tderesources/slox/webdavhandler.h +++ b/tderesources/slox/webdavhandler.h @@ -25,7 +25,7 @@ #include <tqdatetime.h> #include <tqdom.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeabc/addressee.h> namespace KCal { diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h index 1be0aa0e..636389be 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime.h +++ b/tderesources/tvanytime/kcal_resourcetvanytime.h @@ -30,7 +30,7 @@ #include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "service.h" diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h index c99e86e0..814cc492 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h +++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h @@ -21,7 +21,7 @@ #define KCALRESOURCETVANYTIMECONFIG_H #include <kurlrequester.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> diff --git a/tderesources/tvanytime/tvanytime.tdevelop b/tderesources/tvanytime/tvanytime.tdevelop index 4359032f..479d2f50 100644 --- a/tderesources/tvanytime/tvanytime.tdevelop +++ b/tderesources/tvanytime/tvanytime.tdevelop @@ -67,7 +67,7 @@ </kdevautoproject> <kdevfileview> <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> + <group pattern="*.cpp;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> <group pattern="*.png" name="Icons" /> <group pattern="*.po;*.ts" name="Translations" /> diff --git a/translations/desktop_files/KOrn.desktop/cs.po b/translations/desktop_files/KOrn.desktop/cs.po index e59222dd..5c591ef3 100644 --- a/translations/desktop_files/KOrn.desktop/cs.po +++ b/translations/desktop_files/KOrn.desktop/cs.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:25+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-09-20 18:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/korn-korndesktop/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.2.2\n" #. Name #: KOrn.desktop:2 msgid "Korn" -msgstr "" +msgstr "Korn" #. GenericName #: KOrn.desktop:4 diff --git a/translations/desktop_files/KOrn.desktop/it.po b/translations/desktop_files/KOrn.desktop/it.po index 6a82db61..4dd42641 100644 --- a/translations/desktop_files/KOrn.desktop/it.po +++ b/translations/desktop_files/KOrn.desktop/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:25+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-22 12:59+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/korn-korndesktop/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Name #: KOrn.desktop:2 msgid "Korn" -msgstr "" +msgstr "Korn" #. GenericName #: KOrn.desktop:4 diff --git a/translations/desktop_files/KOrn.desktop/uk.po b/translations/desktop_files/KOrn.desktop/uk.po index 6fa678cb..b3296bcb 100644 --- a/translations/desktop_files/KOrn.desktop/uk.po +++ b/translations/desktop_files/KOrn.desktop/uk.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:25+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-22 07:31+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/korn-korndesktop/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: KOrn.desktop:2 msgid "Korn" -msgstr "" +msgstr "Korn" #. GenericName #: KOrn.desktop:4 diff --git a/translations/desktop_files/akregator-desktops/akregator-desktops.pot b/translations/desktop_files/akregator-desktops/akregator-desktops.pot index 92a37715..856c34cf 100644 --- a/translations/desktop_files/akregator-desktops/akregator-desktops.pot +++ b/translations/desktop_files/akregator-desktops/akregator-desktops.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-09 04:13+0200\n" +"POT-Creation-Date: 2021-07-07 22:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -37,8 +37,7 @@ msgid "aKregatorPart" msgstr "" #. Comment -#: akregator_plugin.desktop:2 -#: mk4storage/akregator_mk4storage_plugin.desktop:4 +#: akregator_plugin.desktop:2 mk4storage/akregator_mk4storage_plugin.desktop:4 msgid "Plugin for Akregator" msgstr "" diff --git a/translations/desktop_files/akregator-desktops/cs.po b/translations/desktop_files/akregator-desktops/cs.po index 1fccb0a0..9cdac99f 100644 --- a/translations/desktop_files/akregator-desktops/cs.po +++ b/translations/desktop_files/akregator-desktops/cs.po @@ -1,31 +1,31 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 04:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-09-20 18:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/akregator-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.2.2\n" #. Name #: akregator.desktop:2 -#, fuzzy msgid "Akregator" -msgstr "Komponenta aKregator" +msgstr "Akregator" #. GenericName #: akregator.desktop:4 msgid "RSS Feed Reader" -msgstr "Čtení RSS kanálů" +msgstr "Čtečka RSS kanálů" #. Comment #: akregator.desktop:6 @@ -45,4 +45,4 @@ msgstr "Modul pro Akregator" #. Name #: mk4storage/akregator_mk4storage_plugin.desktop:2 msgid "Metakit storage backend" -msgstr "Metakit úložiště" +msgstr "Backend úložiště Metakit" diff --git a/translations/desktop_files/akregator-desktops/it.po b/translations/desktop_files/akregator-desktops/it.po index accbe163..1b553324 100644 --- a/translations/desktop_files/akregator-desktops/it.po +++ b/translations/desktop_files/akregator-desktops/it.po @@ -1,24 +1,24 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 04:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-25 19:48+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/akregator-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Name #: akregator.desktop:2 -#, fuzzy msgid "Akregator" msgstr "Plugin per Akregator" @@ -35,7 +35,7 @@ msgstr "Un concentratore TDE per RSS" #. Name #: akregator_part.desktop:2 msgid "aKregatorPart" -msgstr "" +msgstr "aKregatorPart" #. Comment #: akregator_plugin.desktop:2 mk4storage/akregator_mk4storage_plugin.desktop:4 diff --git a/translations/desktop_files/akregator-desktops/pl.po b/translations/desktop_files/akregator-desktops/pl.po index 22d070f2..bdb87501 100644 --- a/translations/desktop_files/akregator-desktops/pl.po +++ b/translations/desktop_files/akregator-desktops/pl.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Jan Stolarek <jwstolarek@gmail.com>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 04:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-12 23:04+0000\n" +"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n" +"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/akregator-desktop-files/pl/>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: akregator.desktop:2 -#, fuzzy msgid "Akregator" -msgstr "Wtyczka dla Akregatora" +msgstr "Akregatora" #. GenericName #: akregator.desktop:4 diff --git a/translations/desktop_files/akregator-desktops/uk.po b/translations/desktop_files/akregator-desktops/uk.po index f064bbf5..6dde3e42 100644 --- a/translations/desktop_files/akregator-desktops/uk.po +++ b/translations/desktop_files/akregator-desktops/uk.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 04:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-19 19:59+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/akregator-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: akregator.desktop:2 -#, fuzzy msgid "Akregator" -msgstr "Втулок для Akregator" +msgstr "Akregator" #. GenericName #: akregator.desktop:4 @@ -35,7 +36,7 @@ msgstr "Агрегатор RSS для TDE" #. Name #: akregator_part.desktop:2 msgid "aKregatorPart" -msgstr "" +msgstr "aKregatorPart" #. Comment #: akregator_plugin.desktop:2 mk4storage/akregator_mk4storage_plugin.desktop:4 diff --git a/translations/desktop_files/akregator-eventsrc/cs.po b/translations/desktop_files/akregator-eventsrc/cs.po index bdabb61c..ab19de97 100644 --- a/translations/desktop_files/akregator-eventsrc/cs.po +++ b/translations/desktop_files/akregator-eventsrc/cs.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 04:08+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-09-20 18:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/akregator-events/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.2.2\n" #. Comment #: eventsrc:3 msgid "Akregator" -msgstr "" +msgstr "Akregator" #. Name #: eventsrc:6 @@ -29,7 +30,7 @@ msgstr "Přidán kanál" #. Comment #: eventsrc:7 msgid "A new feed was remotely added to Akregator" -msgstr "Byl přidán nový kanál do Akregatoru" +msgstr "Do Akregatoru byl vzdáleně přidán nový kanál" #. Name #: eventsrc:11 diff --git a/translations/desktop_files/akregator-eventsrc/it.po b/translations/desktop_files/akregator-eventsrc/it.po index 78a8d1f0..d516a184 100644 --- a/translations/desktop_files/akregator-eventsrc/it.po +++ b/translations/desktop_files/akregator-eventsrc/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 04:08+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-25 19:48+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/akregator-events/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Comment #: eventsrc:3 msgid "Akregator" -msgstr "" +msgstr "Akregator" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/akregator-eventsrc/uk.po b/translations/desktop_files/akregator-eventsrc/uk.po index bb2de2da..f3a69145 100644 --- a/translations/desktop_files/akregator-eventsrc/uk.po +++ b/translations/desktop_files/akregator-eventsrc/uk.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 04:08+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-19 19:59+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/akregator-events/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Comment #: eventsrc:3 msgid "Akregator" -msgstr "" +msgstr "Akregator" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/certmanager-desktops/cs.po b/translations/desktop_files/certmanager-desktops/cs.po index 3e2c78bf..885a4e08 100644 --- a/translations/desktop_files/certmanager-desktops/cs.po +++ b/translations/desktop_files/certmanager-desktops/cs.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:10+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/kleopatra-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Name #: conf/kleopatra_config_appear.desktop:15 @@ -79,7 +80,7 @@ msgstr "Nevalidovaný klíč" #. Name #: lib/libkleopatrarc.desktop:10 msgid "Expired Key" -msgstr "Klíš s prošlou platností" +msgstr "Klíč s prošlou platností" #. Name #: lib/libkleopatrarc.desktop:15 diff --git a/translations/desktop_files/kaddressbook-desktops/cs.po b/translations/desktop_files/kaddressbook-desktops/cs.po index c39a4806..ceea72fb 100644 --- a/translations/desktop_files/kaddressbook-desktops/cs.po +++ b/translations/desktop_files/kaddressbook-desktops/cs.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-09 19:32+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:17+0000\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/kaddressbook-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Name #: csv-templates/kaddressbook.desktop:9 @@ -24,7 +25,7 @@ msgstr "Kniha adres (KDE 3.1)" #. Name #: csv-templates/outlook2000.desktop:8 msgid "Outlook 2000" -msgstr "" +msgstr "Outlook 2000" #. Name #: csv-templates/yahoo.desktop:9 @@ -34,7 +35,7 @@ msgstr "Kniha adres Yahoo!" #. Comment #: dcopaddressbook.desktop:5 msgid "Address Book with a DCOP interface" -msgstr "Kniha adres s DCOP rozhraním" +msgstr "Kniha adres s DCOP rozhraním" #. Name #: editors/cryptosettings.desktop:7 @@ -54,91 +55,89 @@ msgstr "Editor adres komunikátorů" #. Name #: editors/kaddressbookimprotocol.desktop:6 msgid "KAddressbook Instant Messaging Protocol" -msgstr "KAddressbook instant messaging protokol" +msgstr "Protokol komunikátorů Knihy adres" #. Name #: editors/protocols/aimprotocol.desktop:7 msgid "AIM" -msgstr "" +msgstr "AIM" #. Comment #: editors/protocols/aimprotocol.desktop:9 msgid "AIM Protocol" -msgstr "AIM protokol" +msgstr "Protokol AIM" #. Name #: editors/protocols/gaduprotocol.desktop:7 -#, fuzzy msgid "Gadu-Gadu" -msgstr "Gadu-Gadu protokol" +msgstr "Gadu-Gadu" #. Comment #: editors/protocols/gaduprotocol.desktop:9 msgid "Gadu-Gadu Protocol" -msgstr "Gadu-Gadu protokol" +msgstr "Protokol Gadu-Gadu" #. Name #: editors/protocols/groupwiseprotocol.desktop:7 msgid "GroupWise" -msgstr "" +msgstr "GroupWise" #. Comment #: editors/protocols/groupwiseprotocol.desktop:9 msgid "Novell GroupWise Messenger" -msgstr "Novell GroupWise komunikátor" +msgstr "Komunikátor Novell GroupWise" #. Name #: editors/protocols/icqprotocol.desktop:7 msgid "ICQ" -msgstr "" +msgstr "ICQ" #. Comment #: editors/protocols/icqprotocol.desktop:9 msgid "ICQ Protocol" -msgstr "ICQ protokol" +msgstr "Protokol ICQ" #. Name #: editors/protocols/ircprotocol.desktop:7 msgid "IRC" -msgstr "" +msgstr "IRC" #. Comment #: editors/protocols/ircprotocol.desktop:9 msgid "Internet Relay Chat" -msgstr "" +msgstr "Protokol Internet Relay Chat" #. Name #: editors/protocols/jabberprotocol.desktop:7 msgid "Jabber" -msgstr "" +msgstr "Jabber" #. Comment #: editors/protocols/jabberprotocol.desktop:9 msgid "Jabber Protocol" -msgstr "Jabber protokol" +msgstr "Protokol Jabber" #. Name #: editors/protocols/meanwhileprotocol.desktop:7 -#, fuzzy msgid "Meanwhile" -msgstr "Meanwhile protokol" +msgstr "Meanwhile" #. Comment #: editors/protocols/meanwhileprotocol.desktop:9 msgid "Meanwhile Protocol" -msgstr "Meanwhile protokol" +msgstr "Protokol Meanwhile" #. Name #. Comment #: editors/protocols/msnprotocol.desktop:7 #: editors/protocols/msnprotocol.desktop:9 msgid "MSN Messenger" -msgstr "" +msgstr "Komunikátor MSN" #. Name #: editors/protocols/skypeprotocol.desktop:7 msgid "Skype" -msgstr "" +msgstr "Skype" #. Comment #: editors/protocols/skypeprotocol.desktop:9 @@ -148,22 +147,22 @@ msgstr "Internetová telefonie Skype" #. Name #: editors/protocols/smsprotocol.desktop:7 msgid "SMS" -msgstr "" +msgstr "SMS" #. Comment #: editors/protocols/smsprotocol.desktop:9 msgid "SMS Protocol" -msgstr "SMS protokol" +msgstr "Protokol SMS" #. Name #: editors/protocols/yahooprotocol.desktop:7 msgid "Yahoo" -msgstr "" +msgstr "Yahoo" #. Comment #: editors/protocols/yahooprotocol.desktop:9 msgid "Yahoo Protocol" -msgstr "Yahoo protokol" +msgstr "Protokol Yahoo" #. Name #: features/distributionlist.desktop:7 @@ -177,14 +176,13 @@ msgstr "Modul pro správu distribučních seznamů" #. Name #: features/distributionlistng.desktop:7 -#, fuzzy msgid "KAB Distribution List Next Generation Plugin" -msgstr "Modul distribučního seznamu" +msgstr "Modul distribučního seznamu nové generace" #. Name #: features/resourceselection.desktop:7 msgid "Address Book Management Plugin" -msgstr "Modul pro správu knih adres" +msgstr "Modul pro správu knihy adres" #. Comment #: features/resourceselection.desktop:9 @@ -194,12 +192,12 @@ msgstr "Modul pro správu knih adres" #. Comment #: interfaces/kaddressbook_contacteditorwidget.desktop:5 msgid "KAddressBook Contact Editor Widget Plugin" -msgstr "Modul widgetu editoru kontaktů KAddressBook" +msgstr "Modul editoru kontaktů knihy adres" #. Comment #: interfaces/kaddressbook_extension.desktop:5 msgid "KAddressBook Extension Plugin" -msgstr "Rozšiřující modul pro Knihu adres" +msgstr "Rozšiřující modul pro knihu adres" #. Comment #: interfaces/kaddressbook_xxport.desktop:5 @@ -208,9 +206,8 @@ msgstr "Modul knihy adres pro import/export" #. Name #: kaddressbook.desktop:2 -#, fuzzy msgid "KAddressBook" -msgstr "Kniha adres Yahoo!" +msgstr "Kniha adres" #. GenericName #: kaddressbook.desktop:4 @@ -220,7 +217,7 @@ msgstr "Správce adres" #. Comment #: kaddressbook_view.desktop:5 msgid "KAddressBook View Plugin" -msgstr "Modul knihu adres pro zobrazování" +msgstr "Modul knihy adres pro pohledy" #. Name #: kcmconfigs/kabconfig.desktop:15 @@ -255,12 +252,12 @@ msgstr "kniha adres;nastavení;vlastní pole;" #. Name #: kcmconfigs/kabldapconfig.desktop:14 msgid "LDAP Lookup" -msgstr "LDAP vyhledávání" +msgstr "Hledání v LDAP" #. Comment #: kcmconfigs/kabldapconfig.desktop:16 msgid "Configure the Address Book LDAP Settings" -msgstr "Nastavit LDAP pro Knihu adres" +msgstr "Nastavit LDAP pro knihu adres" #. Keywords #: kcmconfigs/kabldapconfig.desktop:18 @@ -270,17 +267,17 @@ msgstr "kniha adres;nastavení;LDAP;" #. Name #: thumbnailcreator/ldifvcardthumbnail.desktop:8 msgid "Electronic Business Card Files" -msgstr "Soubory s elektronickými vizitkami" +msgstr "Soubory s elektronickými vizitkami" #. Name #: views/cardview.desktop:7 msgid "Card View" -msgstr "Pohled s kartičkami" +msgstr "Pohled s kartičkami" #. Name #: views/iconview.desktop:7 msgid "Icon View" -msgstr "Pohled s ikonami" +msgstr "Pohled s ikonami" #. Name #: views/tableview.desktop:7 @@ -290,7 +287,7 @@ msgstr "Tabulkový pohled" #. Name #: xxport/bookmark_xxport.desktop:7 msgid "KAB Bookmark XXPort Plugin" -msgstr "Exportní modul záložek" +msgstr "Modul pro přenos záložek" #. Comment #: xxport/bookmark_xxport.desktop:9 @@ -300,7 +297,7 @@ msgstr "Modul pro exportování webových adres kontaktů jako záložky" #. Name #: xxport/csv_xxport.desktop:7 msgid "KAB CSV XXPort Plugin" -msgstr "Exportní modul CSV" +msgstr "Modul pro přenos CSV" #. Comment #: xxport/csv_xxport.desktop:9 @@ -310,7 +307,7 @@ msgstr "Modul pro import a export kontaktů ve formátu CSV" #. Name #: xxport/eudora_xxport.desktop:7 msgid "KAB Eudora XXPort Plugin" -msgstr "Exportní modul do Eudory" +msgstr "Modul pro přenos Eudory" #. Comment #: xxport/eudora_xxport.desktop:9 @@ -320,27 +317,27 @@ msgstr "Modul pro import a export kontaktů programu Eudora" #. Name #: xxport/gnokii_xxport.desktop:7 msgid "KAB Mobile Phone XXPort Plugin" -msgstr "Exportní modul do mobilního telefonu" +msgstr "Modul pro přenos s mobilním telefonem" #. Comment #: xxport/gnokii_xxport.desktop:9 msgid "Mobile Phone Plugin to Import and Export Addressbook Entries" -msgstr "Modul mobilního telefonu pro import a export záznamů Knihy adres" +msgstr "Modul mobilního telefonu pro import a export záznamů knihy adres" #. Name #: xxport/kde2_xxport.desktop:7 msgid "KAB KDE2 XXPort Plugin" -msgstr "Exportní modul KDE2" +msgstr "Modul pro přenos KDE 2" #. Comment #: xxport/kde2_xxport.desktop:9 msgid "Plugin to import the old KDE 2 address book" -msgstr "Modul pro import staré KDE 2 knihy adres" +msgstr "Modul pro import staré KDE 2 knihy adres" #. Name #: xxport/ldif_xxport.desktop:7 msgid "KAB LDIF XXPort Plugin" -msgstr "Exportní modul LDIF" +msgstr "Modul pro přenos LDIF" #. Comment #: xxport/ldif_xxport.desktop:9 @@ -351,7 +348,7 @@ msgstr "Modul pro import a export kontaktů ve formátu Netscape a Mozilla LDIF" #. Name #: xxport/opera_xxport.desktop:7 msgid "KAB Opera XXPort Plugin" -msgstr "Exportní modul do Opery" +msgstr "Modul pro přenos Opery" #. Comment #: xxport/opera_xxport.desktop:9 @@ -361,7 +358,7 @@ msgstr "Modul pro import a export kontaktů programu Opera" #. Name #: xxport/pab_xxport.desktop:7 msgid "KAB MS Exchange Personal Addressbook XXPort Plugin" -msgstr "Exportní modul do adresáře MS Exchange" +msgstr "Modul pro přenos osobního adresáře MS Exchange" #. Comment #: xxport/pab_xxport.desktop:9 @@ -371,7 +368,7 @@ msgstr "Modul pro import osobní knihy adres MS Exchange" #. Name #: xxport/vcard_xxport.desktop:7 msgid "KAB vCard XXPort Plugin" -msgstr "Exportní modul vCard" +msgstr "Modul pro přenos vizitek vCard" #. Comment #: xxport/vcard_xxport.desktop:9 diff --git a/translations/desktop_files/kaddressbook-desktops/kaddressbook-desktops.pot b/translations/desktop_files/kaddressbook-desktops/kaddressbook-desktops.pot index 0c11a145..8463118b 100644 --- a/translations/desktop_files/kaddressbook-desktops/kaddressbook-desktops.pot +++ b/translations/desktop_files/kaddressbook-desktops/kaddressbook-desktops.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-09 19:32+0200\n" +"POT-Creation-Date: 2021-07-07 22:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -169,8 +169,7 @@ msgid "KAB Distribution List Plugin" msgstr "" #. Comment -#: features/distributionlist.desktop:9 -#: features/distributionlistng.desktop:9 +#: features/distributionlist.desktop:9 features/distributionlistng.desktop:9 msgid "Plugin for managing distribution lists" msgstr "" diff --git a/translations/desktop_files/kaddressbook-desktops/pl.po b/translations/desktop_files/kaddressbook-desktops/pl.po index 578e79b6..20c56f46 100644 --- a/translations/desktop_files/kaddressbook-desktops/pl.po +++ b/translations/desktop_files/kaddressbook-desktops/pl.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Jan Stolarek <jwstolarek@gmail.com>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:32+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-12 23:04+0000\n" +"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n" +"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kaddressbook-desktop-files/pl/>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: csv-templates/kaddressbook.desktop:9 @@ -24,7 +26,7 @@ msgstr "Książka adresowa (KDE 3.1)" #. Name #: csv-templates/outlook2000.desktop:8 msgid "Outlook 2000" -msgstr "" +msgstr "Outlook 2000" #. Name #: csv-templates/yahoo.desktop:9 @@ -59,7 +61,7 @@ msgstr "Protokół komunikacji internetowej KAddressbook" #. Name #: editors/protocols/aimprotocol.desktop:7 msgid "AIM" -msgstr "" +msgstr "AIM" #. Comment #: editors/protocols/aimprotocol.desktop:9 @@ -68,9 +70,8 @@ msgstr "Protokół AIM" #. Name #: editors/protocols/gaduprotocol.desktop:7 -#, fuzzy msgid "Gadu-Gadu" -msgstr "Protokół Gadu-Gadu" +msgstr "Gadu-Gadu" #. Comment #: editors/protocols/gaduprotocol.desktop:9 @@ -80,7 +81,7 @@ msgstr "Protokół Gadu-Gadu" #. Name #: editors/protocols/groupwiseprotocol.desktop:7 msgid "GroupWise" -msgstr "" +msgstr "GroupWise" #. Comment #: editors/protocols/groupwiseprotocol.desktop:9 @@ -90,7 +91,7 @@ msgstr "Komunikator Novell GroupWise" #. Name #: editors/protocols/icqprotocol.desktop:7 msgid "ICQ" -msgstr "" +msgstr "ICQ" #. Comment #: editors/protocols/icqprotocol.desktop:9 @@ -100,7 +101,7 @@ msgstr "Protokół ICQ" #. Name #: editors/protocols/ircprotocol.desktop:7 msgid "IRC" -msgstr "" +msgstr "IRC" #. Comment #: editors/protocols/ircprotocol.desktop:9 @@ -110,7 +111,7 @@ msgstr "IRC (Internet Relay Chat)" #. Name #: editors/protocols/jabberprotocol.desktop:7 msgid "Jabber" -msgstr "" +msgstr "Jabber" #. Comment #: editors/protocols/jabberprotocol.desktop:9 @@ -119,9 +120,8 @@ msgstr "Protokół Jabber" #. Name #: editors/protocols/meanwhileprotocol.desktop:7 -#, fuzzy msgid "Meanwhile" -msgstr "Protokół Meanwhile" +msgstr "Meanwhile" #. Comment #: editors/protocols/meanwhileprotocol.desktop:9 @@ -133,12 +133,12 @@ msgstr "Protokół Meanwhile" #: editors/protocols/msnprotocol.desktop:7 #: editors/protocols/msnprotocol.desktop:9 msgid "MSN Messenger" -msgstr "" +msgstr "MSN Messenger" #. Name #: editors/protocols/skypeprotocol.desktop:7 msgid "Skype" -msgstr "" +msgstr "Skype" #. Comment #: editors/protocols/skypeprotocol.desktop:9 @@ -148,7 +148,7 @@ msgstr "Skype - telefonia internetowa" #. Name #: editors/protocols/smsprotocol.desktop:7 msgid "SMS" -msgstr "" +msgstr "SMS" #. Comment #: editors/protocols/smsprotocol.desktop:9 @@ -158,7 +158,7 @@ msgstr "Protokół SMS" #. Name #: editors/protocols/yahooprotocol.desktop:7 msgid "Yahoo" -msgstr "" +msgstr "Yahoo" #. Comment #: editors/protocols/yahooprotocol.desktop:9 diff --git a/translations/desktop_files/kaddressbook-desktops/uk.po b/translations/desktop_files/kaddressbook-desktops/uk.po index 80f37a1e..0c476f91 100644 --- a/translations/desktop_files/kaddressbook-desktops/uk.po +++ b/translations/desktop_files/kaddressbook-desktops/uk.po @@ -1,31 +1,32 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:32+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-19 19:59+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kaddressbook-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: csv-templates/kaddressbook.desktop:9 -#, fuzzy msgid "KAddressBook (KDE 3.1)" -msgstr "Втулок перегляду адресної книги KAddressBook" +msgstr "KAddressBook (KDE 3.1)" #. Name #: csv-templates/outlook2000.desktop:8 msgid "Outlook 2000" -msgstr "" +msgstr "Outlook 2000" #. Name #: csv-templates/yahoo.desktop:9 @@ -60,7 +61,7 @@ msgstr "Протокол миттєвого зв'язку KAddressbook" #. Name #: editors/protocols/aimprotocol.desktop:7 msgid "AIM" -msgstr "" +msgstr "AIM" #. Comment #: editors/protocols/aimprotocol.desktop:9 @@ -69,9 +70,8 @@ msgstr "Протокол AIM" #. Name #: editors/protocols/gaduprotocol.desktop:7 -#, fuzzy msgid "Gadu-Gadu" -msgstr "Протокол Gadu-Gadu" +msgstr "Gadu-Gadu" #. Comment #: editors/protocols/gaduprotocol.desktop:9 @@ -81,17 +81,17 @@ msgstr "Протокол Gadu-Gadu" #. Name #: editors/protocols/groupwiseprotocol.desktop:7 msgid "GroupWise" -msgstr "" +msgstr "GroupWise" #. Comment #: editors/protocols/groupwiseprotocol.desktop:9 msgid "Novell GroupWise Messenger" -msgstr "" +msgstr "Novell GroupWise Messenger" #. Name #: editors/protocols/icqprotocol.desktop:7 msgid "ICQ" -msgstr "" +msgstr "ICQ" #. Comment #: editors/protocols/icqprotocol.desktop:9 @@ -101,7 +101,7 @@ msgstr "Протокол ICQ" #. Name #: editors/protocols/ircprotocol.desktop:7 msgid "IRC" -msgstr "" +msgstr "IRC" #. Comment #: editors/protocols/ircprotocol.desktop:9 @@ -111,7 +111,7 @@ msgstr "IRChat" #. Name #: editors/protocols/jabberprotocol.desktop:7 msgid "Jabber" -msgstr "" +msgstr "Jabber" #. Comment #: editors/protocols/jabberprotocol.desktop:9 @@ -120,9 +120,8 @@ msgstr "Протокол Jabber" #. Name #: editors/protocols/meanwhileprotocol.desktop:7 -#, fuzzy msgid "Meanwhile" -msgstr "Протокол Meanwhile" +msgstr "Meanwhile" #. Comment #: editors/protocols/meanwhileprotocol.desktop:9 @@ -134,12 +133,12 @@ msgstr "Протокол Meanwhile" #: editors/protocols/msnprotocol.desktop:7 #: editors/protocols/msnprotocol.desktop:9 msgid "MSN Messenger" -msgstr "" +msgstr "MSN Messenger" #. Name #: editors/protocols/skypeprotocol.desktop:7 msgid "Skype" -msgstr "" +msgstr "Skype" #. Comment #: editors/protocols/skypeprotocol.desktop:9 @@ -149,7 +148,7 @@ msgstr "Інтернет-телефон Skype" #. Name #: editors/protocols/smsprotocol.desktop:7 msgid "SMS" -msgstr "" +msgstr "SMS" #. Comment #: editors/protocols/smsprotocol.desktop:9 @@ -159,7 +158,7 @@ msgstr "Протокол SMS" #. Name #: editors/protocols/yahooprotocol.desktop:7 msgid "Yahoo" -msgstr "" +msgstr "Yahoo" #. Comment #: editors/protocols/yahooprotocol.desktop:9 @@ -178,9 +177,8 @@ msgstr "Втулок для керування списками розповсю #. Name #: features/distributionlistng.desktop:7 -#, fuzzy msgid "KAB Distribution List Next Generation Plugin" -msgstr "Втулок списку розповсюдження KAB" +msgstr "Втулок Списку Розповсюдження KAB Наступної Генерації" #. Name #: features/resourceselection.desktop:7 @@ -209,9 +207,8 @@ msgstr "Втулок імпорту/експорту адресної книги #. Name #: kaddressbook.desktop:2 -#, fuzzy msgid "KAddressBook" -msgstr "Адресна книга Yahoo" +msgstr "KAddressBook" #. GenericName #: kaddressbook.desktop:4 diff --git a/translations/desktop_files/kalarm-desktops/cs.po b/translations/desktop_files/kalarm-desktops/cs.po index 93f3c944..23be3eba 100644 --- a/translations/desktop_files/kalarm-desktops/cs.po +++ b/translations/desktop_files/kalarm-desktops/cs.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-09 19:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:17+0000\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/kalarm-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Name #: kalarm.desktop:2 kalarm.tray.desktop:2 -#, fuzzy msgid "KAlarm" -msgstr "KAlarm démon" +msgstr "KAlarm" #. GenericName #: kalarm.desktop:4 @@ -30,12 +30,12 @@ msgstr "Osobní plánovač alarmů" #. Comment #: kalarm.tray.desktop:4 msgid "Personal Alarm Scheduler: start as system tray icon" -msgstr "Plánovač alarmů a připomenutí: spustit v systémové liště" +msgstr "Plánovač alarmů a připomenutí: spustit v systémové liště" #. Name #: kalarmd/kalarmd.autostart.desktop:2 kalarmd/kalarmd.desktop:2 msgid "KAlarm Daemon" -msgstr "KAlarm démon" +msgstr "Alarm démon" #. Comment #: kalarmd/kalarmd.autostart.desktop:4 diff --git a/translations/desktop_files/kalarm-desktops/kalarm-desktops.pot b/translations/desktop_files/kalarm-desktops/kalarm-desktops.pot index 58989c4b..b6c65468 100644 --- a/translations/desktop_files/kalarm-desktops/kalarm-desktops.pot +++ b/translations/desktop_files/kalarm-desktops/kalarm-desktops.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-09 19:44+0200\n" +"POT-Creation-Date: 2021-07-07 22:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -32,8 +32,7 @@ msgid "Personal Alarm Scheduler: start as system tray icon" msgstr "" #. Name -#: kalarmd/kalarmd.autostart.desktop:2 -#: kalarmd/kalarmd.desktop:2 +#: kalarmd/kalarmd.autostart.desktop:2 kalarmd/kalarmd.desktop:2 msgid "KAlarm Daemon" msgstr "" diff --git a/translations/desktop_files/kalarm-desktops/ru.po b/translations/desktop_files/kalarm-desktops/ru.po index d8fe688c..c04964cf 100644 --- a/translations/desktop_files/kalarm-desktops/ru.po +++ b/translations/desktop_files/kalarm-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Alexander Golubev <fatzer2@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-01-21 09:11+0000\n" +"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kalarm-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.4.2\n" #. Name #: kalarm.desktop:2 kalarm.tray.desktop:2 @@ -35,9 +37,9 @@ msgstr "Персональный будильник (запускается в #. Name #: kalarmd/kalarmd.autostart.desktop:2 kalarmd/kalarmd.desktop:2 msgid "KAlarm Daemon" -msgstr "Служба уведомлений" +msgstr "Демон уведомлений" #. Comment #: kalarmd/kalarmd.autostart.desktop:4 msgid "KAlarm alarm daemon autostart at login" -msgstr "Служба уведомлений TDE" +msgstr "Демон уведомлений TDE" diff --git a/translations/desktop_files/kalarm-desktops/uk.po b/translations/desktop_files/kalarm-desktops/uk.po index b04ac967..f34ca301 100644 --- a/translations/desktop_files/kalarm-desktops/uk.po +++ b/translations/desktop_files/kalarm-desktops/uk.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-19 19:59+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kalarm-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: kalarm.desktop:2 kalarm.tray.desktop:2 -#, fuzzy msgid "KAlarm" -msgstr "Демон KAlarm" +msgstr "KAlarm" #. GenericName #: kalarm.desktop:4 diff --git a/translations/desktop_files/kandy.desktop/cs.po b/translations/desktop_files/kandy.desktop/cs.po index 31a21fe0..3618f873 100644 --- a/translations/desktop_files/kandy.desktop/cs.po +++ b/translations/desktop_files/kandy.desktop/cs.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:49+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/kandy-kandydesktop/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Name #: src/kandy.desktop:2 msgid "Kandy" -msgstr "" +msgstr "Kandy" #. GenericName #: src/kandy.desktop:4 @@ -29,4 +30,4 @@ msgstr "Nástroj pro mobilní telefony" #. Comment #: src/kandy.desktop:6 msgid "Tool for syncing address book data with mobile phones" -msgstr "Nástroj pro synchronizaci kontaktů s mobilními telefony" +msgstr "Nástroj pro synchronizaci kontaktů s mobilními telefony" diff --git a/translations/desktop_files/kandy.desktop/it.po b/translations/desktop_files/kandy.desktop/it.po index 05073e03..dd943108 100644 --- a/translations/desktop_files/kandy.desktop/it.po +++ b/translations/desktop_files/kandy.desktop/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:49+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-25 19:48+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kandy-kandydesktop/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Name #: src/kandy.desktop:2 msgid "Kandy" -msgstr "" +msgstr "Kandy" #. GenericName #: src/kandy.desktop:4 diff --git a/translations/desktop_files/kandy.desktop/uk.po b/translations/desktop_files/kandy.desktop/uk.po index 649bf9ff..e5c3cbe9 100644 --- a/translations/desktop_files/kandy.desktop/uk.po +++ b/translations/desktop_files/kandy.desktop/uk.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:49+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-19 19:59+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kandy-kandydesktop/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: src/kandy.desktop:2 msgid "Kandy" -msgstr "" +msgstr "Kandy" #. GenericName #: src/kandy.desktop:4 diff --git a/translations/desktop_files/karm-desktops/cs.po b/translations/desktop_files/karm-desktops/cs.po index 519d6471..9774aa04 100644 --- a/translations/desktop_files/karm-desktops/cs.po +++ b/translations/desktop_files/karm-desktops/cs.po @@ -1,30 +1,31 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:52+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-09-20 18:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/karm-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.2.2\n" #. Name #: karm_part.desktop:2 msgid "karmPart" -msgstr "karm komponenta" +msgstr "Komponent karm" #. Name #: support/karm.desktop:2 msgid "KArm" -msgstr "" +msgstr "KArm" #. GenericName #: support/karm.desktop:4 diff --git a/translations/desktop_files/karm-desktops/it.po b/translations/desktop_files/karm-desktops/it.po index 144e343f..0d69c0da 100644 --- a/translations/desktop_files/karm-desktops/it.po +++ b/translations/desktop_files/karm-desktops/it.po @@ -1,30 +1,31 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:52+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-22 12:59+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/karm-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Name #: karm_part.desktop:2 msgid "karmPart" -msgstr "" +msgstr "karmPart" #. Name #: support/karm.desktop:2 msgid "KArm" -msgstr "" +msgstr "KArm" #. GenericName #: support/karm.desktop:4 diff --git a/translations/desktop_files/karm-desktops/uk.po b/translations/desktop_files/karm-desktops/uk.po index 6164438c..0a95cab5 100644 --- a/translations/desktop_files/karm-desktops/uk.po +++ b/translations/desktop_files/karm-desktops/uk.po @@ -1,30 +1,32 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:52+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-19 19:59+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/karm-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: karm_part.desktop:2 msgid "karmPart" -msgstr "" +msgstr "karmPart" #. Name #: support/karm.desktop:2 msgid "KArm" -msgstr "" +msgstr "KArm" #. GenericName #: support/karm.desktop:4 diff --git a/translations/desktop_files/kitchensync.desktop/cs.po b/translations/desktop_files/kitchensync.desktop/cs.po index d8d96fa6..850f467c 100644 --- a/translations/desktop_files/kitchensync.desktop/cs.po +++ b/translations/desktop_files/kitchensync.desktop/cs.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:58+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-09-20 18:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/kitchensync-kitchensyncdesktop/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.2.2\n" #. Name #: kitchensync.desktop:2 msgid "KitchenSync" -msgstr "" +msgstr "KitchenSync" #. GenericName #: kitchensync.desktop:4 diff --git a/translations/desktop_files/kitchensync.desktop/it.po b/translations/desktop_files/kitchensync.desktop/it.po index ef598d50..4f6e3971 100644 --- a/translations/desktop_files/kitchensync.desktop/it.po +++ b/translations/desktop_files/kitchensync.desktop/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:58+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-22 12:59+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kitchensync-kitchensyncdesktop/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Name #: kitchensync.desktop:2 msgid "KitchenSync" -msgstr "" +msgstr "KitchenSync" #. GenericName #: kitchensync.desktop:4 diff --git a/translations/desktop_files/kitchensync.desktop/uk.po b/translations/desktop_files/kitchensync.desktop/uk.po index b5fef6e2..7a559271 100644 --- a/translations/desktop_files/kitchensync.desktop/uk.po +++ b/translations/desktop_files/kitchensync.desktop/uk.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 19:58+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-19 19:59+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kitchensync-kitchensyncdesktop/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: kitchensync.desktop:2 msgid "KitchenSync" -msgstr "" +msgstr "KitchenSync" #. GenericName #: kitchensync.desktop:4 diff --git a/translations/desktop_files/kmail-desktops/cs.po b/translations/desktop_files/kmail-desktops/cs.po index 6fabd836..e8803ad5 100644 --- a/translations/desktop_files/kmail-desktops/cs.po +++ b/translations/desktop_files/kmail-desktops/cs.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 20:57+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/kmail-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Name #: KMail.desktop:2 kmail_view.desktop:2 msgid "KMail" -msgstr "" +msgstr "KMail" #. GenericName #: KMail.desktop:4 @@ -34,12 +35,12 @@ msgstr "Aplikace octetstream" #. Comment #: application_octetstream.desktop:4 msgid "A bodypart formatter plugin for application/octet-stream" -msgstr "Modul formátovače těla pro application/octet-stream" +msgstr "Modul formátování těla zprávy pro application/octet-stream" #. Comment #: dcopimap.desktop:5 dcopmail.desktop:5 msgid "Mail program with a DCOP interface" -msgstr "Poštvní program s DCOP rozhraním" +msgstr "Poštovní program s DCOP rozhraním" #. Name #: kmail_config_accounts.desktop:14 @@ -64,7 +65,7 @@ msgstr "Vzhled" #. Comment #: kmail_config_appearance.desktop:16 msgid "Customize Visual Appearance" -msgstr "Nastavení vzhledu" +msgstr "Úpravy nastavení vzhledu" #. Keywords #: kmail_config_appearance.desktop:18 @@ -134,12 +135,12 @@ msgstr "kmail;bezpečnost;" #. Name #: konqueror/servicemenus/email.desktop:8 msgid "Email File" -msgstr "" +msgstr "Odeslat poštou" #. Name #: profiles/profile-default-rc.desktop:2 msgid "Default" -msgstr "Implicitní" +msgstr "Výchozí" #. Comment #: profiles/profile-default-rc.desktop:4 @@ -159,12 +160,12 @@ msgstr "Zvětší velikost písma pro zrakově postižené uživatele" #. Name #: profiles/profile-html-rc.desktop:2 msgid "HTML" -msgstr "" +msgstr "HTML" #. Comment #: profiles/profile-html-rc.desktop:4 msgid "Standard profile with HTML preview enabled - less secure!" -msgstr "Standardní profil s povoleným náhledem HTML souborů - méně bezpečné!" +msgstr "Standardní profil s povoleným náhledem HTML souborů – méně bezpečné!" #. Name #: profiles/profile-purist-rc.desktop:2 @@ -184,4 +185,4 @@ msgstr "Nejbezpečnější" #. Comment #: profiles/profile-secure-rc.desktop:4 msgid "Sets all necessary options to achieve maximum security" -msgstr "Zapne všechny volby nutné k dosažení nejvyšší bezpečnosti" +msgstr "Zapne všechny volby nutné k dosažení nejvyšší bezpečnosti" diff --git a/translations/desktop_files/kmail-desktops/pl.po b/translations/desktop_files/kmail-desktops/pl.po index 49d48709..856c9fab 100644 --- a/translations/desktop_files/kmail-desktops/pl.po +++ b/translations/desktop_files/kmail-desktops/pl.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Jan Stolarek <jwstolarek@gmail.com>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 20:57+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-12 23:04+0000\n" +"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n" +"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kmail-desktop-files/pl/>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: KMail.desktop:2 kmail_view.desktop:2 msgid "KMail" -msgstr "" +msgstr "KMail" #. GenericName #: KMail.desktop:4 @@ -159,7 +161,7 @@ msgstr "Zwiększone rozmiary czcionek dla osób mających problemy ze wzrokiem" #. Name #: profiles/profile-html-rc.desktop:2 msgid "HTML" -msgstr "" +msgstr "HTML" #. Comment #: profiles/profile-html-rc.desktop:4 diff --git a/translations/desktop_files/kmail-desktops/uk.po b/translations/desktop_files/kmail-desktops/uk.po index 38d88600..4a526758 100644 --- a/translations/desktop_files/kmail-desktops/uk.po +++ b/translations/desktop_files/kmail-desktops/uk.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 20:57+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-19 19:59+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kmail-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: KMail.desktop:2 kmail_view.desktop:2 msgid "KMail" -msgstr "" +msgstr "KMail" #. GenericName #: KMail.desktop:4 @@ -29,7 +31,7 @@ msgstr "Поштовий клієнт" #. Name #: application_octetstream.desktop:2 msgid "Application Octetstream" -msgstr "" +msgstr "Octetstream Додаток" #. Comment #: application_octetstream.desktop:4 @@ -134,7 +136,7 @@ msgstr "kmail;безпека;" #. Name #: konqueror/servicemenus/email.desktop:8 msgid "Email File" -msgstr "" +msgstr "Файл Ел.пошти" #. Name #: profiles/profile-default-rc.desktop:2 @@ -159,7 +161,7 @@ msgstr "Збільшений розмір шрифтів для людей з п #. Name #: profiles/profile-html-rc.desktop:2 msgid "HTML" -msgstr "" +msgstr "HTML" #. Comment #: profiles/profile-html-rc.desktop:4 diff --git a/translations/desktop_files/kmail-eventsrc/cs.po b/translations/desktop_files/kmail-eventsrc/cs.po index ae112068..c56bac58 100644 --- a/translations/desktop_files/kmail-eventsrc/cs.po +++ b/translations/desktop_files/kmail-eventsrc/cs.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 20:57+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-09-20 18:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/kmail-events/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.2.2\n" #. Comment #: eventsrc:3 msgid "KMail" -msgstr "" +msgstr "KMail" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/kmail-eventsrc/it.po b/translations/desktop_files/kmail-eventsrc/it.po index 5de3678e..2ae06cc6 100644 --- a/translations/desktop_files/kmail-eventsrc/it.po +++ b/translations/desktop_files/kmail-eventsrc/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 20:57+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-25 19:48+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kmail-events/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Comment #: eventsrc:3 msgid "KMail" -msgstr "" +msgstr "KMail" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/kmail-eventsrc/uk.po b/translations/desktop_files/kmail-eventsrc/uk.po index 1dbe4991..0286eab1 100644 --- a/translations/desktop_files/kmail-eventsrc/uk.po +++ b/translations/desktop_files/kmail-eventsrc/uk.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-09 20:57+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-19 19:59+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kmail-events/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Comment #: eventsrc:3 msgid "KMail" -msgstr "" +msgstr "KMail" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/kmail-plugins-desktops/cs.po b/translations/desktop_files/kmail-plugins-desktops/cs.po index aa2a585a..6938f980 100644 --- a/translations/desktop_files/kmail-plugins-desktops/cs.po +++ b/translations/desktop_files/kmail-plugins-desktops/cs.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/kmail-plugins-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Name #: bodypartformatter/text_calendar.desktop:2 @@ -26,14 +27,14 @@ msgstr "Aplikace octetstream" #. Comment #: bodypartformatter/text_calendar.desktop:4 msgid "A bodypart formatter plugin for text/calendar" -msgstr "Formátovač těla emailu pro typ text/calendar" +msgstr "Modul formátování těla zprávy pro typ text/calendar" #. Comment #: bodypartformatter/text_vcard.desktop:4 msgid "A bodypart formatter plugin for text/vcard" -msgstr "Formátovač těla emailu pro typ text/vcard" +msgstr "Modul formátování těla zprávy pro typ text/vcard" #. Comment #: bodypartformatter/text_xdiff.desktop:4 msgid "A bodypart formatter plugin for text/x-diff" -msgstr "Formátovač těla emailu pro typ text/x-diff" +msgstr "Modul formátování těla zprávy pro typ text/x-diff" diff --git a/translations/desktop_files/kmail-plugins-desktops/it.po b/translations/desktop_files/kmail-plugins-desktops/it.po index 3f29fd47..e9962427 100644 --- a/translations/desktop_files/kmail-plugins-desktops/it.po +++ b/translations/desktop_files/kmail-plugins-desktops/it.po @@ -1,27 +1,28 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-29 07:59+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kmail-plugins-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Name #: bodypartformatter/text_calendar.desktop:2 #: bodypartformatter/text_vcard.desktop:2 #: bodypartformatter/text_xdiff.desktop:2 msgid "Application Octetstream" -msgstr "" +msgstr "Flusso di ottetti dell'applicazione" #. Comment #: bodypartformatter/text_calendar.desktop:4 diff --git a/translations/desktop_files/kmail-plugins-desktops/uk.po b/translations/desktop_files/kmail-plugins-desktops/uk.po index 0d84df6b..5c2117f7 100644 --- a/translations/desktop_files/kmail-plugins-desktops/uk.po +++ b/translations/desktop_files/kmail-plugins-desktops/uk.po @@ -1,27 +1,29 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-19 19:59+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kmail-plugins-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: bodypartformatter/text_calendar.desktop:2 #: bodypartformatter/text_vcard.desktop:2 #: bodypartformatter/text_xdiff.desktop:2 msgid "Application Octetstream" -msgstr "" +msgstr "Octetstream Додаток" #. Comment #: bodypartformatter/text_calendar.desktop:4 diff --git a/translations/desktop_files/kmobile-desktops/cs.po b/translations/desktop_files/kmobile-desktops/cs.po index 5aba1cc6..9e260a37 100644 --- a/translations/desktop_files/kmobile-desktops/cs.po +++ b/translations/desktop_files/kmobile-desktops/cs.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-10 02:25+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-09-20 18:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/kmobile-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.2.2\n" #. Name #: devices/digicam/libkmobile_digicam.desktop:2 @@ -65,9 +66,8 @@ msgstr "Ukázkové mobilní zařízení" #. Name #: kmobile.desktop:8 -#, fuzzy msgid "KMobile" -msgstr "Mobilní zařízení" +msgstr "KMobile" #. GenericName #: kmobile.desktop:10 @@ -82,7 +82,7 @@ msgstr "Správce mobilních zařízení TDE" #. Name #: libkmobile.desktop:5 msgid "TDE Mobile Device Lowlevel Hardware Driver" -msgstr "TDE nízkoúrovňový ovladač mobilních zářízení " +msgstr "TDE nízkoúrovňový ovladač mobilních zařízení" #. Comment #: tdeioslave/mimetypes/mobile_addressbook.desktop:2 diff --git a/translations/desktop_files/kmobile-desktops/uk.po b/translations/desktop_files/kmobile-desktops/uk.po index 7a07b85f..1ac1bde9 100644 --- a/translations/desktop_files/kmobile-desktops/uk.po +++ b/translations/desktop_files/kmobile-desktops/uk.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-10 02:25+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-22 07:31+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kmobile-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: devices/digicam/libkmobile_digicam.desktop:2 @@ -65,9 +67,8 @@ msgstr "Прототип мобільного пристрою" #. Name #: kmobile.desktop:8 -#, fuzzy msgid "KMobile" -msgstr "Мобільний пристрій" +msgstr "KMobile" #. GenericName #: kmobile.desktop:10 diff --git a/translations/desktop_files/knode-desktops/cs.po b/translations/desktop_files/knode-desktops/cs.po index 9025a64f..3ee0e5cb 100644 --- a/translations/desktop_files/knode-desktops/cs.po +++ b/translations/desktop_files/knode-desktops/cs.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-10 03:42+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/knode-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Name #: KNode.desktop:12 msgid "KNode" -msgstr "" +msgstr "KNode" #. GenericName #: KNode.desktop:14 @@ -44,7 +45,7 @@ msgstr "Vzhled" #. Comment #: knode_config_appearance.desktop:16 msgid "Customize Visual Appearance" -msgstr "Nastavení vzhledu" +msgstr "Úpravy nastavení vzhledu" #. Name #: knode_config_cleanup.desktop:14 @@ -59,7 +60,7 @@ msgstr "Zachování místa na disku" #. Name #: knode_config_identity.desktop:14 msgid "Identity" -msgstr "" +msgstr "Identita" #. Comment #: knode_config_identity.desktop:16 @@ -69,7 +70,7 @@ msgstr "Osobní informace" #. Name #: knode_config_post_news.desktop:14 msgid "Posting News" -msgstr "Odesílání novinek" +msgstr "Odesílání příspěvků" #. Name #: knode_config_privacy.desktop:14 @@ -84,4 +85,4 @@ msgstr "Chraňte své soukromí pomocí podepisování a ověřování podpisů" #. Name #: knode_config_read_news.desktop:14 msgid "Reading News" -msgstr "Čtení novinek" +msgstr "Čtení příspěvků" diff --git a/translations/desktop_files/knode-desktops/uk.po b/translations/desktop_files/knode-desktops/uk.po index a677b0e2..40b7b88e 100644 --- a/translations/desktop_files/knode-desktops/uk.po +++ b/translations/desktop_files/knode-desktops/uk.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-10 03:42+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-22 07:31+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/knode-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: KNode.desktop:12 msgid "KNode" -msgstr "" +msgstr "KNode" #. GenericName #: KNode.desktop:14 diff --git a/translations/desktop_files/knotes-desktops/cs.po b/translations/desktop_files/knotes-desktops/cs.po index e683783e..8991d73b 100644 --- a/translations/desktop_files/knotes-desktops/cs.po +++ b/translations/desktop_files/knotes-desktops/cs.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-10 03:47+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/knotes-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Name #: knotes.desktop:12 -#, fuzzy msgid "KNotes" -msgstr "Poznámky" +msgstr "KNotes" #. GenericName #: knotes.desktop:14 @@ -35,4 +35,4 @@ msgstr "Poznámky" #. Name #: local.desktop:2 msgid "Notes in Local File" -msgstr "Poznámky v lokálním souboru" +msgstr "Poznámky v lokálním souboru" diff --git a/translations/desktop_files/knotes-desktops/it.po b/translations/desktop_files/knotes-desktops/it.po index 98630b66..c0f8ba57 100644 --- a/translations/desktop_files/knotes-desktops/it.po +++ b/translations/desktop_files/knotes-desktops/it.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-10 03:47+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-29 07:59+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/knotes-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Name #: knotes.desktop:12 -#, fuzzy msgid "KNotes" -msgstr "Note" +msgstr "KNotes" #. GenericName #: knotes.desktop:14 diff --git a/translations/desktop_files/knotes-desktops/uk.po b/translations/desktop_files/knotes-desktops/uk.po index cd6c93d8..b282b506 100644 --- a/translations/desktop_files/knotes-desktops/uk.po +++ b/translations/desktop_files/knotes-desktops/uk.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-10 03:47+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-22 07:31+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/knotes-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: knotes.desktop:12 -#, fuzzy msgid "KNotes" -msgstr "Примітки" +msgstr "KNotes" #. GenericName #: knotes.desktop:14 diff --git a/translations/desktop_files/konsolekalendar.desktop/it.po b/translations/desktop_files/konsolekalendar.desktop/it.po new file mode 100644 index 00000000..2e02dbe2 --- /dev/null +++ b/translations/desktop_files/konsolekalendar.desktop/it.po @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-10 03:49+0200\n" +"PO-Revision-Date: 2020-11-22 12:59+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/konsolekalendar-konsolekalendardesktop/it/>\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" + +#. Name +#: konsolekalendar.desktop:2 +msgid "KonsoleKalendar" +msgstr "KonsoleKalendar" diff --git a/translations/desktop_files/konsolekalendar.desktop/pt.po b/translations/desktop_files/konsolekalendar.desktop/pt.po new file mode 100644 index 00000000..09fcd48c --- /dev/null +++ b/translations/desktop_files/konsolekalendar.desktop/pt.po @@ -0,0 +1,20 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-10 03:49+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: konsolekalendar.desktop:2 +msgid "KonsoleKalendar" +msgstr "" diff --git a/translations/desktop_files/kontact-desktops/cs.po b/translations/desktop_files/kontact-desktops/cs.po index 2a906251..061be7e1 100644 --- a/translations/desktop_files/kontact-desktops/cs.po +++ b/translations/desktop_files/kontact-desktops/cs.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-10 16:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:17+0000\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/kontact-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Name #: interfaces/kontactplugin.desktop:4 @@ -30,7 +31,7 @@ msgstr "Kanály" #. Comment #: plugins/akregator/akregatorplugin.desktop:18 msgid "Feed Reader Component (Akregator Plugin)" -msgstr "" +msgstr "Komponenta čtečky kanálů (modul Akregator)" #. Comment #: plugins/akregator/akregatorplugin3.2.desktop:17 @@ -45,38 +46,37 @@ msgstr "Kontakty" #. Comment #: plugins/kaddressbook/kaddressbookplugin.desktop:20 msgid "Contacts Component (KAdressbook Plugin)" -msgstr "" +msgstr "Komponenta kontaktů (modul Kniha adres)" #. Name #: plugins/karm/karmplugin.desktop:15 msgid "Timer" -msgstr "" +msgstr "Měřic času" #. Comment #: plugins/karm/karmplugin.desktop:17 msgid "Time Tracker Component (KArm Plugin)" -msgstr "" +msgstr "Komponenta měřiče času (modul KArm)" #. Name #: plugins/kitchensync/kitchensync.desktop:15 msgid "Sync" -msgstr "" +msgstr "Synchronizace" #. Comment #: plugins/kitchensync/kitchensync.desktop:17 msgid "Synchronization Component (Kitchensynk Plugin)" -msgstr "" +msgstr "Komponenta pro synchronizaci (modul Kitchensync)" #. Name #: plugins/kmail/kcmkmailsummary.desktop:13 msgid "E-Mail Overview" -msgstr "" +msgstr "Přehled emailů" #. Comment #: plugins/kmail/kcmkmailsummary.desktop:15 -#, fuzzy msgid "E-Mail Summary Setup" -msgstr "Nastavení souhrnu speciálních datumů" +msgstr "Nastavení souhrnu emailů" #. Keywords #: plugins/kmail/kcmkmailsummary.desktop:17 @@ -86,23 +86,23 @@ msgstr "email;souhrn;nastavení;nastavit;" #. Name #: plugins/kmail/kmailplugin.desktop:19 src/kontact.setdlg:8 msgid "E-Mail" -msgstr "" +msgstr "Email" #. Comment #: plugins/kmail/kmailplugin.desktop:21 msgid "E-Mail Component (KMail Plugin)" -msgstr "" +msgstr "Komponenta poštovního klienta (modul KMail)" #. Name #: plugins/knode/knodeplugin.desktop:16 #: plugins/newsticker/newstickerplugin.desktop:17 src/kontact.setdlg:32 msgid "News" -msgstr "Novinky" +msgstr "Diskusní skupiny" #. Comment #: plugins/knode/knodeplugin.desktop:18 msgid "Newsreader Component (KNode Plugin)" -msgstr "" +msgstr "Komponenta diskusních skupin (modul KNode)" #. Name #: plugins/knotes/knotesplugin.desktop:16 @@ -112,7 +112,7 @@ msgstr "Poznámky" #. Comment #: plugins/knotes/knotesplugin.desktop:18 msgid "Notes Component (KNotes Plugin)" -msgstr "" +msgstr "Komponenta poznámek (modul KNotes)" #. Name #: plugins/korganizer/journalplugin.desktop:18 @@ -122,13 +122,12 @@ msgstr "Deník" #. Comment #: plugins/korganizer/journalplugin.desktop:20 msgid "Journal Component (KOrganizer Plugin)" -msgstr "" +msgstr "Komponenta deníku (modul KOrganizer)" #. Name #: plugins/korganizer/kcmkorgsummary.desktop:13 -#, fuzzy msgid "Appointment and To-do Overview" -msgstr "Nastavení souhrnu schůzek a úkolů" +msgstr "Přehled schůzek a úkolů" #. Comment #: plugins/korganizer/kcmkorgsummary.desktop:15 @@ -148,38 +147,37 @@ msgstr "Kalendář" #. Comment #: plugins/korganizer/korganizerplugin.desktop:20 msgid "Calendar Component (KOrganizer Plugin)" -msgstr "" +msgstr "Komponenta kalendáře (modul KOrganizer)" #. Name #: plugins/korganizer/todoplugin.desktop:18 msgid "To-do" -msgstr "" +msgstr "Úkoly" #. Comment #: plugins/korganizer/todoplugin.desktop:20 msgid "To-do List Component (KOrganizer plugin)" -msgstr "" +msgstr "Komponenta seznamu úkolů (modul KOrganizer)" #. Name #: plugins/kpilot/kpilotplugin.desktop:18 msgid "Palm" -msgstr "" +msgstr "Palm" #. Comment #: plugins/kpilot/kpilotplugin.desktop:20 msgid "Palm Tools Component (KPilot Plugin)" -msgstr "" +msgstr "Komponenta nástrojů pro Palm (modul KPilot)" #. Name #: plugins/newsticker/kcmkontactknt.desktop:13 src/kontact.setdlg:44 -#, fuzzy msgid "News Ticker" -msgstr "Komponenta zdrojů novinek" +msgstr "Novinky" #. Comment #: plugins/newsticker/kcmkontactknt.desktop:15 msgid "News Ticker Summary Setup" -msgstr "Nastavení souhrnu newstickeru" +msgstr "Nastavení souhrnu novinek" #. Keywords #: plugins/newsticker/kcmkontactknt.desktop:17 @@ -188,20 +186,18 @@ msgstr "novinky;nastavení;" #. Comment #: plugins/newsticker/newstickerplugin.desktop:19 -#, fuzzy msgid "Newsticker Component" -msgstr "Komponenta zdrojů novinek" +msgstr "Komponenta novinek" #. Name #: plugins/specialdates/kcmsdsummary.desktop:13 -#, fuzzy msgid "Special Dates Overview" -msgstr "Speciální data" +msgstr "Přehled speciálních dat" #. Comment #: plugins/specialdates/kcmsdsummary.desktop:15 msgid "Special Dates Summary Setup" -msgstr "Nastavení souhrnu speciálních datumů" +msgstr "Nastavení souhrnu speciálních dat" #. Keywords #: plugins/specialdates/kcmsdsummary.desktop:17 @@ -215,14 +211,13 @@ msgstr "Speciální data" #. Comment #: plugins/specialdates/specialdatesplugin.desktop:18 -#, fuzzy msgid "Special Dates Component" msgstr "Komponenta souhrnu speciálních příležitostí" #. Name #: plugins/summary/kcmkontactsummary.desktop:13 msgid "Summary View Items" -msgstr "" +msgstr "Položky souhrnného pohledu" #. Comment #: plugins/summary/kcmkontactsummary.desktop:15 @@ -236,21 +231,18 @@ msgstr "Souhrn" #. Comment #: plugins/summary/summaryplugin.desktop:16 -#, fuzzy msgid "Summary View Component" -msgstr "Komponenta souhrnu speciálních příležitostí" +msgstr "Komponenta souhrnného pohledu" #. Name #: plugins/test/kptestplugin.desktop:13 -#, fuzzy msgid "TestPlugin" -msgstr "Modul Akregatoru" +msgstr "Testovací modul" #. Comment #: plugins/test/kptestplugin.desktop:15 -#, fuzzy msgid "Kontact Test Plugin" -msgstr "Modul aplikace Kontact" +msgstr "Testovací modul aplikace Kontact" #. Name #: plugins/weather/weatherplugin.desktop:18 @@ -260,13 +252,12 @@ msgstr "Služba počasí" #. Comment #: plugins/weather/weatherplugin.desktop:20 msgid "Kontact Weather Component" -msgstr "" +msgstr "Komponenta služby počasí" #. Name #: src/Kontact.desktop:6 src/kontactconfig.desktop:15 src/kontactdcop.desktop:2 -#, fuzzy msgid "Kontact" -msgstr "Kontakty" +msgstr "Kontakt" #. GenericName #: src/Kontact.desktop:8 @@ -275,42 +266,38 @@ msgstr "Správce osobních informací" #. Comment #: src/kontactconfig.desktop:17 -#, fuzzy msgid "TDE Kontact" -msgstr "Kontakty" +msgstr "TDE Kontakt" #. Keywords #: src/kontactconfig.desktop:19 -#, fuzzy msgid "kontact;" -msgstr "Kontakty" +msgstr "kontakt;" #. Description #: profiles/KontactDefaults/profile.cfg:2 msgid "Default KDE Kontact settings" -msgstr "" +msgstr "Výchozí nastavení TDE Kontaktu" #. Name #: profiles/KontactDefaults/profile.cfg:4 -#, fuzzy msgid "Kontact Style" -msgstr "Modul aplikace Kontact" +msgstr "Styl Kontaktu" #. Description #: profiles/OutlookDefaults/profile.cfg:2 msgid "Settings resembling MS Outlook" -msgstr "" +msgstr "Nastavení připomínající MS Outlook" #. Name #: profiles/OutlookDefaults/profile.cfg:4 msgid "Outlook Style " -msgstr "" +msgstr "Styl Outlook " #. Name #: src/kontact.setdlg:2 -#, fuzzy msgid "Summary View" -msgstr "Souhrn" +msgstr "Souhrnný pohled" #. Comment #: src/kontact.setdlg:3 @@ -318,6 +305,8 @@ msgid "" "Configuration of Kontact's <b>Summary View</b>. Some plugins provide " "<i>Summary View</i> items, choose the ones you would like to list." msgstr "" +"Nastavení <b>souhrnného pohledu</b> Konaktu. Některé moduly poskytují " +"položky pro <i>souhrnný pohled</i>. Vyberte takové, které chcete zobrazit." #. Comment #: src/kontact.setdlg:9 @@ -325,6 +314,8 @@ msgid "" "Configuration of Kontact's E-Mail Plugin <b>KMail</b>, includes a <i>Summary " "View Item</i> and represents a <i>Kontact Component</i>." msgstr "" +"Nastavení modulu poštovního klienta Kontaktu – <b>KMail</b>, obsahuje " +"položku <i>souhrnného pohledu</i> a představuje <i>komponentu Kontaktu</i>." #. Comment #: src/kontact.setdlg:15 @@ -332,11 +323,13 @@ msgid "" "Configuration of Kontact's Adress Book Plugin <b>KAdressbook</b> which " "represents a <i>Kontact Component</i>." msgstr "" +"Nastavení modulu knihy adres Kontaktu – <b>KAddressbook</b>, která " +"představuje <i>komponentu Kontaktu</i>." #. Name #: src/kontact.setdlg:20 msgid "Special Dates Summary" -msgstr "Souhrn speciálních datumů" +msgstr "Souhrn speciálních dat" #. Comment #: src/kontact.setdlg:21 @@ -349,6 +342,8 @@ msgid "" "Configuration of Kontact's Calendar Plugin <b>KOrganizer</b>, includes a " "<i>Summary View Item</i> and represents a <i>Kontact Component</i>." msgstr "" +"Nastavení modulu kalendáře Kontaktu – <b>KOrganizer</b>, obsahuje položku " +"<i>souhrnného pohledu</i> a představuje <i>komponentu Kontaktu</i>." #. Comment #: src/kontact.setdlg:33 @@ -356,6 +351,8 @@ msgid "" "Configuration of Kontact's News Plugin <b>KNode</b> which represents a " "<i>Kontact Component</i>." msgstr "" +"Nastavení modulu diskusních skupin Kontaktu – <b>KNode</b>, který " +"představuje <i>komponentu Kontaktu</i>." #. Name #: src/kontact.setdlg:38 @@ -365,9 +362,9 @@ msgstr "Počasí" #. Comment #: src/kontact.setdlg:39 msgid "Weather Information Component" -msgstr "" +msgstr "Komponenta informací o počasí" #. Comment #: src/kontact.setdlg:45 msgid "News Ticker Component" -msgstr "Komponenta zdrojů novinek" +msgstr "Komponenta novinek" diff --git a/translations/desktop_files/kontact-desktops/kontact-desktops.pot b/translations/desktop_files/kontact-desktops/kontact-desktops.pot index 3bd8f6a6..cf3fa9af 100644 --- a/translations/desktop_files/kontact-desktops/kontact-desktops.pot +++ b/translations/desktop_files/kontact-desktops/kontact-desktops.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-10 16:13+0200\n" +"POT-Creation-Date: 2021-07-07 22:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -38,8 +38,7 @@ msgid "Akregator Plugin" msgstr "" #. Name -#: plugins/kaddressbook/kaddressbookplugin.desktop:18 -#: src/kontact.setdlg:14 +#: plugins/kaddressbook/kaddressbookplugin.desktop:18 src/kontact.setdlg:14 msgid "Contacts" msgstr "" @@ -95,8 +94,7 @@ msgstr "" #. Name #: plugins/knode/knodeplugin.desktop:16 -#: plugins/newsticker/newstickerplugin.desktop:17 -#: src/kontact.setdlg:32 +#: plugins/newsticker/newstickerplugin.desktop:17 src/kontact.setdlg:32 msgid "News" msgstr "" @@ -141,8 +139,7 @@ msgid "calendar; todos; configure; settings;" msgstr "" #. Name -#: plugins/korganizer/korganizerplugin.desktop:18 -#: src/kontact.setdlg:26 +#: plugins/korganizer/korganizerplugin.desktop:18 src/kontact.setdlg:26 msgid "Calendar" msgstr "" @@ -172,8 +169,7 @@ msgid "Palm Tools Component (KPilot Plugin)" msgstr "" #. Name -#: plugins/newsticker/kcmkontactknt.desktop:13 -#: src/kontact.setdlg:44 +#: plugins/newsticker/kcmkontactknt.desktop:13 src/kontact.setdlg:44 msgid "News Ticker" msgstr "" @@ -258,8 +254,7 @@ msgid "Kontact Weather Component" msgstr "" #. Name -#: src/Kontact.desktop:6 src/kontactconfig.desktop:15 -#: src/kontactdcop.desktop:2 +#: src/Kontact.desktop:6 src/kontactconfig.desktop:15 src/kontactdcop.desktop:2 msgid "Kontact" msgstr "" diff --git a/translations/desktop_files/kontact-desktops/uk.po b/translations/desktop_files/kontact-desktops/uk.po index e3f03003..9e6e7b2c 100644 --- a/translations/desktop_files/kontact-desktops/uk.po +++ b/translations/desktop_files/kontact-desktops/uk.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-10 16:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-22 07:31+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/kontact-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: interfaces/kontactplugin.desktop:4 @@ -30,7 +32,7 @@ msgstr "Подачі" #. Comment #: plugins/akregator/akregatorplugin.desktop:18 msgid "Feed Reader Component (Akregator Plugin)" -msgstr "" +msgstr "Компонент Читача Подач (Втулок Akregator)" #. Comment #: plugins/akregator/akregatorplugin3.2.desktop:17 @@ -45,38 +47,37 @@ msgstr "Контакти" #. Comment #: plugins/kaddressbook/kaddressbookplugin.desktop:20 msgid "Contacts Component (KAdressbook Plugin)" -msgstr "" +msgstr "Компонент Контактів (Втулок KAdressbook)" #. Name #: plugins/karm/karmplugin.desktop:15 msgid "Timer" -msgstr "" +msgstr "Таймер" #. Comment #: plugins/karm/karmplugin.desktop:17 msgid "Time Tracker Component (KArm Plugin)" -msgstr "" +msgstr "Компонент Трекеру Часу (Втулок KArm)" #. Name #: plugins/kitchensync/kitchensync.desktop:15 msgid "Sync" -msgstr "" +msgstr "Синхр" #. Comment #: plugins/kitchensync/kitchensync.desktop:17 msgid "Synchronization Component (Kitchensynk Plugin)" -msgstr "" +msgstr "Компонент Синхронізації (Втулок Kitchensynk)" #. Name #: plugins/kmail/kcmkmailsummary.desktop:13 msgid "E-Mail Overview" -msgstr "" +msgstr "Переглянути Е-Пошту" #. Comment #: plugins/kmail/kcmkmailsummary.desktop:15 -#, fuzzy msgid "E-Mail Summary Setup" -msgstr "Налаштування підсумку особливих дат" +msgstr "Підсумкове Налаштування Е-Пошти" #. Keywords #: plugins/kmail/kcmkmailsummary.desktop:17 @@ -86,12 +87,12 @@ msgstr "пошта; підсумок; налаштування; параметр #. Name #: plugins/kmail/kmailplugin.desktop:19 src/kontact.setdlg:8 msgid "E-Mail" -msgstr "" +msgstr "Е-Пошта" #. Comment #: plugins/kmail/kmailplugin.desktop:21 msgid "E-Mail Component (KMail Plugin)" -msgstr "" +msgstr "Компонент Е-Пошти (Втулок KMail)" #. Name #: plugins/knode/knodeplugin.desktop:16 @@ -102,7 +103,7 @@ msgstr "Новини" #. Comment #: plugins/knode/knodeplugin.desktop:18 msgid "Newsreader Component (KNode Plugin)" -msgstr "" +msgstr "Компонент Читача Новин (Втулок KNode)" #. Name #: plugins/knotes/knotesplugin.desktop:16 @@ -112,7 +113,7 @@ msgstr "Примітки" #. Comment #: plugins/knotes/knotesplugin.desktop:18 msgid "Notes Component (KNotes Plugin)" -msgstr "" +msgstr "Компонент Приміток (Втулок KNotes)" #. Name #: plugins/korganizer/journalplugin.desktop:18 @@ -122,13 +123,12 @@ msgstr "Журнал" #. Comment #: plugins/korganizer/journalplugin.desktop:20 msgid "Journal Component (KOrganizer Plugin)" -msgstr "" +msgstr "Компонент Журналу (Втулок KOrganizer)" #. Name #: plugins/korganizer/kcmkorgsummary.desktop:13 -#, fuzzy msgid "Appointment and To-do Overview" -msgstr "Налаштування зведення зустрічей і завдань" +msgstr "Перегляд Призначень та Завдань" #. Comment #: plugins/korganizer/kcmkorgsummary.desktop:15 @@ -148,27 +148,27 @@ msgstr "Календар" #. Comment #: plugins/korganizer/korganizerplugin.desktop:20 msgid "Calendar Component (KOrganizer Plugin)" -msgstr "" +msgstr "Компонент Календаря (Втулок KOrganizer)" #. Name #: plugins/korganizer/todoplugin.desktop:18 msgid "To-do" -msgstr "" +msgstr "Завдання" #. Comment #: plugins/korganizer/todoplugin.desktop:20 msgid "To-do List Component (KOrganizer plugin)" -msgstr "" +msgstr "Компонент Переліку Завдань (Втулок KOrganizer)" #. Name #: plugins/kpilot/kpilotplugin.desktop:18 msgid "Palm" -msgstr "" +msgstr "Palm" #. Comment #: plugins/kpilot/kpilotplugin.desktop:20 msgid "Palm Tools Component (KPilot Plugin)" -msgstr "" +msgstr "Компонент Інструментів Palm (Втулок KPilot)" #. Name #: plugins/newsticker/kcmkontactknt.desktop:13 src/kontact.setdlg:44 @@ -187,15 +187,13 @@ msgstr "новини; налаштування; параметри;" #. Comment #: plugins/newsticker/newstickerplugin.desktop:19 -#, fuzzy msgid "Newsticker Component" -msgstr "Компонент смужки новин" +msgstr "Компонент Newsticker" #. Name #: plugins/specialdates/kcmsdsummary.desktop:13 -#, fuzzy msgid "Special Dates Overview" -msgstr "Особливі дати" +msgstr "Перегляд Особливих Дат" #. Comment #: plugins/specialdates/kcmsdsummary.desktop:15 @@ -216,14 +214,13 @@ msgstr "Особливі дати" #. Comment #: plugins/specialdates/specialdatesplugin.desktop:18 -#, fuzzy msgid "Special Dates Component" -msgstr "Компонент короткого підсумку особливих дат" +msgstr "Компонент Особливих Дат" #. Name #: plugins/summary/kcmkontactsummary.desktop:13 msgid "Summary View Items" -msgstr "" +msgstr "Елементи Підсумкового Виду" #. Comment #: plugins/summary/kcmkontactsummary.desktop:15 @@ -237,9 +234,8 @@ msgstr "Зведення" #. Comment #: plugins/summary/summaryplugin.desktop:16 -#, fuzzy msgid "Summary View Component" -msgstr "Компонент короткого підсумку особливих дат" +msgstr "Компонент Підсумкового Виду" #. Name #: plugins/test/kptestplugin.desktop:13 @@ -259,13 +255,12 @@ msgstr "Служба погоди" #. Comment #: plugins/weather/weatherplugin.desktop:20 msgid "Kontact Weather Component" -msgstr "" +msgstr "Компонент Погоди Kontact" #. Name #: src/Kontact.desktop:6 src/kontactconfig.desktop:15 src/kontactdcop.desktop:2 -#, fuzzy msgid "Kontact" -msgstr "Контакти" +msgstr "Kontact" #. GenericName #: src/Kontact.desktop:8 @@ -274,42 +269,38 @@ msgstr "Менеджер особистої інформації" #. Comment #: src/kontactconfig.desktop:17 -#, fuzzy msgid "TDE Kontact" -msgstr "Контакти" +msgstr "TDE Kontact" #. Keywords #: src/kontactconfig.desktop:19 -#, fuzzy msgid "kontact;" -msgstr "Контакти" +msgstr "контакт;" #. Description #: profiles/KontactDefaults/profile.cfg:2 msgid "Default KDE Kontact settings" -msgstr "" +msgstr "Типові налаштування KDE Kontact" #. Name #: profiles/KontactDefaults/profile.cfg:4 -#, fuzzy msgid "Kontact Style" -msgstr "Втулок Kontact" +msgstr "Стиль Kontact" #. Description #: profiles/OutlookDefaults/profile.cfg:2 msgid "Settings resembling MS Outlook" -msgstr "" +msgstr "Налаштування схожі на MS Outlook" #. Name #: profiles/OutlookDefaults/profile.cfg:4 msgid "Outlook Style " -msgstr "" +msgstr "Стиль Outlook " #. Name #: src/kontact.setdlg:2 -#, fuzzy msgid "Summary View" -msgstr "Зведення" +msgstr "Підсумковий Вигляд" #. Comment #: src/kontact.setdlg:3 @@ -317,6 +308,8 @@ msgid "" "Configuration of Kontact's <b>Summary View</b>. Some plugins provide " "<i>Summary View</i> items, choose the ones you would like to list." msgstr "" +"Конфігурація Kontact <b>Підсумковий Вид</b>. Деякі втулки надають елементи " +"<i>Підсумкового Виду</i>, оберіть такі які бажали-б бачити у переліку." #. Comment #: src/kontact.setdlg:9 @@ -324,6 +317,8 @@ msgid "" "Configuration of Kontact's E-Mail Plugin <b>KMail</b>, includes a <i>Summary " "View Item</i> and represents a <i>Kontact Component</i>." msgstr "" +"Конфігурація Kontact Втулку Е-Пошти <b>KMail</b>, включно із <i>Елементами " +"Підсумкового Виду</i> та представлення <i>Компоненту Kontact</i>." #. Comment #: src/kontact.setdlg:15 @@ -331,6 +326,8 @@ msgid "" "Configuration of Kontact's Adress Book Plugin <b>KAdressbook</b> which " "represents a <i>Kontact Component</i>." msgstr "" +"Конфігурація Kontact Втулку Адресної Книги <b>KAdressbook</b> із " +"представленням <i>Компоненту Kontact</i>." #. Name #: src/kontact.setdlg:20 @@ -348,6 +345,9 @@ msgid "" "Configuration of Kontact's Calendar Plugin <b>KOrganizer</b>, includes a " "<i>Summary View Item</i> and represents a <i>Kontact Component</i>." msgstr "" +"Конфігурація Kontact Втулку Календаря <b>KOrganizer</b>, включно із " +"<i>Елементами Підсумкового Виду</i> та представлення <i>Компоненту Kontact</" +"i>." #. Comment #: src/kontact.setdlg:33 @@ -355,6 +355,8 @@ msgid "" "Configuration of Kontact's News Plugin <b>KNode</b> which represents a " "<i>Kontact Component</i>." msgstr "" +"Конфігурація Kontact Втулку Новин <b>KNode</b> із представленням " +"<i>Компоненту Kontact</i>." #. Name #: src/kontact.setdlg:38 @@ -364,7 +366,7 @@ msgstr "Погода" #. Comment #: src/kontact.setdlg:39 msgid "Weather Information Component" -msgstr "" +msgstr "Погодний Інформаційний Компонент" #. Comment #: src/kontact.setdlg:45 diff --git a/translations/desktop_files/korganizer-desktops/cs.po b/translations/desktop_files/korganizer-desktops/cs.po index 60f093d6..69776caa 100644 --- a/translations/desktop_files/korganizer-desktops/cs.po +++ b/translations/desktop_files/korganizer-desktops/cs.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-11 02:31+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/korganizer-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Comment #: dcopcalendar.desktop:5 msgid "Organizer with a DCOP interface" -msgstr "Organizátor s DCOP rozhraním" +msgstr "Organizátor s DCOP rozhraním" #. Comment #: interfaces/calendar/calendardecoration.desktop:5 @@ -29,14 +30,13 @@ msgstr "Modul dekorace kalendáře" #. Comment #: interfaces/calendar/calendarplugin.desktop:5 msgid "Calendar Plugin" -msgstr "Kalendářový modul" +msgstr "Modul kalendáře" #. Comment #: interfaces/korganizer/korganizerpart.desktop:5 #: interfaces/korganizer/korgprintplugin.desktop:5 -#, fuzzy msgid "KOrganizer Part" -msgstr "Hlavní nastavení KOrganizeru" +msgstr "Komponenta KOrganizer" #. Name #: korgac/korgac.desktop:2 @@ -46,18 +46,17 @@ msgstr "Klient upomínek KOrganizeru" #. GenericName #: korgac/korgac.desktop:4 msgid "KOrganizer Reminder Daemon Client" -msgstr "Klient démona přípomínek KOrganizeru" +msgstr "Klient démona připomínek KOrganizeru" #. Name #: korganizer.desktop:4 -#, fuzzy msgid "KOrganizer" -msgstr "Osobní organizér" +msgstr "KOrganizer" #. GenericName #: korganizer.desktop:6 msgid "Personal Organizer" -msgstr "Osobní organizér" +msgstr "Osobní organizátor" #. Comment #: korganizer.desktop:8 @@ -117,7 +116,7 @@ msgstr "Aktivita" #. Comment #: korganizer_configfreebusy.desktop:16 msgid "KOrganizer Free/Busy Configuration" -msgstr "Nastavení aktivity pro KOrganizer" +msgstr "Nastavení volného/zaneprázdněného času pro KOrganizer" #. Keywords #: korganizer_configfreebusy.desktop:18 @@ -192,7 +191,7 @@ msgstr "Datum a čas" #. Comment #: korganizer_configtime.desktop:16 msgid "KOrganizer Time Configuration" -msgstr "Nastavení času v KOrganizeru" +msgstr "Nastavení času v KOrganizeru" #. Keywords #: korganizer_configtime.desktop:18 @@ -217,7 +216,7 @@ msgstr "korganizer;pohled;" #. Name #: plugins/datenums/datenums.desktop:4 msgid "Date Numbers Plugin for Calendars" -msgstr "Modul pro očíslování dat v kalendáři" +msgstr "Modul pro očíslování dat v kalendáři" #. Comment #: plugins/datenums/datenums.desktop:6 @@ -225,8 +224,8 @@ msgid "" "For each day this plugin shows its daynumber of the year at the top of the " "agenda view. For example, February 1 is day 32 of the year." msgstr "" -"tento modul pro každý den zobrazuje pořadí dne v roce na vrcholu pohledu. " -"Např. 1. únor je 32 druhý den v roce." +"Tento modul pro každý den zobrazuje pořadí dne v roce na vrchu pohledu " +"agendy. Např. 1. únor je 32. den v roce." #. Name #: plugins/exchange/exchange.desktop:4 @@ -239,7 +238,7 @@ msgid "" "This plugin allows korganizer users to work with Microsoft Exchange 2000 " "groupware servers." msgstr "" -"tento modul umožňuje pracovat uživatelům korganizeru s Microsoft Exchange " +"Tento modul umožňuje pracovat uživatelům KOrganizeru s Microsoft Exchange " "2000 groupware servery." #. Name @@ -250,7 +249,7 @@ msgstr "Modul židovského kalendáře" #. Comment #: plugins/hebrew/hebrew.desktop:6 msgid "Shows all dates in korganizer also in the Jewish calendar system." -msgstr "Zobrazení všech dat v korganizeru také v židovském kalendáři." +msgstr "Zobrazení všech dat v KOrganizeru také v židovském kalendáři." #. Name #: plugins/printing/journal/journalprint.desktop:4 @@ -260,22 +259,22 @@ msgstr "Tiskový styl deníku" #. Comment #: plugins/printing/journal/journalprint.desktop:6 msgid "This plugin allows you to print out journal entries (diary entries)." -msgstr "tento modul umožňuje tisk položek deníku." +msgstr "Tento modul umožňuje tisk položek deníku." #. Name #: plugins/printing/list/listprint.desktop:4 msgid "List Print Style" -msgstr "Styl deníku - seznam" +msgstr "Styl deníku – seznam" #. Comment #: plugins/printing/list/listprint.desktop:6 msgid "This plugin allows you to print out events and to-dos in list form." -msgstr "tento modul umožňuje tisknout události a úlohy do seznamu." +msgstr "Tento modul umožňuje tisknout události a úkoly do seznamu." #. Name #: plugins/printing/whatsnext/whatsnextprint.desktop:4 msgid "What's Next Print Style" -msgstr "Styl deníku - co je nového" +msgstr "Styl deníku – co je nového" #. Comment #: plugins/printing/whatsnext/whatsnextprint.desktop:6 @@ -305,9 +304,9 @@ msgid "" "or month views). If you enable this plugin, you can switch to the project " "view and view your to-do list like in a project planner." msgstr "" -"Tento modul poskytuje projektový pohled pro KOrganizer (podobnějako úkoly " +"Tento modul poskytuje projektový pohled pro KOrganizer (podobně jako úkoly " "nebo měsíční pohled). Pokud jej povolíte, může přepnout do projektového " -"pohledu a prohlížet si úkoly jako v projektovém plánovači." +"pohledu a prohlížet si úkoly jako v plánovači projektů." #. Name #: plugins/timespanview/timespanview.desktop:4 @@ -321,6 +320,6 @@ msgid "" "views). If you enable this plugin, you can switch to the timespan view and " "view your events like in a Gantt diagram." msgstr "" -"Tento modul umožňuje časový pohled pro korganizer (podobně jako úkoly nebo " -"měsíční pohled). Pokud ho povolíte, můžete se přepnout na časový pohled a " -"prohlížet si události v Ganttově diagramu." +"Tento modul umožňuje časový pohled pro KOrganizer (podobně jako úkoly nebo " +"měsíční pohled). Pokud jej povolíte, můžete se přepnout na časový pohled a " +"prohlížet si události v Ganttově diagramu." diff --git a/translations/desktop_files/korganizer-desktops/it.po b/translations/desktop_files/korganizer-desktops/it.po index 926e5c22..1a30cc51 100644 --- a/translations/desktop_files/korganizer-desktops/it.po +++ b/translations/desktop_files/korganizer-desktops/it.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-11 02:31+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-29 07:59+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/korganizer-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Comment #: dcopcalendar.desktop:5 @@ -49,9 +50,8 @@ msgstr "Client del demone degli avvisi di KOrganizer" #. Name #: korganizer.desktop:4 -#, fuzzy msgid "KOrganizer" -msgstr "Parte di KOrganizer" +msgstr "KOrganizer" #. GenericName #: korganizer.desktop:6 diff --git a/translations/desktop_files/korganizer-desktops/uk.po b/translations/desktop_files/korganizer-desktops/uk.po index 473c84f6..ffda12b5 100644 --- a/translations/desktop_files/korganizer-desktops/uk.po +++ b/translations/desktop_files/korganizer-desktops/uk.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-11 02:31+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-22 07:31+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/korganizer-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Comment #: dcopcalendar.desktop:5 @@ -49,9 +51,8 @@ msgstr "Демон клієнта нагадування для KOrganizer" #. Name #: korganizer.desktop:4 -#, fuzzy msgid "KOrganizer" -msgstr "Складова KOrganizer" +msgstr "KOrganizer" #. GenericName #: korganizer.desktop:6 diff --git a/translations/desktop_files/ktnef-desktops/cs.po b/translations/desktop_files/ktnef-desktops/cs.po index 298d0cfc..d1012391 100644 --- a/translations/desktop_files/ktnef-desktops/cs.po +++ b/translations/desktop_files/ktnef-desktops/cs.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-09-20 18:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/ktnef-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.2.2\n" #. Name #: gui/ktnef.desktop:2 msgid "KTnef" -msgstr "" +msgstr "KTnef" #. GenericName #: gui/ktnef.desktop:4 @@ -29,7 +30,7 @@ msgstr "Prohlížeč TNEF souborů" #. Comment #: gui/ktnef.desktop:6 msgid "A viewer/extractor for TNEF files" -msgstr "Prohlížeč TNEF souborů" +msgstr "Prohlížeč/rozbalovač TNEF souborů" #. Comment #: gui/ms-tnef.desktop:7 diff --git a/translations/desktop_files/ktnef-desktops/it.po b/translations/desktop_files/ktnef-desktops/it.po index 4288f376..47724605 100644 --- a/translations/desktop_files/ktnef-desktops/it.po +++ b/translations/desktop_files/ktnef-desktops/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-29 07:59+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/ktnef-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Name #: gui/ktnef.desktop:2 msgid "KTnef" -msgstr "" +msgstr "KTnef" #. GenericName #: gui/ktnef.desktop:4 diff --git a/translations/desktop_files/ktnef-desktops/uk.po b/translations/desktop_files/ktnef-desktops/uk.po index ed6937b5..b5ef6d42 100644 --- a/translations/desktop_files/ktnef-desktops/uk.po +++ b/translations/desktop_files/ktnef-desktops/uk.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-22 07:31+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/ktnef-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: gui/ktnef.desktop:2 msgid "KTnef" -msgstr "" +msgstr "KTnef" #. GenericName #: gui/ktnef.desktop:4 diff --git a/translations/desktop_files/libkcal-desktops/cs.po b/translations/desktop_files/libkcal-desktops/cs.po index 9ebb557c..514aff7f 100644 --- a/translations/desktop_files/libkcal-desktops/cs.po +++ b/translations/desktop_files/libkcal-desktops/cs.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:31+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/libkcal-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Name #: kcal_manager.desktop:2 @@ -24,9 +25,9 @@ msgstr "Kalendář" #. Name #: local.desktop:2 msgid "Calendar in Local File" -msgstr "Kalendář v lokálním souboru" +msgstr "Kalendář v lokálním souboru" #. Name #: localdir.desktop:2 msgid "Calendar in Local Directory" -msgstr "Kalendář v lokální složce" +msgstr "Kalendář v lokální složce" diff --git a/translations/desktop_files/libtdepim-desktops/cs.po b/translations/desktop_files/libtdepim-desktops/cs.po index b20de598..3cb9e817 100644 --- a/translations/desktop_files/libtdepim-desktops/cs.po +++ b/translations/desktop_files/libtdepim-desktops/cs.po @@ -1,50 +1,50 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:35+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/libtdepim-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Name #: komposer/core/komposerconfig.desktop:12 -#, fuzzy msgid "Komposer" -msgstr "Komposer editor" +msgstr "Komposer" #. Comment #: komposer/core/komposerconfig.desktop:14 msgid "TDE Komposer" -msgstr "" +msgstr "Komposer TDE" #. Keywords #: komposer/core/komposerconfig.desktop:16 msgid "komposer;" -msgstr "" +msgstr "komposer;editor;" #. Comment #. Name #: komposer/core/komposereditor.desktop:6 #: komposer/plugins/default/defaulteditor.desktop:20 msgid "Komposer Editor" -msgstr "Komposer editor" +msgstr "Editor Komposer" #. Name #: komposer/core/komposerplugin.desktop:6 msgid "Komposer Plugin" -msgstr "Komposer modul" +msgstr "Modul Komposer" #. Comment #: komposer/plugins/default/defaulteditor.desktop:22 msgid "Komposer default editor" -msgstr "Výchozí Komposer editor" +msgstr "Výchozí editor Komposer" diff --git a/translations/desktop_files/libtdepim-desktops/it.po b/translations/desktop_files/libtdepim-desktops/it.po index c6ed686e..d4d66ef9 100644 --- a/translations/desktop_files/libtdepim-desktops/it.po +++ b/translations/desktop_files/libtdepim-desktops/it.po @@ -1,36 +1,36 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:35+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-22 12:59+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/libtdepim-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Name #: komposer/core/komposerconfig.desktop:12 -#, fuzzy msgid "Komposer" msgstr "Komposer editor" #. Comment #: komposer/core/komposerconfig.desktop:14 msgid "TDE Komposer" -msgstr "" +msgstr "TDE Komposer" #. Keywords #: komposer/core/komposerconfig.desktop:16 msgid "komposer;" -msgstr "" +msgstr "komposer;" #. Comment #. Name diff --git a/translations/desktop_files/libtdepim-desktops/uk.po b/translations/desktop_files/libtdepim-desktops/uk.po index 6a3af301..a6c004ce 100644 --- a/translations/desktop_files/libtdepim-desktops/uk.po +++ b/translations/desktop_files/libtdepim-desktops/uk.po @@ -1,36 +1,37 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 14:35+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-30 09:31+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/libtdepim-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: komposer/core/komposerconfig.desktop:12 -#, fuzzy msgid "Komposer" -msgstr "Редактор Komposer" +msgstr "Komposer" #. Comment #: komposer/core/komposerconfig.desktop:14 msgid "TDE Komposer" -msgstr "" +msgstr "TDE Komposer" #. Keywords #: komposer/core/komposerconfig.desktop:16 msgid "komposer;" -msgstr "" +msgstr "komposer;" #. Comment #. Name diff --git a/translations/desktop_files/tdeabc-desktops/cs.po b/translations/desktop_files/tdeabc-desktops/cs.po new file mode 100644 index 00000000..f85c7506 --- /dev/null +++ b/translations/desktop_files/tdeabc-desktops/cs.po @@ -0,0 +1,28 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2020. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 15:04+0200\n" +"PO-Revision-Date: 2020-09-20 18:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/tdeabc-desktop-files/cs/>\n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.2.2\n" + +#. Name +#: tdeabcdistlistupdater/tdeabcdistlistupdater.desktop:2 +msgid "tdeabcdistlistupdater" +msgstr "tdeabcdistlistupdater" + +#. Comment +#: tdeabcdistlistupdater/tdeabcdistlistupdater.desktop:4 +msgid "Tool to update the old distribution lists to the new ones." +msgstr "Nástroj pro aktualizaci starých distribučních seznamů na nové." diff --git a/translations/desktop_files/tdeabc-desktops/it.po b/translations/desktop_files/tdeabc-desktops/it.po new file mode 100644 index 00000000..82a8177d --- /dev/null +++ b/translations/desktop_files/tdeabc-desktops/it.po @@ -0,0 +1,29 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 15:04+0200\n" +"PO-Revision-Date: 2020-11-22 12:59+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/tdeabc-desktop-files/it/>\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" + +#. Name +#: tdeabcdistlistupdater/tdeabcdistlistupdater.desktop:2 +msgid "tdeabcdistlistupdater" +msgstr "tdeabcdistlistupdater" + +#. Comment +#: tdeabcdistlistupdater/tdeabcdistlistupdater.desktop:4 +msgid "Tool to update the old distribution lists to the new ones." +msgstr "" +"Strumento per aggiornare dalle vecchie liste di distribuzione a quelle nuove." diff --git a/translations/desktop_files/tdeabc-desktops/pt.po b/translations/desktop_files/tdeabc-desktops/pt.po new file mode 100644 index 00000000..18ed34be --- /dev/null +++ b/translations/desktop_files/tdeabc-desktops/pt.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 15:04+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: tdeabcdistlistupdater/tdeabcdistlistupdater.desktop:2 +msgid "tdeabcdistlistupdater" +msgstr "" + +#. Comment +#: tdeabcdistlistupdater/tdeabcdistlistupdater.desktop:4 +msgid "Tool to update the old distribution lists to the new ones." +msgstr "" diff --git a/translations/desktop_files/tdeabc-desktops/uk.po b/translations/desktop_files/tdeabc-desktops/uk.po new file mode 100644 index 00000000..6c6a46df --- /dev/null +++ b/translations/desktop_files/tdeabc-desktops/uk.po @@ -0,0 +1,29 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Roman Savochenko <roman@oscada.org>, 2020. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-12 15:04+0200\n" +"PO-Revision-Date: 2020-08-30 09:31+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/tdeabc-desktop-files/uk/>\n" +"Language: uk\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" + +#. Name +#: tdeabcdistlistupdater/tdeabcdistlistupdater.desktop:2 +msgid "tdeabcdistlistupdater" +msgstr "tdeabcdistlistupdater" + +#. Comment +#: tdeabcdistlistupdater/tdeabcdistlistupdater.desktop:4 +msgid "Tool to update the old distribution lists to the new ones." +msgstr "Інструмент оновлення старих переліків розповсюдження до нових." diff --git a/translations/desktop_files/tdefile-desktops/cs.po b/translations/desktop_files/tdefile-desktops/cs.po index 57327254..cdbf3415 100644 --- a/translations/desktop_files/tdefile-desktops/cs.po +++ b/translations/desktop_files/tdefile-desktops/cs.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 15:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/tdefile-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Name #: ics/tdefile_ics.desktop:2 @@ -34,4 +35,4 @@ msgstr "Informace o emailu" #. Name #: vcf/tdefile_vcf.desktop:2 msgid "vCard Info" -msgstr "VCard info" +msgstr "Informace o vizitce vCard" diff --git a/translations/desktop_files/tdeioslave-desktops/cs.po b/translations/desktop_files/tdeioslave-desktops/cs.po index fa48a356..8e9cc632 100644 --- a/translations/desktop_files/tdeioslave-desktops/cs.po +++ b/translations/desktop_files/tdeioslave-desktops/cs.po @@ -1,22 +1,23 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 15:12+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/tdeioslave-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Description #: sieve/sieve.protocol:15 msgid "An ioslave for the Sieve mail filtering protocol" -msgstr "ioslave pro protokol filtrování zpráv Sieve" +msgstr "Pomocný protokol pro filtrování zpráv Sieve" diff --git a/translations/desktop_files/tderesources-desktops/cs.po b/translations/desktop_files/tderesources-desktops/cs.po index 93e98860..9dd0030e 100644 --- a/translations/desktop_files/tderesources-desktops/cs.po +++ b/translations/desktop_files/tderesources-desktops/cs.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-12 15:39+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2021-07-07 18:18+0000\n" +"PO-Revision-Date: 2021-09-13 23:30+0000\n" +"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n" +"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdepim/tdepimresources-desktop-files/cs/>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" #. Name #: birthdays/tdeabc.desktop:2 msgid "Birthdays From KAddressBook" -msgstr "Narozeniny z Knihy adres" +msgstr "Narozeniny z Knihy adres" #. Name #: blogging/blogging.desktop:2 @@ -29,28 +30,28 @@ msgstr "Deníky jako blogy na serveru" #. Name #: caldav/kcal_caldav.desktop:2 msgid "CalDAV Server (e.g. Google Calendar)" -msgstr "CalDAV server (např. Google Calendar)" +msgstr "Server CalDAV (např. Google Calendar)" #. Name #: carddav/tdeabc_carddav.desktop:2 msgid "CardDAV Server (e.g. Zimbra Contacts)" -msgstr "CardDAV server (např. Zimbra Contacts)" +msgstr "Server CardDAV (např. Zimbra Contacts)" #. Name #: egroupware/kcal_xmlrpc.desktop:2 egroupware/knotes_xmlrpc.desktop:2 #: egroupware/tdeabc_xmlrpc.desktop:2 msgid "eGroupware Server (via XML-RPC)" -msgstr "eGroupware Server (přes XML-RPC)" +msgstr "Server eGroupware (přes XML-RPC)" #. Name #: exchange/exchange.desktop:2 msgid "Exchange 2000 Server" -msgstr "Exchange 2000 server" +msgstr "Server Exchange 2000" #. Name #: exchange/exchange_deprecated.desktop:4 msgid "Exchange 2000 Server (deprecated)" -msgstr "Exchange 2000 server (zastaralé)" +msgstr "Server Exchange 2000 (zastaralé)" #. Name #: featureplan/kcal_resourcefeatureplan.desktop:2 @@ -60,7 +61,7 @@ msgstr "XML plán vlastností" #. Name #: groupdav/kcal_groupdav.desktop:2 groupdav/tdeabc_groupdav.desktop:2 msgid "GroupDAV Server (e.g. OpenGroupware)" -msgstr "GroupDAV server (např. OpenGroupware)" +msgstr "Server GroupDAV (např. OpenGroupware)" #. Name #: groupware/kcal_groupware.desktop:2 groupware/tdeabc_groupware.desktop:2 @@ -70,7 +71,7 @@ msgstr "Groupware server" #. Name #: groupwise/kcal_groupwise.desktop:2 groupwise/tdeabc_groupwise.desktop:2 msgid "Novell GroupWise Server" -msgstr "Novell GroupWise server" +msgstr "Server Novell GroupWise" #. Name #: kolab/kcal/kolab.desktop:2 @@ -114,32 +115,28 @@ msgstr "Kalendář ve vzdáleném souboru" #. Name #: scalix/kcal/scalix.desktop:2 -#, fuzzy msgid "Calendar on Scalix Server via KMail" -msgstr "Kalendář na IMAP serveru přes KMail" +msgstr "Kalendář na serveru Scalix přes KMail" #. Name #: scalix/knotes/scalix.desktop:2 -#, fuzzy msgid "Notes on Scalix Server via KMail" -msgstr "Kalendář na IMAP serveru přes KMail" +msgstr "Poznámky na serveru Scalix přes KMail" #. Name #: scalix/tdeabc/scalix.desktop:2 -#, fuzzy msgid "Addressbook on Scalix Server via KMail" -msgstr "Kniha adres na IMAP serveru přes KMail" +msgstr "Kniha adres na serveru Scalix přes KMail" #. Name #: slox/kcal_ox.desktop:2 slox/tdeabc_ox.desktop:2 -#, fuzzy msgid "OpenXchange Server" -msgstr "SUSE LINUX Openexchange server" +msgstr "Server OpenXchange" #. Name #: slox/kcal_slox.desktop:2 slox/tdeabc_slox.desktop:2 msgid "SUSE LINUX Openexchange Server" -msgstr "SUSE LINUX Openexchange server" +msgstr "Server SUSE LINUX Openexchange" #. Name #: tvanytime/kcal_tvanytime.desktop:2 diff --git a/translations/desktop_files/tderesources-desktops/it.po b/translations/desktop_files/tderesources-desktops/it.po index b237014e..9271fe10 100644 --- a/translations/desktop_files/tderesources-desktops/it.po +++ b/translations/desktop_files/tderesources-desktops/it.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 15:39+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-22 12:59+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/tdepimresources-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Name #: birthdays/tdeabc.desktop:2 @@ -129,9 +130,8 @@ msgstr "Rubrica indirizzi su server Scalix via KMail" #. Name #: slox/kcal_ox.desktop:2 slox/tdeabc_ox.desktop:2 -#, fuzzy msgid "OpenXchange Server" -msgstr "Server SUSE LINUX Openexchange" +msgstr "Server Openexchange" #. Name #: slox/kcal_slox.desktop:2 slox/tdeabc_slox.desktop:2 diff --git a/translations/desktop_files/tderesources-desktops/tderesources-desktops.pot b/translations/desktop_files/tderesources-desktops/tderesources-desktops.pot index c16fe8b4..0c17569f 100644 --- a/translations/desktop_files/tderesources-desktops/tderesources-desktops.pot +++ b/translations/desktop_files/tderesources-desktops/tderesources-desktops.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-12 15:39+0200\n" +"POT-Creation-Date: 2021-07-07 22:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -37,8 +37,7 @@ msgid "CardDAV Server (e.g. Zimbra Contacts)" msgstr "" #. Name -#: egroupware/kcal_xmlrpc.desktop:2 -#: egroupware/knotes_xmlrpc.desktop:2 +#: egroupware/kcal_xmlrpc.desktop:2 egroupware/knotes_xmlrpc.desktop:2 #: egroupware/tdeabc_xmlrpc.desktop:2 msgid "eGroupware Server (via XML-RPC)" msgstr "" @@ -59,20 +58,17 @@ msgid "XML Feature Plan" msgstr "" #. Name -#: groupdav/kcal_groupdav.desktop:2 -#: groupdav/tdeabc_groupdav.desktop:2 +#: groupdav/kcal_groupdav.desktop:2 groupdav/tdeabc_groupdav.desktop:2 msgid "GroupDAV Server (e.g. OpenGroupware)" msgstr "" #. Name -#: groupware/kcal_groupware.desktop:2 -#: groupware/tdeabc_groupware.desktop:2 +#: groupware/kcal_groupware.desktop:2 groupware/tdeabc_groupware.desktop:2 msgid "Groupware Server" msgstr "" #. Name -#: groupwise/kcal_groupwise.desktop:2 -#: groupwise/tdeabc_groupwise.desktop:2 +#: groupwise/kcal_groupwise.desktop:2 groupwise/tdeabc_groupwise.desktop:2 msgid "Novell GroupWise Server" msgstr "" diff --git a/translations/desktop_files/tderesources-desktops/uk.po b/translations/desktop_files/tderesources-desktops/uk.po index 979246cc..48c7ef6d 100644 --- a/translations/desktop_files/tderesources-desktops/uk.po +++ b/translations/desktop_files/tderesources-desktops/uk.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-12 15:39+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-08-30 09:31+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdepim/tdepimresources-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.1.1\n" #. Name #: birthdays/tdeabc.desktop:2 @@ -55,7 +57,7 @@ msgstr "Сервер Exchange 2000 (застаріле)" #. Name #: featureplan/kcal_resourcefeatureplan.desktop:2 msgid "XML Feature Plan" -msgstr "" +msgstr "План функцій XML" #. Name #: groupdav/kcal_groupdav.desktop:2 groupdav/tdeabc_groupdav.desktop:2 @@ -114,21 +116,18 @@ msgstr "Календар у віддаленому файлі" #. Name #: scalix/kcal/scalix.desktop:2 -#, fuzzy msgid "Calendar on Scalix Server via KMail" -msgstr "Календар на сервері IMAP через KMail" +msgstr "Календар на Scalix Сервері через KMail" #. Name #: scalix/knotes/scalix.desktop:2 -#, fuzzy msgid "Notes on Scalix Server via KMail" -msgstr "Календар на сервері IMAP через KMail" +msgstr "Нотатки на Scalix Сервері через KMail" #. Name #: scalix/tdeabc/scalix.desktop:2 -#, fuzzy msgid "Addressbook on Scalix Server via KMail" -msgstr "Адресна книга на сервері IMAP через KMail" +msgstr "Адресна книга на Scalix Сервері через KMail" #. Name #: slox/kcal_ox.desktop:2 slox/tdeabc_ox.desktop:2 diff --git a/wizards/egroupwarewizard.h b/wizards/egroupwarewizard.h index 431c61d3..bd25dea1 100644 --- a/wizards/egroupwarewizard.h +++ b/wizards/egroupwarewizard.h @@ -22,7 +22,7 @@ #define EGROUPWAREWIZARD_H #include <tdeconfigwizard.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class TQCheckBox; diff --git a/wizards/exchangewizard.h b/wizards/exchangewizard.h index ffa35d02..8f4978ed 100644 --- a/wizards/exchangewizard.h +++ b/wizards/exchangewizard.h @@ -21,7 +21,7 @@ #define EXCHANGEWIZARD_H #include <tdeconfigwizard.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class TQCheckBox; diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h index 7960a39b..734e14d7 100644 --- a/wizards/groupwisewizard.h +++ b/wizards/groupwisewizard.h @@ -21,7 +21,7 @@ #define GROUPWISEWIZARD_H #include <tdeconfigwizard.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class TQCheckBox; diff --git a/wizards/kolabwizard.h b/wizards/kolabwizard.h index 99fd0c0d..a0f898a0 100644 --- a/wizards/kolabwizard.h +++ b/wizards/kolabwizard.h @@ -23,7 +23,7 @@ #define KOLABWIZARD_H #include <tdeconfigwizard.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class TQCheckBox; diff --git a/wizards/scalixwizard.h b/wizards/scalixwizard.h index 273f6c4a..3b5b5ec3 100644 --- a/wizards/scalixwizard.h +++ b/wizards/scalixwizard.h @@ -23,7 +23,7 @@ #define SCALIXWIZARD_H #include <tdeconfigwizard.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KComboBox; class KLineEdit; diff --git a/wizards/sloxwizard.h b/wizards/sloxwizard.h index d9b24c60..ad6ec0d2 100644 --- a/wizards/sloxwizard.h +++ b/wizards/sloxwizard.h @@ -21,7 +21,7 @@ #define SLOXWIZARD_H #include <tdeconfigwizard.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class TQCheckBox; |