Fixing warning/compilation

sources/Models/Vector2.hpp

@@ -6,12 +6,7 @@
 #define COMSQUARE_VECTOR2_HPP
 
 #include <ostream>
-#include <cmath>
-#include <SFML/Graphics.h>
-#include <SFML/Window.h>
-#include <SFML/System.hpp>
-#include <SFML/Window.hpp>
-#include <SFML/Graphics/RenderWindow.hpp>
+#include <SFML/System/Vector2.hpp>
 
 namespace ComSquare
 {
@@ -25,8 +20,8 @@ namespace ComSquare
 		Vector2<T>()
 			: x(0), y(0) {}
 
-		Vector2<T>(T x, T y)
-			: x(x), y(y) {}
+		Vector2<T>(T _x, T _y)
+			: x(_x), y(_y) {}
 
 		Vector2<T>(sf::Vector2<T> v)
 			: x(v.x), y(v.y) {}

ui/cartridgeView.ui

@@ -22,7 +22,7 @@
     <item row="0" column="0">
      <widget class="QTabWidget" name="tabs">
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <widget class="QWidget" name="general">
        <attribute name="title">
@@ -180,7 +180,7 @@
           <height>351</height>
          </rect>
         </property>
-        <layout class="QFormLayout" name="formLayout_2">
+        <layout class="QFormLayout" name="formLayout_4">
          <item row="0" column="0">
           <widget class="QLabel" name="coProcessorLabel">
            <property name="text">
@@ -272,7 +272,7 @@
        <attribute name="title">
         <string>Native</string>
        </attribute>
-       <widget class="QWidget" name="formLayoutWidget_2">
+       <widget class="QWidget" name="formLayoutWidget_3">
         <property name="geometry">
          <rect>
           <x>0</x>
@@ -281,7 +281,7 @@
           <height>351</height>
          </rect>
         </property>
-        <layout class="QFormLayout" name="formLayout_2">
+        <layout class="QFormLayout" name="formLayout_3">
          <item row="0" column="0">
           <widget class="QLabel" name="coProcessorLabelNat">
            <property name="text">

ui/ui_cpu.h

@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'cpu.ui'
 **
-** Created by: Qt User Interface Compiler version 5.13.2
+** Created by: Qt User Interface Compiler version 5.14.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/