From 2145443cf8e8d5dd818d3e315ca1f0b39bfb8554 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 7 May 2022 16:33:45 +0300 Subject: Autocommit at 07.05.2022 @ 16:33 --- src/Models/Event.cpp | 16 +++++++++++++--- src/Models/Event.h | 4 ++-- src/Models/Hall.h | 10 +++++----- 3 files changed, 20 insertions(+), 10 deletions(-) (limited to 'src/Models') diff --git a/src/Models/Event.cpp b/src/Models/Event.cpp index d86b907..71bf63a 100644 --- a/src/Models/Event.cpp +++ b/src/Models/Event.cpp @@ -29,11 +29,21 @@ const Date& Event::get_date() const { return date; } -void Event::print(std::ostream& ostr) { - ostr.write(hall, sizeof(hall)); +void Event::read(std::istream& istr) { + hall.read(istr); + name.read(istr); + date.read(istr); + tickets.read(istr); + reservations.read(istr); } -void Event::write(std::istream& istr); +void Event::write(std::ostream& ostr) { + hall.write(ostr); + name.write(ostr); + date.write(ostr); + tickets.write(ostr); + reservations.write(ostr); +} int Event::compare(const Event& other) { if (hall == other.hall) diff --git a/src/Models/Event.h b/src/Models/Event.h index b56d12d..05c511e 100644 --- a/src/Models/Event.h +++ b/src/Models/Event.h @@ -27,8 +27,8 @@ public: OrderedList& get_tickets(); OrderedList& get_reservations(); - void print(std::ostream& ostr); - void write(std::istream& istr); + void write(std::ostream& ostr); + void read(std::istream& istr); int compare(const Event& other); diff --git a/src/Models/Hall.h b/src/Models/Hall.h index a164a0b..cd35a47 100644 --- a/src/Models/Hall.h +++ b/src/Models/Hall.h @@ -1,6 +1,9 @@ #ifndef HEADER_HALL #define HEADER_HALL +#include +#include + class Hall { int number; unsigned rows; @@ -12,14 +15,11 @@ public: Hall(int number, unsigned rows, unsigned seatsPerRow); int get_number() const; - void set_number(int number); - unsigned get_rows() const; - void set_rows(unsigned rows); - unsigned get_seatsPerRow() const; - void set_seatsPerRow(unsigned seatsPerRow); + void read(std::istream& istr); + void write(std::ostream& ostr); int compare(const Hall& other) const; }; -- cgit v1.3.1-23-gd82d