From 35357e437c5262a4f71da5ec3019b2507ebc0afb Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Thu, 22 Feb 2024 08:33:31 -0500 Subject: [PATCH] Update copyright --- CMakeLists.txt | 7 +++- COPYING | 2 +- LICENSE.BSD | 2 +- cmake/Conky.cmake | 2 +- cmake/ConkyBuildOptions.cmake | 42 ++++++++++--------- cmake/ConkyCPackSetup.cmake | 32 ++++++++------- cmake/ConkyPlatformChecks.cmake | 4 +- cmake/ToLua.cmake | 25 ++++++------ cmake/UninstallConky.cmake.in | 71 ++++++++++++++++++--------------- data/CMakeLists.txt | 22 +++++----- doc/CMakeLists.txt | 5 +-- extras/CMakeLists.txt | 2 +- lua/CMakeLists.txt | 17 ++++---- lua/libcairo-helper.h | 2 +- lua/libcairo_imlib2_helper.h | 2 +- lua/librsvg-helper.h | 2 +- src/CMakeLists.txt | 4 +- src/algebra.cc | 2 +- src/algebra.h | 2 +- src/bsdapm.cc | 2 +- src/bsdapm.h | 2 +- src/ccurl_thread.cc | 2 +- src/ccurl_thread.h | 2 +- src/colour-settings.cc | 2 +- src/colour-settings.h | 2 +- src/colours.cc | 4 +- src/colours.h | 2 +- src/combine.cc | 2 +- src/combine.h | 2 +- src/common.cc | 4 +- src/common.h | 2 +- src/conky.cc | 2 +- src/conky.h | 2 +- src/core.cc | 2 +- src/core.h | 2 +- src/cpu.cc | 2 +- src/cpu.h | 2 +- src/diskio.cc | 2 +- src/diskio.h | 2 +- src/display-console.cc | 2 +- src/display-file.cc | 2 +- src/display-http.cc | 2 +- src/display-ncurses.cc | 6 +-- src/display-output.cc | 2 +- src/display-wayland.cc | 2 +- src/display-x11.cc | 2 +- src/entropy.cc | 2 +- src/entropy.h | 2 +- src/exec.cc | 2 +- src/exec.h | 2 +- src/fonts.cc | 2 +- src/fonts.h | 2 +- src/freebsd.cc | 2 +- src/freebsd.h | 2 +- src/fs.cc | 2 +- src/fs.h | 2 +- src/gradient.cc | 5 ++- src/gradient.h | 2 +- src/gui.cc | 2 +- src/gui.h | 2 +- src/haiku.cc | 2 +- src/hddtemp.cc | 2 +- src/hddtemp.h | 2 +- src/i18n.h | 2 +- src/i8k.cc | 2 +- src/i8k.h | 2 +- src/ibm.cc | 2 +- src/ibm.h | 2 +- src/ical.cc | 2 +- src/ical.h | 2 +- src/iconv_tools.cc | 2 +- src/iconv_tools.h | 2 +- src/imlib2.cc | 2 +- src/imlib2.h | 2 +- src/irc.cc | 2 +- src/irc.h | 2 +- src/journal.cc | 2 +- src/journal.h | 2 +- src/linux.cc | 2 +- src/linux.h | 2 +- src/llua.cc | 2 +- src/llua.h | 2 +- src/logging.h | 2 +- src/mail.cc | 2 +- src/mail.h | 2 +- src/main.cc | 2 +- src/main.h | 2 +- src/mboxscan.cc | 2 +- src/mboxscan.h | 2 +- src/mixer.cc | 2 +- src/mixer.h | 2 +- src/mpd.cc | 2 +- src/mpd.h | 2 +- src/mysql.cc | 2 +- src/mysql.h | 2 +- src/nc.cc | 2 +- src/nc.h | 2 +- src/net_stat.cc | 2 +- src/net_stat.h | 2 +- src/netbsd.cc | 2 +- src/nvidia.cc | 2 +- src/nvidia.h | 2 +- src/openbsd.cc | 2 +- src/proc.cc | 2 +- src/proc.h | 2 +- src/pulseaudio.cc | 2 +- src/pulseaudio.h | 2 +- src/read_tcpip.cc | 2 +- src/read_tcpip.h | 2 +- src/rss.cc | 2 +- src/rss.h | 2 +- src/scroll.cc | 2 +- src/scroll.h | 2 +- src/solaris.cc | 2 +- src/sony.cc | 2 +- src/sony.h | 2 +- src/specials.cc | 6 +-- src/specials.h | 2 +- src/tailhead.cc | 2 +- src/tailhead.h | 2 +- src/template.cc | 2 +- src/template.h | 2 +- src/text_object.cc | 2 +- src/text_object.h | 2 +- src/timeinfo.cc | 4 +- src/timeinfo.h | 2 +- src/top.cc | 10 ++--- src/top.h | 2 +- src/user.cc | 2 +- src/user.h | 2 +- src/users.cc | 2 +- src/users.h | 2 +- src/wl.cc | 2 +- src/wl.h | 2 +- src/x11.cc | 2 +- src/x11.h | 2 +- src/xmms2.cc | 2 +- src/xmms2.h | 2 +- tests/test-common.cc | 2 +- tests/test-conky.cc | 2 +- tests/test-core.cc | 2 +- tests/test-darwin.cc | 2 +- tests/test-diskio.cc | 2 +- tests/test-fs.cc | 2 +- tests/test-gradient.cc | 2 +- tests/test-graph.cc | 2 +- tests/test-linux.cc | 2 +- 147 files changed, 271 insertions(+), 257 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 186a87acb6..ec512ea35c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under @@ -47,6 +47,7 @@ set(conky_sources ${CMAKE_BINARY_DIR}/config.h ${CMAKE_BINARY_DIR}/build.h) add_subdirectory(lua) add_subdirectory(data) add_subdirectory(doc) + if(BUILD_EXTRAS) add_subdirectory(extras) endif(BUILD_EXTRAS) @@ -61,6 +62,7 @@ if(BUILD_TESTS) include(CodeCoverage) append_coverage_compiler_flags() endif() + include(Catch) endif() @@ -74,6 +76,7 @@ endif() if(NOT DEFINED DOC_PATH) set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${VERSION}") endif(NOT DEFINED DOC_PATH) + set(DOC_FILES extras/convert.lua data/conky_no_x11.conf data/conky.conf) install(FILES ${DOC_FILES} DESTINATION ${DOC_PATH}) @@ -86,7 +89,7 @@ endif(CHECK_CODE_QUALITY) # uninstall target if(NOT TARGET uninstall) configure_file( - "${CMAKE_MODULE_PATH}/UninstallConky.cmake.in" + "${CMAKE_MODULE_PATH}/UninstallConky.cmake.in" "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) diff --git a/COPYING b/COPYING index 16373bcb12..1009cb887c 100644 --- a/COPYING +++ b/COPYING @@ -6,5 +6,5 @@ LICENSE for a copy), except where noted differently (such as in portmon and audacious code which are LGPL, and prss which is an MIT-style license). Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen -Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) +Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) All rights reserved. diff --git a/LICENSE.BSD b/LICENSE.BSD index 541d38cfb6..e5a343f618 100644 --- a/LICENSE.BSD +++ b/LICENSE.BSD @@ -4,7 +4,7 @@ is now licensed under GPLv3. Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen -Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) +Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/cmake/Conky.cmake b/cmake/Conky.cmake index 2503fe8601..b85a53831a 100644 --- a/cmake/Conky.cmake +++ b/cmake/Conky.cmake @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under diff --git a/cmake/ConkyBuildOptions.cmake b/cmake/ConkyBuildOptions.cmake index e38d3f9ba5..7ff95d9df7 100644 --- a/cmake/ConkyBuildOptions.cmake +++ b/cmake/ConkyBuildOptions.cmake @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under @@ -26,15 +26,15 @@ if(NOT CMAKE_BUILD_TYPE) set( CMAKE_BUILD_TYPE Debug CACHE - STRING - "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." + STRING + "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) else(MAINTAINER_MODE) set( CMAKE_BUILD_TYPE RelWithDebInfo CACHE - STRING - "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." + STRING + "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) endif(MAINTAINER_MODE) endif(NOT CMAKE_BUILD_TYPE) @@ -66,22 +66,25 @@ option(BUILD_DOCS "Build documentation" false) option(BUILD_EXTRAS "Build extras (includes syntax files for editors)" false) option(BUILD_I18N "Enable if you want internationalization support" true) + if(BUILD_I18N) set(LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale" - CACHE STRING "Directory containing the locales") + CACHE STRING "Directory containing the locales") endif(BUILD_I18N) # Some standard options set(SYSTEM_CONFIG_FILE "/etc/conky/conky.conf" - CACHE STRING "Default system-wide Conky configuration file") + CACHE STRING "Default system-wide Conky configuration file") + # use FORCE below to make sure this changes when CMAKE_INSTALL_PREFIX is # modified if(NOT LIB_INSTALL_DIR) set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") endif(NOT LIB_INSTALL_DIR) + set(PACKAGE_LIBRARY_DIR "${LIB_INSTALL_DIR}/conky" - CACHE STRING "Package library path (where Lua bindings are installed" - FORCE) + CACHE STRING "Package library path (where Lua bindings are installed" + FORCE) set(DEFAULTNETDEV "eno1" CACHE STRING "Default networkdevice") # Mac only override @@ -90,13 +93,13 @@ if(OS_DARWIN) endif(OS_DARWIN) set(XDG_CONFIG_FILE "$HOME/.config/conky/conky.conf" - CACHE STRING "Configfile of the user (XDG)") + CACHE STRING "Configfile of the user (XDG)") set(CONFIG_FILE "$HOME/.conkyrc" CACHE STRING "Configfile of the user") set(MAX_USER_TEXT_DEFAULT "16384" - CACHE STRING - "Default maximum size of config TEXT buffer, i.e. below TEXT line.") + CACHE STRING + "Default maximum size of config TEXT buffer, i.e. below TEXT line.") set(DEFAULT_TEXT_BUFFER_SIZE "256" - CACHE STRING "Default size used for temporary, static text buffers") + CACHE STRING "Default size used for temporary, static text buffers") set(MAX_NET_INTERFACES "256" CACHE STRING "Maximum number of network devices") # Platform specific options Linux only @@ -127,7 +130,6 @@ cmake_dependent_option( "OS_DARWIN" false) # Optional features etc - option(BUILD_WLAN "Enable wireless support" false) option(BUILD_BUILTIN_CONFIG "Enable builtin default configuration" true) @@ -135,7 +137,7 @@ option(BUILD_BUILTIN_CONFIG "Enable builtin default configuration" true) option(BUILD_IOSTATS "Enable disk I/O stats" true) option(BUILD_OLD_CONFIG "Enable support for the old syntax of configurations" - true) + true) option(BUILD_MATH "Enable math support" true) @@ -198,6 +200,7 @@ dependent_option(BUILD_XINPUT "Build Xinput 2 support" true if(BUILD_X11) set(BUILD_GUI true) endif(BUILD_X11) + if(BUILD_WAYLAND) set(BUILD_GUI true) endif(BUILD_WAYLAND) @@ -236,6 +239,7 @@ option(BUILD_ICAL "Enable if you want iCalendar (RFC 5545) support" false) option(BUILD_IRC "Enable if you want IRC support" false) option(BUILD_HTTP "Enable if you want HTTP support" false) + if(BUILD_HTTP) set(HTTPPORT "10080" CACHE STRING "Port to use for out_to_http") endif(BUILD_HTTP) @@ -245,13 +249,13 @@ option(BUILD_ICONV "Enable iconv support" false) option(BUILD_CMUS "Enable support for cmus music player" true) option(BUILD_JOURNAL "Enable support for reading from the systemd journal" - false) + false) option(BUILD_PULSEAUDIO - "Enable support for Pulseaudio's default sink and source" false) + "Enable support for Pulseaudio's default sink and source" false) option(BUILD_INTEL_BACKLIGHT - "Enable support for Intel backlight" false) + "Enable support for Intel backlight" false) run_dependency_checks() @@ -269,6 +273,6 @@ message(STATUS "CMAKE_CXX_FLAGS_RELEASE: " ${CMAKE_CXX_FLAGS_RELEASE}) message(STATUS "CMAKE_C_FLAGS_RELWITHDEBINFO: " ${CMAKE_C_FLAGS_RELWITHDEBINFO}) message(STATUS "CMAKE_CXX_FLAGS_RELWITHDEBINFO: " - ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) + ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) message(STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE}) diff --git a/cmake/ConkyCPackSetup.cmake b/cmake/ConkyCPackSetup.cmake index cb941c511d..40abac89df 100644 --- a/cmake/ConkyCPackSetup.cmake +++ b/cmake/ConkyCPackSetup.cmake @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under @@ -23,7 +23,7 @@ set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>=2.10-1), libgcc1 (>= 1:4.4.0)") set(CPACK_PACKAGE_CONTACT "brenden@diddyinc.com") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Brenden Matthews") set(CPACK_PACKAGE_FILE_NAME - "${PROJECT_NAME}-${VERSION}-${CMAKE_SYSTEM_NAME}-${CPU_ARCH}") + "${PROJECT_NAME}-${VERSION}-${CMAKE_SYSTEM_NAME}-${CPU_ARCH}") set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_NAME}) @@ -44,20 +44,24 @@ endif(CPACK_GENERATOR MATCHES "NSIS") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION}-src") set(CPACK_SOURCE_GENERATOR "TBZ2") execute_process(COMMAND ${APP_UNAME} - COMMAND ${APP_AWK} "{print $1}" - RESULT_VARIABLE RETVAL - OUTPUT_VARIABLE CPU_ARCH - OUTPUT_STRIP_TRAILING_WHITESPACE) + COMMAND ${APP_AWK} "{print $1}" + RESULT_VARIABLE RETVAL + OUTPUT_VARIABLE CPU_ARCH + OUTPUT_STRIP_TRAILING_WHITESPACE) set(CPACK_SOURCE_IGNORE_FILES - # Exclude backup files generated by text editors. - "~$" - # Git dir/files. - "\\\\.git.*$" - # vim swap files - "\\\\..*\\\\.swp$" - # Build dir. - "build.*$") + + # Exclude backup files generated by text editors. + "~$" + + # Git dir/files. + "\\\\.git.*$" + + # vim swap files + "\\\\..*\\\\.swp$" + + # Build dir. + "build.*$") # Enable CPack include(CPack) diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake index f6dab39e3a..633b69287c 100644 --- a/cmake/ConkyPlatformChecks.cmake +++ b/cmake/ConkyPlatformChecks.cmake @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under @@ -428,10 +428,10 @@ if(BUILD_X11) set(conky_libs ${conky_libs} ${X11_Xinput_LIB}) endif(BUILD_XINPUT) - if(X11_xcb_FOUND) set(HAVE_XCB true) set(conky_libs ${conky_libs} ${X11_xcb_LIB}) + if(X11_xcb_errors_FOUND) set(HAVE_XCB_ERRORS true) set(conky_libs ${conky_libs} ${X11_xcb_LIB} ${X11_xcb_errors_LIB}) diff --git a/cmake/ToLua.cmake b/cmake/ToLua.cmake index 57abbf56c0..823f8f58e5 100644 --- a/cmake/ToLua.cmake +++ b/cmake/ToLua.cmake @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under @@ -30,11 +30,11 @@ function(wrap_tolua VAR FIL) get_filename_component(PATCH ${ARGV2} ABSOLUTE) set(TOLUA_OUT ${CMAKE_CURRENT_BINARY_DIR}/lib${FIL_WE}-orig.c) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lib${FIL_WE}.c - COMMAND ${APP_PATCH} -s ${TOLUA_OUT} ${PATCH} -o - ${CMAKE_CURRENT_BINARY_DIR}/lib${FIL_WE}.c - DEPENDS ${TOLUA_OUT} ${PATCH} - COMMENT "Patching lib${FIL_WE}-orig.c" - VERBATIM) + COMMAND ${APP_PATCH} -s ${TOLUA_OUT} ${PATCH} -o + ${CMAKE_CURRENT_BINARY_DIR}/lib${FIL_WE}.c + DEPENDS ${TOLUA_OUT} ${PATCH} + COMMENT "Patching lib${FIL_WE}-orig.c" + VERBATIM) set_source_files_properties(${TOLUA_OUT} PROPERTIES GENERATED TRUE) else() set(TOLUA_OUT ${CMAKE_CURRENT_BINARY_DIR}/lib${FIL_WE}.c) @@ -43,11 +43,11 @@ function(wrap_tolua VAR FIL) # Call toluapp from 3rdparty/ path directly. The last argument to toluapp is # the path to the tolua Lua sources. add_custom_command(OUTPUT ${TOLUA_OUT} ${INCL} - COMMAND toluapp -n ${FIL_WE} -o ${TOLUA_OUT} ${ABS_FIL} - ${CMAKE_SOURCE_DIR}/3rdparty/toluapp/src/bin/lua/ - DEPENDS ${ABS_FIL} - COMMENT "Running tolua++ on ${FIL}" - VERBATIM) + COMMAND toluapp -n ${FIL_WE} -o ${TOLUA_OUT} ${ABS_FIL} + ${CMAKE_SOURCE_DIR}/3rdparty/toluapp/src/bin/lua/ + DEPENDS ${ABS_FIL} + COMMENT "Running tolua++ on ${FIL}" + VERBATIM) set_source_files_properties(${${VAR}} ${INCL} PROPERTIES GENERATED TRUE) set_source_files_properties( @@ -55,8 +55,7 @@ function(wrap_tolua VAR FIL) PROPERTIES COMPILE_FLAGS "-Wno-bad-function-cast -Wno-unused-parameter -Wno-cast-qual -Wno-error=pedantic" - ) + ) set(${VAR} ${${VAR}} PARENT_SCOPE) - endfunction(wrap_tolua) diff --git a/cmake/UninstallConky.cmake.in b/cmake/UninstallConky.cmake.in index b01928ac55..349bcce41f 100644 --- a/cmake/UninstallConky.cmake.in +++ b/cmake/UninstallConky.cmake.in @@ -1,41 +1,46 @@ # -# Conky, a system monitor, based on torsmo +#Conky, a system monitor, based on torsmo # -# Please see COPYING for details +#Please see COPYING for details # -# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights -# reserved. +#Copyright(c) 2005 - 2024 Brenden Matthews, et.al.(see AUTHORS)All rights +#reserved. # -# 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 3 of the License, or (at your option) any later -# version. +#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 3 of the License, or (at your option) any later +#version. # -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. You should have received a copy of the GNU General Public License -# along with this program. If not, see . +#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, see < http: // www.gnu.org/licenses/>. # -if(NOT EXISTS ${CMAKE_BINARY_DIR}/install_manifest.txt) - message(FATAL_ERROR "Cannot find install manifest: ${CMAKE_BINARY_DIR}/install_manifest.txt") -endif() - -file(READ "${CMAKE_BINARY_DIR}/install_manifest.txt" files) -string(REGEX REPLACE "\n" ";" files "${files}") -foreach(file ${files}) - message(STATUS "Uninstalling $ENV{DESTDIR}${file}") - if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") - exec_program( - ${CMAKE_COMMAND} ARGS "-E remove \"$ENV{DESTDIR}${file}\"" - OUTPUT_VARIABLE rm_out - RETURN_VALUE rm_retval - ) - if(NOT "${rm_retval}" STREQUAL 0) - message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}") +if (NOT EXISTS ${CMAKE_BINARY_DIR} / install_manifest.txt) +message( + FATAL_ERROR + "Cannot find install manifest: ${CMAKE_BINARY_DIR}/install_manifest.txt") endif() - else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") - message(STATUS "File $ENV{DESTDIR}${file} does not exist.") - endif() -endforeach() + + file(READ "${CMAKE_BINARY_DIR}/install_manifest.txt" files) string( + REGEX REPLACE + "\n" + ";" files "${files}") foreach (file ${files}) + message(STATUS "Uninstalling $ENV{DESTDIR}${file}") if ( + IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS + "$ENV{DESTDIR}${file}") + exec_program( + ${CMAKE_COMMAND} ARGS + "-E remove \"$ENV{DESTDIR}${file}\"" OUTPUT_VARIABLE rm_out + RETURN_VALUE rm_retval) if (NOT + "${rm_retval}" STREQUAL 0) + message(FATAL_ERROR + "Problem when removing $ENV{DESTDIR}${file}") + endif() else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS + "$ENV{DESTDIR}${file}") + message(STATUS + "File $ENV{DESTDIR}${file} does not exist.") + endif() endforeach() diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index aa0518d1f5..b50d61dd6b 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under @@ -25,20 +25,21 @@ if(BUILD_BUILTIN_CONFIG) else(BUILD_X11) set(builtin_config conky_no_x11.conf) endif(BUILD_X11) + add_custom_command(OUTPUT defconfig.h - COMMAND ${CMAKE_SOURCE_DIR}/bin/text2c.sh - ${CMAKE_CURRENT_SOURCE_DIR}/${builtin_config} - defconfig.h defconfig - DEPENDS ${builtin_config}) + COMMAND ${CMAKE_SOURCE_DIR}/bin/text2c.sh + ${CMAKE_CURRENT_SOURCE_DIR}/${builtin_config} + defconfig.h defconfig + DEPENDS ${builtin_config}) set(generated_hdr_files ${generated_hdr_files} defconfig.h) endif(BUILD_BUILTIN_CONFIG) if(BUILD_OLD_CONFIG) add_custom_command(OUTPUT convertconf.h - COMMAND ${CMAKE_SOURCE_DIR}/bin/text2c.sh - ${CMAKE_SOURCE_DIR}/extras/convert.lua - convertconf.h convertconf - DEPENDS ${CMAKE_SOURCE_DIR}/extras/convert.lua) + COMMAND ${CMAKE_SOURCE_DIR}/bin/text2c.sh + ${CMAKE_SOURCE_DIR}/extras/convert.lua + convertconf.h convertconf + DEPENDS ${CMAKE_SOURCE_DIR}/extras/convert.lua) set(generated_hdr_files ${generated_hdr_files} convertconf.h) endif(BUILD_OLD_CONFIG) @@ -47,6 +48,5 @@ add_custom_target(generated_hdr_files DEPENDS ${generated_hdr_files}) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") install(FILES conky.desktop DESTINATION share/applications) install(FILES logo/conky-logomark-violet.svg - DESTINATION share/icons/hicolor/scalable/apps) + DESTINATION share/icons/hicolor/scalable/apps) endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index aa9519e2a9..5e2dd65ce9 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under @@ -31,7 +31,7 @@ if(BUILD_DOCS) SOURCES config_settings.yaml variables.yaml lua.yaml man.md.j2 ) add_dependencies(conky.1 man.md) - + set(MAN_PATH "share/man/man1") set(MAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/conky.1) @@ -40,5 +40,4 @@ if(BUILD_DOCS) if(BUILD_DOCS) install(FILES ${MAN_FILES} DESTINATION ${MAN_PATH}) endif(BUILD_DOCS) - endif(BUILD_DOCS) diff --git a/extras/CMakeLists.txt b/extras/CMakeLists.txt index f05db89d7b..5b29960833 100644 --- a/extras/CMakeLists.txt +++ b/extras/CMakeLists.txt @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt index b3acd19a07..ec4d2eecc3 100644 --- a/lua/CMakeLists.txt +++ b/lua/CMakeLists.txt @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under @@ -23,7 +23,6 @@ include(ToLua) add_definitions(-DTOLUA_RELEASE) if(BUILD_X11) - if(BUILD_LUA_CAIRO) include_directories(${luacairo_includes} ${CMAKE_CURRENT_SOURCE_DIR}) @@ -77,21 +76,21 @@ if(BUILD_X11) if(BUILD_LUA_CAIRO AND BUILD_LUA_IMLIB2) include_directories(${luacairo_includes} ${luaimlib2_includes} - ${CMAKE_CURRENT_SOURCE_DIR}) + ${CMAKE_CURRENT_SOURCE_DIR}) wrap_tolua(luacairo_imlib2_helper_src cairo_imlib2_helper.pkg) add_library(conky-cairo_imlib2_helper SHARED ${luacairo_imlib2_helper_src}) set_target_properties(conky-cairo_imlib2_helper - PROPERTIES OUTPUT_NAME "cairo_imlib2_helper") + PROPERTIES OUTPUT_NAME "cairo_imlib2_helper") target_link_libraries(conky-cairo_imlib2_helper - ${luacairo_libs} - ${luaimlib2_libs} - toluapp_lib_static) + ${luacairo_libs} + ${luaimlib2_libs} + toluapp_lib_static) set(lua_libs ${lua_libs} conky-cairo_imlib2_helper) endif(BUILD_LUA_CAIRO AND BUILD_LUA_IMLIB2) endif(BUILD_X11) install(TARGETS ${lua_libs} - LIBRARY DESTINATION ${LIB_INSTALL_DIR}/conky - ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/conky) + LIBRARY DESTINATION ${LIB_INSTALL_DIR}/conky + ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/conky) diff --git a/lua/libcairo-helper.h b/lua/libcairo-helper.h index 6c264d6a22..6c7c1a0ea6 100644 --- a/lua/libcairo-helper.h +++ b/lua/libcairo-helper.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/lua/libcairo_imlib2_helper.h b/lua/libcairo_imlib2_helper.h index 30415e0aa7..3b5718a0d5 100644 --- a/lua/libcairo_imlib2_helper.h +++ b/lua/libcairo_imlib2_helper.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/lua/librsvg-helper.h b/lua/librsvg-helper.h index 27d8eebb5e..3c94528c58 100644 --- a/lua/librsvg-helper.h +++ b/lua/librsvg-helper.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 06002bcfcc..13c6a85419 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under @@ -244,7 +244,7 @@ endif(BUILD_X11) if(BUILD_GUI) set(gui fonts.cc fonts.h gui.cc gui.h) set(optional_sources ${optional_sources} ${gui}) - + if(BUILD_MOUSE_EVENTS) set(mouse_events mouse-events.cc mouse-events.h) set(optional_sources ${optional_sources} ${mouse_events}) diff --git a/src/algebra.cc b/src/algebra.cc index 98e696cd26..3e69294eb8 100644 --- a/src/algebra.cc +++ b/src/algebra.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/algebra.h b/src/algebra.h index 588d4bc28a..2a24f85128 100644 --- a/src/algebra.h +++ b/src/algebra.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/bsdapm.cc b/src/bsdapm.cc index 1be355e1a8..2a45fe54fb 100644 --- a/src/bsdapm.cc +++ b/src/bsdapm.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/bsdapm.h b/src/bsdapm.h index 2e9da5687a..4bb35c7dea 100644 --- a/src/bsdapm.h +++ b/src/bsdapm.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/ccurl_thread.cc b/src/ccurl_thread.cc index 80a807ed1a..fc4caa63ac 100644 --- a/src/ccurl_thread.cc +++ b/src/ccurl_thread.cc @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/ccurl_thread.h b/src/ccurl_thread.h index 0e3ccca80c..da54272ec3 100644 --- a/src/ccurl_thread.h +++ b/src/ccurl_thread.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/colour-settings.cc b/src/colour-settings.cc index 3aa67c76b9..b17fd1ba4d 100644 --- a/src/colour-settings.cc +++ b/src/colour-settings.cc @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/colour-settings.h b/src/colour-settings.h index 646d869598..3af8fac1b0 100644 --- a/src/colour-settings.h +++ b/src/colour-settings.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/colours.cc b/src/colours.cc index 040ac5ffb6..f40ae3ace3 100644 --- a/src/colours.cc +++ b/src/colours.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * @@ -75,7 +75,7 @@ Colour parse_color(const char *name) { unsigned char argb[4] = {0xff, 0, 0, 0}; if (len == 3 || len == 4) { bool skip_alpha = (len == 3); - for (size_t i = 0; i < len; i ++) { + for (size_t i = 0; i < len; i++) { int nib = hex_nibble_value(name[i]); if (nib < 0) { goto err; } // Duplicate the nibble, so "#abc" -> 0xaa, 0xbb, 0xcc diff --git a/src/colours.h b/src/colours.h index f383422ef0..7b2d2cfe2a 100644 --- a/src/colours.h +++ b/src/colours.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/combine.cc b/src/combine.cc index 5262a8db9a..40ab534b13 100644 --- a/src/combine.cc +++ b/src/combine.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/combine.h b/src/combine.h index b0b0c572cf..411ff478a7 100644 --- a/src/combine.h +++ b/src/combine.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/common.cc b/src/common.cc index b988882197..bcbaeebead 100644 --- a/src/common.cc +++ b/src/common.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * @@ -533,7 +533,7 @@ void print_free_bufcache(struct text_object *obj, char *p, } void print_free_cached(struct text_object *obj, char *p, - unsigned int p_max_size) { + unsigned int p_max_size) { human_readable(apply_base_multiplier(obj->data.s, info.free_cached), p, p_max_size); } diff --git a/src/common.h b/src/common.h index bbb90411aa..b637d0b6ca 100644 --- a/src/common.h +++ b/src/common.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/conky.cc b/src/conky.cc index 8c42e1ab4a..3d15f0f2e0 100644 --- a/src/conky.cc +++ b/src/conky.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/conky.h b/src/conky.h index 2d502ee776..1592a50b4f 100644 --- a/src/conky.h +++ b/src/conky.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/core.cc b/src/core.cc index b3d2ad3e80..aecce44ae8 100644 --- a/src/core.cc +++ b/src/core.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/core.h b/src/core.h index 1c4be6534c..368ca696d0 100644 --- a/src/core.h +++ b/src/core.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/cpu.cc b/src/cpu.cc index c7e9e3e0c8..f2548d9e92 100644 --- a/src/cpu.cc +++ b/src/cpu.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/cpu.h b/src/cpu.h index b16af0889a..e1488cb0b8 100644 --- a/src/cpu.h +++ b/src/cpu.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/diskio.cc b/src/diskio.cc index 8f97043dcb..04f267716a 100644 --- a/src/diskio.cc +++ b/src/diskio.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/diskio.h b/src/diskio.h index c9256d631f..e9d4cd58bf 100644 --- a/src/diskio.h +++ b/src/diskio.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/display-console.cc b/src/display-console.cc index 822776bc40..7e1732351a 100644 --- a/src/display-console.cc +++ b/src/display-console.cc @@ -6,7 +6,7 @@ * * Copyright (C) 2018 François Revol et al. * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/display-file.cc b/src/display-file.cc index 0070bd2f5b..12dbac8821 100644 --- a/src/display-file.cc +++ b/src/display-file.cc @@ -6,7 +6,7 @@ * * Copyright (C) 2018 François Revol et al. * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/display-http.cc b/src/display-http.cc index f102738db9..91e0a458b3 100644 --- a/src/display-http.cc +++ b/src/display-http.cc @@ -6,7 +6,7 @@ * * Copyright (C) 2018 François Revol et al. * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/display-ncurses.cc b/src/display-ncurses.cc index 39d9cdd4e2..86b1722ebb 100644 --- a/src/display-ncurses.cc +++ b/src/display-ncurses.cc @@ -6,7 +6,7 @@ * * Copyright (C) 2018 François Revol et al. * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * @@ -128,8 +128,8 @@ bool display_output_ncurses::shutdown() { return false; } void display_output_ncurses::set_foreground_color(Colour c) { int nccolor = to_ncurses(c); - init_pair(nccolor+1, nccolor, COLOR_BLACK); - attron(COLOR_PAIR(nccolor+1)); + init_pair(nccolor + 1, nccolor, COLOR_BLACK); + attron(COLOR_PAIR(nccolor + 1)); } void display_output_ncurses::begin_draw_text() { diff --git a/src/display-output.cc b/src/display-output.cc index b9f49e678a..fe95874192 100644 --- a/src/display-output.cc +++ b/src/display-output.cc @@ -6,7 +6,7 @@ * * Copyright (C) 2018 François Revol et al. * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/display-wayland.cc b/src/display-wayland.cc index fbf4da1dea..880b31d259 100644 --- a/src/display-wayland.cc +++ b/src/display-wayland.cc @@ -6,7 +6,7 @@ * * Copyright (C) 2018-2021 François Revol et al. * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/display-x11.cc b/src/display-x11.cc index e792ba633f..ebb71c0d0a 100644 --- a/src/display-x11.cc +++ b/src/display-x11.cc @@ -6,7 +6,7 @@ * * Copyright (C) 2018-2021 François Revol et al. * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/entropy.cc b/src/entropy.cc index deceebefb4..15273563df 100644 --- a/src/entropy.cc +++ b/src/entropy.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/entropy.h b/src/entropy.h index 8ef99b32f0..addf4bbcab 100644 --- a/src/entropy.h +++ b/src/entropy.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/exec.cc b/src/exec.cc index ec21af477e..edd605714b 100644 --- a/src/exec.cc +++ b/src/exec.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/exec.h b/src/exec.h index db1e83cc11..4b045dbd72 100644 --- a/src/exec.h +++ b/src/exec.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/fonts.cc b/src/fonts.cc index 7d5d27f668..0cfadba4e0 100644 --- a/src/fonts.cc +++ b/src/fonts.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/fonts.h b/src/fonts.h index da32967589..fde446761c 100644 --- a/src/fonts.h +++ b/src/fonts.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/freebsd.cc b/src/freebsd.cc index f39ace5411..2caab79893 100644 --- a/src/freebsd.cc +++ b/src/freebsd.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/freebsd.h b/src/freebsd.h index a899b30a60..f2baf97854 100644 --- a/src/freebsd.h +++ b/src/freebsd.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/fs.cc b/src/fs.cc index 7787f54a9e..061ef5ac9b 100644 --- a/src/fs.cc +++ b/src/fs.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/fs.h b/src/fs.h index a6a0adb37a..16bcafcb19 100644 --- a/src/fs.h +++ b/src/fs.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/gradient.cc b/src/gradient.cc index 1781f430d8..d646520a5c 100644 --- a/src/gradient.cc +++ b/src/gradient.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * @@ -200,7 +200,8 @@ namespace { // Using Rec.2020 color space // Y' = 0.2627 x R + 0.6780 x G + 0.0593 x B long get_luma(long *const rgb) { - return 360L * (uint64_t)(2627L * rgb[0] + 6780L * rgb[1] + 593L * rgb[2]) / 10000L; + return 360L * (uint64_t)(2627L * rgb[0] + 6780L * rgb[1] + 593L * rgb[2]) / + 10000L; } // Using Rec.2020 color space diff --git a/src/gradient.h b/src/gradient.h index 8a76d55f1a..f861ba74d7 100644 --- a/src/gradient.h +++ b/src/gradient.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/gui.cc b/src/gui.cc index 71608d4a6e..76307da0f8 100644 --- a/src/gui.cc +++ b/src/gui.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/gui.h b/src/gui.h index f4af06427b..7dd09106a9 100644 --- a/src/gui.h +++ b/src/gui.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/haiku.cc b/src/haiku.cc index b49bfc2265..73ec54f78c 100644 --- a/src/haiku.cc +++ b/src/haiku.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/hddtemp.cc b/src/hddtemp.cc index 122399f3ec..e2bab99f13 100644 --- a/src/hddtemp.cc +++ b/src/hddtemp.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/hddtemp.h b/src/hddtemp.h index e4879fcb41..8b2a77ba24 100644 --- a/src/hddtemp.h +++ b/src/hddtemp.h @@ -5,7 +5,7 @@ * Please see COPYING for details * * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/i18n.h b/src/i18n.h index 4b77ddd7aa..effaad0192 100644 --- a/src/i18n.h +++ b/src/i18n.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/i8k.cc b/src/i8k.cc index 8783279641..fed53983e2 100644 --- a/src/i8k.cc +++ b/src/i8k.cc @@ -10,7 +10,7 @@ * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/i8k.h b/src/i8k.h index e3cef05e4c..167a441392 100644 --- a/src/i8k.h +++ b/src/i8k.h @@ -10,7 +10,7 @@ * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/ibm.cc b/src/ibm.cc index 1738f7cd50..5b44487532 100644 --- a/src/ibm.cc +++ b/src/ibm.cc @@ -10,7 +10,7 @@ * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/ibm.h b/src/ibm.h index 7bdb5f73a4..ed8b570516 100644 --- a/src/ibm.h +++ b/src/ibm.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/ical.cc b/src/ical.cc index c32318338e..fb39ac1ed6 100644 --- a/src/ical.cc +++ b/src/ical.cc @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/ical.h b/src/ical.h index 00e08def47..3edcc1dcb3 100644 --- a/src/ical.h +++ b/src/ical.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/iconv_tools.cc b/src/iconv_tools.cc index 60f1b67628..5e4d99dc27 100644 --- a/src/iconv_tools.cc +++ b/src/iconv_tools.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/iconv_tools.h b/src/iconv_tools.h index 347b005a21..db9e8fe487 100644 --- a/src/iconv_tools.h +++ b/src/iconv_tools.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/imlib2.cc b/src/imlib2.cc index f6479f2070..094196ea03 100644 --- a/src/imlib2.cc +++ b/src/imlib2.cc @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, et. al. * All rights reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/imlib2.h b/src/imlib2.h index 213ab5005e..4484dc8551 100644 --- a/src/imlib2.h +++ b/src/imlib2.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, et. al. * All rights reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/irc.cc b/src/irc.cc index c1b931d7c8..90cd2b95d0 100644 --- a/src/irc.cc +++ b/src/irc.cc @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/irc.h b/src/irc.h index ba9e5329df..1de9d21ce3 100644 --- a/src/irc.h +++ b/src/irc.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/journal.cc b/src/journal.cc index 5ade3bbeea..3695ae9300 100644 --- a/src/journal.cc +++ b/src/journal.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/journal.h b/src/journal.h index aed24b210a..69b626fc74 100644 --- a/src/journal.h +++ b/src/journal.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/linux.cc b/src/linux.cc index 998c7e1130..634224d2b8 100644 --- a/src/linux.cc +++ b/src/linux.cc @@ -6,7 +6,7 @@ * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/linux.h b/src/linux.h index 1e71657e11..91027f2337 100644 --- a/src/linux.h +++ b/src/linux.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/llua.cc b/src/llua.cc index 1252404727..1353ce38b7 100644 --- a/src/llua.cc +++ b/src/llua.cc @@ -3,7 +3,7 @@ * Conky, a system monitor, based on torsmo * * Copyright (c) 2009 Toni Spets - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/llua.h b/src/llua.h index 150ad8d4b3..d2e373f76a 100644 --- a/src/llua.h +++ b/src/llua.h @@ -3,7 +3,7 @@ * Conky, a system monitor, based on torsmo * * Copyright (c) 2009 Toni Spets - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/logging.h b/src/logging.h index 1c3de80980..ef6cc42644 100644 --- a/src/logging.h +++ b/src/logging.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mail.cc b/src/mail.cc index d4577279a0..d17e84d5b5 100644 --- a/src/mail.cc +++ b/src/mail.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mail.h b/src/mail.h index 4bb2552ac9..c3c71765a3 100644 --- a/src/mail.h +++ b/src/mail.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/main.cc b/src/main.cc index 635a411e76..fd73166a45 100644 --- a/src/main.cc +++ b/src/main.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/main.h b/src/main.h index 9aacec0908..c91cb16c48 100644 --- a/src/main.h +++ b/src/main.h @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mboxscan.cc b/src/mboxscan.cc index 95489f989a..5682418922 100644 --- a/src/mboxscan.cc +++ b/src/mboxscan.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2006 Marco Candrian - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mboxscan.h b/src/mboxscan.h index 80924ce627..0b5d0cbf63 100644 --- a/src/mboxscan.h +++ b/src/mboxscan.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2006 Marco Candrian - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mixer.cc b/src/mixer.cc index 443a8c0da9..e238fec7bb 100644 --- a/src/mixer.cc +++ b/src/mixer.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mixer.h b/src/mixer.h index 98462fbe79..9c706c0375 100644 --- a/src/mixer.h +++ b/src/mixer.h @@ -10,7 +10,7 @@ * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mpd.cc b/src/mpd.cc index 4d28826bed..478f7a5bc9 100644 --- a/src/mpd.cc +++ b/src/mpd.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mpd.h b/src/mpd.h index 5b2a4b308f..f7ca76e618 100644 --- a/src/mpd.h +++ b/src/mpd.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mysql.cc b/src/mysql.cc index daa3214f56..fa31c74f6a 100644 --- a/src/mysql.cc +++ b/src/mysql.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mysql.h b/src/mysql.h index 29d2c5c323..a5aea8b8b3 100644 --- a/src/mysql.h +++ b/src/mysql.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/nc.cc b/src/nc.cc index 0f10fa07b6..d96c95d9ba 100644 --- a/src/nc.cc +++ b/src/nc.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/nc.h b/src/nc.h index 9b75c81a4a..ee4030c1b5 100644 --- a/src/nc.h +++ b/src/nc.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/net_stat.cc b/src/net_stat.cc index b101aa0ded..b36e1ce4c2 100644 --- a/src/net_stat.cc +++ b/src/net_stat.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/net_stat.h b/src/net_stat.h index 954e87a12d..fb74c84be0 100644 --- a/src/net_stat.h +++ b/src/net_stat.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/netbsd.cc b/src/netbsd.cc index 54445a87b1..1db0c90880 100644 --- a/src/netbsd.cc +++ b/src/netbsd.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/nvidia.cc b/src/nvidia.cc index 48c5083ed5..544173e369 100644 --- a/src/nvidia.cc +++ b/src/nvidia.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2008 Markus Meissner - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/nvidia.h b/src/nvidia.h index 523568ae6a..ffe9618142 100644 --- a/src/nvidia.h +++ b/src/nvidia.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2008 Markus Meissner - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/openbsd.cc b/src/openbsd.cc index 35029b8f89..acb87afa67 100644 --- a/src/openbsd.cc +++ b/src/openbsd.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/proc.cc b/src/proc.cc index 177a319991..2807b4c1d4 100644 --- a/src/proc.cc +++ b/src/proc.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/proc.h b/src/proc.h index d7d43de973..c102d5a97f 100644 --- a/src/proc.h +++ b/src/proc.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/pulseaudio.cc b/src/pulseaudio.cc index 68564e4043..020b977b6a 100644 --- a/src/pulseaudio.cc +++ b/src/pulseaudio.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/pulseaudio.h b/src/pulseaudio.h index d01f56da03..4a7e20b79b 100644 --- a/src/pulseaudio.h +++ b/src/pulseaudio.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/read_tcpip.cc b/src/read_tcpip.cc index 236fb49d12..0b26edeb75 100644 --- a/src/read_tcpip.cc +++ b/src/read_tcpip.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/read_tcpip.h b/src/read_tcpip.h index 912efe0f7f..b23e594e93 100644 --- a/src/read_tcpip.h +++ b/src/read_tcpip.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/rss.cc b/src/rss.cc index bb00c646c5..d858319777 100644 --- a/src/rss.cc +++ b/src/rss.cc @@ -5,7 +5,7 @@ * Please see COPYING for details * * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/rss.h b/src/rss.h index 538f7959d4..40b8959e91 100644 --- a/src/rss.h +++ b/src/rss.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/scroll.cc b/src/scroll.cc index c2cf27aa0d..dee6934c07 100644 --- a/src/scroll.cc +++ b/src/scroll.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/scroll.h b/src/scroll.h index c7d9e836a5..b8dc936b8e 100644 --- a/src/scroll.h +++ b/src/scroll.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/solaris.cc b/src/solaris.cc index a227af1fd4..35a0e322da 100644 --- a/src/solaris.cc +++ b/src/solaris.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/sony.cc b/src/sony.cc index 7f2de70ac4..8bda0fd8c7 100644 --- a/src/sony.cc +++ b/src/sony.cc @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * Copyright (c) 2009 Yeon-Hyeong Yang * (see AUTHORS) * All rights reserved. diff --git a/src/sony.h b/src/sony.h index ae614c2dd7..00ab006e9b 100644 --- a/src/sony.h +++ b/src/sony.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * Copyright (c) 2009 Yeon-Hyeong Yang * (see AUTHORS) * All rights reserved. diff --git a/src/specials.cc b/src/specials.cc index 133193cac9..b45c3ef6f2 100644 --- a/src/specials.cc +++ b/src/specials.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * @@ -668,10 +668,10 @@ void new_stippled_hr(struct text_object *obj, char *p, void new_fg(struct text_object *obj, char *p, unsigned int p_max_size) { if (false #ifdef BUILD_GUI - || (display_output() && display_output()->graphical()) + || (display_output() && display_output()->graphical()) #endif /* BUILD_GUI */ #ifdef BUILD_NCURSES - || out_to_ncurses.get(*state) + || out_to_ncurses.get(*state) #endif /* BUILD_NCURSES */ ) { new_special(p, FG)->arg = obj->data.l; diff --git a/src/specials.h b/src/specials.h index 513b43f7a8..efbded2e5f 100644 --- a/src/specials.h +++ b/src/specials.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/tailhead.cc b/src/tailhead.cc index 5c0c0791d4..9733986591 100644 --- a/src/tailhead.cc +++ b/src/tailhead.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/tailhead.h b/src/tailhead.h index c7f1ab9009..67ab331ea4 100644 --- a/src/tailhead.h +++ b/src/tailhead.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/template.cc b/src/template.cc index aee67f4a48..39cc5949cc 100644 --- a/src/template.cc +++ b/src/template.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/template.h b/src/template.h index 53a93c0b89..bc9ad46cda 100644 --- a/src/template.h +++ b/src/template.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/text_object.cc b/src/text_object.cc index 3d3b737241..9a34eac028 100644 --- a/src/text_object.cc +++ b/src/text_object.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/text_object.h b/src/text_object.h index 72cc1c2d7e..dd72776d5b 100644 --- a/src/text_object.h +++ b/src/text_object.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/timeinfo.cc b/src/timeinfo.cc index 1a1da8ea0a..bd6665b61a 100644 --- a/src/timeinfo.cc +++ b/src/timeinfo.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * @@ -31,11 +31,11 @@ #include "timeinfo.h" +#include #include #include #include #include -#include #include "conky.h" #include "logging.h" #include "text_object.h" diff --git a/src/timeinfo.h b/src/timeinfo.h index e969332d56..ccf958816f 100644 --- a/src/timeinfo.h +++ b/src/timeinfo.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/top.cc b/src/top.cc index 73a59e3e56..3c2f1d82fb 100644 --- a/src/top.cc +++ b/src/top.cc @@ -10,7 +10,7 @@ * * Copyright (c) 2005 Adi Zaimi, Dan Piponi , * Dave Clark - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * @@ -99,7 +99,9 @@ static void unhash_all_processes() { } } -struct process *get_first_process() { return first_process; } +struct process *get_first_process() { + return first_process; +} void free_all_processes() { struct process *next = nullptr, *pr = first_process; @@ -390,9 +392,7 @@ static void process_find_top(struct process **cpu, struct process **mem, int update_top() { // if nothing else has ever set up info, we need to update it here, because // info.memmax is used to print percentages in `print_top_mem` - if (info.memmax == 0) { - update_meminfo(); - } + if (info.memmax == 0) { update_meminfo(); } process_find_top(info.cpu, info.memu, info.time #ifdef BUILD_IOSTATS , diff --git a/src/top.h b/src/top.h index f278aeeddb..41a05244d5 100644 --- a/src/top.h +++ b/src/top.h @@ -10,7 +10,7 @@ * * Copyright (c) 2005 Adi Zaimi, Dan Piponi , * Dave Clark - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/user.cc b/src/user.cc index cecd14dae6..c5912262f0 100644 --- a/src/user.cc +++ b/src/user.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/user.h b/src/user.h index dec37c96b5..ad8fab9de7 100644 --- a/src/user.h +++ b/src/user.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/users.cc b/src/users.cc index fc819f801a..f0d2921a3c 100644 --- a/src/users.cc +++ b/src/users.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/users.h b/src/users.h index 8a29e0bb79..09d0db2bc9 100644 --- a/src/users.h +++ b/src/users.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/wl.cc b/src/wl.cc index 4c6f55fc67..d5487cea2e 100644 --- a/src/wl.cc +++ b/src/wl.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/wl.h b/src/wl.h index af1f475489..11be20fb36 100644 --- a/src/wl.h +++ b/src/wl.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/x11.cc b/src/x11.cc index c05e54fae3..cb77b18873 100644 --- a/src/x11.cc +++ b/src/x11.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/x11.h b/src/x11.h index 3273a8bf75..c5bb606809 100644 --- a/src/x11.h +++ b/src/x11.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/xmms2.cc b/src/xmms2.cc index eac53b655a..69af7c1011 100644 --- a/src/xmms2.cc +++ b/src/xmms2.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/xmms2.h b/src/xmms2.h index 18609adac2..7833aed511 100644 --- a/src/xmms2.h +++ b/src/xmms2.h @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/tests/test-common.cc b/tests/test-common.cc index e044dadcd3..69bd124154 100644 --- a/tests/test-common.cc +++ b/tests/test-common.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/tests/test-conky.cc b/tests/test-conky.cc index 8452f889c8..a1d841b0c9 100644 --- a/tests/test-conky.cc +++ b/tests/test-conky.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/tests/test-core.cc b/tests/test-core.cc index c7f80b3f89..769be7681f 100644 --- a/tests/test-core.cc +++ b/tests/test-core.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/tests/test-darwin.cc b/tests/test-darwin.cc index 51a44e7449..b598706d47 100644 --- a/tests/test-darwin.cc +++ b/tests/test-darwin.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/tests/test-diskio.cc b/tests/test-diskio.cc index eb380fb503..a160d57ea3 100644 --- a/tests/test-diskio.cc +++ b/tests/test-diskio.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/tests/test-fs.cc b/tests/test-fs.cc index bcd039a7de..5533f807c0 100644 --- a/tests/test-fs.cc +++ b/tests/test-fs.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/tests/test-gradient.cc b/tests/test-gradient.cc index f4d5399dba..fee3247ac5 100644 --- a/tests/test-gradient.cc +++ b/tests/test-gradient.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/tests/test-graph.cc b/tests/test-graph.cc index 4650b4b193..0f921ef6a1 100644 --- a/tests/test-graph.cc +++ b/tests/test-graph.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/tests/test-linux.cc b/tests/test-linux.cc index c637c06f6a..79ef452382 100644 --- a/tests/test-linux.cc +++ b/tests/test-linux.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. *