Hello community, here is the log from the commit of package lskat for openSUSE:Factory checked in at 2014-08-25 11:01:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lskat (Old) and /work/SRC/openSUSE:Factory/.lskat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lskat" Changes: -------- --- /work/SRC/openSUSE:Factory/lskat/lskat.changes 2014-07-16 16:19:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lskat.new/lskat.changes 2014-08-25 11:02:21.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Aug 15 09:02:50 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.14.0 + * KDE 4.14.0 SC Final Release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- +Thu Jul 17 16:47:47 UTC 2014 - cgiboude...@gmx.com + +- Update to 4.13.90 + * KDE 4.14 Beta 2 release + * See http://www.kde.org/announcements/announce-4.14-beta2.php + +------------------------------------------------------------------- Old: ---- lskat-4.13.80.tar.xz New: ---- lskat-4.14.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lskat.spec ++++++ --- /var/tmp/diff_new_pack.47Hnb2/_old 2014-08-25 11:02:23.000000000 +0200 +++ /var/tmp/diff_new_pack.47Hnb2/_new 2014-08-25 11:02:23.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Card Url: http://www.kde.org -Version: 4.13.80 +Version: 4.14.0 Release: 0 Source0: lskat-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ lskat-4.13.80.tar.xz -> lskat-4.14.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lskat-4.13.80/src/display_two.h new/lskat-4.14.0/src/display_two.h --- old/lskat-4.13.80/src/display_two.h 2014-05-08 00:36:53.000000000 +0200 +++ new/lskat-4.14.0/src/display_two.h 2014-08-13 22:33:29.000000000 +0200 @@ -58,9 +58,9 @@ /** Start the display. */ - void start(); + void start(); - /** Main theme function. Called by the theme manager. Redraw and resize + /** Main theme function. Called by the theme manager. Redraw and resize * display. */ virtual void changeTheme(); @@ -81,7 +81,7 @@ /** Turn a card on the display. The card is flipped backside * to frontside. - * @param cardNumber The card number (0-7) + * @param cardNumber The card number (0-31) */ void turn(int cardNumber); @@ -91,7 +91,7 @@ * @param delta Card offset from target position (0,1,2,...) */ void remove(int winnerPosition, int cardNumber, int delta); - + /** Display the score on the game board. * @param position Which player position * @param score The score to display @@ -110,7 +110,7 @@ public slots: /** Convert the position of a mouse click to a logical - * game position, that is position (up/down) and a + * game position, that is position (up/down) and a * card number (0-7) * @param mouse The mouse coordinates [screen coordinates] * @param playerNumber The resulting player number [0-1] @@ -127,7 +127,7 @@ /** Checks whether the shuffling is still ongoing (timer). */ - void checkShuffle(); + void checkShuffle(); signals: /** Signal is emitted when the dealing animation is done. @@ -150,7 +150,7 @@ CardSprite* getCardSprite(int cardValue); private: - // Pixmap for movement sprite + // Pixmap for movement sprite QPixmap* mMovePixmap; // Store all move sprites QHash<int,PixmapSprite*> mMoveSprites; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lskat-4.13.80/src/mainwindow.cpp new/lskat-4.14.0/src/mainwindow.cpp --- old/lskat-4.13.80/src/mainwindow.cpp 2014-05-08 00:36:53.000000000 +0200 +++ new/lskat-4.14.0/src/mainwindow.cpp 2014-08-13 22:33:29.000000000 +0200 @@ -402,8 +402,7 @@ // End a game action = KStandardGameAction::end(this, SLOT(menuEndGame()), actionCollection()); action->setWhatsThis(i18n("Ends a currently played game. No winner will be declared.")); - if (global_demo_mode) action->setEnabled(false); - else action->setEnabled(false); + action->setEnabled(false); // Quit the program action = KStandardGameAction::quit(this, SLOT(close()), actionCollection()); @@ -512,7 +511,6 @@ void Mainwindow::menuCardDeck() { QString front = mCardTheme; - int result; KConfigGroup grp = KGlobal::config()->group("ProgramData"); KCardWidget* cardwidget = new KCardWidget(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lskat-4.13.80/src/player.cpp new/lskat-4.14.0/src/player.cpp --- old/lskat-4.13.80/src/player.cpp 2014-05-08 00:36:53.000000000 +0200 +++ new/lskat-4.14.0/src/player.cpp 2014-08-13 22:33:29.000000000 +0200 @@ -41,8 +41,8 @@ mDeck = 0; mInput = 0; mTrump = Club; - - // Reset internal variables - they are set by 'load' + + // Reset internal variables - they are set by 'load' setName(QLatin1String( "" )); mScore = 0; mNumberOfGames = 0; @@ -50,7 +50,7 @@ } -// Destructor +// Destructor Player::~Player() { delete mInput; @@ -98,10 +98,10 @@ } -// Deal a number of cards to this player +// Deal a number of cards to this player void Player::deal(int amount) { - if (!mDeck) + if (!mDeck) { kFatal() << "No deck set to player."; return; @@ -123,20 +123,20 @@ } -// Retrieve the input device of the player +// Retrieve the input device of the player AbstractInput* Player::input() { return mInput; } -// Set the input device of the player +// Set the input device of the player void Player::setInput(AbstractInput* input) { // Try to set the same turn status after changing input bool oldTurnAllowed = false; // Get rid of old input devive if existing - if (mInput) + if (mInput) { oldTurnAllowed = mInput->inputAllowed(); mInput->setInputAllowed(false); @@ -153,26 +153,26 @@ } -// Set this player to start a turn +// Set this player to start a turn void Player::startTurn() { mInput->setInputAllowed(true); } -// Set this player to stop a turn +// Set this player to stop a turn void Player::stopTurn() { mInput->setInputAllowed(false); } - -// Remove a card from the given position. Typically if the + +// Remove a card from the given position. Typically if the card was played. void Player::deleteCard(int cardPosition) { if (cardPosition >= mCards.size()) { - kFatal() << "Player" << mId << "tries to delete non esxisting card position " + kFatal() << "Player" << mId << "tries to delete non existing card position " << cardPosition <<" >=" << mCards.size(); } mCards[cardPosition] = -1; @@ -184,22 +184,22 @@ { if (cardPosition >= mCards.size()) { - kFatal() << "Player" << mId << "tries to add to esxisting card position " + kFatal() << "Player" << mId << "tries to add to existing card position " << cardPosition <<" >=" << mCards.size(); } mCards[cardPosition] = card; } -// Retrive card value at given logical position +// Retrieve card value at given logical position int Player::getCard(int playerNumber) { if (playerNumber >= mCards.size()) { - kFatal() << "Player" << mId << "tries to get non esxisting card " + kFatal() << "Player" << mId << "tries to get non existing card " << playerNumber <<" >=" << mCards.size(); } - + int card = mCards[playerNumber]; return card; } @@ -212,7 +212,7 @@ } -// Retrive the number of won moves for this player +// Retrieve the number of won moves for this player int Player::noOfMovesWon() { return mMovesWon; @@ -244,7 +244,7 @@ } -// Retrive the amount of points this player has +// Retrieve the amount of points this player has int Player::points() { return mPoints; @@ -259,7 +259,7 @@ } -// Retrive the player's name +// Retrieve the player's name QString Player::name() { return mName; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lskat-4.13.80/src/player.h new/lskat-4.14.0/src/player.h --- old/lskat-4.13.80/src/player.h 2014-05-08 00:36:53.000000000 +0200 +++ new/lskat-4.14.0/src/player.h 2014-08-13 22:33:29.000000000 +0200 @@ -50,16 +50,16 @@ */ explicit Player(int id, QObject* parent=0); - /** Destructor + /** Destructor */ virtual ~Player(); - /** Retrive the player numner. + /** Retrieve the player number. * @return The id. */ int id() {return mId;} - /** Retrive card value at given logical position + /** Retrieve card value at given logical position * @param playerNumber (0..max number of cards of player) * @return Card number */ @@ -78,29 +78,29 @@ */ void addCard(int cardPosition, int card); - /** Set this player to start a turn + /** Set this player to start a turn */ void startTurn(); - /** Set this player to stop a turn + /** Set this player to stop a turn */ void stopTurn(); - - /** Deal a number of cards to this player + + /** Deal a number of cards to this player * @param amount The amount of cards */ - void deal(int amount); + void deal(int amount); - /** Increases the number of moves one for this player. + /** Increases the number of moves by one for this player. * @param amount Increase by this amount (default 1) */ void increaseMovesWon(int amount = 1); - /** Retrive the number of won moves for this player. + /** Retrieve the number of won moves for this player. * @return The amount of won moves for this player. */ int noOfMovesWon(); - + /** Adds a card which is one in a move to this player. * Also increase this players point by the points * of the card. Note, this method has to be called with both @@ -115,7 +115,7 @@ */ int getWonCard(int no); - /** Retrive the amount of points this player has. + /** Retrieve the amount of points this player has. * @return The amount of points (0-120). */ int points(); @@ -125,8 +125,8 @@ * @param points The points. */ void setPoints(int points); - - /** Retrive the name of the player. + + /** Retrieve the name of the player. * @return The player's name. */ QString name(); @@ -137,8 +137,7 @@ */ void setName(const QString &name); - /** Add a number of won games to the overall - * player statistic. + /** Add a number of won games to the overall player statistic. * @param amount The amount of won games */ void addWonGame(int amount); @@ -148,8 +147,7 @@ */ int wonGames(); - /** Add a number of games to the overall - * player statistic. + /** Add a number of games to the overall player statistic. * @param amount The amount of games */ void addGame(int amount); @@ -159,8 +157,7 @@ */ int games(); - /** Add a score to the overall - * player statistic. + /** Add a score to the overall player statistic. * @param amount The score amount */ void addScore(int amount); @@ -170,7 +167,7 @@ */ int score(); - /** Retrieve the input device of the player + /** Retrieve the input device of the player * @return The input device. */ AbstractInput* input(); @@ -183,7 +180,7 @@ /** Set the deck for drawing cards. * @param deck The deck */ - void setDeck(Deck* deck); + void setDeck(Deck* deck); /** Refresh GUI by emitting a signal. */ @@ -191,19 +188,19 @@ /** Clear the all time statistics of this player. */ - void clear(); + void clear(); - /** Set the trump to the player + /** Set the trump to the player * @param trump The trump suite */ - void setTrump(Suite trump); + void setTrump(Suite trump); /** Retrieve the trump. * @return The trump suite. */ Suite trump(); - /** Saves the properties + /** Saves the properties * @param config The config group object. */ void save(KConfigGroup& config); @@ -220,31 +217,31 @@ void signalUpdate(Player* p); private: - // Players input device + // Players input device AbstractInput* mInput; - // Card deck + // Card deck Deck* mDeck; - // Our cards + // Our cards QVector<int> mCards; - // Our won cards + // Our won cards QList<int> mWonCards; - // Our points + // Our points int mPoints; - // Our id + // Our id int mId; - // Number of moves won in the current game + // Number of moves won in the current game int mMovesWon; - // The current trump + // The current trump Suite mTrump; // These attributes need to be saved // Our name QString mName; - // Overall games won for this player + // Overall games won for this player int mGamesWon; - // Overall score for this player + // Overall score for this player int mScore; - // Overall number of games for this player + // Overall number of games for this player int mNumberOfGames; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lskat-4.13.80/src/thememanager.cpp new/lskat-4.14.0/src/thememanager.cpp --- old/lskat-4.13.80/src/thememanager.cpp 2014-05-08 00:36:53.000000000 +0200 +++ new/lskat-4.14.0/src/thememanager.cpp 2014-08-13 22:33:29.000000000 +0200 @@ -102,14 +102,9 @@ // Constructor for the theme manager ThemeManager::ThemeManager(const QString &cardTheme, const QString &themefile, QObject* parent, int initialSize) - : QObject(parent), mConfig( 0 ) + : QObject(parent), mRenderer(0), mConfig(0), mCardTheme(cardTheme), + mScale(initialSize), mAspectRatio(1.0), mCardAspectRatio(1.0) { - mScale = initialSize; - mAspectRatio = 1.0; - mCardAspectRatio = 1.0; - mCardTheme = cardTheme; - mRenderer = 0; - mCardCache = new KCardCache(); // updateTheme(themefile); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
