Skip to content

Commit

Permalink
conflict fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mahdijamebozorg
Mahdijamebozorg committed Jul 19, 2021
2 parents 07f6e1b + 255f95a commit 4b3dfbd
Show file tree
Hide file tree
Showing 8 changed files with 150 additions and 19 deletions.
12 changes: 6 additions & 6 deletions Advanced_Chess.pro.user
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.10.0, 2021-07-19T17:20:44. -->
<!-- Written by QtCreator 4.10.0, 2021-07-19T17:34:29. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
Expand Down Expand Up @@ -66,7 +66,7 @@
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mahdi/programming/CPP/Final_project/Advanced_Chess</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mahdi/programming/CPP/Final_project/build-Advanced_Chess-Desktop_Qt_5_13_1_GCC_64bit_qt_qt5-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
Expand Down Expand Up @@ -122,7 +122,7 @@
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mahdi/build-Advanced_Chess-Desktop_Qt_5_13_1_GCC_64bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mahdi/programming/CPP/Final_project/build-Advanced_Chess-Desktop_Qt_5_13_1_GCC_64bit_qt_qt5-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
Expand Down Expand Up @@ -178,7 +178,7 @@
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mahdi/build-Advanced_Chess-Desktop_Qt_5_13_1_GCC_64bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mahdi/programming/CPP/Final_project/build-Advanced_Chess-Desktop_Qt_5_13_1_GCC_64bit_qt_qt5-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
Expand Down Expand Up @@ -301,7 +301,7 @@
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Advanced_Chess</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Advanced_Chess2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/mahdi/programming/CPP/Final_project/Advanced_Chess/Advanced_Chess.pro</value>
<value type="QString" key="RunConfiguration.Arguments"></value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
Expand All @@ -312,7 +312,7 @@
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/mahdi/programming/CPP/Final_project/Advanced_Chess</value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/mahdi/programming/CPP/Final_project/build-Advanced_Chess-Desktop_Qt_5_13_1_GCC_64bit_qt_qt5-Debug</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
Expand Down
48 changes: 35 additions & 13 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -787,11 +787,12 @@ compiler_moc_header_clean:
-$(DEL_FILE) moc_backend.cpp
moc_backend.cpp: backend.hpp \
Header/GameManager.hpp \
Header/User.hpp \
Header/AccessGame.hpp \
Header/Chessman.hpp \
Header/Exceptions.hpp \
Header/ChessBoard.hpp \
Header/Cell.hpp \
Header/User.hpp \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/QDebug \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/qdebug.h \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/qalgorithms.h \
Expand Down Expand Up @@ -1263,11 +1264,12 @@ compiler_clean: compiler_rcc_clean compiler_moc_predefs_clean compiler_moc_heade

backend.o: backend.cpp backend.hpp \
Header/GameManager.hpp \
Header/User.hpp \
Header/AccessGame.hpp \
Header/Chessman.hpp \
Header/Exceptions.hpp \
Header/ChessBoard.hpp \
Header/Cell.hpp \
Header/User.hpp \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/QDebug \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/qdebug.h \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/qalgorithms.h \
Expand Down Expand Up @@ -1724,11 +1726,12 @@ backend.o: backend.cpp backend.hpp \

main.o: main.cpp backend.hpp \
Header/GameManager.hpp \
Header/User.hpp \
Header/AccessGame.hpp \
Header/Chessman.hpp \
Header/Exceptions.hpp \
Header/ChessBoard.hpp \
Header/Cell.hpp \
Header/User.hpp \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/QDebug \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/qdebug.h \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/qalgorithms.h \
Expand Down Expand Up @@ -2186,6 +2189,7 @@ main.o: main.cpp backend.hpp \

AccessGame.o: src/AccessGame.cpp Header/AccessGame.hpp \
Header/Chessman.hpp \
Header/Exceptions.hpp \
Header/ChessBoard.hpp \
Header/Cell.hpp \
Header/Pawn.hpp \
Expand All @@ -2197,16 +2201,19 @@ AccessGame.o: src/AccessGame.cpp Header/AccessGame.hpp \
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o AccessGame.o src/AccessGame.cpp

