From 44d4d9b454f8eaab367372d096bf510beb83a2b7 Mon Sep 17 00:00:00 2001 From: "alexis.drai" Date: Fri, 27 Jan 2023 18:38:39 +0100 Subject: [PATCH 1/4] Fix #1 --- .gitignore | 35 +---------------------------------- .idea/cpp_stl.iml | 2 -- .idea/misc.xml | 4 ---- .idea/modules.xml | 8 -------- .idea/vcs.xml | 6 ------ 5 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 .idea/cpp_stl.iml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index a1391dc..ce7d853 100644 --- a/.gitignore +++ b/.gitignore @@ -2,31 +2,7 @@ # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# AWS User-specific -.idea/**/aws.xml - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries +.idea # Gradle and Maven with auto-import # When using Gradle or Maven with auto-import, you should exclude module files, @@ -59,9 +35,6 @@ out/ # JIRA plugin atlassian-ide-plugin.xml -# Cursive Clojure plugin -.idea/replstate.xml - # SonarLint plugin .idea/sonarlint/ @@ -71,12 +44,6 @@ crashlytics.properties crashlytics-build.properties fabric.properties -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser - # ---> C++ # Prerequisites *.d diff --git a/.idea/cpp_stl.iml b/.idea/cpp_stl.iml deleted file mode 100644 index f08604b..0000000 --- a/.idea/cpp_stl.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 79b3c94..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 732d01b..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file -- 2.36.3 From 44715bb6edcba25c32c96dc7490d5b92bd43513d Mon Sep 17 00:00:00 2001 From: "alexis.drai" Date: Fri, 27 Jan 2023 18:42:18 +0100 Subject: [PATCH 2/4] Fix #4 --- Personnage/Kenny.cpp | 3 --- Personnage/Kenny.h | 6 ++---- Personnage/Personnage.cpp | 4 ---- Personnage/Personnage.h | 6 ++---- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Personnage/Kenny.cpp b/Personnage/Kenny.cpp index 76f2655..6495912 100644 --- a/Personnage/Kenny.cpp +++ b/Personnage/Kenny.cpp @@ -12,9 +12,6 @@ void Kenny::parler(const string &message) const cout << "MMmmmhhmmmm" << endl; } -Kenny::Kenny() : Kenny("Kenny", "huh?") -{} - Kenny::Kenny(const std::string &name, const std::string &pv) : Personnage(name, pv) diff --git a/Personnage/Kenny.h b/Personnage/Kenny.h index 8f2731d..e665b4f 100644 --- a/Personnage/Kenny.h +++ b/Personnage/Kenny.h @@ -13,10 +13,8 @@ class Kenny : public Personnage public: void parler(const std::string &message) const override; - Kenny(); - - Kenny(const std::string &name, - const std::string &pv); + explicit Kenny(const std::string &name = "Kenny", + const std::string &pv = "huh?"); }; diff --git a/Personnage/Personnage.cpp b/Personnage/Personnage.cpp index 2dc40ae..1a69a16 100644 --- a/Personnage/Personnage.cpp +++ b/Personnage/Personnage.cpp @@ -11,10 +11,6 @@ void Personnage::parler(const string &message) const cout << message << endl; } -Personnage::Personnage() - : Personnage("FNU", "wat") -{} - Personnage::Personnage(const std::string &name, const std::string &pv) : m_name(name), m_pv(pv) diff --git a/Personnage/Personnage.h b/Personnage/Personnage.h index 1b2567d..f8d32d3 100644 --- a/Personnage/Personnage.h +++ b/Personnage/Personnage.h @@ -17,10 +17,8 @@ public: const std::string &name() const; - Personnage(); - - Personnage(const std::string &name, - const std::string &pv); + explicit Personnage(const std::string &name = "FNU", + const std::string &pv = "wat"); }; -- 2.36.3 From f2e2e67ceee8b91d3386e9c34099a79f76a4d115 Mon Sep 17 00:00:00 2001 From: "alexis.drai" Date: Fri, 27 Jan 2023 18:43:26 +0100 Subject: [PATCH 3/4] Fix #3 --- Personnage/Personnage.cpp | 3 +++ Personnage/Personnage.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Personnage/Personnage.cpp b/Personnage/Personnage.cpp index 1a69a16..7d91880 100644 --- a/Personnage/Personnage.cpp +++ b/Personnage/Personnage.cpp @@ -20,3 +20,6 @@ const string &Personnage::name() const { return m_name; } + +Personnage::~Personnage() += default; diff --git a/Personnage/Personnage.h b/Personnage/Personnage.h index f8d32d3..3c26795 100644 --- a/Personnage/Personnage.h +++ b/Personnage/Personnage.h @@ -19,6 +19,8 @@ public: explicit Personnage(const std::string &name = "FNU", const std::string &pv = "wat"); + + virtual ~Personnage(); }; -- 2.36.3 From 4670eb94e38208d9db11e338a0884bebef7e778c Mon Sep 17 00:00:00 2001 From: "alexis.drai" Date: Fri, 27 Jan 2023 18:45:32 +0100 Subject: [PATCH 4/4] Fix #5 --- Personnage/Kenny.cpp | 4 ---- Personnage/Kenny.h | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Personnage/Kenny.cpp b/Personnage/Kenny.cpp index 6495912..3e904ad 100644 --- a/Personnage/Kenny.cpp +++ b/Personnage/Kenny.cpp @@ -12,7 +12,3 @@ void Kenny::parler(const string &message) const cout << "MMmmmhhmmmm" << endl; } -Kenny::Kenny(const std::string &name, - const std::string &pv) - : Personnage(name, pv) -{} diff --git a/Personnage/Kenny.h b/Personnage/Kenny.h index e665b4f..cf282bb 100644 --- a/Personnage/Kenny.h +++ b/Personnage/Kenny.h @@ -12,9 +12,7 @@ class Kenny : public Personnage { public: void parler(const std::string &message) const override; - - explicit Kenny(const std::string &name = "Kenny", - const std::string &pv = "huh?"); + using Personnage::Personnage; }; -- 2.36.3