diff --git a/dependencies/subprojects/animationwindow/include/Image.h b/dependencies/subprojects/animationwindow/include/Image.h index a249f2b7480dafa45a8d06df45e201aca8d6c78f..621e96f9baba7d13bffb9ed320c4e0ba24cc03ae 100644 --- a/dependencies/subprojects/animationwindow/include/Image.h +++ b/dependencies/subprojects/animationwindow/include/Image.h @@ -1,7 +1,7 @@ #pragma once #include <string> -#include <Point.h> +#include "Point.h" #include <filesystem> #include "SDL_render.h" diff --git a/dependencies/subprojects/animationwindow/include/widgets/Button.h b/dependencies/subprojects/animationwindow/include/widgets/Button.h index a899860a083efbea4970ba2b2f2d95bb350c6f08..2631907f8688e2c4dfd86c13449070615115ffbd 100644 --- a/dependencies/subprojects/animationwindow/include/widgets/Button.h +++ b/dependencies/subprojects/animationwindow/include/widgets/Button.h @@ -2,8 +2,8 @@ #include "Widget.h" #include "Point.h" -#include <string> #include "Color.h" +#include <string> namespace TDT4102 { class Button : public TDT4102::Widget { diff --git a/dependencies/subprojects/animationwindow/include/widgets/CheckBox.h b/dependencies/subprojects/animationwindow/include/widgets/CheckBox.h index d4375d2d025f7eb8f665597365fa4455ad7f881b..26599ba7eadba3b555d0401889c6c8eccfde0035 100644 --- a/dependencies/subprojects/animationwindow/include/widgets/CheckBox.h +++ b/dependencies/subprojects/animationwindow/include/widgets/CheckBox.h @@ -2,8 +2,8 @@ #include "Widget.h" #include "Point.h" -#include <string> #include "Color.h" +#include <string> namespace TDT4102 { class CheckBox : public TDT4102::Widget { diff --git a/dependencies/subprojects/animationwindow/include/widgets/RadioButton.h b/dependencies/subprojects/animationwindow/include/widgets/RadioButton.h index b2f0149c98e3ec0ec3f95d16232dc2703e4e1428..c968c99c1468d6ef003d8c99103200ad6c62d86a 100644 --- a/dependencies/subprojects/animationwindow/include/widgets/RadioButton.h +++ b/dependencies/subprojects/animationwindow/include/widgets/RadioButton.h @@ -2,8 +2,8 @@ #include "Widget.h" #include "Point.h" -#include <string> #include "Color.h" +#include <string> namespace TDT4102 { class RadioButton : public TDT4102::Widget { diff --git a/dependencies/subprojects/animationwindow/src/widgets/TextBox.cpp b/dependencies/subprojects/animationwindow/src/widgets/TextBox.cpp index f97c9609b561c7fc99c97022316ff56efb7b1551..5a023dd77c148957bee3c2fe79a542b8f5f47db2 100644 --- a/dependencies/subprojects/animationwindow/src/widgets/TextBox.cpp +++ b/dependencies/subprojects/animationwindow/src/widgets/TextBox.cpp @@ -19,7 +19,7 @@ TDT4102::TextBox::TextBox(TDT4102::Point location, unsigned int width, unsigned } std::string TDT4102::TextBox::getText() const { - return std::string(contents.data());; + return std::string(contents.data()); } void TDT4102::TextBox::setText(std::string updatedText) {