From 60b449ee8f3c032db4f991fa9e062ffb09ab8285 Mon Sep 17 00:00:00 2001 From: moridi Date: Thu, 25 Apr 2019 19:37:26 +0430 Subject: [PATCH] Merge the Part-2 branch with the master branch --- .gitignore | 3 ++- {1 => Part-1}/Makefile | 0 {1 => Part-1}/header/cone.h | 0 {1 => Part-1}/header/constant.h | 0 {1 => Part-1}/header/cuboid.h | 0 {1 => Part-1}/header/shape.h | 0 {1 => Part-1}/header/sphere.h | 0 {1 => Part-1}/src/cone.cpp | 0 {1 => Part-1}/src/cuboid.cpp | 0 {1 => Part-1}/src/main.cpp | 0 {1 => Part-1}/src/shape.cpp | 0 {1 => Part-1}/src/sphere.cpp | 0 Makefile => Part-2/Makefile | 0 {include => Part-2/include}/Directory-inl.h | 0 {include => Part-2/include}/Directory.h | 0 {include => Part-2/include}/Element-inl.h | 0 {include => Part-2/include}/Element.h | 0 {include => Part-2/include}/Exception-inl.h | 0 {include => Part-2/include}/Exception.h | 0 {include => Part-2/include}/File-inl.h | 0 {include => Part-2/include}/File.h | 0 {include => Part-2/include}/FileSystem-inl.h | 0 {include => Part-2/include}/FileSystem.h | 0 {include => Part-2/include}/Link-inl.h | 0 {include => Part-2/include}/Link.h | 0 {src => Part-2/src}/Directory.cpp | 0 {src => Part-2/src}/File.cpp | 0 {src => Part-2/src}/FileSystem.cpp | 0 {src => Part-2/src}/Link.cpp | 0 {src => Part-2/src}/Main.cpp | 0 30 files changed, 2 insertions(+), 1 deletion(-) rename {1 => Part-1}/Makefile (100%) rename {1 => Part-1}/header/cone.h (100%) rename {1 => Part-1}/header/constant.h (100%) rename {1 => Part-1}/header/cuboid.h (100%) rename {1 => Part-1}/header/shape.h (100%) rename {1 => Part-1}/header/sphere.h (100%) rename {1 => Part-1}/src/cone.cpp (100%) rename {1 => Part-1}/src/cuboid.cpp (100%) rename {1 => Part-1}/src/main.cpp (100%) rename {1 => Part-1}/src/shape.cpp (100%) rename {1 => Part-1}/src/sphere.cpp (100%) rename Makefile => Part-2/Makefile (100%) rename {include => Part-2/include}/Directory-inl.h (100%) rename {include => Part-2/include}/Directory.h (100%) rename {include => Part-2/include}/Element-inl.h (100%) rename {include => Part-2/include}/Element.h (100%) rename {include => Part-2/include}/Exception-inl.h (100%) rename {include => Part-2/include}/Exception.h (100%) rename {include => Part-2/include}/File-inl.h (100%) rename {include => Part-2/include}/File.h (100%) rename {include => Part-2/include}/FileSystem-inl.h (100%) rename {include => Part-2/include}/FileSystem.h (100%) rename {include => Part-2/include}/Link-inl.h (100%) rename {include => Part-2/include}/Link.h (100%) rename {src => Part-2/src}/Directory.cpp (100%) rename {src => Part-2/src}/File.cpp (100%) rename {src => Part-2/src}/FileSystem.cpp (100%) rename {src => Part-2/src}/Link.cpp (100%) rename {src => Part-2/src}/Main.cpp (100%) diff --git a/.gitignore b/.gitignore index 687f936..8f90b06 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,5 @@ *.out *.app -.vscode \ No newline at end of file +.vscode +.DS_Store \ No newline at end of file diff --git a/1/Makefile b/Part-1/Makefile similarity index 100% rename from 1/Makefile rename to Part-1/Makefile diff --git a/1/header/cone.h b/Part-1/header/cone.h similarity index 100% rename from 1/header/cone.h rename to Part-1/header/cone.h diff --git a/1/header/constant.h b/Part-1/header/constant.h similarity index 100% rename from 1/header/constant.h rename to Part-1/header/constant.h diff --git a/1/header/cuboid.h b/Part-1/header/cuboid.h similarity index 100% rename from 1/header/cuboid.h rename to Part-1/header/cuboid.h diff --git a/1/header/shape.h b/Part-1/header/shape.h similarity index 100% rename from 1/header/shape.h rename to Part-1/header/shape.h diff --git a/1/header/sphere.h b/Part-1/header/sphere.h similarity index 100% rename from 1/header/sphere.h rename to Part-1/header/sphere.h diff --git a/1/src/cone.cpp b/Part-1/src/cone.cpp similarity index 100% rename from 1/src/cone.cpp rename to Part-1/src/cone.cpp diff --git a/1/src/cuboid.cpp b/Part-1/src/cuboid.cpp similarity index 100% rename from 1/src/cuboid.cpp rename to Part-1/src/cuboid.cpp diff --git a/1/src/main.cpp b/Part-1/src/main.cpp similarity index 100% rename from 1/src/main.cpp rename to Part-1/src/main.cpp diff --git a/1/src/shape.cpp b/Part-1/src/shape.cpp similarity index 100% rename from 1/src/shape.cpp rename to Part-1/src/shape.cpp diff --git a/1/src/sphere.cpp b/Part-1/src/sphere.cpp similarity index 100% rename from 1/src/sphere.cpp rename to Part-1/src/sphere.cpp diff --git a/Makefile b/Part-2/Makefile similarity index 100% rename from Makefile rename to Part-2/Makefile diff --git a/include/Directory-inl.h b/Part-2/include/Directory-inl.h similarity index 100% rename from include/Directory-inl.h rename to Part-2/include/Directory-inl.h diff --git a/include/Directory.h b/Part-2/include/Directory.h similarity index 100% rename from include/Directory.h rename to Part-2/include/Directory.h diff --git a/include/Element-inl.h b/Part-2/include/Element-inl.h similarity index 100% rename from include/Element-inl.h rename to Part-2/include/Element-inl.h diff --git a/include/Element.h b/Part-2/include/Element.h similarity index 100% rename from include/Element.h rename to Part-2/include/Element.h diff --git a/include/Exception-inl.h b/Part-2/include/Exception-inl.h similarity index 100% rename from include/Exception-inl.h rename to Part-2/include/Exception-inl.h diff --git a/include/Exception.h b/Part-2/include/Exception.h similarity index 100% rename from include/Exception.h rename to Part-2/include/Exception.h diff --git a/include/File-inl.h b/Part-2/include/File-inl.h similarity index 100% rename from include/File-inl.h rename to Part-2/include/File-inl.h diff --git a/include/File.h b/Part-2/include/File.h similarity index 100% rename from include/File.h rename to Part-2/include/File.h diff --git a/include/FileSystem-inl.h b/Part-2/include/FileSystem-inl.h similarity index 100% rename from include/FileSystem-inl.h rename to Part-2/include/FileSystem-inl.h diff --git a/include/FileSystem.h b/Part-2/include/FileSystem.h similarity index 100% rename from include/FileSystem.h rename to Part-2/include/FileSystem.h diff --git a/include/Link-inl.h b/Part-2/include/Link-inl.h similarity index 100% rename from include/Link-inl.h rename to Part-2/include/Link-inl.h diff --git a/include/Link.h b/Part-2/include/Link.h similarity index 100% rename from include/Link.h rename to Part-2/include/Link.h diff --git a/src/Directory.cpp b/Part-2/src/Directory.cpp similarity index 100% rename from src/Directory.cpp rename to Part-2/src/Directory.cpp diff --git a/src/File.cpp b/Part-2/src/File.cpp similarity index 100% rename from src/File.cpp rename to Part-2/src/File.cpp diff --git a/src/FileSystem.cpp b/Part-2/src/FileSystem.cpp similarity index 100% rename from src/FileSystem.cpp rename to Part-2/src/FileSystem.cpp diff --git a/src/Link.cpp b/Part-2/src/Link.cpp similarity index 100% rename from src/Link.cpp rename to Part-2/src/Link.cpp diff --git a/src/Main.cpp b/Part-2/src/Main.cpp similarity index 100% rename from src/Main.cpp rename to Part-2/src/Main.cpp