zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-06-09 20:59:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing warning/compilation

Browse Source
This commit is contained in:
Anonymus Raccoon
2020-05-14 01:21:52 +02:00
parent c8f7af7ea3
commit 2033bd56e6
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Models/Vector2.hpp
+3 -8
View File
@@ -6,12 +6,7 @@
#define COMSQUARE_VECTOR2_HPP #define COMSQUARE_VECTOR2_HPP
#include <ostream> #include <ostream>
#include <cmath> #include <SFML/System/Vector2.hpp>
#include <SFML/Graphics.h>
#include <SFML/Window.h>
#include <SFML/System.hpp>
#include <SFML/Window.hpp>
#include <SFML/Graphics/RenderWindow.hpp>
namespace ComSquare namespace ComSquare
{ {
@@ -25,8 +20,8 @@ namespace ComSquare
Vector2<T>() Vector2<T>()
: x(0), y(0) {} : x(0), y(0) {}
Vector2<T>(T x, T y) Vector2<T>(T _x, T _y)
: x(x), y(y) {} : x(_x), y(_y) {}
Vector2<T>(sf::Vector2<T> v) Vector2<T>(sf::Vector2<T> v)
: x(v.x), y(v.y) {} : x(v.x), y(v.y) {}
ui/cartridgeView.ui
+4 -4
View File
@@ -22,7 +22,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabs"> <widget class="QTabWidget" name="tabs">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="general"> <widget class="QWidget" name="general">
<attribute name="title"> <attribute name="title">
@@ -180,7 +180,7 @@
<height>351</height> <height>351</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout_2"> <layout class="QFormLayout" name="formLayout_4">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="coProcessorLabel"> <widget class="QLabel" name="coProcessorLabel">
<property name="text"> <property name="text">
@@ -272,7 +272,7 @@
<attribute name="title"> <attribute name="title">
<string>Native</string> <string>Native</string>
</attribute> </attribute>
<widget class="QWidget" name="formLayoutWidget_2"> <widget class="QWidget" name="formLayoutWidget_3">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@@ -281,7 +281,7 @@
<height>351</height> <height>351</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout_2"> <layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="coProcessorLabelNat"> <widget class="QLabel" name="coProcessorLabelNat">
<property name="text"> <property name="text">
ui/ui_cpu.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************** /********************************************************************************
** Form generated from reading UI file 'cpu.ui' ** 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! ** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/ ********************************************************************************/