Hello community, here is the log from the commit of package killbots for openSUSE:Factory checked in at 2016-01-10 13:05:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/killbots (Old) and /work/SRC/openSUSE:Factory/.killbots.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "killbots" Changes: -------- --- /work/SRC/openSUSE:Factory/killbots/killbots.changes 2015-11-15 12:35:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.killbots.new/killbots.changes 2016-01-10 13:05:31.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Dec 13 13:20:10 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: ---- killbots-15.08.3.tar.xz New: ---- killbots-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ killbots.spec ++++++ --- /var/tmp/diff_new_pack.rmLflC/_old 2016-01-10 13:05:31.000000000 +0100 +++ /var/tmp/diff_new_pack.rmLflC/_new 2016-01-10 13:05:31.000000000 +0100 @@ -38,7 +38,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 15.08.3 +Version: 15.12.0 Release: 0 Source0: killbots-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ killbots-15.08.3.tar.xz -> killbots-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-15.08.3/CMakeLists.txt new/killbots-15.12.0/CMakeLists.txt --- old/killbots-15.08.3/CMakeLists.txt 2015-11-04 20:57:38.000000000 +0100 +++ new/killbots-15.12.0/CMakeLists.txt 2015-11-11 17:04:45.000000000 +0100 @@ -6,21 +6,18 @@ find_package(ECM 1.7.0 REQUIRED CONFIG) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Test) +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets) find_package(KF5 REQUIRED COMPONENTS CoreAddons Config WidgetsAddons Config I18n - GuiAddons ConfigWidgets - ItemViews - IconThemes XmlGui - KIO Completion - NotifyConfig + DocTools + DBusAddons ) find_package(KF5KDEGames 4.9.0 REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-15.08.3/main.cpp new/killbots-15.12.0/main.cpp --- old/killbots-15.08.3/main.cpp 2015-11-04 20:57:38.000000000 +0100 +++ new/killbots-15.12.0/main.cpp 2015-11-11 17:04:45.000000000 +0100 @@ -30,19 +30,20 @@ { QApplication app(argc, argv); - Kdelibs4ConfigMigrator migrate(QLatin1String("killbots")); - migrate.setConfigFiles(QStringList() << QLatin1String("killbotsrc")); - migrate.setUiFiles(QStringList() << QLatin1String("killbotsui.rc")); + Kdelibs4ConfigMigrator migrate(QStringLiteral("killbots")); + migrate.setConfigFiles(QStringList() << QStringLiteral("killbotsrc")); + migrate.setUiFiles(QStringList() << QStringLiteral("killbotsui.rc")); migrate.migrate(); KLocalizedString::setApplicationDomain("killbots"); - KAboutData about("killbots", i18n("Killbots"), "1.2.0"); + KAboutData about(QStringLiteral("killbots"), i18n("Killbots"), QStringLiteral("1.2.0")); about.setShortDescription(i18n("A KDE game of killer robots and teleportation.")); about.setLicense(KAboutLicense::GPL_V2); about.setCopyrightStatement(i18n("© 2006-2009, Parker Coates")); - about.addAuthor(i18n("Parker Coates"), i18n("Developer"), "[email protected]"); - about.addCredit(i18n("Mark Rae"), i18n("Author of Gnome Robots. Invented safe teleports, pushing junkheaps and fast robots."), "", "http://live.gnome.org/Robots";); + about.addAuthor(i18n("Parker Coates"), i18n("Developer"), QStringLiteral("[email protected]")); + about.addCredit(i18n("Mark Rae"), i18n("Author of Gnome Robots. Invented safe teleports, pushing junkheaps and fast robots."), QLatin1String(""), QStringLiteral("http://live.gnome.org/Robots";)); + about.setHomepage(QStringLiteral("https://www.kde.org/applications/games/killbots/";)); QCommandLineParser parser; KAboutData::setApplicationData(about); @@ -54,7 +55,7 @@ KDBusService service; - app.setWindowIcon(QIcon::fromTheme(QLatin1String("killbots"))); + app.setWindowIcon(QIcon::fromTheme(QStringLiteral("killbots"))); Killbots::MainWindow *mainWindow = new Killbots::MainWindow; mainWindow->show(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-15.08.3/mainwindow.cpp new/killbots-15.12.0/mainwindow.cpp --- old/killbots-15.08.3/mainwindow.cpp 2015-11-04 20:57:38.000000000 +0100 +++ new/killbots-15.12.0/mainwindow.cpp 2015-11-11 17:04:45.000000000 +0100 @@ -58,34 +58,34 @@ m_engine = new Engine(m_coordinator, this); m_coordinator->setEngine(m_engine); - connect(m_engine, SIGNAL(gameOver(int,int)), this, SLOT(onGameOver(int,int))); + connect(m_engine, &Engine::gameOver, this, &MainWindow::onGameOver); m_scene = new Scene(this); m_coordinator->setScene(m_scene); - connect(m_scene, SIGNAL(clicked(int)), m_coordinator, SLOT(requestAction(int))); - connect(Renderer::self()->themeProvider(), SIGNAL(currentThemeChanged(const KgTheme*)), m_scene, SLOT(doLayout())); + connect(m_scene, &Scene::clicked, m_coordinator, &Coordinator::requestAction); + connect(Renderer::self()->themeProvider(), &KgThemeProvider::currentThemeChanged, m_scene, &Scene::doLayout); m_view = new View(m_scene, this); m_view->setMinimumSize(400, 280); m_view->setWhatsThis(i18n("This is the main game area used to interact with Killbots. It shows the current state of the game grid and allows one to control the hero using the mouse. It also displays certain statistics about the game in progress.")); setCentralWidget(m_view); - connect(m_view, SIGNAL(sizeChanged(QSize)), m_scene, SLOT(doLayout())); + connect(m_view, &View::sizeChanged, m_scene, &Scene::doLayout); m_keyboardMapper = new QSignalMapper(this); connect(m_keyboardMapper, SIGNAL(mapped(int)), m_coordinator, SLOT(requestAction(int))); setupActions(); - connect(m_engine, SIGNAL(teleportAllowed(bool)), actionCollection()->action("teleport"), SLOT(setEnabled(bool))); - connect(m_engine, SIGNAL(teleportAllowed(bool)), actionCollection()->action("teleport_sip"), SLOT(setEnabled(bool))); - connect(m_engine, SIGNAL(teleportSafelyAllowed(bool)), actionCollection()->action("teleport_safely"), SLOT(setEnabled(bool))); - connect(m_engine, SIGNAL(vaporizerAllowed(bool)), actionCollection()->action("vaporizer"), SLOT(setEnabled(bool))); - connect(m_engine, SIGNAL(waitOutRoundAllowed(bool)), actionCollection()->action("wait_out_round"), SLOT(setEnabled(bool))); + connect(m_engine, &Engine::teleportAllowed, actionCollection()->action(QStringLiteral("teleport")), &QAction::setEnabled); + connect(m_engine, &Engine::teleportAllowed, actionCollection()->action(QStringLiteral("teleport_sip")), &QAction::setEnabled); + connect(m_engine, &Engine::teleportSafelyAllowed, actionCollection()->action(QStringLiteral("teleport_safely")), &QAction::setEnabled); + connect(m_engine, &Engine::vaporizerAllowed, actionCollection()->action(QStringLiteral("vaporizer")), &QAction::setEnabled); + connect(m_engine, &Engine::waitOutRoundAllowed, actionCollection()->action(QStringLiteral("wait_out_round")), &QAction::setEnabled); setupGUI(Save | Create | ToolBar | Keys); // Delaying the start of the first game by 50ms to avoid resize events after // the game has been started. Delaying by 0ms doesn't seem to be enough. - QTimer::singleShot(50, m_coordinator, SLOT(requestNewGame())); + QTimer::singleShot(50, m_coordinator, &Coordinator::requestNewGame); } Killbots::MainWindow::~MainWindow() @@ -98,31 +98,31 @@ // An instance of the dialog could be already created and could be cached, // in which case we want to display the cached dialog instead of creating // another one - if (!KConfigDialog::showDialog("configurePreferencesDialog")) { + if (!KConfigDialog::showDialog(QStringLiteral("configurePreferencesDialog"))) { // Creating a dialog because KConfigDialog didn't find an instance of it - KConfigDialog *configDialog = new KConfigDialog(this, "configurePreferencesDialog", Settings::self()); + KConfigDialog *configDialog = new KConfigDialog(this, QStringLiteral("configurePreferencesDialog"), Settings::self()); // Creating setting pages and adding them to the dialog configDialog->addPage(new OptionsPage(this), i18n("General"), - "configure", + QStringLiteral("configure"), i18n("Configure general settings") ); configDialog->addPage(new RulesetSelector(this), i18n("Game Type"), - "games-config-custom", + QStringLiteral("games-config-custom"), i18n("Select a game type") ); configDialog->addPage(new KgThemeSelector(Renderer::self()->themeProvider()), i18n("Appearance"), - "games-config-theme", + QStringLiteral("games-config-theme"), i18n("Select a graphical theme") ); configDialog->setMaximumSize(800, 600); // Update the sprite style if it has changed - connect(configDialog, SIGNAL(settingsChanged(QString)), this, SLOT(onSettingsChanged())); + connect(configDialog, &KConfigDialog::settingsChanged, this, &MainWindow::onSettingsChanged); configDialog->show(); } @@ -166,10 +166,10 @@ void Killbots::MainWindow::createScoreDialog() { m_scoreDialog = new KScoreDialog(KScoreDialog::Name, this); - m_scoreDialog->addField(KScoreDialog::Level, i18n("Round"), "round"); + m_scoreDialog->addField(KScoreDialog::Level, i18n("Round"), QStringLiteral("round")); m_scoreDialog->setModal(false); QStringList fileList; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "killbots/ruleset", QStandardPaths::LocateDirectory); + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("killbots/ruleset"), QStandardPaths::LocateDirectory); Q_FOREACH (const QString &dir, dirs) { const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop")); Q_FOREACH (const QString &file, fileNames) { @@ -199,7 +199,7 @@ scoreEntry[ KScoreDialog::Level ].setNum(round); if (m_scoreDialog->addScore(scoreEntry)) { - QTimer::singleShot(1000, this, SLOT(showHighscores())); + QTimer::singleShot(1000, this, &MainWindow::showHighscores); } } } @@ -248,94 +248,94 @@ KStandardAction::preferences(this, SLOT(configurePreferences()), actionCollection()); createMappedAction(TeleportSafely, - "teleport_safely", + QStringLiteral("teleport_safely"), i18n("Teleport Safely"), i18nc("Shortcut for teleport safely. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "T"), Qt::Key_Plus, i18n("Teleport to a safe location"), - "games-solve" + QStringLiteral("games-solve") ); createMappedAction(Teleport, - "teleport", + QStringLiteral("teleport"), i18n("Teleport"), i18nc("Shortcut for teleport. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "R"), Qt::Key_Minus, i18n("Teleport to a random location"), - "roll" + QStringLiteral("roll") ); createMappedAction(TeleportSafelyIfPossible, - "teleport_sip", + QStringLiteral("teleport_sip"), i18n("Teleport, Safely If Possible"), i18nc("Shortcut for teleport safely if possible. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "Space"), Qt::Key_0, i18n("Teleport safely if that action is enabled, otherwise teleport randomly") ); createMappedAction(Vaporizer, - "vaporizer", + QStringLiteral("vaporizer"), i18n("Vaporizer"), i18nc("Shortcut for vaporizer. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "F"), Qt::Key_Period, i18n("Destroy all enemies in neighboring cells"), - "edit-bomb" + QStringLiteral("edit-bomb") ); createMappedAction(WaitOutRound, - "wait_out_round", + QStringLiteral("wait_out_round"), i18n("Wait Out Round"), i18nc("Shortcut for wait out round. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "V"), Qt::Key_Asterisk, i18n("Risk remaining in place until the end of the round for bonuses"), - "process-stop" + QStringLiteral("process-stop") ); createMappedAction(UpLeft, - "move_up_left", + QStringLiteral("move_up_left"), i18n("Move Up and Left"), i18nc("Shortcut for move up and left. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "Q"), Qt::Key_7 ); createMappedAction(Up, - "move_up", + QStringLiteral("move_up"), i18n("Move Up"), i18nc("Shortcut for move up. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "W"), Qt::Key_8 ); createMappedAction(UpRight, - "move_up_right", + QStringLiteral("move_up_right"), i18n("Move Up and Right"), i18nc("Shortcut for move up and right. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "E"), Qt::Key_9 ); createMappedAction(Left, - "move_left", + QStringLiteral("move_left"), i18n("Move Left"), i18nc("Shortcut for move left. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "A"), Qt::Key_4 ); createMappedAction(Hold, - "stand_still", + QStringLiteral("stand_still"), i18n("Stand Still"), i18nc("Shortcut for stand still. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "S"), Qt::Key_5 ); createMappedAction(Right, - "move_right", + QStringLiteral("move_right"), i18n("Move Right"), i18nc("Shortcut for move right. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "D"), Qt::Key_6 ); createMappedAction(DownLeft, - "move_down_left", + QStringLiteral("move_down_left"), i18n("Move Down and Left"), i18nc("Shortcut for move down and left. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "Z"), Qt::Key_1 ); createMappedAction(Down, - "move_down", + QStringLiteral("move_down"), i18n("Move Down"), i18nc("Shortcut for move down. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "X"), Qt::Key_2 ); createMappedAction(DownRight, - "move_down_right", + QStringLiteral("move_down_right"), i18n("Move Down and Right"), i18nc("Shortcut for move down and right. See http://websvn.kde.org/trunk/KDE/kdegames/killbots/README.translators?view=markup";, "C"), Qt::Key_3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-15.08.3/numericdisplayitem.cpp new/killbots-15.12.0/numericdisplayitem.cpp --- old/killbots-15.08.3/numericdisplayitem.cpp 2015-11-04 20:57:38.000000000 +0100 +++ new/killbots-15.12.0/numericdisplayitem.cpp 2015-11-11 17:04:45.000000000 +0100 @@ -26,7 +26,7 @@ Killbots::NumericDisplayItem::NumericDisplayItem(const QString &label, QGraphicsItem *parent) : QObject(), - KGameRenderedItem(Renderer::self(), "status", parent), + KGameRenderedItem(Renderer::self(), QStringLiteral("status"), parent), m_label(label), m_value(0), m_digits(3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-15.08.3/optionspage.cpp new/killbots-15.12.0/optionspage.cpp --- old/killbots-15.08.3/optionspage.cpp 2015-11-04 20:57:38.000000000 +0100 +++ new/killbots-15.12.0/optionspage.cpp 2015-11-11 17:04:45.000000000 +0100 @@ -41,15 +41,15 @@ clickActionList << i18n("Wait Out Round"); kcfg_MiddleClickAction = new KComboBox(); - kcfg_MiddleClickAction->setObjectName(QLatin1String("kcfg_MiddleClickAction")); + kcfg_MiddleClickAction->setObjectName(QStringLiteral("kcfg_MiddleClickAction")); kcfg_MiddleClickAction->addItems(clickActionList); kcfg_RightClickAction = new KComboBox(); - kcfg_RightClickAction->setObjectName(QLatin1String("kcfg_RightClickAction")); + kcfg_RightClickAction->setObjectName(QStringLiteral("kcfg_RightClickAction")); kcfg_RightClickAction->addItems(clickActionList); kcfg_AnimationSpeed = new QSlider(Qt::Horizontal); - kcfg_AnimationSpeed->setObjectName(QLatin1String("kcfg_AnimationSpeed")); + kcfg_AnimationSpeed->setObjectName(QStringLiteral("kcfg_AnimationSpeed")); kcfg_AnimationSpeed->setSingleStep(1); kcfg_AnimationSpeed->setMinimumWidth(200); QLabel *slowLabel = new QLabel(i18n("Slow")); @@ -71,7 +71,7 @@ speedLabel->setBuddy(kcfg_AnimationSpeed); kcfg_PreventUnsafeMoves = new QCheckBox(i18n("Prevent &unsafe moves")); - kcfg_PreventUnsafeMoves->setObjectName(QLatin1String("kcfg_PreventUnsafeMoves")); + kcfg_PreventUnsafeMoves->setObjectName(QStringLiteral("kcfg_PreventUnsafeMoves")); QFormLayout *formLayout = new QFormLayout(this); formLayout->setMargin(0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-15.08.3/renderer.cpp new/killbots-15.12.0/renderer.cpp --- old/killbots-15.08.3/renderer.cpp 2015-11-04 20:57:38.000000000 +0100 +++ new/killbots-15.12.0/renderer.cpp 2015-11-11 17:04:45.000000000 +0100 @@ -31,8 +31,8 @@ { KgThemeProvider *prov = new KgThemeProvider; prov->discoverThemes( - "appdata", QLatin1String("themes"), //theme file location - QLatin1String("robotkill") //default theme file name + "appdata", QStringLiteral("themes"), //theme file location + QStringLiteral("robotkill") //default theme file name ); return prov; } @@ -60,7 +60,7 @@ QCursor Killbots::Renderer::cursorFromAction(int direction) { - QString element = QString("cursor%1").arg(direction); + QString element = QStringLiteral("cursor%1").arg(direction); QPixmap pixmap = spritePixmap(element, QSize(42, 42)); return QCursor(pixmap); } @@ -68,7 +68,7 @@ QColor Killbots::Renderer::textColor() { if (m_cachedTheme != theme()->identifier()) { - m_textColor = spritePixmap("textcolor", QSize(3, 3)).toImage().pixel(1, 1); + m_textColor = spritePixmap(QStringLiteral("textcolor"), QSize(3, 3)).toImage().pixel(1, 1); m_cachedTheme = theme()->identifier(); } return m_textColor; @@ -76,6 +76,6 @@ qreal Killbots::Renderer::aspectRatio() { - const QRectF tileRect = boundsOnSprite("cell"); + const QRectF tileRect = boundsOnSprite(QStringLiteral("cell")); return qBound<qreal>(0.3333, tileRect.width() / tileRect.height(), 3.0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-15.08.3/rulesetdetailsdialog.cpp new/killbots-15.12.0/rulesetdetailsdialog.cpp --- old/killbots-15.08.3/rulesetdetailsdialog.cpp 2015-11-04 20:57:38.000000000 +0100 +++ new/killbots-15.12.0/rulesetdetailsdialog.cpp 2015-11-11 17:04:45.000000000 +0100 @@ -46,7 +46,7 @@ void Killbots::RulesetDetailsDialog::loadRuleset(const Ruleset *ruleset) { - static QStringList maskedItems = QStringList() << "Name" << "Author" << "AuthorContact" << "Description"; + static QStringList maskedItems = QStringList() << QStringLiteral("Name") << QStringLiteral("Author") << QStringLiteral("AuthorContact") << QStringLiteral("Description"); static QStringList junkheapEnumText = QStringList() << i18nc("Quantity of junkheaps that can be pushed", "None") << i18nc("Quantity of junkheaps that can be pushed", "One") @@ -77,7 +77,7 @@ QString valueText; if (dynamic_cast<const KCoreConfigSkeleton::ItemBool *>(item)) { valueText = item->property().toBool() ? i18n("Yes") : i18n("No"); - } else if (it.key() == "PushableJunkheaps") { + } else if (it.key() == QLatin1String("PushableJunkheaps")) { valueText = junkheapEnumText.at(item->property().toInt()); } else { valueText = item->property().toString(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-15.08.3/rulesetselector.cpp new/killbots-15.12.0/rulesetselector.cpp --- old/killbots-15.08.3/rulesetselector.cpp 2015-11-04 20:57:38.000000000 +0100 +++ new/killbots-15.12.0/rulesetselector.cpp 2015-11-11 17:04:45.000000000 +0100 @@ -43,7 +43,7 @@ { // Create a hidden KLineEdit to use the automatic KConfigXT connection kcfg_Ruleset = new KLineEdit(); - kcfg_Ruleset->setObjectName(QLatin1String("kcfg_Ruleset")); + kcfg_Ruleset->setObjectName(QStringLiteral("kcfg_Ruleset")); kcfg_Ruleset->hide(); m_listWidget = new QListWidget(); @@ -114,7 +114,7 @@ m_listWidget->clear(); m_listWidget->setSortingEnabled(true); - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "killbots/rulesets/", QStandardPaths::LocateDirectory); + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("killbots/rulesets/"), QStandardPaths::LocateDirectory); Q_FOREACH (const QString &dir, dirs) { const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop")); Q_FOREACH (const QString &file, fileNames) { @@ -154,9 +154,9 @@ if (ruleset->authorContact().contains(' ')) { m_authorContact->setText(ruleset->authorContact()); } else if (ruleset->authorContact().contains('@')) { - m_authorContact->setText(QString("<qt><a href=\"mailto:%1\";>%1</a></qt>").arg(ruleset->authorContact())); + m_authorContact->setText(QStringLiteral("<qt><a href=\"mailto:%1\";>%1</a></qt>").arg(ruleset->authorContact())); } else if (ruleset->authorContact().contains('.')) { - m_authorContact->setText(QString("<qt><a href=\"http://%1\";>%1</a></qt>").arg(ruleset->authorContact())); + m_authorContact->setText(QStringLiteral("<qt><a href=\"http://%1\";>%1</a></qt>").arg(ruleset->authorContact())); } else { m_authorContact->setText(ruleset->authorContact()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-15.08.3/scene.cpp new/killbots-15.12.0/scene.cpp --- old/killbots-15.08.3/scene.cpp 2015-11-04 20:57:38.000000000 +0100 +++ new/killbots-15.12.0/scene.cpp 2015-11-11 17:04:45.000000000 +0100 @@ -73,7 +73,7 @@ sprite->setRenderSize(m_cellSize); sprite->enqueueGridPos(position); updateSpritePos(sprite, position); - sprite->scale(0, 0); + sprite->setTransform(QTransform::fromScale(0, 0), true); // A bit of a hack, but we use the sprite type for stacking order. sprite->setZValue(type); @@ -100,7 +100,7 @@ } else if (value < 1.0) { foreach (Sprite *sprite, newSprites) { sprite->resetTransform(); - sprite->scale(value, value); + sprite->setTransform(QTransform::fromScale(value, value), true); } foreach (Sprite *sprite, slidingSprites) { @@ -121,13 +121,13 @@ foreach (Sprite *sprite, teleportingSprites) { sprite->resetTransform(); - sprite->scale(scaleFactor, scaleFactor); + sprite->setTransform(QTransform::fromScale(scaleFactor, scaleFactor), true); } foreach (Sprite *sprite, destroyedSprites) { sprite->resetTransform(); - sprite->scale(1 - value, 1 - value); - sprite->rotate(value * 180); + sprite->setTransform(QTransform::fromScale(1 - value, 1 - value), true); + sprite->setTransform(QTransform().rotate(value * 180), true); } } else { foreach (Sprite *sprite, newSprites + slidingSprites + teleportingSprites) { @@ -276,9 +276,9 @@ m_rows * m_cellSize.height() ); - QPixmap unrotated = Renderer::self()->spritePixmap("background", size); + QPixmap unrotated = Renderer::self()->spritePixmap(QStringLiteral("background"), size); p.begin(&unrotated); - p.drawTiledPixmap(gridRect, Renderer::self()->spritePixmap("cell", m_cellSize)); + p.drawTiledPixmap(gridRect, Renderer::self()->spritePixmap(QStringLiteral("cell"), m_cellSize)); p.end(); // The background brush begins painting at 0,0 but our sceneRect doesn't diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/killbots-15.08.3/sprite.cpp new/killbots-15.12.0/sprite.cpp --- old/killbots-15.08.3/sprite.cpp 2015-11-04 20:57:38.000000000 +0100 +++ new/killbots-15.12.0/sprite.cpp 2015-11-11 17:04:45.000000000 +0100 @@ -47,16 +47,16 @@ switch (m_type) { case Hero : - setSpriteKey("hero"); + setSpriteKey(QStringLiteral("hero")); break; case Robot : - setSpriteKey("enemy"); + setSpriteKey(QStringLiteral("enemy")); break; case Fastbot : - setSpriteKey("fastenemy"); + setSpriteKey(QStringLiteral("fastenemy")); break; case Junkheap : - setSpriteKey("junkheap"); + setSpriteKey(QStringLiteral("junkheap")); break; default : break;
