From 6f8c1d14846f190b496a470133b65e8be6964ae7 Mon Sep 17 00:00:00 2001 From: twanvl Date: Sat, 2 Aug 2008 15:25:37 +0000 Subject: [PATCH] changed function name (exportCard -> includeCard), because it better describes what the function does. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1032 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/gui/images_export_window.cpp | 4 ++-- src/gui/images_export_window.hpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gui/images_export_window.cpp b/src/gui/images_export_window.cpp index 3c0689b4..0df25334 100644 --- a/src/gui/images_export_window.cpp +++ b/src/gui/images_export_window.cpp @@ -63,7 +63,7 @@ void ExportCardImages::exportImages(const SetP& set, wxFileName& fn, const Strin // Export std::set used; // for CONFLICT_NUMBER_OVERWRITE FOR_EACH(card, set->cards) { - if (exportCard(card)) { + if (includeCard(card)) { // filename for this card Context& ctx = set->getContext(card); String filename = untag(ctx.eval(*filename_script)->toString()); @@ -121,7 +121,7 @@ void ImagesExportWindow::onOk(wxCommandEvent&) { EndModal(wxID_OK); } -bool ImagesExportWindow::exportCard(const CardP& card) const { +bool ImagesExportWindow::includeCard(const CardP& card) const { return isSelected(card); } diff --git a/src/gui/images_export_window.hpp b/src/gui/images_export_window.hpp index 69428dc5..2deebc92 100644 --- a/src/gui/images_export_window.hpp +++ b/src/gui/images_export_window.hpp @@ -22,7 +22,8 @@ class ExportCardImages { void exportImages(const SetP& set, wxFileName& filename, const String& filename_template, FilenameConflicts conflicts); virtual ~ExportCardImages() {} protected: - virtual bool exportCard(const CardP& card) const { return true; } + /// Should the given card be exported? + virtual bool includeCard(const CardP& card) const { return true; } }; // ----------------------------------------------------------------------------- : ImagesExportWindow @@ -37,7 +38,7 @@ class ImagesExportWindow : public CardSelectWindow, private ExportCardImages { void onOk(wxCommandEvent&); - virtual bool exportCard(const CardP& card) const; + virtual bool includeCard(const CardP& card) const; wxTextCtrl* format; wxChoice* conflicts;