From cac5f75de318c219c16744fb01810ac7fa28e939 Mon Sep 17 00:00:00 2001 From: Colin Clark Date: Thu, 4 Apr 2024 18:31:37 +0100 Subject: [PATCH] Additional test for temporary comments - The only sequence checked for is "//~" - Delete existing temporary comments --- meson.build | 15 +++++++++++ scripts/temporary-comments-check.sh | 39 +++++++++++++++++++++++++++++ src/collect-dlg.h | 1 - src/pixbuf-renderer.cc | 7 ------ 4 files changed, 54 insertions(+), 8 deletions(-) create mode 100755 scripts/temporary-comments-check.sh diff --git a/meson.build b/meson.build index 90ac63cc..9d0e1187 100644 --- a/meson.build +++ b/meson.build @@ -756,6 +756,21 @@ else summary({'Debug Statements' : ['Test runs:', false]}, section : 'Testing', bool_yn : true) endif +# Temporary comments checks +tmp_comments_check_sh = find_program('temporary-comments-check.sh', dirs : scriptsdir, required : true) +if tmp_comments_check_sh.found() + foreach source_file : main_sources + pan_view_sources + view_file_sources + source_file_name = fs.name(source_file) + if (source_file_name != 'debug.h') + test('Temporary Comments_ ' + source_file_name, tmp_comments_check_sh, args : [source_file], timeout : 100) + endif + endforeach + + summary({'Temporary Comments' : ['Test runs:', true]}, section : 'Testing', bool_yn : true) +else + summary({'Temporary Comments' : ['Test runs:', false]}, section : 'Testing', bool_yn : true) +endif + # Lua test option = get_option('lua') if not option.disabled() diff --git a/scripts/temporary-comments-check.sh b/scripts/temporary-comments-check.sh new file mode 100755 index 00000000..65c1197e --- /dev/null +++ b/scripts/temporary-comments-check.sh @@ -0,0 +1,39 @@ +#!/bin/sh +#********************************************************************** +# Copyright (C) 2024 - The Geeqie Team +# +# Author: Colin Clark +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#********************************************************************** + +## @file +## @brief Check for temporary comments +## +## $1 Source file to check +## +## Look for //~ +## + +res=$(grep --line-number '//~' "$1") + +if [ -z "$res" ] +then + exit 0 +else + printf "%s\n" "$res" + exit 1 +fi + diff --git a/src/collect-dlg.h b/src/collect-dlg.h index 912bdad7..5ec68bf2 100644 --- a/src/collect-dlg.h +++ b/src/collect-dlg.h @@ -27,7 +27,6 @@ struct CollectionData; void collection_dialog_save_as(CollectionData *cd); void collection_dialog_save_close(CollectionData *cd); -//~ void collection_dialog_load(gchar *path); void collection_dialog_append(CollectionData *cd); diff --git a/src/pixbuf-renderer.cc b/src/pixbuf-renderer.cc index ced53dbf..d79b1d63 100644 --- a/src/pixbuf-renderer.cc +++ b/src/pixbuf-renderer.cc @@ -74,13 +74,6 @@ enum { PR_SCROLLER_DEAD_ZONE = 6 }; -/* when scaling image to below this size, use nearest pixel for scaling - * (below about 4, the other scale types become slow generating their conversion tables) - */ -//~ enum { -//~ PR_MIN_SCALE_SIZE = 8 -//~ }; - enum { SIGNAL_ZOOM = 0, SIGNAL_CLICKED, -- 2.20.1