Bishop.o: src/Bishop.cpp Header/Bishop.hpp \
Header/Chessman.hpp
Header/Chessman.hpp \
Header/Exceptions.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Bishop.o src/Bishop.cpp

Cell.o: src/Cell.cpp Header/Cell.hpp \
Header/Chessman.hpp
Header/Chessman.hpp \
Header/Exceptions.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Cell.o src/Cell.cpp

ChessBoard.o: src/ChessBoard.cpp Header/ChessBoard.hpp \
Header/Cell.hpp \
Header/Chessman.hpp \
Header/Exceptions.hpp \
Header/AccessGame.hpp \
Header/User.hpp \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/QDebug \
Expand Down Expand Up @@ -2275,37 +2282,46 @@ ChessBoard.o: src/ChessBoard.cpp Header/ChessBoard.hpp \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/qsharedpointer_impl.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ChessBoard.o src/ChessBoard.cpp

Chessman.o: src/Chessman.cpp Header/Chessman.hpp
Chessman.o: src/Chessman.cpp Header/Chessman.hpp \
Header/Exceptions.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Chessman.o src/Chessman.cpp

Functions.o: src/Functions.cpp Header/Chessman.hpp
Functions.o: src/Functions.cpp Header/Chessman.hpp \
Header/Exceptions.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Functions.o src/Functions.cpp

GameManager.o: src/GameManager.cpp Header/GameManager.hpp \
Header/User.hpp \
Header/AccessGame.hpp \
Header/Chessman.hpp \
Header/Exceptions.hpp \
Header/ChessBoard.hpp \
Header/Cell.hpp \
<<<<<<< HEAD
Header/Pawn.hpp \
Header/Rook.hpp \
Header/Bishop.hpp \
Header/King.hpp \
Header/Knight.hpp \
Header/Queen.hpp \
Header/Exceptions.hpp
=======
Header/User.hpp
>>>>>>> 255f95ab2c52e92d509f212bc0932fa0a99aea62
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o GameManager.o src/GameManager.cpp

King.o: src/King.cpp Header/King.hpp \
Header/Chessman.hpp
Header/Chessman.hpp \
Header/Exceptions.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o King.o src/King.cpp

Knight.o: src/Knight.cpp Header/Knight.hpp \
Header/Chessman.hpp
Header/Chessman.hpp \
Header/Exceptions.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Knight.o src/Knight.cpp

Pawn.o: src/Pawn.cpp Header/Pawn.hpp \
Header/Chessman.hpp \
<<<<<<< HEAD
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/QDebug \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/qdebug.h \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/qalgorithms.h \
Expand Down Expand Up @@ -2370,19 +2386,25 @@ Pawn.o: src/Pawn.cpp Header/Pawn.hpp \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/qcontiguouscache.h \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/qsharedpointer.h \
/opt/Qt5.13.1/5.13.1/gcc_64/include/QtCore/qsharedpointer_impl.h
=======
Header/Exceptions.hpp
>>>>>>> 255f95ab2c52e92d509f212bc0932fa0a99aea62
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Pawn.o src/Pawn.cpp

Queen.o: src/Queen.cpp Header/Queen.hpp \
Header/Chessman.hpp
Header/Chessman.hpp \
Header/Exceptions.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Queen.o src/Queen.cpp

Rook.o: src/Rook.cpp Header/Rook.hpp \
Header/Chessman.hpp
Header/Chessman.hpp \
Header/Exceptions.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Rook.o src/Rook.cpp

User.o: src/User.cpp Header/User.hpp \
Header/AccessGame.hpp \
Header/Chessman.hpp
Header/Chessman.hpp \
Header/Exceptions.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o User.o src/User.cpp

qrc_qml.o: qrc_qml.cpp
Expand Down
3 changes: 3 additions & 0 deletions backend.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ unsigned BackEnd::choose(unsigned index)
qDebug() << s.what();
return UNACCESSABLE;
}

qDebug() << "canGo" << srcState.first;
qDebug() << "canHit" << srcState.second;

