Hello community, here is the log from the commit of package kdiamond for openSUSE:Factory checked in at 2016-01-10 13:05:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiamond (Old) and /work/SRC/openSUSE:Factory/.kdiamond.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdiamond" Changes: -------- --- /work/SRC/openSUSE:Factory/kdiamond/kdiamond.changes 2015-11-15 12:34:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdiamond.new/kdiamond.changes 2016-01-10 13:05:10.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Dec 13 13:17:54 UTC 2015 - [email protected] + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- Old: ---- kdiamond-15.08.3.tar.xz New: ---- kdiamond-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiamond.spec ++++++ --- /var/tmp/diff_new_pack.nwkM9i/_old 2016-01-10 13:05:12.000000000 +0100 +++ /var/tmp/diff_new_pack.nwkM9i/_new 2016-01-10 13:05:12.000000000 +0100 @@ -38,7 +38,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 15.08.3 +Version: 15.12.0 Release: 0 Source0: kdiamond-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kdiamond-15.08.3.tar.xz -> kdiamond-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-15.08.3/CMakeLists.txt new/kdiamond-15.12.0/CMakeLists.txt --- old/kdiamond-15.08.3/CMakeLists.txt 2015-07-25 20:31:43.000000000 +0200 +++ new/kdiamond-15.12.0/CMakeLists.txt 2015-11-09 16:42:39.000000000 +0100 @@ -15,9 +15,7 @@ WidgetsAddons Config I18n - GuiAddons ConfigWidgets - IconThemes XmlGui Notifications NotifyConfig) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-15.08.3/src/game-state.cpp new/kdiamond-15.12.0/src/game-state.cpp --- old/kdiamond-15.08.3/src/game-state.cpp 2015-07-25 20:31:43.000000000 +0200 +++ new/kdiamond-15.12.0/src/game-state.cpp 2015-11-09 16:42:39.000000000 +0100 @@ -118,7 +118,7 @@ p->m_state = state; emit stateChanged(state); if (state == KDiamond::Finished) { - KNotification::event(QLatin1Literal("gamefinished")); + KNotification::event(QStringLiteral("gamefinished")); emit message(i18nc("Not meant like 'You have lost', more like 'Time is up'.", "Game over.")); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-15.08.3/src/game.cpp new/kdiamond-15.12.0/src/game.cpp --- old/kdiamond-15.08.3/src/game.cpp 2015-07-25 20:31:43.000000000 +0200 +++ new/kdiamond-15.12.0/src/game.cpp 2015-11-09 16:42:39.000000000 +0100 @@ -45,7 +45,7 @@ const int minSize = m_board->gridSize(); setSceneRect(0.0, 0.0, minSize, minSize); connect(this, &Game::sceneRectChanged, this, &Game::updateGraphics); - connect(renderer->themeProvider(), SIGNAL(currentThemeChanged(const KgTheme*)), SLOT(updateGraphics())); + connect(renderer->themeProvider(), &KgThemeProvider::currentThemeChanged, this, &Game::updateGraphics); addItem(m_board); //init messenger m_messenger->setMessageOpacity(0.8); @@ -148,14 +148,14 @@ t.translate(leftOffset, 0).scale(diamondSize, diamondSize); m_board->setTransform(t); //render background - QPixmap pix = m_board->renderer()->spritePixmap(QLatin1Literal("kdiamond-background"), sceneSize); + QPixmap pix = m_board->renderer()->spritePixmap(QStringLiteral("kdiamond-background"), sceneSize); const KgTheme *theme = m_board->renderer()->theme(); - const bool hasBorder = theme->customData(QLatin1Literal("HasBorder")).toInt() > 0; + const bool hasBorder = theme->customData(QStringLiteral("HasBorder")).toInt() > 0; if (hasBorder) { - const qreal borderPercentage = theme->customData(QLatin1Literal("BorderPercentage")).toFloat(); + const qreal borderPercentage = theme->customData(QStringLiteral("BorderPercentage")).toFloat(); const int padding = borderPercentage * boardSize; const int boardBorderSize = 2 * padding + boardSize; - const QPixmap boardPix = m_board->renderer()->spritePixmap(QLatin1Literal("kdiamond-border"), QSize(boardBorderSize, boardBorderSize)); + const QPixmap boardPix = m_board->renderer()->spritePixmap(QStringLiteral("kdiamond-border"), QSize(boardBorderSize, boardBorderSize)); QPainter painter(&pix); painter.drawPixmap(QPoint(leftOffset - padding, -padding), boardPix); } @@ -243,7 +243,7 @@ } //fall through case KDiamond::RevokeSwapDiamondsJob: //invoke movement - KNotification::event(QLatin1Literal("move")); + KNotification::event(QStringLiteral("move")); m_board->swapDiamonds(m_swappingDiamonds[0], m_swappingDiamonds[1]); break; case KDiamond::RemoveRowsJob: { @@ -267,7 +267,7 @@ //report to Game m_gameState->addPoints(diamondsToRemove.count()); //invoke remove animation, then fill gaps immediately after the animation - KNotification::event(QLatin1Literal("remove")); + KNotification::event(QStringLiteral("remove")); foreach (const QPoint &diamondPos, diamondsToRemove) { m_board->removeDiamond(diamondPos); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-15.08.3/src/infobar.cpp new/kdiamond-15.12.0/src/infobar.cpp --- old/kdiamond-15.08.3/src/infobar.cpp 2015-07-25 20:31:43.000000000 +0200 +++ new/kdiamond-15.12.0/src/infobar.cpp 2015-11-09 16:42:39.000000000 +0100 @@ -77,7 +77,7 @@ if (seconds < 10) { secondString.prepend(QLatin1Char('0')); } - mTime->setText(i18n("Time left: %1", QString::fromLatin1("%1:%2").arg(minuteString).arg(secondString))); + mTime->setText(i18n("Time left: %1", QStringLiteral("%1:%2").arg(minuteString).arg(secondString))); //special treatment if game is finished if (remainingSeconds == 0) { updateMoves(0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-15.08.3/src/main.cpp new/kdiamond-15.12.0/src/main.cpp --- old/kdiamond-15.08.3/src/main.cpp 2015-07-25 20:31:43.000000000 +0200 +++ new/kdiamond-15.12.0/src/main.cpp 2015-11-09 16:42:39.000000000 +0100 @@ -38,20 +38,20 @@ int main(int argc, char **argv) { QApplication app(argc, argv); - Kdelibs4ConfigMigrator migrate(QLatin1String("kdiamond")); - migrate.setConfigFiles(QStringList() << QLatin1String("kdiamondrc") << QLatin1String("kdiamond.notifyrc")); - migrate.setUiFiles(QStringList() << QLatin1String("kdiamondui.rc")); + Kdelibs4ConfigMigrator migrate(QStringLiteral("kdiamond")); + migrate.setConfigFiles(QStringList() << QStringLiteral("kdiamondrc") << QStringLiteral("kdiamond.notifyrc")); + migrate.setUiFiles(QStringList() << QStringLiteral("kdiamondui.rc")); migrate.migrate(); qsrand(time(0)); KLocalizedString::setApplicationDomain("kdiamond"); - KAboutData about(QLatin1Literal("kdiamond"), i18nc("The application's name", "KDiamond"), QLatin1Literal(version), i18n(description), - KAboutLicense::GPL, i18n("(C) 2008-2010 Stefan Majewsky and others"), QLatin1Literal("http://games.kde.org/kdiamond";)); - about.addAuthor(i18n("Stefan Majewsky"), i18n("Original author and current maintainer"), QLatin1Literal("[email protected]")); - about.addAuthor(i18n("Paul Bunbury"), i18n("Gameplay refinement"), QLatin1Literal("[email protected]")); - about.addCredit(i18n("Eugene Trounev"), i18n("Default theme"), QLatin1Literal("[email protected]")); - about.addCredit(i18n("Felix Lemke"), i18n("Classic theme"), QLatin1Literal("[email protected]")); - about.addCredit(i18n("Jeffrey Kelling"), i18n("Technical consultant"), QLatin1Literal("[email protected]")); + KAboutData about(QStringLiteral("kdiamond"), i18nc("The application's name", "KDiamond"), QLatin1Literal(version), i18n(description), + KAboutLicense::GPL, i18n("(C) 2008-2010 Stefan Majewsky and others"), QStringLiteral("http://games.kde.org/kdiamond";)); + about.addAuthor(i18n("Stefan Majewsky"), i18n("Original author and current maintainer"), QStringLiteral("[email protected]")); + about.addAuthor(i18n("Paul Bunbury"), i18n("Gameplay refinement"), QStringLiteral("[email protected]")); + about.addCredit(i18n("Eugene Trounev"), i18n("Default theme"), QStringLiteral("[email protected]")); + about.addCredit(i18n("Felix Lemke"), i18n("Classic theme"), QStringLiteral("[email protected]")); + about.addCredit(i18n("Jeffrey Kelling"), i18n("Technical consultant"), QStringLiteral("[email protected]")); QCommandLineParser parser; KAboutData::setApplicationData(about); parser.addVersionOption(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-15.08.3/src/mainwindow.cpp new/kdiamond-15.12.0/src/mainwindow.cpp --- old/kdiamond-15.08.3/src/mainwindow.cpp 2015-07-25 20:31:43.000000000 +0200 +++ new/kdiamond-15.12.0/src/mainwindow.cpp 2015-11-09 16:42:39.000000000 +0100 @@ -48,7 +48,7 @@ ThemeProvider(QObject *parent = 0) : KgThemeProvider("Theme", parent) { - discoverThemes("appdata", QLatin1String("themes")); + discoverThemes("appdata", QStringLiteral("themes")); } }; @@ -57,7 +57,7 @@ public: Renderer() : KGameRenderer(new ThemeProvider, 10) { - setFrameSuffix(QString::fromLatin1("-%1")); + setFrameSuffix(QStringLiteral("-%1")); } }; } @@ -68,7 +68,7 @@ , m_game(0) , m_view(new KDiamond::View) , m_infoBar(0) - , m_newAct(new KActionMenu(QIcon::fromTheme(QLatin1String("document-new")), i18nc("new game", "&New"), this)) + , m_newAct(new KActionMenu(QIcon::fromTheme(QStringLiteral("document-new")), i18nc("new game", "&New"), this)) , m_newTimedAct(new QAction(i18n("Timed game"), this)) , m_newUntimedAct(new QAction(i18n("Untimed game"), this)) , m_renderer(new KDiamond::Renderer()) @@ -78,7 +78,7 @@ //init GUI - "New Action" m_newAct->setToolTip(i18n("Start a new game")); m_newAct->setWhatsThis(i18n("Start a new game.")); - actionCollection()->addAction(QLatin1String("game_new"), m_newAct); + actionCollection()->addAction(QStringLiteral("game_new"), m_newAct); actionCollection()->setDefaultShortcuts(m_newAct, KStandardShortcut::openNew()); connect(m_newAct, &KActionMenu::triggered, this, &MainWindow::startGameDispatcher); m_newAct->addAction(m_newTimedAct); @@ -164,7 +164,7 @@ scoreInfo[KScoreDialog::Custom1] = m_gameState->mode() == KDiamond::UntimedGame ? i18n("Untimed") : i18n("Timed"); //report score QPointer<KScoreDialog> dialog = new KScoreDialog(KScoreDialog::Name | KScoreDialog::Score, this); - dialog->addField(KScoreDialog::Custom1, i18n("Mode"), QLatin1Literal("mode")); + dialog->addField(KScoreDialog::Custom1, i18n("Mode"), QStringLiteral("mode")); dialog->initFromDifficulty(Kg::difficulty()); dialog->addScore(scoreInfo); dialog->exec(); @@ -176,11 +176,11 @@ //pause game if necessary m_gameState->setState(KDiamond::Paused); if (m_gameState->state() != KDiamond::Finished) { - actionCollection()->action(QLatin1Literal("game_pause"))->setChecked(true); + actionCollection()->action(QStringLiteral("game_pause"))->setChecked(true); } //show dialog QPointer<KScoreDialog> dialog = new KScoreDialog(KScoreDialog::Name | KScoreDialog::Score, this); - dialog->addField(KScoreDialog::Custom1, i18n("Mode"), QLatin1Literal("mode")); + dialog->addField(KScoreDialog::Custom1, i18n("Mode"), QStringLiteral("mode")); dialog->initFromDifficulty(Kg::difficulty()); dialog->exec(); delete dialog;
