Renamed and reconfigured file names

client.pro

@@ -64,7 +64,7 @@ win32 {
 }
 
 unix {
-    guiRes.commands += rcc -binary $$PWD/res/hotseatgame/game_ui.qrc.qrc -o $$DESTDIR/res/game_ui_data.gtr $$escape_expand(\n\t) \
+    guiRes.commands += rcc -binary $$PWD/res/hotseatgame/game_ui.qrc -o $$DESTDIR/res/game_ui_data.gtr $$escape_expand(\n\t) \
                        rcc -binary $$PWD/res/hotseatgame/units.qrc -o $$DESTDIR/res/unit_data.gtr $$escape_expand(\n\t) \
                        rcc -binary $$PWD/res/hotseatgame/effects.qrc -o $$DESTDIR/res/effect_data.gtr $$escape_expand(\n\t) \
                        rcc -binary $$PWD/res/hotseatgame/spells.qrc -o $$DESTDIR/res/spell_data.gtr
@@ -76,61 +76,61 @@ PRE_TARGETDEPS += BuildResources
 # ================================================== #
 SOURCES += \
     source/main.cpp \
-    source/Cell.cpp \
-    source/gui/Scene.cpp \
-    source/gui/GuiSceneManager.cpp \
-    source/gui/GUI.cpp \
-    source/gui/MainMenu.cpp \
-    source/gui/LoadingForm.cpp \
-    source/units/Mage.cpp \
-    source/units/Unit.cpp \
-    source/units/Warrior.cpp \
-    source/PlayerManager.cpp \
-    source/Race.cpp \
-    source/RaceManager.cpp \
-    source/hotseatgame/GameManager.cpp \
-    source/hotseatgame/UnitsQueue.cpp \
-    source/hotseatgame/gui/PlayerVsPlayerIntro.cpp \
-    source/hotseatgame/gui/PreBattleScene.cpp \
-    source/hotseatgame/gui/RaceIcon.cpp \
-    source/hotseatgame/gui/RecruitmentScene.cpp \
-    source/hotseatgame/gui/UnitIcon.cpp \
-    source/hotseatgame/gui/HotSeatGame.cpp \
-    source/effects/Effect.cpp
+    source/effects/effect.cpp \
+    source/gui/gui.cpp \
+    source/gui/guiscenemanager.cpp \
+    source/gui/loadingform.cpp \
+    source/gui/mainmenu.cpp \
+    source/gui/scene.cpp \
+    source/hotseatgame/gui/hotseatgame.cpp \
+    source/hotseatgame/gui/playervsplayerintro.cpp \
+    source/hotseatgame/gui/prebattlescene.cpp \
+    source/hotseatgame/gui/raceicon.cpp \
+    source/hotseatgame/gui/recruitmentscene.cpp \
+    source/hotseatgame/gui/uniticon.cpp \
+    source/hotseatgame/gamemanager.cpp \
+    source/hotseatgame/unitsqueue.cpp \
+    source/units/mage.cpp \
+    source/units/unit.cpp \
+    source/units/warrior.cpp \
+    source/cell.cpp \
+    source/playermanager.cpp \
+    source/race.cpp \
+    source/racemanager.cpp
 
 HEADERS += \
-    include/Cell.h \
-    include/Player.h \
-    include/PlayerManager.h \
-    include/Race.h \
-    include/RaceManager.h \
-    include/AbstractFactory.h \
-    include/units/Mage.h \
-    include/units/Unit.h \
-    include/units/Warrior.h \
-    include/gui/GUI.h \
-    include/gui/GuiSceneManager.h \
-    include/gui/MainMenu.h \
-    include/gui/Scene.h \
-    include/gui/LoadingForm.h \
-    include/hotseatgame/GameManager.h \
-    include/hotseatgame/UnitsQueue.h \
-    include/hotseatgame/gui/PlayerVsPlayerIntro.h \
-    include/hotseatgame/gui/PreBattleScene.h \
-    include/hotseatgame/gui/RaceIcon.h \
-    include/hotseatgame/gui/RecruitmentScene.h \
-    include/hotseatgame/gui/UnitIcon.h \
-    include/hotseatgame/gui/HotSeatGame.h \
-    include/effects/Effect.h
+    include/effects/effect.h \
+    include/gui/gui.h \
+    include/gui/guiscenemanager.h \
+    include/gui/loadingform.h \
+    include/gui/mainmenu.h \
+    include/gui/scene.h \
+    include/hotseatgame/gui/hotseatgame.h \
+    include/hotseatgame/gui/playervsplayerintro.h \
+    include/hotseatgame/gui/prebattlescene.h \
+    include/hotseatgame/gui/raceicon.h \
+    include/hotseatgame/gui/recruitmentscene.h \
+    include/hotseatgame/gui/uniticon.h \
+    include/hotseatgame/gamemanager.h \
+    include/hotseatgame/unitsqueue.h \
+    include/units/mage.h \
+    include/units/unit.h \
+    include/units/warrior.h \
+    include/abstractfactory.h \
+    include/cell.h \
+    include/player.h \
+    include/playermanager.h \
+    include/race.h \
+    include/racemanager.h
 
 FORMS += \
-    include/gui/GUI.ui \
-    include/gui/MainMenu.ui \
-    include/hotseatgame/gui/PlayerVsPlayerIntro.ui \
-    include/hotseatgame/gui/PreBattleScene.ui \
-    include/hotseatgame/gui/RecruitmentScene.ui \
-    include/hotseatgame/gui/HotSeatGame.ui \
-    include/gui/LoadingForm.ui
+    include/gui/gui.ui \
+    include/gui/loadingform.ui \
+    include/gui/mainmenu.ui \
+    include/hotseatgame/gui/hotseatgame.ui \
+    include/hotseatgame/gui/playervsplayerintro.ui \
+    include/hotseatgame/gui/prebattlescene.ui \
+    include/hotseatgame/gui/recruitmentscene.ui
 
 RESOURCES += \
      res/GUI.qrc

include/gui/LoadingForm.h → include/gui/loadingform.h

@@ -1,7 +1,7 @@
 #ifndef LOADINGFORM_H
 #define LOADINGFORM_H
 
-#include "Scene.h"
+#include "scene.h"
 
 namespace Ui {
 class LoadingForm;

include/gui/MainMenu.h → include/gui/mainmenu.h

@@ -1,7 +1,7 @@
 #ifndef MAINMENU_H
 #define MAINMENU_H
 
-#include "gui/Scene.h"
+#include "gui/scene.h"
 
 #include <QWidget>
 

include/hotseatgame/GameManager.h → include/hotseatgame/gamemanager.h

@@ -1,6 +1,6 @@
 #include <vector>
-#include <hotseatgame/UnitsQueue.h>
-#include <PlayerManager.h>
+#include <hotseatgame/unitsqueue.h>
+#include <playermanager.h>
 
 
 class Cell;

include/hotseatgame/gui/PlayerVsPlayerIntro.h → include/hotseatgame/gui/playervsplayerintro.h

@@ -1,7 +1,7 @@
 #ifndef PLAYERVSPLAYERINTRO_H
 #define PLAYERVSPLAYERINTRO_H
 
-#include "gui/Scene.h"
+#include "gui/scene.h"
 
 #include <QWidget>
 

include/hotseatgame/gui/PreBattleScene.h → include/hotseatgame/gui/prebattlescene.h

@@ -3,7 +3,7 @@
 
 #include <QWidget>
 
-#include "gui/Scene.h"
+#include "gui/scene.h"
 
 #include <vector>
 

include/hotseatgame/gui/PreBattleScene.ui → include/hotseatgame/gui/prebattlescene.ui

@@ -163,7 +163,7 @@
   <customwidget>
    <class>RaceIcon</class>
    <extends>QLabel</extends>
-   <header>gui/raceicon.h</header>
+   <header location="global">hotseatgame/gui/raceicon.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

include/hotseatgame/gui/RaceIcon.h → include/hotseatgame/gui/raceicon.h

@@ -1,7 +1,7 @@
 #ifndef RACEICON_H
 #define RACEICON_H
 
-#include "Race.h"
+#include "race.h"
 
 #include <QObject>
 #include <QWidget>

include/hotseatgame/gui/RecruitmentScene.h → include/hotseatgame/gui/recruitmentscene.h

@@ -1,7 +1,7 @@
 #ifndef RECRUITMENTSCENE_H
 #define RECRUITMENTSCENE_H
 
-#include "gui/Scene.h"
+#include "gui/scene.h"
 
 #include <QWidget>
 

include/hotseatgame/gui/RecruitmentScene.ui → include/hotseatgame/gui/recruitmentscene.ui

@@ -425,6 +425,11 @@
   <zorder>unit_spec_widget_</zorder>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>RaceIcon</class>
+   <extends>QLabel</extends>
+   <header location="global">hotseatgame/gui/raceicon.h</header>
+  </customwidget>
   <customwidget>
    <class>Scene</class>
    <extends>QWidget</extends>
@@ -434,7 +439,7 @@
   <customwidget>
    <class>UnitIcon</class>
    <extends>QLabel</extends>
-   <header>gui/uniticon.h</header>
+   <header location="global">hotseatgame/gui/uniticon.h</header>
    <slots>
     <signal>clicked()</signal>
     <signal>doubleclicked()</signal>
@@ -442,11 +447,6 @@
     <signal>unhovered()</signal>
    </slots>
   </customwidget>
-  <customwidget>
-   <class>RaceIcon</class>
-   <extends>QLabel</extends>
-   <header>gui/raceicon.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

include/hotseatgame/gui/UnitIcon.h → include/hotseatgame/gui/uniticon.h

@@ -1,7 +1,7 @@
 #ifndef UNITICON_H
 #define UNITICON_H
 
-#include "units/Unit.h"
+#include "units/unit.h"
 
 #include <QObject>
 #include <QWidget>

include/Player.h → include/player.h

@@ -1,8 +1,8 @@
 #ifndef INCLUDEPLAYER_H
 #define INCLUDEPLAYER_H
 
-#include "units/Unit.h"
-#include "RaceManager.h"
+#include "units/unit.h"
+#include "racemanager.h"
 
 #include <QObject>
 #include <QDebug>

include/PlayerManager.h → include/playermanager.h

@@ -1,7 +1,7 @@
 #ifndef INCLUDEPLAYERMANAGER_H
 #define INCLUDEPLAYERMANAGER_H
 
-#include <Player.h>
+#include <player.h>
 
 #include <QObject>
 

include/Race.h → include/race.h

@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "AbstractFactory.h"
+#include "abstractfactory.h"
 
 class Unit;
 

include/units/Mage.h → include/units/mage.h

@@ -1,7 +1,7 @@
 #ifndef UNITS_MAGE_H
 #define UNITS_MAGE_H
 
-#include "units/Unit.h"
+#include "units/unit.h"
 
 #include <QObject>
 

include/units/Unit.h → include/units/unit.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "AbstractFactory.h"
+#include "abstractfactory.h"
 #include <QObject>
 #include <QString>
 #include <QImage>

include/units/Warrior.h → include/units/warrior.h

@@ -1,7 +1,7 @@
 #ifndef UNITS_WARRIOR_H
 #define UNITS_WARRIOR_H
 
-#include "units/Unit.h"
+#include "units/unit.h"
 
 #include <QObject>
 #include <QString>

source/Cell.cpp → source/cell.cpp

@@ -1,8 +1,8 @@
 /*
  * I love Qt
  */
-#include "Cell.h"
-#include "units/Unit.h"
+#include "cell.h"
+#include "units/unit.h"
 #include <string>
 #include <queue>
 #include <vector>

source/effects/Effect.cpp → source/effects/effect.cpp

@@ -1,8 +1,8 @@
 //
 // Created by IgorBat on 21.04.2018.
 //
-#include "AbstractFactory.h"
-#include "effects/Effect.h"
+#include "abstractfactory.h"
+#include "effects/effect.h"
 
 #include <iostream>
 #include <algorithm>

source/gui/GUI.cpp → source/gui/gui.cpp

@@ -1,5 +1,5 @@
-#include <gui/GUI.h>
-#include <ui_GUI.h>
+#include <gui/gui.h>
+#include <ui_gui.h>
 #include <QDebug>
 
 GUI::GUI(QWidget *parent) :

source/gui/GuiSceneManager.cpp → source/gui/guiscenemanager.cpp

@@ -1,11 +1,11 @@
-#include "gui/GuiSceneManager.h"
-#include "gui/GUI.h"
-#include "gui/MainMenu.h"
+#include "gui/guiscenemanager.h"
+#include "gui/gui.h"
+#include "gui/mainmenu.h"
 
-#include "hotseatgame/gui/RecruitmentScene.h"
-#include "hotseatgame/gui/PlayerVsPlayerIntro.h"
-#include "hotseatgame/gui/PreBattleScene.h"
-#include "hotseatgame/gui/HotSeatGame.h"
+#include "hotseatgame/gui/recruitmentscene.h"
+#include "hotseatgame/gui/playervsplayerintro.h"
+#include "hotseatgame/gui/prebattlescene.h"
+#include "hotseatgame/gui/hotseatgame.h"
 
 #include <QResource>
 #include <QApplication>
@@ -16,13 +16,13 @@ GuiSceneManager::GuiSceneManager(QObject *parent) : QObject(parent) {
     gui_->show();
     current_scene_ = "none";
 
-    QResource::registerResource(QApplication::applicationDirPath() + "/res/gui_data.gtr");
+    QResource::registerResource(QApplication::applicationDirPath() + "/res/game_ui_data.gtr");
     QResource::registerResource(QApplication::applicationDirPath() + "/res/unit_data.gtr");
     QResource::registerResource(QApplication::applicationDirPath() + "/res/spell_data.gtr");
     QResource::registerResource(QApplication::applicationDirPath() + "/res/effect_data.gtr");
 
-    QFontDatabase::addApplicationFont(":/../assets/fonts/barocco-initial.ttf");
-    QFontDatabase::addApplicationFont(":/../assets/fonts/viking-cyr.ttf");
+    QFontDatabase::addApplicationFont(":/assets/fonts/barocco-initial.ttf");
+    QFontDatabase::addApplicationFont(":/assets/fonts/viking-cyr.ttf");
 
     registerScene("main_menu", new MainMenu(gui_->mainContentScene()));
     registerScene("pvp_intro", new PlayerVsPlayerIntro(gui_->mainContentScene()));

source/gui/LoadingForm.cpp → source/gui/loadingform.cpp

@@ -1,5 +1,5 @@
-#include "gui/LoadingForm.h"
-#include "ui_LoadingForm.h"
+#include "gui/loadingform.h"
+#include "ui_loadingform.h"
 
 LoadingForm::LoadingForm(QWidget *parent) :
     Scene(parent),

source/gui/MainMenu.cpp → source/gui/mainmenu.cpp

@@ -1,6 +1,6 @@
-#include "gui/MainMenu.h"
-#include "gui/GuiSceneManager.h"
-#include "ui_MainMenu.h"
+#include "gui/mainmenu.h"
+#include "gui/guiscenemanager.h"
+#include "ui_mainmenu.h"
 
 #include <QString>
 #include <QApplication>

source/gui/Scene.cpp → source/gui/scene.cpp

@@ -1,4 +1,4 @@
-#include "gui/Scene.h"
+#include "gui/scene.h"
 
 Scene::Scene(QWidget *parent) : QWidget(parent)
 {

source/hotseatgame/GameManager.cpp → source/hotseatgame/gamemanager.cpp

@@ -1,8 +1,8 @@
 /*
 * Someone tells, that Qt can to build this
 */
-#include "include/hotseatgame/GameManager.h"
-#include "Cell.h"
+#include "include/hotseatgame/gamemanager.h"
+#include "cell.h"
 #include <iostream>
 
 GameManager::GameManager(QObject *parent) : QObject(parent)

source/hotseatgame/gui/HotSeatGame.cpp → source/hotseatgame/gui/hotseatgame.cpp

@@ -1,5 +1,5 @@
-#include "hotseatgame/gui/HotSeatGame.h"
-#include "ui_HotSeatGame.h"
+#include "hotseatgame/gui/hotseatgame.h"
+#include "ui_hotseatgame.h"
 #include "gui/guiscenemanager.h"
 
 #include <QDebug>

source/hotseatgame/gui/PlayerVsPlayerIntro.cpp → source/hotseatgame/gui/playervsplayerintro.cpp

@@ -1,9 +1,9 @@
-#include "hotseatgame/gui/PlayerVsPlayerIntro.h"
-#include "gui/GuiSceneManager.h"
-#include "PlayerManager.h"
-#include "gui/Scene.h"
+#include "hotseatgame/gui/playervsplayerintro.h"
+#include "gui/guiscenemanager.h"
+#include "playermanager.h"
+#include "gui/scene.h"
 
-#include "ui_PlayerVsPlayerIntro.h"
+#include "ui_playervsplayerintro.h"
 
 PlayerVsPlayerIntro::PlayerVsPlayerIntro(QWidget *parent) :
     Scene(parent),

source/hotseatgame/gui/PreBattleScene.cpp → source/hotseatgame/gui/prebattlescene.cpp

@@ -1,15 +1,15 @@
 
-#include "hotseatgame/gui/PreBattleScene.h"
+#include "hotseatgame/gui/prebattlescene.h"
 
-#include "Player.h"
-#include "PlayerManager.h"
-#include "Race.h"
-#include "RaceManager.h"
+#include "player.h"
+#include "playermanager.h"
+#include "race.h"
+#include "racemanager.h"
 
-#include "hotseatgame/gui/RaceIcon.h"
-#include "hotseatgame/gui/UnitIcon.h"
-#include "gui/GuiSceneManager.h"
-#include "ui_PreBattleScene.h"
+#include "hotseatgame/gui/raceicon.h"
+#include "hotseatgame/gui/uniticon.h"
+#include "gui/guiscenemanager.h"
+#include "ui_prebattlescene.h"
 
 #include <QMessageBox>
 

source/hotseatgame/gui/RaceIcon.cpp → source/hotseatgame/gui/raceicon.cpp

@@ -1,4 +1,4 @@
-#include <hotseatgame/gui/RaceIcon.h>
+#include <hotseatgame/gui/raceicon.h>
 #include <QDebug>
 #include <QTime>
 #include <QEvent>

source/hotseatgame/gui/RecruitmentScene.cpp → source/hotseatgame/gui/recruitmentscene.cpp

@@ -1,14 +1,14 @@
-#include <hotseatgame/gui/RecruitmentScene.h>
-#include <hotseatgame/gui/UnitIcon.h>
-#include <hotseatgame/gui/RaceIcon.h>
-#include <gui/GuiSceneManager.h>
-#include <gui/Scene.h>
-#include <PlayerManager.h>
-#include <Player.h>
-#include <RaceManager.h>
-#include <Race.h>
-
-#include <ui_RecruitmentScene.h>
+#include <hotseatgame/gui/recruitmentscene.h>
+#include <hotseatgame/gui/uniticon.h>
+#include <hotseatgame/gui/raceicon.h>
+#include <gui/guiscenemanager.h>
+#include <gui/scene.h>
+#include <playermanager.h>
+#include <player.h>
+#include <racemanager.h>
+#include <race.h>
+
+#include <ui_recruitmentscene.h>
 #include <QHBoxLayout>
 #include <QString>
 #include <QStringList>

source/hotseatgame/gui/UnitIcon.cpp → source/hotseatgame/gui/uniticon.cpp

@@ -1,4 +1,4 @@
-#include <hotseatgame/gui/UnitIcon.h>
+#include <hotseatgame/gui/uniticon.h>
 #include <QDebug>
 #include <QTime>
 #include <QBitmap>

source/hotseatgame/UnitsQueue.cpp → source/hotseatgame/unitsqueue.cpp

@@ -1,4 +1,4 @@
-#include <hotseatgame/UnitsQueue.h>
+#include <hotseatgame/unitsqueue.h>
 #include <vector>
 #include <string>
 

source/main.cpp

@@ -1,4 +1,4 @@
-#include <gui/GuiSceneManager.h>
+#include <gui/guiscenemanager.h>
 
 #include <QApplication>
 #include <QDesktopWidget>

source/PlayerManager.cpp → source/playermanager.cpp

@@ -1,4 +1,4 @@
-#include "PlayerManager.h"
+#include "playermanager.h"
 #include <cassert>
 
 PlayerManager::PlayerManager(QObject *parent) : QObject(parent)

source/Race.cpp → source/race.cpp

@@ -1,7 +1,7 @@
-#include "Race.h"
-#include "units/Unit.h"
-#include "units/Warrior.h"
-#include "units/Mage.h"
+#include "race.h"
+#include "units/unit.h"
+#include "units/warrior.h"
+#include "units/mage.h"
 
 #include <QFile>
 #include <QTextStream>

source/RaceManager.cpp → source/racemanager.cpp

@@ -1,5 +1,5 @@
-#include "RaceManager.h"
-#include "Race.h"
+#include "racemanager.h"
+#include "race.h"
 
 #include <QFile>
 #include <QDebug>

source/units/Mage.cpp → source/units/mage.cpp

@@ -1,5 +1,5 @@
-#include "units/Mage.h"
-#include "units/Unit.h"
+#include "units/mage.h"
+#include "units/unit.h"
 
 Mage::Mage(QString parameters) : Unit(parameters)
 {

source/units/Unit.cpp → source/units/unit.cpp

@@ -1,6 +1,6 @@
-#include "AbstractFactory.h"
-#include "units/Unit.h"
-#include "Cell.h"
+#include "abstractfactory.h"
+#include "units/unit.h"
+#include "cell.h"
 #include "effects/effect.h"
 
 #include <iostream>

source/units/Warrior.cpp → source/units/warrior.cpp

@@ -1,5 +1,5 @@
-#include "units/Warrior.h"
-#include "units/Unit.h"
+#include "units/warrior.h"
+#include "units/unit.h"
 #include <cassert>
 
 Warrior::Warrior(QString parameters) : Unit(parameters)