Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Turns FileData into a C++-style class (phase 1 of #1369) #1375

Closed
wants to merge 16 commits into from
Closed

Turns FileData into a C++-style class (phase 1 of #1369) #1375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a3f7aa7
Moves filedata.cc to filedata/filedata.cc
xsdg May 28, 2024
7745d45
Step 1 of a 2-step copy of filedata.h to filedata.cc
xsdg May 31, 2024
cd1583f
Adds `src/filedata/` subdir to clang-tidy-check.sh
xsdg May 31, 2024
81724ba
Step 2 of a 2-step copy of filedata.h to filedata.cc
xsdg May 31, 2024
971622c
Updates path to `src/filedata/filedata.cc` in translation files.
xsdg May 31, 2024
96b7cbd
Merge commit for 2-step copy of src/filedata.h to src/filedata.cc
xsdg May 31, 2024
e641d17
Uses semi-automated replacements to create a trampoline implementatio…
xsdg May 28, 2024
ddfe039
Fixups to make filedata.cc compilable
xsdg May 29, 2024
cd99df9
Adjusts filedata.h to create both a C++ API and a C API.
xsdg May 31, 2024
f69dd4f
Drops declarations for method with no definition, and declares a defi…
xsdg May 30, 2024
51a9369
Adds "FileData::" class namespace for class methods.
xsdg May 30, 2024
a74f9ea
Uses the "::" scope resolution operator for static class methods
xsdg May 30, 2024
986cbdd
Suppresses the clangtidy warning about class methods that could be st…
xsdg May 29, 2024
07a5dca
Uses __builtin_(FILE/LINE) in place of __FILE__ and __LINE__ macros f…
xsdg May 30, 2024
a22e1dd
Auto-updates POTFILES using `regen-potfiles.sh`
xsdg May 31, 2024
d4ce39d
Refactors how source files are aggregated for testing
xsdg May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ add_global_arguments('-Wno-overlength-strings', language : 'c')
add_global_arguments('-Wno-error=deprecated-declarations', language : 'cpp')

# Project requirements
# code_sources is all human-written geeqie C/C++ code
code_sources = []
# project_sources will include code_sources, as well as auto-generated code,
# third-party code, and some other code-like dependencies.
project_sources = []
gnome = import('gnome')
thread_dep = dependency('threads')
Expand Down Expand Up @@ -729,7 +733,7 @@ if running_from_git
if clang_tidy_exe.found()
git_exe = find_program('git', required : true)

foreach source_file : main_sources + pan_view_sources + view_file_sources
foreach source_file : code_sources
if fs.name(source_file).endswith('.cc')
source_file_name = fs.name(source_file)
config_file = join_paths(meson.project_source_root(), '.clang-tidy')
Expand All @@ -749,7 +753,7 @@ endif
# Single value enum checks
enum_check_sh = find_program('enum-check.sh', dirs : scriptsdir, required : true)
if enum_check_sh.found()
foreach source_file : main_sources + pan_view_sources + view_file_sources
foreach source_file : code_sources
source_file_name = fs.name(source_file)
test('Single Value enum_ ' + source_file_name, enum_check_sh, args : [source_file], timeout : 100, suite : 'analysis')
endforeach
Expand All @@ -762,7 +766,7 @@ endif
# Debug statement checks
debug_check_sh = find_program('debug-check.sh', dirs : scriptsdir, required : true)
if debug_check_sh.found()
foreach source_file : main_sources + pan_view_sources + view_file_sources
foreach source_file : code_sources
source_file_name = fs.name(source_file)
if (source_file_name != 'debug.h')
test('Debug Statements_ ' + source_file_name, debug_check_sh, args : [source_file], timeout : 100, suite : 'analysis')
Expand All @@ -777,7 +781,7 @@ 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
foreach source_file : code_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, suite : 'analysis')
Expand All @@ -794,7 +798,7 @@ gtk4_migration_check_sh = find_program('gtk4-migration-regression-check.sh', dir
if gtk4_migration_check_sh.found()
compat_cc = join_paths(meson.project_source_root(), 'src', 'compat.cc')
compat_h = join_paths(meson.project_source_root(), 'src', 'compat.h')
foreach source_file : main_sources + pan_view_sources + view_file_sources
foreach source_file : code_sources
source_file_name = fs.name(source_file)
if (source_file_name != 'debug.h')
test('GTK4 migration_ ' + source_file_name, gtk4_migration_check_sh, args : [source_file, compat_cc, compat_h], timeout : 100, suite : 'analysis')
Expand All @@ -809,7 +813,7 @@ endif
# Untranslated text checks
untranslated_text_sh = find_program('untranslated-text.sh', dirs : scriptsdir, required : true)
if untranslated_text_sh.found()
foreach source_file : main_sources + pan_view_sources + view_file_sources
foreach source_file : code_sources
if fs.name(source_file).endswith('.cc')
source_file_name = fs.name(source_file)
test('Untranslated Text_ ' + source_file_name, untranslated_text_sh, args : [source_file], timeout : 200, suite : 'analysis')
Expand Down
3 changes: 3 additions & 0 deletions po/POTFILES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
org.geeqie.Geeqie.appdata.xml.in
org.geeqie.Geeqie.desktop.in
plugins/camera-import/org.geeqie.camera-import.desktop.in
plugins/exif-datetime-to-file/org.geeqie.exif-datetime-to-file.desktop.in
plugins/export-jpeg/org.geeqie.export-jpeg.desktop.in
plugins/image-crop/org.geeqie.image-crop.desktop.in
plugins/open-with/org.geeqie.open-with.desktop.in
Expand Down Expand Up @@ -41,6 +42,7 @@ src/exif-common.cc
src/exiv2.cc
src/filecache.cc
src/filedata.cc
src/filedata/filedata.cc
src/filefilter.cc
src/format-canon.cc
src/format-fuji.cc
Expand Down Expand Up @@ -109,6 +111,7 @@ src/secure-save.cc
src/shortcuts.cc
src/similar.cc
src/slideshow.cc
src/tests/pixbuf-util.cc
src/third-party/whereami.cc
src/third-party/zonedetect.cc
src/thumb.cc
Expand Down
36 changes: 18 additions & 18 deletions po/ar.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2664,86 +2664,86 @@ msgstr "تاريخ الملف"
msgid "Lens"
msgstr ""

#: src/filedata.cc:134
#: src/filedata/filedata.cc:134
#, c-format
msgid "%d bytes"
msgstr "%d بايت"

#: src/filedata.cc:138
#: src/filedata/filedata.cc:138
#, fuzzy, c-format
msgid "%.1f KiB"
msgstr "%.1f ك"

#: src/filedata.cc:142
#: src/filedata/filedata.cc:142
#, fuzzy, c-format
msgid "%.1f MiB"
msgstr "%.1f ميجابايت"

#: src/filedata.cc:147
#: src/filedata/filedata.cc:147
#, fuzzy, c-format
msgid "%.1f GiB"
msgstr "%.1f جيجابايت"

#: src/filedata.cc:2826
#: src/filedata/filedata.cc:2826
msgid "file or directory does not exist"
msgstr ""

#: src/filedata.cc:2832
#: src/filedata/filedata.cc:2832
#, fuzzy
msgid "destination already exists"
msgstr ""
"هذا الدليل: \n"
"%s \n"
" موجود بالفعل."

#: src/filedata.cc:2838
#: src/filedata/filedata.cc:2838
msgid "destination can't be overwritten"
msgstr ""

#: src/filedata.cc:2844
#: src/filedata/filedata.cc:2844
msgid "destination directory is not writable"
msgstr ""

#: src/filedata.cc:2850
#: src/filedata/filedata.cc:2850
msgid "destination directory does not exist"
msgstr ""

#: src/filedata.cc:2856
#: src/filedata/filedata.cc:2856
msgid "source directory is not writable"
msgstr ""

#: src/filedata.cc:2862
#: src/filedata/filedata.cc:2862
#, fuzzy
msgid "no read permission"
msgstr "(غير مصرّح للقراءة) %s بايتات"

#: src/filedata.cc:2868
#: src/filedata/filedata.cc:2868
msgid "file is readonly"
msgstr ""

#: src/filedata.cc:2874
#: src/filedata/filedata.cc:2874
msgid "destination already exists and will be overwritten"
msgstr ""

#: src/filedata.cc:2880
#: src/filedata/filedata.cc:2880
#, fuzzy
msgid "source and destination are the same"
msgstr "الملف المصدر هو الملف المهدف. تم إلغاء العملية."

#: src/filedata.cc:2886
#: src/filedata/filedata.cc:2886
#, fuzzy
msgid "source and destination have different extension"
msgstr "الملف المصدر هو الملف المهدف. تم إلغاء العملية."

#: src/filedata.cc:2892
#: src/filedata/filedata.cc:2892
msgid "there are unsaved metadata changes for the file"
msgstr ""

#: src/filedata.cc:2898
#: src/filedata/filedata.cc:2898
msgid "another destination file has the same filename"
msgstr ""

#: src/filedata.cc:3460
#: src/filedata/filedata.cc:3460
#, fuzzy, c-format
msgid "Error: Unable to write marks lists to: %s\n"
msgstr "فشل عملية حفظ قائمة تاريخ إستخدام البرنامج إلى %s \n"
Expand Down
36 changes: 18 additions & 18 deletions po/be.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2604,86 +2604,86 @@ msgstr "Старонка %d"
msgid "Lens"
msgstr ""

#: src/filedata.cc:134
#: src/filedata/filedata.cc:134
#, c-format
msgid "%d bytes"
msgstr "%d байтаў"

#: src/filedata.cc:138
#: src/filedata/filedata.cc:138
#, fuzzy, c-format
msgid "%.1f KiB"
msgstr "%.1f K"

#: src/filedata.cc:142
#: src/filedata/filedata.cc:142
#, fuzzy, c-format
msgid "%.1f MiB"
msgstr "%.1f MB"

#: src/filedata.cc:147
#: src/filedata/filedata.cc:147
#, fuzzy, c-format
msgid "%.1f GiB"
msgstr "%.1f GB"

#: src/filedata.cc:2826
#: src/filedata/filedata.cc:2826
msgid "file or directory does not exist"
msgstr ""

#: src/filedata.cc:2832
#: src/filedata/filedata.cc:2832
#, fuzzy
msgid "destination already exists"
msgstr ""
"Калекцыя:\n"
"%s\n"
"ужо існуе."

#: src/filedata.cc:2838
#: src/filedata/filedata.cc:2838
msgid "destination can't be overwritten"
msgstr ""

#: src/filedata.cc:2844
#: src/filedata/filedata.cc:2844
msgid "destination directory is not writable"
msgstr ""

#: src/filedata.cc:2850
#: src/filedata/filedata.cc:2850
msgid "destination directory does not exist"
msgstr ""

#: src/filedata.cc:2856
#: src/filedata/filedata.cc:2856
msgid "source directory is not writable"
msgstr ""

#: src/filedata.cc:2862
#: src/filedata/filedata.cc:2862
#, fuzzy
msgid "no read permission"
msgstr "(няма правоў для чытання) %s байтаў"

#: src/filedata.cc:2868
#: src/filedata/filedata.cc:2868
msgid "file is readonly"
msgstr ""

#: src/filedata.cc:2874
#: src/filedata/filedata.cc:2874
msgid "destination already exists and will be overwritten"
msgstr ""

#: src/filedata.cc:2880
#: src/filedata/filedata.cc:2880
#, fuzzy
msgid "source and destination are the same"
msgstr "Крыніца і пазначэнне аднолькавыя, аперацыя перарвана"

#: src/filedata.cc:2886
#: src/filedata/filedata.cc:2886
#, fuzzy
msgid "source and destination have different extension"
msgstr "Крыніца і пазначэнне аднолькавыя, аперацыя перарвана"

#: src/filedata.cc:2892
#: src/filedata/filedata.cc:2892
msgid "there are unsaved metadata changes for the file"
msgstr ""

#: src/filedata.cc:2898
#: src/filedata/filedata.cc:2898
msgid "another destination file has the same filename"
msgstr ""

#: src/filedata.cc:3460
#: src/filedata/filedata.cc:3460
#, fuzzy, c-format
msgid "Error: Unable to write marks lists to: %s\n"
msgstr "Немагчыма запісаць спісы гісторыі ў: %s\n"
Expand Down
Loading