From 112a0d344da9e66d20ee9ab5d488e59c5d52e6ad Mon Sep 17 00:00:00 2001
From: Angeld55 <angel_dimitriev@abv.bg>
Date: Thu, 9 Apr 2020 18:09:42 +0300
Subject: added new examples

---
 Big4AndInheritance/Drinks/AlcoholDrink.cpp | 18 ---------
 Big4AndInheritance/Drinks/AlcoholDrink.h   | 14 -------
 Big4AndInheritance/Drinks/Drink.cpp        | 63 ------------------------------
 Big4AndInheritance/Drinks/Drink.h          | 21 ----------
 Big4AndInheritance/Drinks/main.cpp         | 10 -----
 5 files changed, 126 deletions(-)
 delete mode 100644 Big4AndInheritance/Drinks/AlcoholDrink.cpp
 delete mode 100644 Big4AndInheritance/Drinks/AlcoholDrink.h
 delete mode 100644 Big4AndInheritance/Drinks/Drink.cpp
 delete mode 100644 Big4AndInheritance/Drinks/Drink.h
 delete mode 100644 Big4AndInheritance/Drinks/main.cpp

(limited to 'Big4AndInheritance/Drinks')

diff --git a/Big4AndInheritance/Drinks/AlcoholDrink.cpp b/Big4AndInheritance/Drinks/AlcoholDrink.cpp
deleted file mode 100644
index db3619c..0000000
--- a/Big4AndInheritance/Drinks/AlcoholDrink.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "AlcoholDrink.h"
-
-
-
-AlcoholDrink::AlcoholDrink(const char* mark, int ml, int percentAlcohol) : Drink(mark,ml)
-{
-	setAlcohol(percentAlcohol);
-}
-void AlcoholDrink::setAlcohol(int alcohol)
-{
-	if (alcohol < 4 || alcohol>98)
-		alcohol = 20;
-	percentAlcohol = alcohol;
-}
-int AlcoholDrink::getAlcohol() const
-{
-	return percentAlcohol;
-}
diff --git a/Big4AndInheritance/Drinks/AlcoholDrink.h b/Big4AndInheritance/Drinks/AlcoholDrink.h
deleted file mode 100644
index 1bf3d66..0000000
--- a/Big4AndInheritance/Drinks/AlcoholDrink.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "Drink.h"
-
-class AlcoholDrink : public Drink
-{
-private:
-	int percentAlcohol;
-
-public:
-	AlcoholDrink(const char* mark, int ml, int percentAlcohol);
-	void setAlcohol(int alcohol);
-	int AlcoholDrink::getAlcohol() const;
-};
diff --git a/Big4AndInheritance/Drinks/Drink.cpp b/Big4AndInheritance/Drinks/Drink.cpp
deleted file mode 100644
index a2933ad..0000000
--- a/Big4AndInheritance/Drinks/Drink.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-#include "Drink.h"
-
-
-void Drink::CopyFrom(const Drink& other)
-{
-	int len = strlen(other.mark);
-	mark = new char[len + 1];
-	strcpy(mark, other.mark);
-
-	ml = other.ml;
-}
-void Drink::Free()
-{
-	delete[] mark;
-	ml = 0;
-}
-
-Drink::Drink()
-{
-	mark = new char[6];
-	strcpy(mark, "Water");
-	ml = 500;
-}
-Drink::Drink(const char* mark, int ml)
-{
-	int len = strlen(mark);
-	this->mark = new char[len + 1];
-	strcpy(this->mark, mark);
-	
-	setML(ml);
-
-}
-Drink::Drink(const Drink& other)
-{
-	CopyFrom(other);
-}
-Drink& Drink::operator=(const Drink& other)
-{
-	if (this != &other)
-	{
-		Free();
-		CopyFrom(other);
-	}
-	return *this;
-}
-Drink::~Drink()
-{
-	Free();
-}
-void Drink::setML(int ml)
-{
-	if (ml < 100 || ml> 1000)
-		ml = 500;
-	this->ml = ml;
-}
-int Drink::getML() const
-{
-	return ml;
-}
-const char* Drink::getMark() const
-{
-	return mark;
-}
diff --git a/Big4AndInheritance/Drinks/Drink.h b/Big4AndInheritance/Drinks/Drink.h
deleted file mode 100644
index c02398b..0000000
--- a/Big4AndInheritance/Drinks/Drink.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-#include <iostream>
-
-class Drink
-{
-private:
-	char* mark;
-	int ml;
-	void CopyFrom(const Drink& other);
-	void Free();
-public:
-	Drink();
-	Drink(const char* mark, int ml);
-	Drink(const Drink& other);
-	Drink& operator=(const Drink& other);
-	~Drink();
-	
-	void setML(int ml);
-	int getML() const;
-	const char* getMark() const;
-};
diff --git a/Big4AndInheritance/Drinks/main.cpp b/Big4AndInheritance/Drinks/main.cpp
deleted file mode 100644
index 6c67b96..0000000
--- a/Big4AndInheritance/Drinks/main.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "AlcoholDrink.h"
-int main()
-{
-	AlcoholDrink  DR1("Spirt", 100, 98);
-	
-	AlcoholDrink dr2 (DR1);
-	dr2.getMark();
-	
-	
-}
-- 
cgit v1.3.1-23-gd82d