Expand Down Expand Up @@ -210,6 +211,8 @@ bool BackEnd::move(unsigned index)
}

qDebug() << "moved from" << indexToIJ(srcIndex) << " to " << indexToIJ(destIndex);

manager->changeTurn();

return true;
}
Binary file removed main.o
View file
Binary file not shown.
21 changes: 21 additions & 0 deletions moc_backend.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ static const uint qt_meta_data_BackEnd[] = {
3, 0, 120, 2, 0x06 /* Public */,

// slots: name, argc, parameters, tag, flags
<<<<<<< HEAD
4, 0, 121, 2, 0x0a /* Public */,
5, 1, 122, 2, 0x0a /* Public */,
7, 1, 125, 2, 0x0a /* Public */,
Expand All @@ -111,6 +112,26 @@ static const uint qt_meta_data_BackEnd[] = {
26, 1, 157, 2, 0x0a /* Public */,
27, 1, 160, 2, 0x0a /* Public */,
28, 0, 163, 2, 0x0a /* Public */,
=======
4, 0, 116, 2, 0x0a /* Public */,
5, 1, 117, 2, 0x0a /* Public */,
7, 1, 120, 2, 0x0a /* Public */,
9, 1, 123, 2, 0x0a /* Public */,
11, 0, 126, 2, 0x0a /* Public */,
12, 0, 127, 2, 0x0a /* Public */,
13, 0, 128, 2, 0x0a /* Public */,
14, 0, 129, 2, 0x0a /* Public */,
15, 0, 130, 2, 0x0a /* Public */,
16, 0, 131, 2, 0x0a /* Public */,
17, 0, 132, 2, 0x0a /* Public */,
18, 1, 133, 2, 0x0a /* Public */,
20, 1, 136, 2, 0x0a /* Public */,
21, 1, 139, 2, 0x0a /* Public */,
22, 2, 142, 2, 0x0a /* Public */,
25, 2, 147, 2, 0x0a /* Public */,
26, 1, 152, 2, 0x0a /* Public */,
27, 1, 155, 2, 0x0a /* Public */,
>>>>>>> 255f95ab2c52e92d509f212bc0932fa0a99aea62

// signals: parameters
QMetaType::Void,
Expand Down
Binary file removed moc_backend.o
View file
Binary file not shown.
85 changes: 85 additions & 0 deletions qrc_qml.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74725,12 +74725,17 @@ static const unsigned char qt_resource_struct[] = {
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/LoginPage.qml
0x0,0x0,0x0,0xb8,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x12,0x47,
<<<<<<< HEAD
0x0,0x0,0x1,0x7a,0xb8,0xe0,0xef,0x78,
=======
0x0,0x0,0x1,0x7a,0xb8,0xe0,0xef,0xdb,
>>>>>>> 255f95ab2c52e92d509f212bc0932fa0a99aea62
// :/Assets
0x0,0x0,0x1,0x5e,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0xc,
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/BoardBottomSide.qml
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
<<<<<<< HEAD
0x0,0x0,0x1,0x7a,0xbb,0xa1,0x3c,0x40,
// :/main.qml
0x0,0x0,0x1,0x48,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x20,0x1d,
Expand All @@ -74756,13 +74761,41 @@ static const unsigned char qt_resource_struct[] = {
// :/BoardTopSide.qml
0x0,0x0,0x0,0x4a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x8,0xa,
0x0,0x0,0x1,0x7a,0xbb,0xa1,0x3c,0x40,
=======
0x0,0x0,0x1,0x7a,0xbb,0xa1,0x3f,0xf1,
// :/main.qml
0x0,0x0,0x1,0x48,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1f,0xec,
0x0,0x0,0x1,0x7a,0xa3,0xea,0xbe,0xe3,
// :/qtquickcontrols2.conf
0x0,0x0,0x1,0x18,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1e,0xb6,
0x0,0x0,0x1,0x7a,0xa3,0xea,0xbe,0xe3,
// :/Board.qml
0x0,0x0,0x0,0xd8,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x16,0xb6,
0x0,0x0,0x1,0x7a,0xbb,0x84,0xd6,0x39,
// :/BoardRightSide.qml
0x0,0x0,0x0,0x8e,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0xf,0x97,
0x0,0x0,0x1,0x7a,0xb9,0xfe,0xcb,0x4f,
// :/BoardLeftSide.qml
0x0,0x0,0x0,0xf0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x1b,0x19,
0x0,0x0,0x1,0x7a,0xb8,0xd9,0xc3,0xc5,
// :/MainPage.qml
0x0,0x0,0x0,0x2c,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x5,0xf7,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x78,
// :/GamePage.qml
0x0,0x0,0x0,0x70,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0xd,0xe3,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x78,
// :/BoardTopSide.qml
0x0,0x0,0x0,0x4a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x8,0xa,
0x0,0x0,0x1,0x7a,0xbb,0xa1,0x3f,0x81,
>>>>>>> 255f95ab2c52e92d509f212bc0932fa0a99aea62
// :/Assets/Icons
0x0,0x0,0x1,0x82,0x0,0x2,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0x14,
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/Assets/Images
0x0,0x0,0x1,0x70,0x0,0x2,0x0,0x0,0x0,0x6,0x0,0x0,0x0,0xe,
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/Assets/Images/Wood2.jpg
<<<<<<< HEAD
0x0,0x0,0x3,0x3e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0xd,0x3d,0xe7,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xe8,0x68,
// :/Assets/Images/Wood5.jpg
Expand Down Expand Up @@ -74816,6 +74849,58 @@ static const unsigned char qt_resource_struct[] = {
// :/Assets/Icons/BBishop.png
0x0,0x0,0x2,0x5c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x6e,0x1b,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xe8,0x68,
=======
0x0,0x0,0x3,0x24,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0xd,0x36,0x98,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x58,
// :/Assets/Images/Wood5.jpg
0x0,0x0,0x2,0xc6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x96,0xe1,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x58,
// :/Assets/Images/Main.jpg
0x0,0x0,0x2,0xde,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4,0x85,0xfc,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x58,
// :/Assets/Images/Board.jpg
0x0,0x0,0x2,0xf4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x6,0x53,0x2a,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x54,
// :/Assets/Images/Login.jpg
0x0,0x0,0x3,0xc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0xa,0x8,0x39,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x58,
// :/Assets/Icons/BKing.png
0x0,0x0,0x1,0x92,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x25,0x88,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x54,
// :/Assets/Icons/WKing.png
0x0,0x0,0x2,0x12,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x50,0x65,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x54,
// :/Assets/Icons/BRook.png
0x0,0x0,0x2,0x78,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x7a,0x86,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x54,
// :/Assets/Icons/WRook.png
0x0,0x0,0x1,0xfa,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x4c,0xd4,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x54,
// :/Assets/Icons/BPawn.png
0x0,0x0,0x2,0x44,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x66,0x8f,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x54,
// :/Assets/Icons/WPawn.png
0x0,0x0,0x1,0xaa,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x30,0x1c,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x54,
// :/Assets/Icons/BQueen.png
0x0,0x0,0x2,0x2a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x59,0xfd,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x54,
// :/Assets/Icons/WQueen.png
0x0,0x0,0x2,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x7e,0xf2,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x54,
// :/Assets/Icons/WKnight.png
0x0,0x0,0x1,0xde,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x41,0xec,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x54,
// :/Assets/Icons/BKnight.png
0x0,0x0,0x1,0xc2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x36,0xb1,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x54,
// :/Assets/Icons/WBishop.png
0x0,0x0,0x2,0xaa,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x8a,0xe7,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x54,
// :/Assets/Icons/BBishop.png
0x0,0x0,0x2,0x5c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x6d,0xea,
0x0,0x0,0x1,0x7a,0xaa,0x88,0xea,0x54,
>>>>>>> 255f95ab2c52e92d509f212bc0932fa0a99aea62

};

Expand Down
Binary file removed qrc_qml.o
View file
Binary file not shown.

0 comments on commit 4b3dfbd

Please sign in to comment.