Hello community, here is the log from the commit of package kollision for openSUSE:Factory checked in at 2015-05-11 18:16:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kollision (Old) and /work/SRC/openSUSE:Factory/.kollision.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kollision" Changes: -------- --- /work/SRC/openSUSE:Factory/kollision/kollision.changes 2015-03-11 09:50:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kollision.new/kollision.changes 2015-05-11 18:16:27.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Apr 11 13:18:40 UTC 2015 - [email protected] + +- Update to KDE Applications 15.04.0 + * KDE Applications 15.04.0 + * https://www.kde.org/announcements/announce-applications-15.04.0.php + + +------------------------------------------------------------------- +Sat Mar 21 18:13:23 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:47:10 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- Old: ---- kollision-14.12.3.tar.xz New: ---- kollision-15.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kollision.spec ++++++ --- /var/tmp/diff_new_pack.bLUzJV/_old 2015-05-11 18:16:28.000000000 +0200 +++ /var/tmp/diff_new_pack.bLUzJV/_new 2015-05-11 18:16:28.000000000 +0200 @@ -18,16 +18,36 @@ Name: kollision BuildRequires: libkdegames-devel -BuildRequires: xz +BuildRequires: extra-cmake-modules +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5QuickWidgets) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: kconfig-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: ki18n-devel +BuildRequires: kguiaddons-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kitemviews-devel +BuildRequires: kiconthemes-devel +BuildRequires: kxmlgui-devel +BuildRequires: kio-devel +BuildRequires: knotifyconfig-devel +BuildRequires: kdelibs4support-devel +BuildRequires: knewstuff-devel +BuildRequires: phonon4qt5-devel +BuildRequires: update-desktop-files Summary: Kollision game License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 14.12.3 +Version: 15.04.0 Release: 0 Source0: kollision-%{version}.tar.xz +Obsoletes: %{name}5 < %{version} +Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description KDE version of a classic arcade game @@ -37,23 +57,21 @@ %setup -q -n kollision-%{version} %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %kde4_makeinstall - %suse_update_desktop_file -r kollision Game LogicGame - %kde_post_install + %kf5_makeinstall -C build + %suse_update_desktop_file -r org.kde.kollision Game LogicGame %files %defattr(-,root,root) %doc COPYING COPYING.DOC -%{_kde4_bindir}/kollision -%{_kde4_htmldir}/en/kollision/ -%{_kde4_applicationsdir}/kollision.desktop -%{_kde4_iconsdir}/hicolor/*/apps/kollision.* -%{_kde4_iconsdir}/oxygen/*/apps/kollision.* -%{_kde4_appsdir}/kollision/ +%{_kf5_bindir}/kollision +%{_kf5_htmldir}/en/kollision/ +%{_kf5_applicationsdir}/org.kde.kollision.desktop +%{_kf5_iconsdir}/hicolor/*/*/kollision.* +%{_kf5_appsdir}/kollision/ +%{_kf5_kxmlguidir}/kollision/ %changelog ++++++ kollision-14.12.3.tar.xz -> kollision-15.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/CMakeLists.txt new/kollision-15.04.0/CMakeLists.txt --- old/kollision-14.12.3/CMakeLists.txt 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/CMakeLists.txt 2015-03-18 07:40:21.000000000 +0100 @@ -1,15 +1,39 @@ project(kollision) -if(NOT COMPILING_KDEGAMES) - find_package(KDE4 REQUIRED) - include(KDE4Defaults) - include(MacroLibrary) - find_package(KDEGames 4.9.0 REQUIRED) - - add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) - include_directories(${KDEGAMES_INCLUDE_DIRS} ${KDE4_INCLUDES} ${QDBUS_INCLUDE_DIRS}) -endif(NOT COMPILING_KDEGAMES) +cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) +set (QT_MIN_VERSION "5.3.0") + +find_package(ECM 1.3.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 Qml Quick QuickWidgets Svg Test) +find_package(KF5 REQUIRED COMPONENTS + CoreAddons + Config + WidgetsAddons + Config + DBusAddons + I18n + ConfigWidgets + TextWidgets + XmlGui + KIO + NotifyConfig + NewStuff + ) + +find_package(KF5KDEGames 4.9.0 REQUIRED) +find_package(Phonon4Qt5 CONFIG REQUIRED) + +include(FeatureSummary) +include(ECMInstallIcons) +include(KDEInstallDirs) +include(KDECompilerSettings) +include(KDECMakeSettings) + +add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DTRANSLATION_DOMAIN="kollision") + add_subdirectory(pictures) add_subdirectory(sounds) @@ -24,13 +48,15 @@ mainwindow.cpp message.cpp ) -kde4_add_kcfg_files(kollision_SRCS kollisionconfig.kcfgc) -kde4_add_ui_files(kollision_SRCS preferences.ui) -kde4_add_app_icon(kollision_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pictures/hi*-app-kollision.png") -kde4_add_executable(kollision ${kollision_SRCS}) +kconfig_add_kcfg_files(kollision_SRCS kollisionconfig.kcfgc) +ki18n_wrap_ui(kollision_SRCS preferences.ui) +#kde4_add_app_icon(kollision_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pictures/hi*-apps-kollision.png") +add_executable(kollision ${kollision_SRCS}) -target_link_libraries(kollision ${KDE4_KDEUI_LIBS} kdegames ${KDE4_PHONON_LIBS}) +target_link_libraries(kollision KF5KDEGames Phonon::phonon4qt5 KF5::DBusAddons KF5::XmlGui KF5::I18n) install(TARGETS kollision ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(PROGRAMS kollision.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(FILES kollisionui.rc DESTINATION ${DATA_INSTALL_DIR}/kollision) +install(PROGRAMS org.kde.kollision.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(FILES kollisionui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kollision) + +feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/README.PACKAGERS new/kollision-15.04.0/README.PACKAGERS --- old/kollision-14.12.3/README.PACKAGERS 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/README.PACKAGERS 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -EXTRA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/animation.cpp new/kollision-15.04.0/animation.cpp --- old/kollision-14.12.3/animation.cpp 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/animation.cpp 2015-03-18 07:40:21.000000000 +0100 @@ -12,7 +12,7 @@ #include "sprite.h" #include <math.h> -#include <kdebug.h> +#include <QDebug> Animation::~Animation() { @@ -190,5 +190,5 @@ } } -#include "animation.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/animator.cpp new/kollision-15.04.0/animator.cpp --- old/kollision-14.12.3/animator.cpp 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/animator.cpp 2015-03-18 07:40:21.000000000 +0100 @@ -8,11 +8,10 @@ */ #include "animator.h" -#include <kdebug.h> Animator::Animator() { - connect(&m_timer, SIGNAL(timeout()), this, SLOT(tick())); + connect(&m_timer, &QTimer::timeout, this, &Animator::tick); } void Animator::add(Animation* a) @@ -44,6 +43,6 @@ } -#include "animator.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/doc/CMakeLists.txt new/kollision-15.04.0/doc/CMakeLists.txt --- old/kollision-14.12.3/doc/CMakeLists.txt 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/doc/CMakeLists.txt 2015-03-18 07:40:21.000000000 +0100 @@ -1,3 +1,3 @@ ########### install files ############### -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kollision) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kollision) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/doc/index.docbook new/kollision-15.04.0/doc/index.docbook --- old/kollision-14.12.3/doc/index.docbook 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/doc/index.docbook 2015-03-18 07:40:21.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "<application>Kollision</application>"> <!ENTITY kappversion "0.1"> <!ENTITY package "kdegames"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/kollision.desktop new/kollision-15.04.0/kollision.desktop --- old/kollision-14.12.3/kollision.desktop 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/kollision.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,105 +0,0 @@ -[Desktop Entry] -Name=Kollision -Name[ast]=Kollision -Name[bs]=Kollision -Name[ca]=Kollision -Name[ca@valencia]=Kollision -Name[cs]=Kollision -Name[da]=Kollision -Name[de]=Kollision -Name[el]=Kollision -Name[en_GB]=Kollision -Name[eo]=Kollision -Name[es]=Kollision -Name[et]=Kollision -Name[eu]=Kollision -Name[fi]=Kollision -Name[fr]=Kollision -Name[ga]=Kollision -Name[gl]=Kollision -Name[hne]=कोलिसन -Name[hu]=Kollision -Name[it]=Kollision -Name[ja]=Kollision -Name[kk]=Kollision -Name[km]=Kollision -Name[ko]=Kollision -Name[lt]=Kollision -Name[lv]=Kollision -Name[mr]=कोलिजन -Name[nb]=Kollision -Name[nds]=Kollision -Name[nl]=Kollision -Name[nn]=Kollisjon -Name[pl]=Kolizja -Name[pt]=Kollision -Name[pt_BR]=Kollision -Name[ro]=Koliziune -Name[ru]=Kollision -Name[sk]=Kollision -Name[sl]=Kollision -Name[sr]=Колизија -Name[sr@ijekavian]=Колизија -Name[sr@ijekavianlatin]=Kolizija -Name[sr@latin]=Kolizija -Name[sv]=Kollision -Name[tr]=Kollision -Name[ug]=Kollision -Name[uk]=Kollision -Name[x-test]=xxKollisionxx -Name[zh_CN]=Kollision -Name[zh_TW]=Kollision -Exec=kollision -Icon=kollision -Type=Application -Comment=A simple ball dodging game -Comment[ast]=Un xuegu pa esquivar una bola -Comment[bs]=Jednostavna igra izbjegavanja lopte -Comment[ca]=Un senzill joc d'esquivar una bola -Comment[ca@valencia]=Un senzill joc d'esquivar una bola -Comment[da]=Et enkelt undvigelsesspil med bolde -Comment[de]=Ein einfaches Ausweich-Ballspiel -Comment[el]=Ένα απλό παιχνίδι ελιγμών με μπάλες -Comment[en_GB]=A simple ball dodging game -Comment[es]=Un juego sencillo de esquivar pelotas -Comment[et]=Lihtne pallitogimise mäng -Comment[eu]=Pilota saihesteko joku bat -Comment[fa]=بازی ساده جاخالی دادن -Comment[fi]=Yksinkertainen väistelypeli -Comment[fr]=Un jeu simple d'évitement de balles -Comment[ga]=Cluiche simplí ina bhfuil ort liathróidí a sheachaint -Comment[gl]=Un xogo de bólas -Comment[hne]=एक सादा गेंद डाज करे के खेल -Comment[hu]=Egyszerű labdakikerülős játék -Comment[it]=Un semplice gioco in cui devi schivare delle palle -Comment[ja]=ボールをよけるシンプルなゲーム -Comment[kk]=Қарапайым доптан жалтару ойны -Comment[km]=ល្បែងគេចបាល់ធម្មតា -Comment[ko]=튀는 공 피하기 게임 -Comment[lv]=Vienkārša izvairīšanās spēle -Comment[mr]=सोपा चेंडू तटविण्याचा खेळ -Comment[nb]=En enkelt spill om å unngå ballen -Comment[nds]=En eenfach Ball-Utwiekspeel -Comment[nl]=Een eenvoudig "stuiterende bal"-spel -Comment[nn]=Enkelt spel der du skal unngå kollisjonar -Comment[pl]=Gra w unikanie kul -Comment[pt]=Um jogo simples de desvio de bolas -Comment[pt_BR]=Um jogo simples: desvie das bolas -Comment[ro]=Un joc simplu de evitare a bilelor -Comment[ru]=Простая игра в уклонение от шариков -Comment[sk]=Hra s vyhýbaním loptičiek -Comment[sl]=Preprosta igra izmikanja žogicam -Comment[sr]=Једноставна игра избегавања лопти -Comment[sr@ijekavian]=Једноставна игра избјегавања лопти -Comment[sr@ijekavianlatin]=Jednostavna igra izbjegavanja lopti -Comment[sr@latin]=Jednostavna igra izbegavanja lopti -Comment[sv]=Ett enkelt spel för att undvika bollar -Comment[tr]=Basit bir top sıçratma oyunu -Comment[ug]=ئاددىي توپ ئېتىشىپ ئويناش ئويۇنى -Comment[uk]=Проста гра з кулькою -Comment[x-test]=xxA simple ball dodging gamexx -Comment[zh_CN]=一个简单的躲避球游戏 -Comment[zh_TW]=簡單的閃躲球遊戲 -Terminal=false -Categories=Qt;KDE;Game;ArcadeGame; -X-DocPath=kollision/index.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/kollision.kcfg new/kollision-15.04.0/kollision.kcfg --- old/kollision-14.12.3/kollision.kcfg 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/kollision.kcfg 2015-03-18 07:40:21.000000000 +0100 @@ -3,7 +3,6 @@ "http://www.kde.org/standards/kcfg/1.0/kcfg.xsd";> <kcfg> <kcfgfile name="kollisionrc"/> - <include>kglobalsettings.h</include> <group name="sounds"> <entry name="EnableSounds" type="Bool"> <label>Whether sound effects should be played.</label> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/main.cpp new/kollision-15.04.0/main.cpp --- old/kollision-14.12.3/main.cpp 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/main.cpp 2015-03-18 07:40:21.000000000 +0100 @@ -7,30 +7,45 @@ (at your option) any later version. */ -#include <KApplication> + #include <KAboutData> -#include <KLocale> -#include <KCmdLineArgs> +#include <QApplication> +#include <KLocalizedString> +#include <QCommandLineParser> +#include <kdelibs4configmigrator.h> +#include <KDBusService> #include "mainwindow.h" int main(int argc, char *argv[]) { - KAboutData aboutData("kollision", 0, ki18n("Kollision"), - "0.1", ki18n("KDE collision game"), KAboutData::License_GPL, - ki18n("(c) 2007 Paolo Capriotti"), KLocalizedString(), "http://games.kde.org/kollision";); - aboutData.addAuthor(ki18n("Paolo Capriotti"), KLocalizedString(), "[email protected]"); - aboutData.addAuthor(ki18n("Dmitry Suzdalev"), KLocalizedString(), "[email protected]"); - aboutData.addCredit(ki18n("Matteo Guarnieri"), ki18n("Original idea")); - aboutData.addCredit(ki18n("Brian Croom"), ki18n("Port to use KGameRenderer")); - - KCmdLineArgs::init(argc, argv, &aboutData); - - KCmdLineOptions options; - KCmdLineArgs::addCmdLineOptions(options); - KApplication app; - KGlobal::locale()->insertCatalog( QLatin1String( "libkdegames" )); + Kdelibs4ConfigMigrator migrate(QStringLiteral("kollision")); + migrate.setConfigFiles(QStringList() << QStringLiteral("kollisionrc")); + migrate.setUiFiles(QStringList() << QStringLiteral("kollisionui.rc")); + migrate.migrate(); + + QApplication app(argc, argv); + + KAboutData aboutData("kollision", i18n("Kollision"), + "0.2", i18n("KDE collision game"), KAboutLicense::GPL, + i18n("(c) 2007 Paolo Capriotti"), "http://games.kde.org/kollision";); + aboutData.addAuthor(i18n("Paolo Capriotti"), QString(), "[email protected]"); + aboutData.addAuthor(i18n("Dmitry Suzdalev"), QString(), "[email protected]"); + aboutData.addCredit(i18n("Matteo Guarnieri"), i18n("Original idea")); + aboutData.addCredit(i18n("Brian Croom"), i18n("Port to use KGameRenderer")); + + + app.setWindowIcon(QIcon::fromTheme(QLatin1String("kollision"))); + + QCommandLineParser parser; + KAboutData::setApplicationData(aboutData); + parser.addVersionOption(); + parser.addHelpOption(); + aboutData.setupCommandLine(&parser); + parser.process(app); + aboutData.processCommandLine(&parser); + KDBusService service; MainWindow* window = new MainWindow; window->show(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/mainarea.cpp new/kollision-15.04.0/mainarea.cpp --- old/kollision-14.12.3/mainarea.cpp 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/mainarea.cpp 2015-03-18 07:40:21.000000000 +0100 @@ -15,13 +15,11 @@ #include <QGraphicsSceneMouseEvent> #include <QPainter> #include <KGameRenderer> - -#include <KAction> -#include <KDebug> +#include <QAction> #include <KgDifficulty> #include <KgTheme> #include <KLocalizedString> -#include <KStandardDirs> + #include "ball.h" #include "kollisionconfig.h" @@ -31,6 +29,7 @@ #include <stdio.h> #include <time.h> #include <sys/time.h> +#include <QStandardPaths> struct Collision { @@ -42,7 +41,7 @@ { Theme() : KgTheme("pictures/theme.desktop") { - setGraphicsPath(KStandardDirs::locate("appdata", "pictures/theme.svgz")); + setGraphicsPath(QStandardPaths::locate(QStandardPaths::DataLocation, "pictures/theme.svgz")); } }; @@ -54,10 +53,10 @@ , m_paused(false) , m_pause_time(0) , m_penalty(0) -, m_soundHitWall(KStandardDirs::locate("appdata", "sounds/hit_wall.ogg")) -, m_soundYouLose(KStandardDirs::locate("appdata", "sounds/you_lose.ogg")) -, m_soundBallLeaving(KStandardDirs::locate("appdata", "sounds/ball_leaving.ogg")) -, m_soundStart(KStandardDirs::locate("appdata", "sounds/start.ogg")) +, m_soundHitWall(QStandardPaths::locate(QStandardPaths::DataLocation, "sounds/hit_wall.ogg")) +, m_soundYouLose(QStandardPaths::locate(QStandardPaths::DataLocation, "sounds/you_lose.ogg")) +, m_soundBallLeaving(QStandardPaths::locate(QStandardPaths::DataLocation, "sounds/ball_leaving.ogg")) +, m_soundStart(QStandardPaths::locate(QStandardPaths::DataLocation, "sounds/start.ogg")) , m_pause_action(0) { // Initialize the sound state @@ -70,7 +69,7 @@ srand(time(0)); m_timer.setInterval(20); - connect(&m_timer, SIGNAL(timeout()), this, SLOT(tick())); + connect(&m_timer, &QTimer::timeout, this, &MainArea::tick); m_msg_font = QApplication::font(); m_msg_font.setPointSize(15); @@ -95,7 +94,7 @@ { m_soundEnabled = p_enabled; KollisionConfig::setEnableSounds(p_enabled); - KollisionConfig::self()->writeConfig(); + KollisionConfig::self()->save(); } Animation* MainArea::writeMessage(const QString& text) @@ -129,16 +128,16 @@ m_welcome_msg.clear(); foreach (const QString &line, text.split('\n')) { m_welcome_msg.append( - KSharedPtr<Message>(new Message(line, m_msg_font, m_size))); + QExplicitlySharedDataPointer<Message>(new Message(line, m_msg_font, m_size))); } displayMessages(m_welcome_msg); if (fade) { AnimationGroup* anim = new AnimationGroup; - foreach (KSharedPtr<Message> message, m_welcome_msg) { + foreach (QExplicitlySharedDataPointer<Message> message, m_welcome_msg) { message->setOpacityF(0.0); anim->add(new FadeAnimation( - SpritePtr::staticCast(message), 0.0, 1.0, 1000)); + message, 0.0, 1.0, 1000)); } m_animator.add(anim); @@ -150,16 +149,16 @@ } } -void MainArea::displayMessages(const QList<KSharedPtr<Message> >& messages) +void MainArea::displayMessages(const QList<QExplicitlySharedDataPointer<Message> >& messages) { int totalHeight = 0; - foreach (KSharedPtr<Message> message, messages) { + foreach (QExplicitlySharedDataPointer<Message> message, messages) { totalHeight += message->height(); } QPointF pos(m_size / 2.0, (m_size - totalHeight) / 2.0); for (int i = 0; i < messages.size(); i++) { - KSharedPtr<Message> msg = messages[i]; + QExplicitlySharedDataPointer<Message> msg = messages[i]; int halfHeight = msg->height() / 2; pos.ry() += halfHeight; msg->setPosition(pos); @@ -261,7 +260,7 @@ m_soundStart.start(); } -void MainArea::setPauseAction(KAction* action) +void MainArea::setPauseAction(QAction * action) { m_pause_action = action; } @@ -519,7 +518,7 @@ "Click to restart", time); emit gameOver(time); Animation* a = writeText(text); - connect(this, SIGNAL(starting()), a, SLOT(stop())); + connect(this, &MainArea::starting, a, &Animation::stop); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/mainarea.h new/kollision-15.04.0/mainarea.h --- old/kollision-14.12.3/mainarea.h 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/mainarea.h 2015-03-18 07:40:21.000000000 +0100 @@ -24,7 +24,7 @@ class Ball; class Animation; class QGraphicsSceneMouseEvent; -class KAction; +class QAction; struct Collision; @@ -69,7 +69,7 @@ KgSound m_soundBallLeaving; KgSound m_soundStart; - KAction* m_pause_action; + QAction * m_pause_action; double radius() const; QPointF randomPoint() const; @@ -81,7 +81,7 @@ Animation* writeMessage(const QString& text); Animation* writeText(const QString& lines, bool fade = true); - void displayMessages(const QList<KSharedPtr<Message> >& msgs); + void displayMessages(const QList<QExplicitlySharedDataPointer<Message> >& msgs); void playSound(int sound); void onDeath(); void setManPosition(const QPointF& p); @@ -91,7 +91,7 @@ public: MainArea(); void start(); - void setPauseAction(KAction* action); + void setPauseAction(QAction * action); public slots: void tick(); void enableSounds(bool enable); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/mainwindow.cpp new/kollision-15.04.0/mainwindow.cpp --- old/kollision-14.12.3/mainwindow.cpp 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/mainwindow.cpp 2015-03-18 07:40:21.000000000 +0100 @@ -13,13 +13,13 @@ #include <QLabel> #include <QGraphicsView> -#include <KAction> +#include <QAction> #include <KActionCollection> -#include <KDebug> +#include <QDebug> #include <KgDifficulty> #include <KScoreDialog> #include <KStandardGameAction> -#include <KStatusBar> +#include <QStatusBar> #include <KToggleAction> #include "mainarea.h" @@ -52,7 +52,7 @@ l->setSizeConstraint(QLayout::SetFixedSize); // setup status bar - KStatusBar* bar = statusBar(); + QStatusBar* bar = statusBar(); Q_ASSERT(bar); m_time_label = new QLabel(""); bar->addPermanentWidget(m_time_label); @@ -61,14 +61,14 @@ bar->addWidget(m_balls_label); // bar->setItemAlignment(STATUSBAR_BALLS, Qt::AlignLeft); - connect(m_main, SIGNAL(changeGameTime(int)), this, SLOT(setGameTime(int))); - connect(m_main, SIGNAL(changeBallNumber(int)), this, SLOT(setBallNumber(int))); - connect(m_main, SIGNAL(changeState(bool)), this, SLOT(changeState(bool))); - connect(m_main, SIGNAL(pause(bool)), this, SLOT(pause(bool))); + connect(m_main, &MainArea::changeGameTime, this, &MainWindow::setGameTime); + connect(m_main, &MainArea::changeBallNumber, this, &MainWindow::setBallNumber); + connect(m_main, &MainArea::changeState, this, &MainWindow::changeState); + connect(m_main, &MainArea::pause, this, &MainWindow::pause); stateChanged("playing", KXMLGUIClient::StateReverse); - connect(m_main, SIGNAL(starting()), this, SLOT(newGame())); - connect(m_main, SIGNAL(gameOver(int)), this, SLOT(gameOver(int))); + connect(m_main, &MainArea::starting, this, &MainWindow::newGame); + connect(m_main, &MainArea::gameOver, this, &MainWindow::gameOver); } MainWindow::~MainWindow() @@ -79,20 +79,20 @@ void MainWindow::setupActions() { // Game - KAction* abort = actionCollection()->addAction( QLatin1String( "game_abort" )); + QAction * abort = actionCollection()->addAction( QLatin1String( "game_abort" )); abort->setText(i18n("End game")); - connect(abort, SIGNAL(triggered()), m_main, SLOT(abort())); + connect(abort, &QAction::triggered, m_main, &MainArea::abort); - KAction* pause = KStandardGameAction::pause(m_main, SLOT(togglePause()), actionCollection()); + QAction * pause = KStandardGameAction::pause(m_main, SLOT(togglePause()), actionCollection()); m_main->setPauseAction(pause); KStandardGameAction::highscores(this, SLOT(highscores()), actionCollection()); KStandardGameAction::quit(this, SLOT(close()), actionCollection()); - KAction* action; + QAction * action; action = new KToggleAction(i18n("&Play Sounds"), this); action->setChecked(KollisionConfig::enableSounds()); actionCollection()->addAction( QLatin1String( "options_sounds" ), action); - connect(action, SIGNAL(triggered(bool)), m_main, SLOT(enableSounds(bool))); + connect(action, &QAction::triggered, m_main, &MainArea::enableSounds); setupGUI(Create | Save | Keys | StatusBar); } @@ -157,4 +157,4 @@ } } -#include "mainwindow.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/message.h new/kollision-15.04.0/message.h --- old/kollision-14.12.3/message.h 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/message.h 2015-03-18 07:40:21.000000000 +0100 @@ -11,7 +11,7 @@ #define MESSAGE_H #include <QGraphicsTextItem> -#include <KSharedPtr> +#include <QExplicitlySharedDataPointer> #include "sprite.h" class Message : public QGraphicsTextItem, public Sprite @@ -33,6 +33,6 @@ int height() const; }; -typedef KSharedPtr<Message> MessagePtr; +typedef QExplicitlySharedDataPointer<Message> MessagePtr; #endif // MESSAGE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/org.kde.kollision.desktop new/kollision-15.04.0/org.kde.kollision.desktop --- old/kollision-14.12.3/org.kde.kollision.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kollision-15.04.0/org.kde.kollision.desktop 2015-03-18 07:40:21.000000000 +0100 @@ -0,0 +1,106 @@ +[Desktop Entry] +Name=Kollision +Name[ast]=Kollision +Name[bs]=Kollision +Name[ca]=Kollision +Name[ca@valencia]=Kollision +Name[cs]=Kollision +Name[da]=Kollision +Name[de]=Kollision +Name[el]=Kollision +Name[en_GB]=Kollision +Name[eo]=Kollision +Name[es]=Kollision +Name[et]=Kollision +Name[eu]=Kollision +Name[fi]=Kollision +Name[fr]=Kollision +Name[ga]=Kollision +Name[gl]=Kollision +Name[hne]=कोलिसन +Name[hu]=Kollision +Name[it]=Kollision +Name[ja]=Kollision +Name[kk]=Kollision +Name[km]=Kollision +Name[ko]=Kollision +Name[lt]=Kollision +Name[lv]=Kollision +Name[mr]=कोलिजन +Name[nb]=Kollision +Name[nds]=Kollision +Name[nl]=Kollision +Name[nn]=Kollisjon +Name[pl]=Kolizja +Name[pt]=Kollision +Name[pt_BR]=Kollision +Name[ro]=Koliziune +Name[ru]=Kollision +Name[sk]=Kollision +Name[sl]=Kollision +Name[sr]=Колизија +Name[sr@ijekavian]=Колизија +Name[sr@ijekavianlatin]=Kolizija +Name[sr@latin]=Kolizija +Name[sv]=Kollision +Name[tr]=Kollision +Name[ug]=Kollision +Name[uk]=Kollision +Name[x-test]=xxKollisionxx +Name[zh_CN]=Kollision +Name[zh_TW]=Kollision +Exec=kollision +Icon=kollision +Type=Application +Comment=A simple ball dodging game +Comment[ast]=Un xuegu pa esquivar una bola +Comment[bs]=Jednostavna igra izbjegavanja lopte +Comment[ca]=Un senzill joc d'esquivar una bola +Comment[ca@valencia]=Un senzill joc d'esquivar una bola +Comment[da]=Et enkelt undvigelsesspil med bolde +Comment[de]=Ein einfaches Ausweich-Ballspiel +Comment[el]=Ένα απλό παιχνίδι ελιγμών με μπάλες +Comment[en_GB]=A simple ball dodging game +Comment[es]=Un juego sencillo de esquivar pelotas +Comment[et]=Lihtne pallitogimise mäng +Comment[eu]=Pilota saihesteko joku bat +Comment[fa]=بازی ساده جاخالی دادن +Comment[fi]=Yksinkertainen väistelypeli +Comment[fr]=Un jeu simple d'évitement de balles +Comment[ga]=Cluiche simplí ina bhfuil ort liathróidí a sheachaint +Comment[gl]=Un xogo de bólas +Comment[hne]=एक सादा गेंद डाज करे के खेल +Comment[hu]=Egyszerű labdakikerülős játék +Comment[it]=Un semplice gioco in cui devi schivare delle palle +Comment[ja]=ボールをよけるシンプルなゲーム +Comment[kk]=Қарапайым доптан жалтару ойны +Comment[km]=ល្បែងគេចបាល់ធម្មតា +Comment[ko]=튀는 공 피하기 게임 +Comment[lv]=Vienkārša izvairīšanās spēle +Comment[mr]=सोपा चेंडू तटविण्याचा खेळ +Comment[nb]=En enkelt spill om å unngå ballen +Comment[nds]=En eenfach Ball-Utwiekspeel +Comment[nl]=Een eenvoudig "stuiterende bal"-spel +Comment[nn]=Enkelt spel der du skal unngå kollisjonar +Comment[pl]=Gra w unikanie kul +Comment[pt]=Um jogo simples de desvio de bolas +Comment[pt_BR]=Um jogo simples: desvie das bolas +Comment[ro]=Un joc simplu de evitare a bilelor +Comment[ru]=Простая игра в уклонение от шариков +Comment[sk]=Hra s vyhýbaním loptičiek +Comment[sl]=Preprosta igra izmikanja žogicam +Comment[sr]=Једноставна игра избегавања лопти +Comment[sr@ijekavian]=Једноставна игра избјегавања лопти +Comment[sr@ijekavianlatin]=Jednostavna igra izbjegavanja lopti +Comment[sr@latin]=Jednostavna igra izbegavanja lopti +Comment[sv]=Ett enkelt spel för att undvika bollar +Comment[tr]=Basit bir top sıçratma oyunu +Comment[ug]=ئاددىي توپ ئېتىشىپ ئويناش ئويۇنى +Comment[uk]=Проста гра з кулькою +Comment[x-test]=xxA simple ball dodging gamexx +Comment[zh_CN]=一个简单的躲避球游戏 +Comment[zh_TW]=簡單的閃躲球遊戲 +Terminal=false +Categories=Qt;KDE;Game;ArcadeGame; +X-DocPath=kollision/index.html +X-DBUS-ServiceName=org.kde.kollision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/pictures/CMakeLists.txt new/kollision-15.04.0/pictures/CMakeLists.txt --- old/kollision-14.12.3/pictures/CMakeLists.txt 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/pictures/CMakeLists.txt 2015-03-18 07:40:21.000000000 +0100 @@ -4,4 +4,6 @@ # theme.desktop does not need to be installed anymore DESTINATION ${DATA_INSTALL_DIR}/kollision/pictures) -kde4_install_icons(${ICON_INSTALL_DIR}) +ecm_install_icons(ICONS hi128-apps-kollision.png hi22-apps-kollision.png hi48-apps-kollision.png ox128-apps-kollision.png ox22-apps-kollision.png ox48-apps-kollision.png +hi16-apps-kollision.png hi32-apps-kollision.png hi64-apps-kollision.png ox16-apps-kollision.png ox32-apps-kollision.png ox64-apps-kollision.png +DESTINATION ${ICON_INSTALL_DIR}) Files old/kollision-14.12.3/pictures/hi128-app-kollision.png and new/kollision-15.04.0/pictures/hi128-app-kollision.png differ Files old/kollision-14.12.3/pictures/hi128-apps-kollision.png and new/kollision-15.04.0/pictures/hi128-apps-kollision.png differ Files old/kollision-14.12.3/pictures/hi16-app-kollision.png and new/kollision-15.04.0/pictures/hi16-app-kollision.png differ Files old/kollision-14.12.3/pictures/hi16-apps-kollision.png and new/kollision-15.04.0/pictures/hi16-apps-kollision.png differ Files old/kollision-14.12.3/pictures/hi22-app-kollision.png and new/kollision-15.04.0/pictures/hi22-app-kollision.png differ Files old/kollision-14.12.3/pictures/hi22-apps-kollision.png and new/kollision-15.04.0/pictures/hi22-apps-kollision.png differ Files old/kollision-14.12.3/pictures/hi32-app-kollision.png and new/kollision-15.04.0/pictures/hi32-app-kollision.png differ Files old/kollision-14.12.3/pictures/hi32-apps-kollision.png and new/kollision-15.04.0/pictures/hi32-apps-kollision.png differ Files old/kollision-14.12.3/pictures/hi48-app-kollision.png and new/kollision-15.04.0/pictures/hi48-app-kollision.png differ Files old/kollision-14.12.3/pictures/hi48-apps-kollision.png and new/kollision-15.04.0/pictures/hi48-apps-kollision.png differ Files old/kollision-14.12.3/pictures/hi64-app-kollision.png and new/kollision-15.04.0/pictures/hi64-app-kollision.png differ Files old/kollision-14.12.3/pictures/hi64-apps-kollision.png and new/kollision-15.04.0/pictures/hi64-apps-kollision.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/sprite.h new/kollision-15.04.0/sprite.h --- old/kollision-14.12.3/sprite.h 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/sprite.h 2015-03-18 07:40:21.000000000 +0100 @@ -13,7 +13,7 @@ #include <QPointF> #include "spritefwd.h" -class Sprite : public KShared +class Sprite : public QSharedData { public: virtual ~Sprite() { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-14.12.3/spritefwd.h new/kollision-15.04.0/spritefwd.h --- old/kollision-14.12.3/spritefwd.h 2014-12-31 07:59:23.000000000 +0100 +++ new/kollision-15.04.0/spritefwd.h 2015-03-18 07:40:21.000000000 +0100 @@ -10,11 +10,11 @@ #ifndef SPRITEFWD_H #define SPRITEFWD_H -#include <KSharedPtr> +#include <QExplicitlySharedDataPointer> class Sprite; -typedef KSharedPtr<Sprite> SpritePtr; +typedef QExplicitlySharedDataPointer<Sprite> SpritePtr; #endif // SPRITEFWD_H
