From d5e50b9f5323cab9ef51ca408ab6a031503e5888 Mon Sep 17 00:00:00 2001
From: Joakim Hunskaar <joakim.borge.hunskar@gmail.com>
Date: Sun, 2 Mar 2025 19:19:24 +0100
Subject: [PATCH] remove extra semicolon and rearranging includes
---
dependencies/subprojects/animationwindow/include/Image.h | 2 +-
.../subprojects/animationwindow/include/widgets/Button.h | 2 +-
.../subprojects/animationwindow/include/widgets/CheckBox.h | 2 +-
.../subprojects/animationwindow/include/widgets/RadioButton.h | 2 +-
.../subprojects/animationwindow/src/widgets/TextBox.cpp | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dependencies/subprojects/animationwindow/include/Image.h b/dependencies/subprojects/animationwindow/include/Image.h
index a249f2b..621e96f 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 a899860..2631907 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 d4375d2..26599ba 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 b2f0149..c968c99 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 f97c960..5a023dd 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) {
--
GitLab