Commit e75adbd2 authored by Laurent Montel's avatar Laurent Montel 😁

port++

parent 68394bbe
......@@ -45,5 +45,5 @@ add_subdirectory(doc)
########### install files ###############
install( PROGRAMS lskat.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
ecm_install_icons( ${ICON_INSTALL_DIR} )
ecm_install_icons( ICONS hi128-apps-lskat.png hi16-apps-lskat.png hi22-apps-lskat.png hi32-apps-lskat.png hi48-apps-lskat.png hi64-apps-lskat.png DESTINATION ${ICON_INSTALL_DIR} )
......@@ -26,6 +26,7 @@
// Qt includes
#include <QPoint>
#include <QMatrix>
#include <QGraphicsScene>
// KDE includes
#include <kdebug.h>
......@@ -44,9 +45,10 @@
// Constructor for the view
CardSprite::CardSprite(const Suite suite, const CardType cardtype, ThemeManager* theme,
int advancePeriod, QGraphicsScene* scene)
: Themable(QLatin1String( THEME_ID ), theme), QGraphicsPixmapItem(0, scene)
: Themable(QLatin1String( THEME_ID ), theme), QGraphicsPixmapItem(0)
{
scene->addItem(this);
mAnimationState = Idle;
mCurrentFrame = -1; // Frame will be set to backside
mAdvancePeriod = advancePeriod;
......
......@@ -63,7 +63,8 @@ GameView::GameView(const QSize &size, int advancePeriod, QGraphicsScene* scene,
// Debug
mDisplayUpdateTime = 0;
mFrameSprite = new QGraphicsTextItem(0, scene);
mFrameSprite = new QGraphicsTextItem(0);
scene->addItem(mFrameSprite);
mFrameSprite->setPos(QPointF(0.0, 0.0));
mFrameSprite->setZValue(1000.0);
if (global_debug > 0) mFrameSprite->show();
......
......@@ -45,7 +45,7 @@
#include <kapplication.h>
#include <kcmdlineargs.h>
#include <kdebug.h>
#include <kaboutdata.h>
#include <K4AboutData>
#include <klocale.h>
#include <kglobal.h>
......@@ -66,10 +66,10 @@ bool global_demo_mode = false;
int main(int argc, char *argv[])
{
global_debug=0;
KAboutData aboutData( "lskat", 0, ki18n("LSkat"),
K4AboutData aboutData( "lskat", 0, ki18n("LSkat"),
LSKAT_VERSION,
ki18n("LSkat: A desktop card game"),
KAboutData::License_GPL,
K4AboutData::License_GPL,
ki18n("(c) 1995-2007, Martin Heni"),
KLocalizedString(),
"http://games.kde.org/lskat" );
......
......@@ -32,7 +32,7 @@
#include <khelpmenu.h>
#include <kdebug.h>
#include <kstandardaction.h>
#include <kaction.h>
#include <QAction>
#include <kactioncollection.h>
#include <kstatusbar.h>
#include <kstandarddirs.h>
......@@ -44,7 +44,7 @@
#include <ktoolbar.h>
#include <kselectaction.h>
#include <kapplication.h>
#include <KShortcut>
// Application specific includes
#include "lskatglobal.h"
#include "gameview.h"
......@@ -457,7 +457,7 @@ void Mainwindow::initGUI()
themeAct->setWhatsThis(i18n("Changing theme."));
// Choose card deck
KAction *action1 = actionCollection()->addAction( QLatin1String( "select_carddeck" ));
QAction *action1 = actionCollection()->addAction( QLatin1String( "select_carddeck" ));
action1->setText(i18n("Select &Card Deck..."));
action1->setShortcuts( KShortcut( Qt::Key_F10 ) );
connect(action1, SIGNAL(triggered(bool)), this, SLOT(menuCardDeck()));
......
......@@ -25,6 +25,7 @@
// Qt includes
#include <QSizeF>
#include <QGraphicsScene>
// KDE includes
#include <kdebug.h>
......@@ -34,8 +35,9 @@
// Constructor for the sprite
PixmapSprite::PixmapSprite(const QString &id, ThemeManager* theme, int advancePeriod, int no, QGraphicsScene* canvas)
: Themable(id, theme), QGraphicsPixmapItem(0, canvas)
: Themable(id, theme), QGraphicsPixmapItem(0)
{
canvas->addItem(this);
hide();
mAnimationState = Idle;
......@@ -51,8 +53,9 @@ PixmapSprite::PixmapSprite(const QString &id, ThemeManager* theme, int advancePe
// Constructor for the sprite
PixmapSprite::PixmapSprite(int advancePeriod, int no, QGraphicsScene* canvas)
: Themable(), QGraphicsPixmapItem(0, canvas)
: Themable(), QGraphicsPixmapItem(0)
{
canvas->addItem(this);
hide();
mAnimationState = Idle;
......
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