Commit 497525f3 authored by Laurent Montel's avatar Laurent Montel 😁

Port++

parent 80574fc5
......@@ -37,9 +37,8 @@ link_directories( ${CMAKE_CURRENT_BINARY_DIR}/iris/ )
set(ksirk_SRCS
GameLogic/gameautomaton.cpp
#READD
#kgamewin.cpp
#kgamewinslots.cpp
kgamewin.cpp
kgamewinslots.cpp
gestionSprites.cpp
Sprites/backgnd.cpp
Sprites/animsprite.cpp
......@@ -76,14 +75,12 @@ set(ksirk_SRCS
Dialogs/restartOrExitDialogImpl.cpp
Dialogs/joingame.cpp
Dialogs/jabbergameui.cpp
#READD
#Dialogs/InvasionSlider.cpp
Dialogs/InvasionSlider.cpp
Dialogs/newGameSummaryWidget.cpp
Dialogs/tcpconnectwidget.cpp
main.cpp
decoratedgameframe.cpp
#READD
#ksirkConfigDialog.cpp
ksirkConfigDialog.cpp
fightArena.cpp
mainMenu.cpp
krightdialog.cpp
......
......@@ -62,6 +62,7 @@
#include <QHostInfo>
// include files for KDE
#include <KUrl>
#include <K4AboutData>
#include <kiconloader.h>
#include <kmessagebox.h>
......@@ -534,7 +535,7 @@ QPixmap KGameWindow::buildDice(const QString& id)
QPixmap KGameWindow::getDice(DiceColor color, int num)
{
if(num==0 || num==-1)
{return NULL;}
{return QPixmap();}
else {return m_dices[color][num-1];}
}
......
......@@ -53,6 +53,7 @@
#include <QInputDialog>
// include files for KDE
#include <KUrl>
#include <kfiledialog.h>
#include <KLocalizedString>
#include <kconfig.h>
......
......@@ -63,7 +63,7 @@ ecm_install_icons( ${ICON_INSTALL_DIR} )
install( FILES ksirkskineditorsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
install( PROGRAMS ksirkskineditor.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES ksirkskineditorui.rc DESTINATION ${DATA_INSTALL_DIR}/ksirkskineditor )
install( FILES ksirkskineditorui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/ksirkskineditor )
set (pics_default_DATA
cross.png
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment