Hello community, here is the log from the commit of package kfourinline for openSUSE:Factory checked in at 2016-01-10 13:05:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfourinline (Old) and /work/SRC/openSUSE:Factory/.kfourinline.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kfourinline" Changes: -------- --- /work/SRC/openSUSE:Factory/kfourinline/kfourinline.changes 2015-11-15 12:34:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kfourinline.new/kfourinline.changes 2016-01-10 13:05:14.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Dec 13 13:18:22 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: ---- kfourinline-15.08.3.tar.xz New: ---- kfourinline-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfourinline.spec ++++++ --- /var/tmp/diff_new_pack.yKNejn/_old 2016-01-10 13:05:16.000000000 +0100 +++ /var/tmp/diff_new_pack.yKNejn/_new 2016-01-10 13:05:16.000000000 +0100 @@ -45,7 +45,7 @@ License: LGPL-2.0+ Group: Amusements/Toys/Other Url: http://www.kde.org -Version: 15.08.3 +Version: 15.12.0 Release: 0 Source0: kfourinline-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kfourinline-15.08.3.tar.xz -> kfourinline-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/CMakeLists.txt new/kfourinline-15.12.0/CMakeLists.txt --- old/kfourinline-15.08.3/CMakeLists.txt 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/CMakeLists.txt 2015-11-11 10:43:54.000000000 +0100 @@ -22,7 +22,9 @@ DNSSD KIO NotifyConfig - KDELibs4Support) + KDELibs4Support + DocTools +) find_package(KF5KDEGames 4.9.0 REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/CMakeLists.txt new/kfourinline-15.12.0/src/CMakeLists.txt --- old/kfourinline-15.08.3/src/CMakeLists.txt 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/CMakeLists.txt 2015-11-11 10:43:54.000000000 +0100 @@ -35,7 +35,7 @@ kconfig_add_kcfg_files(kwin4_SRCS prefs.kcfgc ) file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../*-apps-k*.png") -ecm_add_app_icon(kblocks_SRCS ICONS ${ICONS_SRCS}) +ecm_add_app_icon(kwin4_SRCS ICONS ${ICONS_SRCS}) add_executable(kfourinline ${kwin4_SRCS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/chatdlg.cpp new/kfourinline-15.12.0/src/chatdlg.cpp --- old/kfourinline-15.08.3/src/chatdlg.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/chatdlg.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -54,8 +54,8 @@ QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); okButton->setDefault(true); okButton->setShortcut(Qt::CTRL | Qt::Key_Return); - connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept())); - connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); + connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); okButton->setDefault(true); setModal(false); setMinimumSize(QSize(200,200)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/displaygame.cpp new/kfourinline-15.12.0/src/displaygame.cpp --- old/kfourinline-15.08.3/src/displaygame.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/displaygame.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -48,7 +48,7 @@ // Constructor for the display DisplayGame::DisplayGame(ReflectionGraphicsScene* scene, ThemeManager* theme, QGraphicsView* parent) - : Themeable("gamedisplay",theme), QObject(parent) + : Themeable(QStringLiteral("gamedisplay"),theme), QObject(parent) { // Store arguments as attributes mScene = scene; @@ -64,7 +64,7 @@ // Create piece sprites for (int i=0; i<42; i++) { - PieceSprite* sprite = new PieceSprite("piece", mTheme, i, mScene); + PieceSprite* sprite = new PieceSprite(QStringLiteral("piece"), mTheme, i, mScene); if (!sprite) qCCritical(KFOURINLINE_LOG) << "Cannot load sprite" << "piece"; mSprites.append(sprite); mPieces.append(sprite); @@ -74,7 +74,7 @@ // Create stars for (int i=0;i<4;i++) { - PixmapSprite* sprite = new PixmapSprite("star", mTheme, i, mScene); + PixmapSprite* sprite = new PixmapSprite(QStringLiteral("star"), mTheme, i, mScene); if (!sprite) qCCritical(KFOURINLINE_LOG) << "Cannot load sprite" << "star"; mSprites.append(sprite); mStars.append(sprite); @@ -82,13 +82,13 @@ } // Create board - mBoard = new PixmapSprite("board", mTheme, 0, mScene); + mBoard = new PixmapSprite(QStringLiteral("board"), mTheme, 0, mScene); if (!mBoard) qCCritical(KFOURINLINE_LOG) << "Cannot load sprite" << "board"; mSprites.append(mBoard); mBoard->hide(); // Create hint - mHint = new PixmapSprite("hint", mTheme, 0, mScene); + mHint = new PixmapSprite(QStringLiteral("hint"), mTheme, 0, mScene); if (!mHint) qCCritical(KFOURINLINE_LOG) << "Cannot load sprite" << "hint"; mSprites.append(mHint); mHint->hide(); @@ -100,7 +100,7 @@ // mGameOver->hide(); // Create score board - mScoreBoard = new ScoreSprite("scoreboard", mTheme, 0, mScene); + mScoreBoard = new ScoreSprite(QStringLiteral("scoreboard"), mTheme, 0, mScene); if (!mScoreBoard) qCCritical(KFOURINLINE_LOG) << "Cannot load sprite" << "scoreboard"; mSprites.append(mScoreBoard); mScoreBoard->hide(); @@ -109,7 +109,7 @@ // Create movement indication arrows for (int i=0; i<7; i++) { - PixmapSprite* arrow = new PixmapSprite("arrow", mTheme, i, mScene); + PixmapSprite* arrow = new PixmapSprite(QStringLiteral("arrow"), mTheme, i, mScene); if (!arrow) qCCritical(KFOURINLINE_LOG) << "Cannot load sprite" << "arrow"; mSprites.append(arrow); mArrows.append(arrow); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/displayintro.cpp new/kfourinline-15.12.0/src/displayintro.cpp --- old/kfourinline-15.08.3/src/displayintro.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/displayintro.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -52,7 +52,7 @@ // Constructor for the intro display DisplayIntro::DisplayIntro(QGraphicsScene* scene, ThemeManager* theme, QGraphicsView* parent) - : Themeable("introdisplay",theme), QObject(parent) + : Themeable(QStringLiteral("introdisplay"),theme), QObject(parent) { // Choose a background color scene->setBackgroundBrush(QColor(0,0,128)); @@ -69,7 +69,7 @@ // Create all sprites used for intro for (int i=0; i<42; i++) { - IntroSprite* sprite = new IntroSprite("intro_piece", mTheme, i, mScene); + IntroSprite* sprite = new IntroSprite(QStringLiteral("intro_piece"), mTheme, i, mScene); mSprites.append(sprite); if ((i/1)%2==0) sprite->setFrame(0); else sprite->setFrame(1); @@ -78,12 +78,12 @@ } // Create board - PixmapSprite* pixmap = new PixmapSprite("introboard", mTheme, 0, mScene); + PixmapSprite* pixmap = new PixmapSprite(QStringLiteral("introboard"), mTheme, 0, mScene); mSprites.append(pixmap); pixmap->show(); // Create quicklaunch. We align text horizontally using QTextDocument - mQuickLaunch = new PixmapSprite("quicklaunch", mTheme, 0, mScene); + mQuickLaunch = new PixmapSprite(QStringLiteral("quicklaunch"), mTheme, 0, mScene); mSprites.append(mQuickLaunch); mQuickLaunch->show(); mTextQuicklaunch = new QGraphicsTextItem(mQuickLaunch); @@ -115,64 +115,64 @@ // Color buttons - mStartButton[0] = new ButtonSprite(false, "button0_start", mTheme, 0, mScene); + mStartButton[0] = new ButtonSprite(false, QStringLiteral("button0_start"), mTheme, 0, mScene); mSprites.append(mStartButton[0]); mStartButton[0]->show(); - connect(mStartButton[0]->notify(),SIGNAL(signalNotify(QGraphicsItem*,int)), - this,SLOT(buttonPressed(QGraphicsItem*,int))); + connect(mStartButton[0]->notify(),&SpriteNotify::signalNotify, + this,&DisplayIntro::buttonPressed); if (Prefs::startcolouryellow()) mStartButton[0]->setStatus(true); - mStartButton[1] = new ButtonSprite(false, "button1_start", mTheme, 1, mScene); + mStartButton[1] = new ButtonSprite(false, QStringLiteral("button1_start"), mTheme, 1, mScene); mSprites.append(mStartButton[1]); mStartButton[1]->show(); - connect(mStartButton[1]->notify(),SIGNAL(signalNotify(QGraphicsItem*,int)), - this,SLOT(buttonPressed(QGraphicsItem*,int))); + connect(mStartButton[1]->notify(),&SpriteNotify::signalNotify, + this,&DisplayIntro::buttonPressed); if (Prefs::startcolourred()) mStartButton[1]->setStatus(true); - mPlayerButton[0] = new ButtonSprite(false, "button0_color", mTheme, 2, mScene); + mPlayerButton[0] = new ButtonSprite(false, QStringLiteral("button0_color"), mTheme, 2, mScene); mSprites.append(mPlayerButton[0]); mPlayerButton[0]->show(); - connect(mPlayerButton[0]->notify(),SIGNAL(signalNotify(QGraphicsItem*,int)), - this,SLOT(buttonPressed(QGraphicsItem*,int))); + connect(mPlayerButton[0]->notify(),&SpriteNotify::signalNotify, + this,&DisplayIntro::buttonPressed); if (Prefs::input0mouse()|| Prefs::input0key()) mPlayerButton[0]->setStatus(true); - mPlayerButton[1] = new ButtonSprite(false, "button1_color", mTheme, 3, mScene); + mPlayerButton[1] = new ButtonSprite(false, QStringLiteral("button1_color"), mTheme, 3, mScene); mSprites.append(mPlayerButton[1]); mPlayerButton[1]->show(); - connect(mPlayerButton[1]->notify(),SIGNAL(signalNotify(QGraphicsItem*,int)), - this,SLOT(buttonPressed(QGraphicsItem*,int))); + connect(mPlayerButton[1]->notify(),&SpriteNotify::signalNotify, + this,&DisplayIntro::buttonPressed); if ((Prefs::input1mouse()|| Prefs::input1key()) && !mPlayerButton[0]->status()) mPlayerButton[0]->setStatus(true); // Start game buttons - ButtonSprite* button = new ButtonSprite(true, "button_aieasy", mTheme, 10, mScene); + ButtonSprite* button = new ButtonSprite(true, QStringLiteral("button_aieasy"), mTheme, 10, mScene); mSprites.append(button); button->setText(i18nc("quick start button - player versus AI level easy", "Easy Game")); button->show(); - connect(button->notify(),SIGNAL(signalNotify(QGraphicsItem*,int)), - this,SLOT(buttonPressed(QGraphicsItem*,int))); + connect(button->notify(),&SpriteNotify::signalNotify, + this,&DisplayIntro::buttonPressed); - button = new ButtonSprite(true, "button_ainormal", mTheme, 11, mScene); + button = new ButtonSprite(true, QStringLiteral("button_ainormal"), mTheme, 11, mScene); mSprites.append(button); button->setText(i18nc("quick start button - player versus AI level normal", "Normal Game")); button->show(); - connect(button->notify(),SIGNAL(signalNotify(QGraphicsItem*,int)), - this,SLOT(buttonPressed(QGraphicsItem*,int))); + connect(button->notify(),&SpriteNotify::signalNotify, + this,&DisplayIntro::buttonPressed); - button = new ButtonSprite(true, "button_aihard", mTheme, 12, mScene); + button = new ButtonSprite(true, QStringLiteral("button_aihard"), mTheme, 12, mScene); mSprites.append(button); button->setText(i18nc("quick start button - player versus AI level hard", "Hard Game")); button->show(); - connect(button->notify(),SIGNAL(signalNotify(QGraphicsItem*,int)), - this,SLOT(buttonPressed(QGraphicsItem*,int))); + connect(button->notify(),&SpriteNotify::signalNotify, + this,&DisplayIntro::buttonPressed); - button = new ButtonSprite(true, "button_player", mTheme, 13, mScene); + button = new ButtonSprite(true, QStringLiteral("button_player"), mTheme, 13, mScene); mSprites.append(button); button->setText(i18nc("quick start button - player versus player", "Two Player Game")); button->show(); - connect(button->notify(),SIGNAL(signalNotify(QGraphicsItem*,int)), - this,SLOT(buttonPressed(QGraphicsItem*,int))); + connect(button->notify(),&SpriteNotify::signalNotify, + this,&DisplayIntro::buttonPressed); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/kgamedebugdialog.cpp new/kfourinline-15.12.0/src/kgamedebugdialog.cpp --- old/kfourinline-15.08.3/src/kgamedebugdialog.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/kgamedebugdialog.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -460,7 +460,7 @@ d->mGame = g; if (g) { //TODO: connect to the KGame signals for joined/removed players!!! - connect(d->mGame, SIGNAL(destroyed()), this, SLOT(slotUnsetKGame())); + connect(d->mGame, &QObject::destroyed, this, &KGameDebugDialog::slotUnsetKGame); // connect(); for ( QList<KPlayer*>::const_iterator it = d->mGame->playerList()->begin(); it!=d->mGame->playerList()->end(); ++it ) @@ -470,7 +470,7 @@ slotUpdateGameData(); - connect(d->mGame, SIGNAL(signalMessageUpdate(int,quint32,quint32)), this, SLOT(slotMessageUpdate(int,quint32,quint32))); + connect(d->mGame, &KGame::signalMessageUpdate, this, &KGameDebugDialog::slotMessageUpdate); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/kgamedialog.cpp new/kfourinline-15.12.0/src/kgamedialog.cpp --- old/kfourinline-15.08.3/src/kgamedialog.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/kgamedialog.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -139,7 +139,7 @@ widget->setParent(parent); widget->move(QPoint(0,0)); d->mConfigWidgets.append(widget); - connect(widget, SIGNAL(destroyed(QObject*)), this, SLOT(slotRemoveConfigWidget(QObject*))); + connect(widget, &QObject::destroyed, this, &KGameDialog::slotRemoveConfigWidget); if (!d->mGame) { qCWarning(KFOURINLINE_LOG) << "No game has been set!"; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/kgamedialogconfig.cpp new/kfourinline-15.12.0/src/kgamedialogconfig.cpp --- old/kfourinline-15.08.3/src/kgamedialogconfig.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/kgamedialogconfig.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -146,7 +146,7 @@ // Needs to be AFTER the creation of the dialogs setConnected(false); - setDefaultNetworkInfo(QLatin1String( "localhost" ), 7654,true); + setDefaultNetworkInfo(QStringLiteral( "localhost" ), 7654,true); } KGameDialogNetworkConfig::~KGameDialogNetworkConfig() @@ -183,8 +183,8 @@ } // We need to learn about failed connections if (game()) { - connect(game(), SIGNAL(signalConnectionBroken()), - this, SLOT(slotConnectionBroken())); + connect(game(), &KGameNetwork::signalConnectionBroken, + this, &KGameDialogNetworkConfig::slotConnectionBroken); } } setConnected(connected, master); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/kwin4.cpp new/kfourinline-15.12.0/src/kwin4.cpp --- old/kfourinline-15.08.3/src/kwin4.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/kwin4.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -93,16 +93,16 @@ #ifndef NDEBUG #ifdef SRC_DIR qCDebug(KFOURINLINE_LOG) << "Found SRC_DIR =" << SRC_DIR; - KGlobal::dirs()->addResourceDir("kwin4theme",QString(SRC_DIR)+QString("/grafix/")); + KGlobal::dirs()->addResourceDir("kwin4theme",QStringLiteral(SRC_DIR)+QStringLiteral("/grafix/")); #endif #endif // Read theme files - QStringList themeList = KGlobal::dirs()->findAllResources("kwin4theme", "*.desktop", KStandardDirs::NoDuplicates); + QStringList themeList = KGlobal::dirs()->findAllResources("kwin4theme", QStringLiteral("*.desktop"), KStandardDirs::NoDuplicates); if (themeList.isEmpty()) { KMessageBox::error(this, i18n("Installation error: No theme list found.")); - QTimer::singleShot(0, this,SLOT(close())); + QTimer::singleShot(0, this,&QWidget::close); return; } @@ -149,7 +149,7 @@ if (mTheme->checkTheme() != 0) { KMessageBox::error(this, i18n("Installation error: Theme file error.")); - QTimer::singleShot(0, this,SLOT(close())); + QTimer::singleShot(0, this,&QWidget::close); return; } @@ -190,7 +190,7 @@ // Start game automatically in demo mode else if (global_demo_mode) { - QTimer::singleShot(11500, this,SLOT(menuNewGame())); + QTimer::singleShot(11500, this,&KWin4App::menuNewGame); } } @@ -326,16 +326,16 @@ KStandardGameAction::hint(this, SLOT(askForHint()), actionCollection()); KStandardGameAction::quit(this, SLOT(close()), actionCollection()); - action = actionCollection()->addAction( QLatin1String( "network_conf" )); + action = actionCollection()->addAction( QStringLiteral( "network_conf" )); action->setText(i18n("&Network Configuration...")); connect(action, &QAction::triggered, this, &KWin4App::configureNetwork); - action = actionCollection()->addAction( QLatin1String( "network_chat" )); + action = actionCollection()->addAction( QStringLiteral( "network_chat" )); action->setText(i18n("Network Chat...")); connect(action, &QAction::triggered, this, &KWin4App::configureChat); - action = actionCollection()->addAction( QLatin1String( "statistics" )); - action->setIcon(QIcon::fromTheme( QLatin1String( "view-statistics" ))); + action = actionCollection()->addAction( QStringLiteral( "statistics" )); + action->setIcon(QIcon::fromTheme( QStringLiteral( "view-statistics" ))); action->setText(i18n("&Show Statistics")); connect(action, &QAction::triggered, this, &KWin4App::showStatistics); action->setToolTip(i18n("Show statistics.")); @@ -350,8 +350,8 @@ QStringList themes(mThemeFiles.keys()); themes.sort(); - action = actionCollection()->addAction( QLatin1String( "theme" ) , new KSelectAction(i18n("Theme" ), this)); - action->setIcon(QIcon::fromTheme( QLatin1String( "games-config-theme" ))); + action = actionCollection()->addAction( QStringLiteral( "theme" ) , new KSelectAction(i18n("Theme" ), this)); + action->setIcon(QIcon::fromTheme( QStringLiteral( "games-config-theme" ))); ((KSelectAction*)action)->setItems(themes); connect(action, &QAction::triggered, this, &KWin4App::changeTheme); qCDebug(KFOURINLINE_LOG) << "Setting current theme item to" << mThemeIndexNo; @@ -360,7 +360,7 @@ // Debug if (global_debug>0) { - action = actionCollection()->addAction( QLatin1String( "file_debug" )); + action = actionCollection()->addAction( QStringLiteral( "file_debug" )); action->setText(i18n("Debug KGame")); connect(action, &QAction::triggered, this, &KWin4App::debugKGame); } @@ -387,7 +387,7 @@ //QT5 statusBar()->setItemAlignment(ID_STATUS_MSG, Qt::AlignLeft | Qt::AlignVCenter); - displayStatusbarMover(""); + displayStatusbarMover(QLatin1String("")); displayStatusMessage(i18n("Welcome to Four Wins")); } @@ -426,7 +426,7 @@ qCDebug(KFOURINLINE_LOG) << "SAVE PROPERTIES for GROUP" << grp.name(); // Save current game? - QString name = QString("current_game")+grp.name(); + QString name = QStringLiteral("current_game")+grp.name(); QString filename = KStandardDirs::locateLocal("appdata", name); bool isRunning = (mDoc->gameStatus()==KGame::Run); if (isRunning) @@ -497,9 +497,9 @@ // Load a game menu void KWin4App::menuOpenGame() { - QString dir(":<kwin4>"); - QString filter("*"); - QString file("/tmp/kwin.save"); + QString dir(QStringLiteral(":<kwin4>")); + QString filter(QStringLiteral("*")); + QString file(QStringLiteral("/tmp/kwin.save")); if (global_debug < 1) file=KFileDialog::getOpenFileName(dir,filter,this); mDoc->load(file,true); @@ -509,9 +509,9 @@ // Save game menu void KWin4App::menuSaveGame() { - QString dir(":<kwin4>"); - QString filter("*"); - QString file("/tmp/kwin.save"); + QString dir(QStringLiteral(":<kwin4>")); + QString filter(QStringLiteral("*")); + QString file(QStringLiteral("/tmp/kwin.save")); if (global_debug < 1) file=KFileDialog::getSaveFileName(dir,filter,this); mDoc->save(file); @@ -564,7 +564,7 @@ mDoc->loadSettings(); // Start game (direct call will crash as intro object will be deleted) - QTimer::singleShot(0, this,SLOT(menuNewGame())); + QTimer::singleShot(0, this,&KWin4App::menuNewGame); } @@ -691,7 +691,7 @@ // Automatically restart game in demo mode if (global_demo_mode) { - QTimer::singleShot(10000, this,SLOT(menuNewGame())); + QTimer::singleShot(10000, this,&KWin4App::menuNewGame); } } @@ -790,7 +790,7 @@ // just for testing - should be non-modal KGameDialog dlg(mDoc, 0, i18n("Network Configuration"), this); dlg.networkConfig()->setDefaultNetworkInfo(host, port); - dlg.networkConfig()->setDiscoveryInfo("_kfourinline._tcp",Prefs::gamename()); + dlg.networkConfig()->setDiscoveryInfo(QStringLiteral("_kfourinline._tcp"),Prefs::gamename()); KVBox *box=dlg.configPage(); QLayout *l=box->layout(); @@ -798,7 +798,7 @@ mColorGroup=new KButtonGroup(box); QVBoxLayout *grouplay=new QVBoxLayout(mColorGroup); connect(mColorGroup, &KButtonGroup::clicked, this, &KWin4App::remoteChanged); - connect(dlg.networkConfig(), SIGNAL(signalServerTypeChanged(int)), this, SLOT(serverTypeChanged(int))); + connect(dlg.networkConfig(), &KGameDialogNetworkConfig::signalServerTypeChanged, this, &KWin4App::serverTypeChanged); QRadioButton *b1 = new QRadioButton(i18n("Black should be played by remote player"), mColorGroup); QRadioButton *b2 = new QRadioButton(i18n("Red should be played by remote player"), mColorGroup); @@ -869,7 +869,7 @@ void KWin4App::configureSettings() { static Ui::Settings ui; // Dialog is internally static anyway - if(KConfigDialog::showDialog("settings")) + if(KConfigDialog::showDialog(QStringLiteral("settings"))) { // The dialog need to refresh the buttons as they are not conectable via a signal-slot // in KConfigDialog @@ -890,7 +890,7 @@ return; } - KConfigDialog* dialog = new KConfigDialog(this, "settings", Prefs::self()); + KConfigDialog* dialog = new KConfigDialog(this, QStringLiteral("settings"), Prefs::self()); dialog->setFaceType(KPageDialog::Plain); dialog->setStandardButtons(QDialogButtonBox::Ok|QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help); dialog->button(QDialogButtonBox::Ok)->setDefault(true); @@ -902,7 +902,7 @@ ui.kcfg_startcolouryellow->setText(mTheme->colorNamePlayer(1)); ui.Input0->setTitle(i18n("%1 Plays With", mTheme->colorNamePlayer(0))); ui.Input1->setTitle(i18n("%1 Plays With", mTheme->colorNamePlayer(1))); - dialog->addPage(frame, i18n("General"), "games-config-options"); + dialog->addPage(frame, i18n("General"), QStringLiteral("games-config-options")); connect(dialog, &KConfigDialog::settingsChanged, mDoc, &KWin4Doc::loadSettings); dialog->show(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/kwin4doc.cpp new/kfourinline-15.12.0/src/kwin4doc.cpp --- old/kfourinline-15.08.3/src/kwin4doc.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/kwin4doc.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -81,25 +81,25 @@ // The field array needs not be updated as any move will change it // Careful only in new resetGame! Maybe unlocal it there! // mField.setPolicy(KGamePropertyBase::PolicyLocal); - mField.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QString("mField")); + mField.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QStringLiteral("mField")); mFieldFilled.resize(7); mHistory.resize(43); - mHistory.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QString("mHistory")); + mHistory.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QStringLiteral("mHistory")); - mAmzug.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QString("mAmzug")); - mCurrentMove.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QString("mCurrentMove")); - mMaxMove.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QString("mMaxMove")); - mFieldFilled.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QString("mFieldFilled")); - mHistoryCnt.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QString("mHistoryCnt")); - mLastColumn.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QString("mLastColumn")); - mLastHint.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QString("mLastHint")); - mLastColour.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QString("mLastColour")); - mScore.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QString("mScore")); + mAmzug.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QStringLiteral("mAmzug")); + mCurrentMove.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QStringLiteral("mCurrentMove")); + mMaxMove.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QStringLiteral("mMaxMove")); + mFieldFilled.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QStringLiteral("mFieldFilled")); + mHistoryCnt.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QStringLiteral("mHistoryCnt")); + mLastColumn.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QStringLiteral("mLastColumn")); + mLastHint.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QStringLiteral("mLastHint")); + mLastColour.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QStringLiteral("mLastColour")); + mScore.registerData(dataHandler(),KGamePropertyBase::PolicyLocal,QStringLiteral("mScore")); // game startup parameter mStartPlayer=Yellow; - mStartPlayer.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QString("mStartPlayer")); + mStartPlayer.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QStringLiteral("mStartPlayer")); setCurrentPlayer((COLOUR)mStartPlayer.value()); if (global_debug>1) qCDebug(KFOURINLINE_LOG) << "amZug policy=" << mAmzug.policy(); @@ -831,7 +831,7 @@ // Try whether we run from a development source dir #ifndef NDEBUG #ifdef SRC_DIR - QString srcname = QString(SRC_DIR)+QString("/src/kfourinlineproc"); + QString srcname = QStringLiteral(SRC_DIR)+QStringLiteral("/src/kfourinlineproc"); QFile fsrc(srcname); if (fsrc.exists()) { @@ -845,7 +845,7 @@ // First try a local dir override QDir dir; // TODO: This local filename is not found!! - QString filename=dir.path()+QString("/kwin4/kfourinlineproc"); + QString filename=dir.path()+QStringLiteral("/kwin4/kfourinlineproc"); qCDebug(KFOURINLINE_LOG) << "PROC FILENAME="<<filename; QFile flocal(filename); if (flocal.exists()) @@ -853,7 +853,7 @@ if (global_debug>1) qCDebug(KFOURINLINE_LOG) << "Found local process" << filename; return filename; } - QString path= QStandardPaths::findExecutable("kfourinlineproc"); + QString path= QStandardPaths::findExecutable(QStringLiteral("kfourinlineproc")); if (!path.isNull()) { if (global_debug>1) qCDebug(KFOURINLINE_LOG) << "Found system process" << path; @@ -897,7 +897,7 @@ if (!doMove(move,pl)) { // Repeat the same input - QTimer::singleShot(0, this,SLOT(repeatMove())); + QTimer::singleShot(0, this,&KWin4Doc::repeatMove); } return false; @@ -994,8 +994,8 @@ KGameKeyIO *input; input=new KGameKeyIO(pView->parentWidget()); // Connect keys input to a function to process the actual input - connect((KGameKeyIO *)input,SIGNAL(signalKeyEvent(KGameIO*,QDataStream&,QKeyEvent*,bool*)), - pView,SLOT(keyInput(KGameIO*,QDataStream&,QKeyEvent*,bool*))); + connect((KGameKeyIO *)input,&KGameKeyIO::signalKeyEvent, + pView,&KWin4View::keyInput); player->addGameIO(input); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/kwin4player.cpp new/kfourinline-15.12.0/src/kwin4player.cpp --- old/kfourinline-15.08.3/src/kwin4player.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/kwin4player.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -33,14 +33,14 @@ { // Register KGameProperties in KGame framework mStatus = 0; - mWin.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QString("mWin")); - mRemis.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QString("mRemis")); - mLost.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QString("mLost")); - mBrk.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QString("mBrk")); - mAllWin.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QString("mAllWin")); - mAllRemis.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QString("mAllRemis")); - mAllLost.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QString("mAllLost")); - mAllBrk.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QString("mAllBrk")); + mWin.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QStringLiteral("mWin")); + mRemis.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QStringLiteral("mRemis")); + mLost.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QStringLiteral("mLost")); + mBrk.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QStringLiteral("mBrk")); + mAllWin.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QStringLiteral("mAllWin")); + mAllRemis.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QStringLiteral("mAllRemis")); + mAllLost.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QStringLiteral("mAllLost")); + mAllBrk.registerData(dataHandler(),KGamePropertyBase::PolicyDirty,QStringLiteral("mAllBrk")); dataHandler()->setPolicy(KGamePropertyBase::PolicyDirty,false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/kwin4proc.cpp new/kfourinline-15.12.0/src/kwin4proc.cpp --- old/kfourinline-15.08.3/src/kwin4proc.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/kwin4proc.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -144,7 +144,7 @@ // Load brain position cache void KComputer::loadBrain() { - QFile file(mBrainDir+QString("kwin4.brain")); + QFile file(mBrainDir+QStringLiteral("kwin4.brain")); if (!file.open(QIODevice::ReadOnly )) { fprintf(stderr," KComputer::Brain file cannot be opened.\n"); @@ -203,7 +203,7 @@ // Save brain position cache void KComputer::saveBrain() { - QFile file(mBrainDir+QString("kwin4.brain")); + QFile file(mBrainDir+QStringLiteral("kwin4.brain")); if (!file.open(QIODevice::WriteOnly )) { fprintf(stderr," KComputer::saving brain failed.\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/kwin4view.cpp new/kfourinline-15.12.0/src/kwin4view.cpp --- old/kfourinline-15.08.3/src/kwin4view.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/kwin4view.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -57,7 +57,7 @@ ReflectionGraphicsScene* scene, ThemeManager* theme, QWidget* parent) - : Themeable("theview", theme), QGraphicsView(scene, parent) + : Themeable(QStringLiteral("theview"), theme), QGraphicsView(scene, parent) { // Store attributes mScene = scene; @@ -181,7 +181,7 @@ // Set debug sprite if (global_debug > 0) { - mFrameSprite->setPlainText(QString("CurrentUpdate: %1 ms AverageUpdate%2 ms DefaultUpdate: %3*%4 ms"). + mFrameSprite->setPlainText(QStringLiteral("CurrentUpdate: %1 ms AverageUpdate%2 ms DefaultUpdate: %3*%4 ms"). arg(elapsed).arg(int(avg)).arg(mDefaultUpdateTime).arg(mSlowDownFactor)); } @@ -402,7 +402,7 @@ if (delta < 15) queueDelay = 750; else if (delta < 35) queueDelay = 500; - QTimer::singleShot(queueDelay, this, SLOT(rescaleTheme()) ); + QTimer::singleShot(queueDelay, this, &KWin4View::rescaleTheme ); } @@ -509,8 +509,8 @@ SpriteNotify* notify = mGameDisplay->displayPiece(x, y, color, no, animation); if (notify && animation) { - QObject::disconnect(notify,SIGNAL(signalNotify(QGraphicsItem*,int)), - this,SLOT(moveDone(QGraphicsItem*,int))); + QObject::disconnect(notify,&SpriteNotify::signalNotify, + this,&KWin4View::moveDone); connect(notify, &SpriteNotify::signalNotify, this, &KWin4View::moveDone); } mGameDisplay->displayHint(0,0,false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/main.cpp new/kfourinline-15.12.0/src/main.cpp --- old/kfourinline-15.08.3/src/main.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/main.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -70,45 +70,45 @@ migrate.migrate(); KLocalizedString::setApplicationDomain("kfourinline"); - KAboutData aboutData( "kfourinline", i18n("KFourInLine"), + KAboutData aboutData( QStringLiteral("kfourinline"), i18n("KFourInLine"), KWIN4_VERSION, i18n("KFourInLine: Two player board game"), KAboutLicense::GPL, - i18n("(c) 1995-2007, Martin Heni"), - "http://games.kde.org/kfourinline"; ); - aboutData.addAuthor(i18n("Martin Heni"),i18n("Game design and code"), "[email protected]"); - aboutData.addAuthor(i18n("Johann Ollivier Lapeyre"),i18n("Graphics"), "[email protected]"); - aboutData.addAuthor(i18n("Eugene Trounev"),i18n("Graphics"), "[email protected]"); + i18n("(c) 1995-2007, Martin Heni")); + aboutData.addAuthor(i18n("Martin Heni"),i18n("Game design and code"), QStringLiteral("[email protected]")); + aboutData.addAuthor(i18n("Johann Ollivier Lapeyre"),i18n("Graphics"), QStringLiteral("[email protected]")); + aboutData.addAuthor(i18n("Eugene Trounev"),i18n("Graphics"), QStringLiteral("[email protected]")); aboutData.addAuthor(i18n("Benjamin Meyer"), i18n("Code Improvements")); + aboutData.setHomepage(QStringLiteral("http://games.kde.org/kfourinline";)); QCommandLineParser parser; KAboutData::setApplicationData(aboutData); parser.addVersionOption(); parser.addHelpOption(); - parser.addOption(QCommandLineOption(QStringList() << QLatin1String("d") << QLatin1String("debug"), i18n("Enter debug level"), QLatin1String("level"))); - parser.addOption(QCommandLineOption(QStringList() << QLatin1String("skipintro"), i18n("Skip intro animation"))); - parser.addOption(QCommandLineOption(QStringList() << QLatin1String("demo"), i18n("Run game in demo (autoplay) mode"))); + parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("d") << QStringLiteral("debug"), i18n("Enter debug level"), QStringLiteral("level"))); + parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("skipintro"), i18n("Skip intro animation"))); + parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("demo"), i18n("Run game in demo (autoplay) mode"))); aboutData.setupCommandLine(&parser); parser.process(app); aboutData.processCommandLine(&parser); - app.setWindowIcon(QIcon::fromTheme(QLatin1String("kfourinline"))); + app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kfourinline"))); /* command line handling */ // Check for debug command line option - if (parser.isSet("debug")) + if (parser.isSet(QStringLiteral("debug"))) { - global_debug=QString(parser.value("debug")).toInt(); + global_debug=QString(parser.value(QStringLiteral("debug"))).toInt(); qCDebug(KFOURINLINE_LOG) << "Debug level set to" << global_debug; } // Check for debug command line option - if (parser.isSet("skipintro")) + if (parser.isSet(QStringLiteral("skipintro"))) { global_skip_intro = true; qCDebug(KFOURINLINE_LOG) << "Skip intro cmd line chosen" << global_skip_intro; } // Check for debug command line option - if (parser.isSet("demo")) + if (parser.isSet(QStringLiteral("demo"))) { global_demo_mode = true; qCDebug(KFOURINLINE_LOG) << "Running in demo mode" << global_demo_mode; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/pixmapsprite.cpp new/kfourinline-15.12.0/src/pixmapsprite.cpp --- old/kfourinline-15.08.3/src/pixmapsprite.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/pixmapsprite.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -113,11 +113,11 @@ QString svgid = config.readEntry("svgid"); // Read sequence of frame pixmaps when auto ID given QPixmap pixmap; - if (svgid == "auto") + if (svgid == QLatin1String("auto")) { for (int i=mStartFrame;i<=mEndFrame;i++) { - QString name = QString("frame%1").arg(i); + QString name = QStringLiteral("frame%1").arg(i); svgid = config.readEntry(name); if (!refframe.isNull()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/score.cpp new/kfourinline-15.12.0/src/score.cpp --- old/kfourinline-15.08.3/src/score.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/score.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -59,10 +59,10 @@ // Call this only after set name if (mInputDevice[i] == (int)KGameIO::ProcessIO) mDisplay->setLevel(mLevel[i], i); else mDisplay->setLevel(-1, i); - mDisplay->setWon(QString("%1").arg(mWin[i]), i); - mDisplay->setDraw(QString("%1").arg(mRemis[i]), i); - mDisplay->setLoss(QString("%1").arg(mLoss[i]), i); - mDisplay->setBreak(QString("%1").arg(mBrk[i]), i); + mDisplay->setWon(QStringLiteral("%1").arg(mWin[i]), i); + mDisplay->setDraw(QStringLiteral("%1").arg(mRemis[i]), i); + mDisplay->setLoss(QStringLiteral("%1").arg(mLoss[i]), i); + mDisplay->setBreak(QStringLiteral("%1").arg(mBrk[i]), i); mDisplay->setInput(mInputDevice[i], i); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/scoresprite.cpp new/kfourinline-15.12.0/src/scoresprite.cpp --- old/kfourinline-15.08.3/src/scoresprite.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/scoresprite.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -51,7 +51,7 @@ scene->addItem(mBreak[i]); mName[i] = new QGraphicsTextItem(this); scene->addItem(mName[i]); - mInput[i] = new PixmapSprite(QString("scoreinput%1").arg(i), theme, i, scene); + mInput[i] = new PixmapSprite(QStringLiteral("scoreinput%1").arg(i), theme, i, scene); if (!mInput[i]) qCCritical(KFOURINLINE_LOG) << "Cannot load sprite" << "scoreinput"<<i; mInput[i]->setParentItem(this); mInput[i]->setOffsetStatus(false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfourinline-15.08.3/src/thememanager.cpp new/kfourinline-15.12.0/src/thememanager.cpp --- old/kfourinline-15.08.3/src/thememanager.cpp 2015-05-29 13:58:54.000000000 +0200 +++ new/kfourinline-15.12.0/src/thememanager.cpp 2015-11-11 10:43:54.000000000 +0100 @@ -109,14 +109,14 @@ // Read config and SVG file for theme delete mConfig; mConfig = new KConfig(rcfile, KConfig::NoGlobals); - QString svgfile = config("general").readEntry("svgfile"); + QString svgfile = config(QStringLiteral("general")).readEntry("svgfile"); svgfile = KStandardDirs::locate("kwin4theme", svgfile); qCDebug(KFOURINLINE_LOG) << "Reading SVG master file =" << svgfile; - mAspectRatio = config("general").readEntry("aspect-ratio", 1.0); + mAspectRatio = config(QStringLiteral("general")).readEntry("aspect-ratio", 1.0); qCDebug(KFOURINLINE_LOG) << "Aspect ratio =" << mAspectRatio; - mColorNamePlayer[0] = i18nc("Player 0 color", config("general").readEntry("colorNamePlayer0").toUtf8()); + mColorNamePlayer[0] = i18nc("Player 0 color", config(QStringLiteral("general")).readEntry("colorNamePlayer0").toUtf8()); qCDebug(KFOURINLINE_LOG) << "Player 0 color name =" << mColorNamePlayer[0]; - mColorNamePlayer[1] = i18nc("Player 1 color", config("general").readEntry("colorNamePlayer1").toUtf8()); + mColorNamePlayer[1] = i18nc("Player 1 color", config(QStringLiteral("general")).readEntry("colorNamePlayer1").toUtf8()); qCDebug(KFOURINLINE_LOG) << "Player 1 color name =" << mColorNamePlayer[1]; delete mRenderer;
