Hello community, here is the log from the commit of package kbounce for openSUSE:Factory checked in at 2015-05-11 17:40:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbounce (Old) and /work/SRC/openSUSE:Factory/.kbounce.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbounce" Changes: -------- --- /work/SRC/openSUSE:Factory/kbounce/kbounce.changes 2015-03-11 09:45:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kbounce.new/kbounce.changes 2015-05-11 17:40:59.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Apr 11 12:44:29 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 17:21:03 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:36:14 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- Old: ---- kbounce-14.12.3.tar.xz New: ---- kbounce-15.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbounce.spec ++++++ --- /var/tmp/diff_new_pack.nJEKqf/_old 2015-05-11 17:40:59.000000000 +0200 +++ /var/tmp/diff_new_pack.nJEKqf/_new 2015-05-11 17:40:59.000000000 +0200 @@ -19,15 +19,51 @@ Name: kbounce BuildRequires: libkdegames-devel BuildRequires: xz +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5QuickWidgets) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: kcoreaddons-devel +BuildRequires: kconfig-devel +BuildRequires: kitemmodels-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kwindowsystem-devel +BuildRequires: kcodecs-devel +BuildRequires: karchive-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kdnssd-framework-devel +BuildRequires: kdeclarative-devel +BuildRequires: ki18n-devel +BuildRequires: kguiaddons-devel +BuildRequires: kservice-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kitemviews-devel +BuildRequires: kiconthemes-devel +BuildRequires: kcompletion-devel +BuildRequires: kjobwidgets-devel +BuildRequires: ktextwidgets-devel +BuildRequires: kglobalaccel-devel +BuildRequires: kxmlgui-devel +BuildRequires: kcrash-devel +BuildRequires: kbookmarks-devel +BuildRequires: kio-devel +BuildRequires: knotifyconfig-devel +BuildRequires: knewstuff-devel +BuildRequires: kdelibs4support-devel +BuildRequires: phonon4qt5-devel +BuildRequires: update-desktop-files Summary: Bounce ball game License: LGPL-2.0+ Group: Amusements/Games/Action/Other Url: http://www.kde.org -Version: 14.12.3 +Version: 15.04.0 Release: 0 Source0: kbounce-%{version}.tar.xz +Obsoletes: %{name}5 < %{version} +Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Your task in KBounce (Jezz Ball) is to catch several moving balls in a @@ -38,22 +74,21 @@ %setup -q -n kbounce-%{version} %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %kde4_makeinstall - %suse_update_desktop_file -r kbounce Game LogicGame - %kde_post_install + %kf5_makeinstall -C build + %suse_update_desktop_file -r org.kde.kbounce Game LogicGame %files %defattr(-,root,root) %doc COPYING COPYING.DOC -%{_kde4_bindir}/kbounce -%{_kde4_applicationsdir}/kbounce.desktop -%{_kde4_htmldir}/en/kbounce/ -%{_kde4_iconsdir}/hicolor/*/apps/kbounce.* -%{_kde4_appsdir}/kbounce/ +%{_kf5_bindir}/kbounce +%{_kf5_applicationsdir}/org.kde.kbounce.desktop +%{_kf5_htmldir}/en/kbounce/ +%{_kf5_iconsdir}/hicolor/*/apps/kbounce.* +%{_kf5_sharedir}/kbounce/ +%{_kf5_sharedir}/kxmlgui5/ %changelog ++++++ kbounce-14.12.3.tar.xz -> kbounce-15.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/CMakeLists.txt new/kbounce-15.04.0/CMakeLists.txt --- old/kbounce-14.12.3/CMakeLists.txt 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/CMakeLists.txt 2015-03-18 07:29:07.000000000 +0100 @@ -1,27 +1,47 @@ project(kbounce) -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.2.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 Svg Test) +find_package(KF5 REQUIRED COMPONENTS + CoreAddons + Config + WidgetsAddons + DBusAddons + I18n + GuiAddons + ConfigWidgets + IconThemes + Completion + TextWidgets + XmlGui + KIO + NotifyConfig + ) + +find_package(KF5KDEGames 4.9.0 REQUIRED) +find_package(Phonon4Qt5 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="kbounce") add_subdirectory( themes ) add_subdirectory( sounds ) add_subdirectory( pics ) add_subdirectory( doc ) -include_directories(${CMAKE_SOURCE_DIR}/libkdegames/highscore) +include_directories(${CMAKE_SOURCE_DIR}/KF5KDEGames/highscore) -if(KDE4_ENABLE_FPIE) - set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_CXX_FPIE_FLAGS}") -endif(KDE4_ENABLE_FPIE) - ########### next target ############### set(kbounce_SRCS @@ -35,24 +55,27 @@ wall.cpp backgroundselector.cpp) -kde4_add_kcfg_files(kbounce_SRCS settings.kcfgc) -kde4_add_ui_files(kbounce_SRCS backgroundselector.ui ) -kde4_add_app_icon(kbounce_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hi*-app-kbounce.png") -kde4_add_executable(kbounce ${kbounce_SRCS}) - -target_link_libraries(kbounce ${KDE4_KDEUI_LIBS} kdegames ${KDE4_PHONON_LIBS} ${KDE4_KIO_LIBS}) -if(KDE4_ENABLE_FPIE) - target_link_libraries(kbounce ${KDE4_PIE_LDFLAGS}) -endif(KDE4_ENABLE_FPIE) - +kconfig_add_kcfg_files(kbounce_SRCS settings.kcfgc) +ki18n_wrap_ui(kbounce_SRCS backgroundselector.ui ) +kde4_add_app_icon(kbounce_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hi*-app-kbounce.png") +add_executable(kbounce ${kbounce_SRCS}) + +target_link_libraries(kbounce + Qt5::Svg + KF5::XmlGui + KF5::I18n + Phonon::phonon4qt5 + KF5::KIOWidgets + KF5::DBusAddons + KF5KDEGames ) install(TARGETS kbounce ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### -install( PROGRAMS kbounce.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES kbounceui.rc DESTINATION ${DATA_INSTALL_DIR}/kbounce ) - +install( PROGRAMS org.kde.kbounce.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES kbounceui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kbounce ) +feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/README.PACKAGERS new/kbounce-15.04.0/README.PACKAGERS --- old/kbounce-14.12.3/README.PACKAGERS 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-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/kbounce-14.12.3/backgroundselector.cpp new/kbounce-15.04.0/backgroundselector.cpp --- old/kbounce-14.12.3/backgroundselector.cpp 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/backgroundselector.cpp 2015-03-18 07:29:07.000000000 +0100 @@ -21,19 +21,20 @@ #include "backgroundselector.h" #include "ui_backgroundselector.h" -#include <kfiledialog.h> + #include <KConfigDialog> -#include "renderer.h" -#include <QPainter> #include <KColorScheme> #include <KLocalizedString> +#include "renderer.h" + +#include <QPainter> + BackgroundSelector::BackgroundSelector(QWidget* parent, KConfigSkeleton* config) : QWidget(parent), ui(new Ui::KBounceBackgroundSelector),m_config(config) { ui->setupUi(this); - ui->kurlrequester->fileDialog()->setMode(KFile::Directory); setupData(); } @@ -61,8 +62,8 @@ { //The lineEdit widget holds our bg path, but the user does not manipulate it directly ui->kcfg_BackgroundPicturePath->hide(); - connect(ui->kurlrequester, SIGNAL(textChanged(QString)), this, SLOT(imagePathChanged(QString))); - connect(ui->kcfg_UseRandomBackgroundPictures, SIGNAL(toggled(bool)),this,SLOT(useRandomBackgroundPicturesChanged(bool))); + connect(ui->kurlrequester, &KUrlRequester::textChanged, this, &BackgroundSelector::imagePathChanged); + connect(ui->kcfg_UseRandomBackgroundPictures, &QCheckBox::toggled, this, &BackgroundSelector::useRandomBackgroundPicturesChanged); //Get our currently configured Tileset entry KConfig * config = m_config->config(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/ball.cpp new/kbounce-15.04.0/ball.cpp --- old/kbounce-14.12.3/ball.cpp 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/ball.cpp 2015-03-18 07:29:07.000000000 +0100 @@ -21,7 +21,8 @@ #include <cmath> -#include <kdebug.h> +#include <QDebug> + #include <KRandom> #include "board.h" @@ -54,7 +55,7 @@ if ( m_reflectY ) { - kDebug() << "Reflecting ball Y"; + qDebug() << "Reflecting ball Y"; m_velocity.y = -m_velocity.y; m_reflectY = false; } @@ -91,7 +92,7 @@ void KBounceBall::resize( const QSize& tileSize ) { - kDebug() << "New size:" << tileSize; + qDebug() << "New size:" << tileSize; m_size.setWidth( static_cast<int>( BALL_RELATIVE_SIZE * tileSize.width() ) ); m_size.setHeight( static_cast<int> ( BALL_RELATIVE_SIZE * tileSize.height() ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/board.cpp new/kbounce-15.04.0/board.cpp --- old/kbounce-14.12.3/board.cpp 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/board.cpp 2015-03-18 07:29:07.000000000 +0100 @@ -18,13 +18,12 @@ #include "board.h" -#include <kdebug.h> -#include <KGlobal> #include <KRandom> #include <QGraphicsScene> #include <QTimer> #include <QPainter> +#include <QDebug> #include "ball.h" #include "gameobject.h" @@ -44,7 +43,7 @@ { m_clock = new QTimer( this ); m_clock->setInterval( GAME_DELAY ); - connect( m_clock, SIGNAL(timeout()), this, SLOT(tick()) ); + connect(m_clock, &QTimer::timeout, this, &KBounceBoard::tick); m_walls.append( new KBounceWall( KBounceWall::Up, m_renderer, this ) ); m_walls.append( new KBounceWall( KBounceWall::Right, m_renderer, this ) ); @@ -170,17 +169,17 @@ if ( x < 0 || x >= TILE_NUM_W ) { - kDebug() << "Wall x position out of board."; + qDebug() << "Wall x position out of board."; return; } if ( y < 0 || y >= TILE_NUM_H ) { - kDebug() << "Wall y position out of board."; + qDebug() << "Wall y position out of board."; return; } if ( m_tiles[x][y] != Free ) { - kDebug() << "Wall could not be build in a field which is not free."; + qDebug() << "Wall could not be build in a field which is not free."; return; } @@ -439,5 +438,5 @@ if ( x > 0 ) fill ( x - 1, y ); } -#include "board.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/doc/CMakeLists.txt new/kbounce-15.04.0/doc/CMakeLists.txt --- old/kbounce-14.12.3/doc/CMakeLists.txt 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/doc/CMakeLists.txt 2015-03-18 07:29:07.000000000 +0100 @@ -1,4 +1,4 @@ ########### install files ############### # # -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kbounce) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kbounce) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/doc/index.docbook new/kbounce-15.04.0/doc/index.docbook --- old/kbounce-14.12.3/doc/index.docbook 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/doc/index.docbook 2015-03-18 07:29:07.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 "&kbounce;"> <!ENTITY kappversion "0.11"><!--Applicaion version. Use this variable everywhere it's needed.--> <!ENTITY package "kdegames"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/gamewidget.cpp new/kbounce-15.04.0/gamewidget.cpp --- old/kbounce-14.12.3/gamewidget.cpp 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/gamewidget.cpp 2015-03-18 07:29:07.000000000 +0100 @@ -22,12 +22,13 @@ #include <QPalette> #include <QTimer> +#include <QDebug> +#include <QStandardPaths> -#include <KStandardDirs> -#include <KLocale> #include <KgDifficulty> #include <KgThemeProvider> #include <KColorScheme> +#include <KLocalizedString> static const int MIN_MARGIN = 50; static const int GAME_TIME_DELAY = 1000; @@ -43,19 +44,19 @@ , m_lives( 0 ) , m_time( 0 ) , m_vertical( false ) -, m_soundTimeout( KStandardDirs::locate( "appdata", "sounds/timeout.wav" ) ) +, m_soundTimeout( QStandardPaths::locate( QStandardPaths::DataLocation, "sounds/timeout.wav" ) ) { m_board = new KBounceBoard( &m_renderer ); - connect( m_board, SIGNAL(fillChanged(int)), this, SLOT(onFillChanged(int)) ); - connect( m_board, SIGNAL(wallDied()), this, SLOT(onWallDied()) ); + connect(m_board, &KBounceBoard::fillChanged, this, &KBounceGameWidget::onFillChanged); + connect(m_board, &KBounceBoard::wallDied, this, &KBounceGameWidget::onWallDied); m_overlay = new QGraphicsPixmapItem(); m_overlay->hide(); m_clock = new QTimer( this ); m_clock->setInterval( GAME_TIME_DELAY ); - connect( m_clock, SIGNAL(timeout()), this, SLOT(tick()) ); - connect( this, SIGNAL(livesChanged(int)),this,SLOT(onLivesChanged(int)) ); + connect(m_clock, &QTimer::timeout, this, &KBounceGameWidget::tick); + connect(this, &KBounceGameWidget::livesChanged, this, &KBounceGameWidget::onLivesChanged); setMouseTracking( true ); @@ -80,7 +81,7 @@ int KBounceGameWidget::score() { - kDebug() << "Score:" << m_score; + qDebug() << "Score:" << m_score; return m_score; } @@ -159,7 +160,7 @@ void KBounceGameWidget::settingsChanged() { - kDebug() << "Settings changed"; + qDebug() << "Settings changed"; if (KBounceSettings::useRandomBackgroundPictures()) { @@ -256,7 +257,7 @@ void KBounceGameWidget::resizeEvent( QResizeEvent* ev ) { - kDebug() << "Size" << ev->size(); + qDebug() << "Size" << ev->size(); m_renderer.setBackgroundSize( ev->size() ); @@ -466,5 +467,5 @@ unsetCursor(); } -#include "gamewidget.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/gamewidget.h new/kbounce-15.04.0/gamewidget.h --- old/kbounce-14.12.3/gamewidget.h 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/gamewidget.h 2015-03-18 07:29:07.000000000 +0100 @@ -25,10 +25,10 @@ #include <QGraphicsView> #include <QGraphicsScene> #include <QGraphicsPixmapItem> +#include <QMouseEvent> #include <KgSound> #include <KgDifficulty> -#include <QMouseEvent> #include "board.h" #include "renderer.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/kbounce.desktop new/kbounce-15.04.0/kbounce.desktop --- old/kbounce-14.12.3/kbounce.desktop 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/kbounce.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,129 +0,0 @@ -[Desktop Entry] -Name=KBounce -Name[af]=K-hop -Name[ast]=KBounce -Name[be]=Несуцішныя шарыкі -Name[bn]=কে-বাউন্স -Name[br]=KBounce -Name[bs]=KBounce -Name[ca]=KBounce -Name[ca@valencia]=KBounce -Name[cs]=KBounce -Name[cy]=KBounce -Name[da]=KBounce -Name[de]=KBounce -Name[el]=KBounce -Name[en_GB]=KBounce -Name[eo]=KBounce -Name[es]=KBounce -Name[et]=KBounce -Name[eu]=KBounce -Name[fa]=پرش -Name[fi]=KBounce -Name[fr]=KBounce -Name[ga]=KBounce -Name[gl]=KBounce -Name[he]=KBounce -Name[hne]=के-बाउंस -Name[hr]=KBounce -Name[hu]=KBounce -Name[is]=KBounce -Name[it]=KBounce -Name[ja]=KBounce -Name[kk]=KBounce -Name[km]=KBounce -Name[ko]=KBounce -Name[lt]=KBounce -Name[lv]=KBounce -Name[mk]=KBounce -Name[mr]=के-बाउंस -Name[nb]=KBounce -Name[nds]=KBounce -Name[ne]=केडीई उफ्रिने -Name[nl]=KBounce -Name[nn]=KBounce -Name[pa]=ਕੇ-ਬਾਊਂਸ -Name[pl]=KOdbij -Name[pt]=KBounce -Name[pt_BR]=KBounce -Name[ro]=Bilă săritoare -Name[ru]=KBounce -Name[se]=KBounce -Name[sk]=KBounce -Name[sl]=KBounce -Name[sq]=KBounce -Name[sr]=К‑одбој -Name[sr@ijekavian]=К‑одбој -Name[sr@ijekavianlatin]=K‑odboj -Name[sr@latin]=K‑odboj -Name[sv]=Kstuds -Name[ta]=கேபவுன்ஸ் -Name[tg]=KТӯби ҷаҳанда -Name[tr]=KBounce -Name[ug]=KBounce -Name[uk]=KBounce -Name[vi]=KBounce -Name[wa]=KBounce -Name[xh]=KBounce -Name[x-test]=xxKBouncexx -Name[zh_CN]=KBounce -Name[zh_TW]=KBounce 彈力球 - -Type=Application -Exec=kbounce -caption %c -X-DocPath=kbounce/index.html -Icon=kbounce - -GenericName=Ball Bouncing Game -GenericName[ast]=Xuegu nel que reboten les boles -GenericName[bs]=Igra lopta koja odskače -GenericName[ca]=Un joc de pilotes rebotant -GenericName[ca@valencia]=Un joc de pilotes rebotant -GenericName[cs]=Hra s poskakujícími míčky -GenericName[da]=Et spil med hoppende bolde -GenericName[de]=Bälle einfangen -GenericName[el]=Παιχνίδι αναπήδησης μπάλας -GenericName[en_GB]=Ball Bouncing Game -GenericName[eo]=Ludo de saltadantaj pilkoj -GenericName[es]=Juego de pelotas que rebotan -GenericName[et]=Pallipõrgatamise mäng -GenericName[eu]=Pilotak boteak ematen jokoa -GenericName[fa]=بازی پرش توپها -GenericName[fi]=Pallopeli -GenericName[fr]=Jeu de balles rebondissantes -GenericName[ga]=Cluiche Liathróide Preabtha -GenericName[gl]=Xogo de bólas que botan -GenericName[hne]=उछलती गेंदों वाले खेल -GenericName[hu]=Labdajáték -GenericName[it]=Gioco di rimbalzi di palline -GenericName[ja]=跳ねるボールのゲーム -GenericName[kk]=Доп қағу ойны -GenericName[km]=ល្បែងបាល់លោត -GenericName[ko]=튕기는 공 게임 -GenericName[lv]=Atlēcošās bumbiņas spēle -GenericName[mr]=चेंडू उडविण्याचा खेळ -GenericName[nb]=Sprettballspill -GenericName[nds]=Speel mit springen Bäll -GenericName[nl]=Stuiterbalspel -GenericName[nn]=Sprettballspel -GenericName[pl]=Gra w odbijanie kul -GenericName[pt]=Jogo de Bolas aos Saltos -GenericName[pt_BR]=Jogo de bolas rebatidas -GenericName[ro]=Joc cu o minge săritoare -GenericName[ru]=Неуёмные шарики -GenericName[sk]=Hra s poskakujúcou loptou -GenericName[sl]=Odbijajoča se žogica -GenericName[sq]=Lojë me top që kërcen -GenericName[sr]=Игра одбијајућих лопти -GenericName[sr@ijekavian]=Игра одбијајућих лопти -GenericName[sr@ijekavianlatin]=Igra odbijajućih lopti -GenericName[sr@latin]=Igra odbijajućih lopti -GenericName[sv]=Studsande bollar -GenericName[tr]=Top Zıplatma Oyunu -GenericName[ug]=توپنى سەكرىتىش ئويۇنى -GenericName[uk]=Гра з відбиття м’ячика -GenericName[x-test]=xxBall Bouncing Gamexx -GenericName[zh_CN]=弹球游戏 -GenericName[zh_TW]=彈力球遊戲 -X-DBUS-StartupType=Multi -Categories=Qt;KDE;Game;ArcadeGame; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/main.cpp new/kbounce-15.04.0/main.cpp --- old/kbounce-14.12.3/main.cpp 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/main.cpp 2015-03-18 07:29:07.000000000 +0100 @@ -16,45 +16,75 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <KAboutData> -#include <KApplication> -#include <KCmdLineArgs> - #include "mainwindow.h" -#include <klocale.h> -#include <kglobal.h> +#include <KAboutData> +#include <KLocalizedString> +#include <kdelibs4configmigrator.h> +#include <KDBusService> -using namespace std; +#include <QApplication> +#include <QCommandLineParser> static const char description[] = I18N_NOOP("KDE Bounce Ball Game"); -static const char version[] = "0.11"; static const char copyleft[] = I18N_NOOP("(c) 2000-2005, Stefan Schimanski\n(c) 2007, Tomasz Boczkowski"); int main(int argc, char **argv) { - KAboutData aboutData( "kbounce", 0, ki18n("KBounce"), - version, ki18n(description), KAboutData::License_LGPL, - ki18n(copyleft), KLocalizedString(), "http://games.kde.org/kbounce"; ); - - aboutData.addAuthor(ki18n("Stefan Schimanski"), ki18n("Original author"), "[email protected]"); - aboutData.addAuthor(ki18n("Sandro Sigala"), ki18n("Highscore"), "[email protected]"); - aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Contributions"), "[email protected]"); - aboutData.addAuthor(ki18n("Tomasz Boczkowski"), ki18n("Port to KDE4. Current maintainer"), "[email protected]" ); - aboutData.addCredit(ki18n("Dmitry Suzdalev"), ki18n("Port to QGraphicsView framework"), "[email protected]"); - aboutData.addCredit(ki18n("Andreas Scherf"), ki18n("Image Background and Fixes"), "[email protected]"); + Kdelibs4ConfigMigrator migrate(QLatin1String("kbounce")); + migrate.setConfigFiles(QStringList() << QLatin1String("kbouncerc")); + migrate.setUiFiles(QStringList() << QLatin1String("kbounceui.rc")); + migrate.migrate(); + + QApplication app(argc, argv); + + KAboutData aboutData(QStringLiteral("kbounce"), i18n("KBounce"), + QStringLiteral("0.11"), i18n(description), + KAboutLicense::GPL, i18n(copyleft), QString(), + QStringLiteral("http://games.kde.org/kbounce";)); + + aboutData.addAuthor(i18n("Stefan Schimanski"), + i18n("Original author"), + QStringLiteral("[email protected]")); + + aboutData.addAuthor(i18n("Sandro Sigala"), + i18n("Highscore"), + QStringLiteral("[email protected]")); + + aboutData.addAuthor(i18n("Benjamin Meyer"), + i18n("Contributions"), + QStringLiteral("[email protected]")); + + aboutData.addAuthor(i18n("Tomasz Boczkowski"), + i18n("Port to KDE4. Current maintainer"), + QStringLiteral("[email protected]")); + + aboutData.addCredit(i18n("Dmitry Suzdalev"), + i18n("Port to QGraphicsView framework"), + QStringLiteral("[email protected]")); + + aboutData.addCredit(i18n("Andreas Scherf"), + i18n("Image Background and Fixes"), + QStringLiteral("[email protected]")); + + KAboutData::setApplicationData(aboutData); + QCommandLineParser parser; + parser.addVersionOption(); + parser.addHelpOption(); + aboutData.setupCommandLine(&parser); + parser.process(app); + aboutData.processCommandLine(&parser); - KCmdLineArgs::init( argc, argv, &aboutData ); + app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kbounce"))); - KApplication application; - KGlobal::locale()->insertCatalog( QLatin1String( "libkdegames" )); + KDBusService service; - if (application.isSessionRestored()) + if (app.isSessionRestored()) RESTORE(KBounceMainWindow) else { KBounceMainWindow *w = new KBounceMainWindow; w->show(); } - return application.exec(); + return app.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/mainwindow.cpp new/kbounce-15.04.0/mainwindow.cpp --- old/kbounce-14.12.3/mainwindow.cpp 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/mainwindow.cpp 2015-03-18 07:29:07.000000000 +0100 @@ -16,39 +16,45 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "mainwindow.h" -#include <KAction> +#include <krandom.h> +#include <kstandardgameaction.h> + +#include <KToggleAction> #include <KActionCollection> #include <KConfigDialog> -#include <kdebug.h> -#include <KGlobal> -#include <KLocale> #include <KMessageBox> -#include <krandom.h> -#include <KStatusBar> -#include <KStandardDirs> -#include <KToggleAction> - -#include <kstandardgameaction.h> #include <KScoreDialog> #include <KgThemeSelector> #include <KgDifficulty> +#include <KLocalizedString> +#include <QDebug> +#include <QStatusBar> +#include <QAction> +#include "mainwindow.h" #include "gamewidget.h" #include "settings.h" #include "backgroundselector.h" KBounceMainWindow::KBounceMainWindow() { + //setComponentName(QStringLiteral("kbounce"), i18n("KBounce")); m_statusBar = statusBar(); - m_statusBar->insertItem( i18n( "Level: %1", QString::fromLatin1( "XX" ) ), 1, 1 ); - m_statusBar->insertItem( i18n( "Score: %1", QString::fromLatin1( "XXXXXX" ) ), 2, 1 ); - m_statusBar->insertItem( i18n( "Filled: %1%", QString::fromLatin1( "XX" ) ), 3, 1 ); - m_statusBar->insertItem( i18n( "Lives: %1", QString::fromLatin1( "XX" ) ), 4, 1 ); - m_statusBar->insertItem( i18n( "Time: %1", QString::fromLatin1( "XXX" ) ), 5, 1 ); - + + levelLabel->setText(i18n("Level: %1", QString::fromLatin1( "XX" ))); + scoreLabel->setText(i18n("Score: %1", QString::fromLatin1( "XXXXXX" ))); + filledLabel->setText(i18n( "Filled: %1%", QString::fromLatin1( "XX" ))); + livesLabel->setText(i18n( "Lives: %1", QString::fromLatin1( "XX" ))); + timeLabel->setText(i18n( "Time: %1", QString::fromLatin1( "XXX" ))); + + m_statusBar->insertPermanentWidget(0, levelLabel, 1); + m_statusBar->insertPermanentWidget(1, scoreLabel, 1); + m_statusBar->insertPermanentWidget(2, filledLabel, 1); + m_statusBar->insertPermanentWidget(3, livesLabel, 1); + m_statusBar->insertPermanentWidget(4, timeLabel, 1); + m_gameWidget = new KBounceGameWidget( this ); connect( m_gameWidget, SIGNAL(levelChanged(int)), this, SLOT(displayLevel(int)) ); connect( m_gameWidget, SIGNAL(scoreChanged(int)), this, SLOT(displayScore(int)) ); @@ -165,7 +171,7 @@ return; } - kDebug() ; + qDebug() ; KScoreDialog ksdialog( KScoreDialog::Name | KScoreDialog::Score | KScoreDialog::Level, this ); ksdialog.initFromDifficulty(Kg::difficulty()); KScoreDialog::FieldInfo info; @@ -182,7 +188,6 @@ KConfigDialog* dialog = new KConfigDialog( this, "settings", KBounceSettings::self()); dialog->addPage( new KgThemeSelector(m_gameWidget->renderer()->themeProvider(), 0, dialog), i18n( "Theme" ), "games-config-theme" ); dialog->addPage( new BackgroundSelector(dialog,KBounceSettings::self() ),i18n("Background"),"games-config-background"); - dialog->setHelp(QString(),"kbounce"); dialog->show(); connect( dialog, SIGNAL(settingsChanged(QString)), this, SLOT(settingsChanged()) ); } @@ -196,7 +201,7 @@ void KBounceMainWindow::settingsChanged() { m_gameWidget->settingsChanged(); - KBounceSettings::self()->writeConfig(); // Bug 184606 + KBounceSettings::self()->save(); // Bug 184606 } void KBounceMainWindow::setSounds( bool val ) @@ -207,27 +212,27 @@ void KBounceMainWindow::displayLevel( int level ) { - m_statusBar->changeItem( i18n( "Level: %1", level ), 1 ); + levelLabel->setText(i18n("Level: %1", level)); } void KBounceMainWindow::displayScore( int score ) { - m_statusBar->changeItem( i18n( "Score: %1", score ), 2 ); + scoreLabel->setText(i18n("Score: %1", score)); } void KBounceMainWindow::displayFilled( int filled ) { - m_statusBar->changeItem( i18n( "Filled: %1%", filled ), 3 ); + filledLabel->setText(i18n("Filled: %1%", filled)); } void KBounceMainWindow::displayLives( int lives ) { - m_statusBar->changeItem( i18n( "Lives: %1", lives - 1 ), 4 ); + livesLabel->setText(i18n("Lives: %1", lives - 1)); } void KBounceMainWindow::displayTime( int time ) { - m_statusBar->changeItem( i18n( "Time: %1", time ), 5 ); + timeLabel->setText(i18n("Time: %1", time)); } void KBounceMainWindow::gameStateChanged( KBounceGameWidget::State state ) @@ -315,4 +320,4 @@ // } -#include "mainwindow.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/mainwindow.h new/kbounce-15.04.0/mainwindow.h --- old/kbounce-14.12.3/mainwindow.h 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/mainwindow.h 2015-03-18 07:29:07.000000000 +0100 @@ -21,10 +21,13 @@ #include <KXmlGuiWindow> +#include <QLabel> +#include <QPointer> + #include "gamewidget.h" -class KAction; -class KStatusBar; +class QAction; +class QStatusBar; class KToggleAction; @@ -60,10 +63,16 @@ KBounceGameWidget* m_gameWidget; - KStatusBar* m_statusBar; + QStatusBar* m_statusBar; KToggleAction *m_pauseAction, *m_backgroundShowAction, *m_soundAction; - KAction *m_newAction; + QAction *m_newAction; + + QPointer<QLabel> levelLabel = new QLabel; + QPointer<QLabel> scoreLabel = new QLabel; + QPointer<QLabel> filledLabel = new QLabel; + QPointer<QLabel> livesLabel = new QLabel; + QPointer<QLabel> timeLabel = new QLabel; }; #endif // KBOUNCE_MAINWINDOW_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/org.kde.kbounce.desktop new/kbounce-15.04.0/org.kde.kbounce.desktop --- old/kbounce-14.12.3/org.kde.kbounce.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kbounce-15.04.0/org.kde.kbounce.desktop 2015-03-18 07:29:07.000000000 +0100 @@ -0,0 +1,130 @@ +[Desktop Entry] +Name=KBounce +Name[af]=K-hop +Name[ast]=KBounce +Name[be]=Несуцішныя шарыкі +Name[bn]=কে-বাউন্স +Name[br]=KBounce +Name[bs]=KBounce +Name[ca]=KBounce +Name[ca@valencia]=KBounce +Name[cs]=KBounce +Name[cy]=KBounce +Name[da]=KBounce +Name[de]=KBounce +Name[el]=KBounce +Name[en_GB]=KBounce +Name[eo]=KBounce +Name[es]=KBounce +Name[et]=KBounce +Name[eu]=KBounce +Name[fa]=پرش +Name[fi]=KBounce +Name[fr]=KBounce +Name[ga]=KBounce +Name[gl]=KBounce +Name[he]=KBounce +Name[hne]=के-बाउंस +Name[hr]=KBounce +Name[hu]=KBounce +Name[is]=KBounce +Name[it]=KBounce +Name[ja]=KBounce +Name[kk]=KBounce +Name[km]=KBounce +Name[ko]=KBounce +Name[lt]=KBounce +Name[lv]=KBounce +Name[mk]=KBounce +Name[mr]=के-बाउंस +Name[nb]=KBounce +Name[nds]=KBounce +Name[ne]=केडीई उफ्रिने +Name[nl]=KBounce +Name[nn]=KBounce +Name[pa]=ਕੇ-ਬਾਊਂਸ +Name[pl]=KOdbij +Name[pt]=KBounce +Name[pt_BR]=KBounce +Name[ro]=Bilă săritoare +Name[ru]=KBounce +Name[se]=KBounce +Name[sk]=KBounce +Name[sl]=KBounce +Name[sq]=KBounce +Name[sr]=К‑одбој +Name[sr@ijekavian]=К‑одбој +Name[sr@ijekavianlatin]=K‑odboj +Name[sr@latin]=K‑odboj +Name[sv]=Kstuds +Name[ta]=கேபவுன்ஸ் +Name[tg]=KТӯби ҷаҳанда +Name[tr]=KBounce +Name[ug]=KBounce +Name[uk]=KBounce +Name[vi]=KBounce +Name[wa]=KBounce +Name[xh]=KBounce +Name[x-test]=xxKBouncexx +Name[zh_CN]=KBounce +Name[zh_TW]=KBounce 彈力球 + +Type=Application +Exec=kbounce -qwindowtitle %c +X-DocPath=kbounce/index.html +Icon=kbounce + +GenericName=Ball Bouncing Game +GenericName[ast]=Xuegu nel que reboten les boles +GenericName[bs]=Igra lopta koja odskače +GenericName[ca]=Un joc de pilotes rebotant +GenericName[ca@valencia]=Un joc de pilotes rebotant +GenericName[cs]=Hra s poskakujícími míčky +GenericName[da]=Et spil med hoppende bolde +GenericName[de]=Bälle einfangen +GenericName[el]=Παιχνίδι αναπήδησης μπάλας +GenericName[en_GB]=Ball Bouncing Game +GenericName[eo]=Ludo de saltadantaj pilkoj +GenericName[es]=Juego de pelotas que rebotan +GenericName[et]=Pallipõrgatamise mäng +GenericName[eu]=Pilotak boteak ematen jokoa +GenericName[fa]=بازی پرش توپها +GenericName[fi]=Pallopeli +GenericName[fr]=Jeu de balles rebondissantes +GenericName[ga]=Cluiche Liathróide Preabtha +GenericName[gl]=Xogo de bólas que botan +GenericName[hne]=उछलती गेंदों वाले खेल +GenericName[hu]=Labdajáték +GenericName[it]=Gioco di rimbalzi di palline +GenericName[ja]=跳ねるボールのゲーム +GenericName[kk]=Доп қағу ойны +GenericName[km]=ល្បែងបាល់លោត +GenericName[ko]=튕기는 공 게임 +GenericName[lv]=Atlēcošās bumbiņas spēle +GenericName[mr]=चेंडू उडविण्याचा खेळ +GenericName[nb]=Sprettballspill +GenericName[nds]=Speel mit springen Bäll +GenericName[nl]=Stuiterbalspel +GenericName[nn]=Sprettballspel +GenericName[pl]=Gra w odbijanie kul +GenericName[pt]=Jogo de Bolas aos Saltos +GenericName[pt_BR]=Jogo de bolas rebatidas +GenericName[ro]=Joc cu o minge săritoare +GenericName[ru]=Неуёмные шарики +GenericName[sk]=Hra s poskakujúcou loptou +GenericName[sl]=Odbijajoča se žogica +GenericName[sq]=Lojë me top që kërcen +GenericName[sr]=Игра одбијајућих лопти +GenericName[sr@ijekavian]=Игра одбијајућих лопти +GenericName[sr@ijekavianlatin]=Igra odbijajućih lopti +GenericName[sr@latin]=Igra odbijajućih lopti +GenericName[sv]=Studsande bollar +GenericName[tr]=Top Zıplatma Oyunu +GenericName[ug]=توپنى سەكرىتىش ئويۇنى +GenericName[uk]=Гра з відбиття м’ячика +GenericName[x-test]=xxBall Bouncing Gamexx +GenericName[zh_CN]=弹球游戏 +GenericName[zh_TW]=彈力球遊戲 +X-DBUS-StartupType=Multi +Categories=Qt;KDE;Game;ArcadeGame; +X-DBUS-ServiceName=org.kde.kbounce Files old/kbounce-14.12.3/pics/16-apps-kbounce.png and new/kbounce-15.04.0/pics/16-apps-kbounce.png differ Files old/kbounce-14.12.3/pics/22-apps-kbounce.png and new/kbounce-15.04.0/pics/22-apps-kbounce.png differ Files old/kbounce-14.12.3/pics/32-apps-kbounce.png and new/kbounce-15.04.0/pics/32-apps-kbounce.png differ Files old/kbounce-14.12.3/pics/48-apps-kbounce.png and new/kbounce-15.04.0/pics/48-apps-kbounce.png differ Files old/kbounce-14.12.3/pics/64-apps-kbounce.png and new/kbounce-15.04.0/pics/64-apps-kbounce.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/pics/CMakeLists.txt new/kbounce-15.04.0/pics/CMakeLists.txt --- old/kbounce-14.12.3/pics/CMakeLists.txt 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/pics/CMakeLists.txt 2015-03-18 07:29:07.000000000 +0100 @@ -1 +1,9 @@ -kde4_install_icons( ${ICON_INSTALL_DIR} ) +ecm_install_icons(ICONS + 16-apps-kbounce.png + 22-apps-kbounce.png + 32-apps-kbounce.png + 48-apps-kbounce.png + 64-apps-kbounce.png + DESTINATION ${ICON_INSTALL_DIR} + THEME hicolor +) Files old/kbounce-14.12.3/pics/hi16-app-kbounce.png and new/kbounce-15.04.0/pics/hi16-app-kbounce.png differ Files old/kbounce-14.12.3/pics/hi22-app-kbounce.png and new/kbounce-15.04.0/pics/hi22-app-kbounce.png differ Files old/kbounce-14.12.3/pics/hi32-app-kbounce.png and new/kbounce-15.04.0/pics/hi32-app-kbounce.png differ Files old/kbounce-14.12.3/pics/hi48-app-kbounce.png and new/kbounce-15.04.0/pics/hi48-app-kbounce.png differ Files old/kbounce-14.12.3/pics/hi64-app-kbounce.png and new/kbounce-15.04.0/pics/hi64-app-kbounce.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/renderer.cpp new/kbounce-15.04.0/renderer.cpp --- old/kbounce-14.12.3/renderer.cpp 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/renderer.cpp 2015-03-18 07:29:07.000000000 +0100 @@ -23,12 +23,12 @@ #include "renderer.h" #include "settings.h" -#include <kdebug.h> - -#include <QtGui/QApplication> #include <QtGui/QPainter> #include <QtGui/QPalette> #include <QDir> +#include <QDebug> +#include <QApplication> + #include <krandom.h> #include <KgThemeProvider> @@ -95,7 +95,7 @@ { //This is a dirty fix to the qt's m_svgRenderer.render() method that //leaves an garbage-filled border of a pixmap - kDebug() << "Rendering the background. Size:" << m_backgroundSize; + qDebug() << "Rendering the background. Size:" << m_backgroundSize; if ( m_useRandomBackgrounds && loadNewBackgroundPixmap() ) { return m_cachedBackground; @@ -111,7 +111,7 @@ // list directory QDir dir( path, "*.png *.jpg", QDir::Name|QDir::IgnoreCase, QDir::Files ); if ( !dir.exists() ) { - kDebug() << "CustomBackground Directory not found" << endl; + qDebug() << "CustomBackground Directory not found" << endl; return QPixmap(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/renderer.h new/kbounce-15.04.0/renderer.h --- old/kbounce-14.12.3/renderer.h 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/renderer.h 2015-03-18 07:29:07.000000000 +0100 @@ -22,8 +22,7 @@ #ifndef RENDERER_H #define RENDERER_H -#include <QSvgRenderer> -#include <KPixmapCache> +#include <QtSvg/QSvgRenderer> #include <KGameRenderer> #include <QSize> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-14.12.3/wall.cpp new/kbounce-15.04.0/wall.cpp --- old/kbounce-14.12.3/wall.cpp 2014-12-31 07:59:08.000000000 +0100 +++ new/kbounce-15.04.0/wall.cpp 2015-03-18 07:29:07.000000000 +0100 @@ -20,10 +20,10 @@ #include <cmath> -#include <kdebug.h> #include <KRandom> -#include <KStandardDirs> + #include <QPainter> +#include <QStandardPaths> #include "board.h" #include "renderer.h" @@ -38,8 +38,8 @@ : KGameRenderedItem( renderer,"",board ) , m_board( board ) , m_dir( dir ) -, m_soundWallstart( KStandardDirs::locate( "appdata", "sounds/wallstart.wav" ) ) -, m_soundReflect( KStandardDirs::locate( "appdata", "sounds/reflect.wav" ) ) +, m_soundWallstart( QStandardPaths::locate( QStandardPaths::DataLocation, "sounds/wallstart.wav" ) ) +, m_soundReflect( QStandardPaths::locate( QStandardPaths::DataLocation, "sounds/reflect.wav" ) ) { // The wall velocity would initialised on every new level. m_wallVelocity = 0.0; @@ -318,5 +318,5 @@ } -#include "wall.moc" +
