Hello community,
here is the log from the commit of package kjumpingcube for openSUSE:Factory checked in at 2015-05-11 18:07:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kjumpingcube (Old)
and /work/SRC/openSUSE:Factory/.kjumpingcube.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjumpingcube"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kjumpingcube/kjumpingcube.changes 2015-03-11 09:49:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kjumpingcube.new/kjumpingcube.changes 2015-05-11 18:07:26.000000000 +0200
@@ -1,0 +2,22 @@
+Sat Apr 11 13:17:00 UTC 2015 - tittiatcoke@gmail.com
+
+- 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:10:42 UTC 2015 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.03.95
+ * KDE Applications 15.04 RC
+
+
+-------------------------------------------------------------------
+Sun Mar 8 12:45:56 UTC 2015 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.03.80
+ * KDE Applications 15.04 Beta
+
+
+-------------------------------------------------------------------
Old:
----
kjumpingcube-14.12.3.tar.xz
New:
----
kjumpingcube-15.04.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kjumpingcube.spec ++++++
--- /var/tmp/diff_new_pack.KhFSd5/_old 2015-05-11 18:07:27.000000000 +0200
+++ /var/tmp/diff_new_pack.KhFSd5/_new 2015-05-11 18:07:27.000000000 +0200
@@ -18,16 +18,36 @@
Name: kjumpingcube
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: Tactical board 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: kjumpingcube-%{version}.tar.xz
+Obsoletes: %{name}5 < %{version}
+Provides: %{name}5 = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%kde4_runtime_requires
%description
KJumpingCube is a tactical one or two-player game. The playing field
@@ -39,22 +59,22 @@
%setup -q -n kjumpingcube-%{version}
%build
- %cmake_kde4 -d build
+ %cmake_kf5 -d build
%make_jobs
%install
- cd build
- %kde4_makeinstall
- %kde_post_install
+ %kf5_makeinstall -C build
%files
%defattr(-,root,root)
%doc COPYING COPYING.DOC
-%{_kde4_bindir}/kjumpingcube
-%{_kde4_htmldir}/en/kjumpingcube/
-%{_kde4_applicationsdir}/kjumpingcube.desktop
-%{_kde4_iconsdir}/hicolor/*/apps/kjumpingcube.*
-%{_kde4_appsdir}/kjumpingcube/
-%{_kde4_configkcfgdir}/kjumpingcube.kcfg
+%{_kf5_bindir}/kjumpingcube
+%{_kf5_htmldir}/en/kjumpingcube/
+%{_kf5_applicationsdir}/org.kde.kjumpingcube.desktop
+%{_kf5_iconsdir}/hicolor/*/apps/kjumpingcube.*
+%{_kf5_appsdir}/kjumpingcube/
+%dir %{_kf5_configkcfgdir}
+%{_kf5_configkcfgdir}/kjumpingcube.kcfg
+%_datadir/kxmlgui5/kjumpingcube/
%changelog
++++++ kjumpingcube-14.12.3.tar.xz -> kjumpingcube-15.04.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/CMakeLists.txt new/kjumpingcube-15.04.0/CMakeLists.txt
--- old/kjumpingcube-14.12.3/CMakeLists.txt 2014-12-31 07:59:19.000000000 +0100
+++ new/kjumpingcube-15.04.0/CMakeLists.txt 2015-03-25 13:23:44.000000000 +0100
@@ -1,15 +1,40 @@
project(kjumpingcube)
-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
+ ItemModels
+ WidgetsAddons
+ WindowSystem
+ Config
+ DBusAddons
+ I18n
+ ConfigWidgets
+ TextWidgets
+ XmlGui
+ KIO
+ NotifyConfig
+ NewStuff
+ KDELibs4Support)
+
+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="kjumpingcube")
add_subdirectory( pics )
add_subdirectory( doc )
@@ -27,27 +52,27 @@
ai_newton.cpp
ai_box.cpp )
-kde4_add_ui_files(kjumpingcube_SRCS settings.ui )
+ki18n_wrap_ui(kjumpingcube_SRCS settings.ui )
-kde4_add_kcfg_files(kjumpingcube_SRCS prefs.kcfgc )
+kconfig_add_kcfg_files(kjumpingcube_SRCS prefs.kcfgc )
-kde4_add_app_icon(kjumpingcube_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-kjumpingcube.png")
-kde4_add_executable(kjumpingcube ${kjumpingcube_SRCS})
+kde4_add_app_icon(kjumpingcube_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-apps-kjumpingcube.png")
+add_executable(kjumpingcube ${kjumpingcube_SRCS})
-target_link_libraries(kjumpingcube ${KDE4_KIO_LIBS} kdegames )
+target_link_libraries(kjumpingcube KF5::KIOCore KF5KDEGames KF5::XmlGui KF5::KDELibs4Support Qt5::Svg)
install(TARGETS kjumpingcube ${INSTALL_TARGETS_DEFAULT_ARGS} )
########### install files ###############
-install( PROGRAMS kjumpingcube.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( PROGRAMS org.kde.kjumpingcube.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES kjumpingcube.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
-install( FILES kjumpingcubeui.rc DESTINATION ${DATA_INSTALL_DIR}/kjumpingcube )
-
-kde4_install_icons( ${ICON_INSTALL_DIR} )
+install( FILES kjumpingcubeui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kjumpingcube )
+ecm_install_icons( ICONS hi128-apps-kjumpingcube.png hi16-apps-kjumpingcube.png hi22-apps-kjumpingcube.png hi32-apps-kjumpingcube.png hi48-apps-kjumpingcube.png hi64-apps-kjumpingcube.png DESTINATION ${ICON_INSTALL_DIR} )
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/ai_box.cpp new/kjumpingcube-15.04.0/ai_box.cpp
--- old/kjumpingcube-14.12.3/ai_box.cpp 2014-12-31 07:59:19.000000000 +0100
+++ new/kjumpingcube-15.04.0/ai_box.cpp 2015-03-25 13:23:44.000000000 +0100
@@ -17,8 +17,7 @@
**************************************************************************** */
#include "ai_box.h"
-// #include <QStack>
-
+//
#include <QDebug>
#include "stdio.h"
@@ -430,4 +429,4 @@
}
#endif
-#include "ai_box.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/ai_main.cpp new/kjumpingcube-15.04.0/ai_main.cpp
--- old/kjumpingcube-14.12.3/ai_main.cpp 2014-12-31 07:59:19.000000000 +0100
+++ new/kjumpingcube-15.04.0/ai_main.cpp 2015-03-25 13:23:44.000000000 +0100
@@ -24,10 +24,8 @@
#include "ai_newton.h"
#include "ai_box.h"
-#include <QApplication>
#include <QDebug>
-#include <QTime>
#include "prefs.h"
@@ -123,7 +121,7 @@
m_random.setSeed (0);
- connect (m_thread, SIGNAL(done(int)), this, SIGNAL(done(int)));
+ connect(m_thread, &ThreadedAI::done, this, &AI_Main::done);
}
AI_Main::~AI_Main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/doc/CMakeLists.txt new/kjumpingcube-15.04.0/doc/CMakeLists.txt
--- old/kjumpingcube-14.12.3/doc/CMakeLists.txt 2014-12-31 07:59:19.000000000 +0100
+++ new/kjumpingcube-15.04.0/doc/CMakeLists.txt 2015-03-25 13:23:44.000000000 +0100
@@ -1,4 +1,4 @@
########### install files ###############
#
#
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kjumpingcube)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kjumpingcube)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/doc/index.docbook new/kjumpingcube-15.04.0/doc/index.docbook
--- old/kjumpingcube-14.12.3/doc/index.docbook 2014-12-31 07:59:19.000000000 +0100
+++ new/kjumpingcube-15.04.0/doc/index.docbook 2015-03-25 13:23:44.000000000 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--IMPORTANT: please note that'do not change this!' notice does not apply to translators -->
-<!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 "&kjumpingcube;">
<!ENTITY kappversion "2.1"><!--Application version. Use this variable everywhere it's needed.-->
<!ENTITY package "kdegames"> <!-- do not change this! -->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/game.cpp new/kjumpingcube-15.04.0/game.cpp
--- old/kjumpingcube-14.12.3/game.cpp 2014-12-31 07:59:19.000000000 +0100
+++ new/kjumpingcube-15.04.0/game.cpp 2015-03-25 13:23:44.000000000 +0100
@@ -27,13 +27,12 @@
#include "settingswidget.h"
#include <KConfigDialog> // IDW test.
-
+#include <QDebug>
#include <KLocalizedString>
#include <KMessageBox>
-#include <KFileDialog>
-#include <KTemporaryFile>
+#include <QFileDialog>
+#include <QTemporaryFile>
#include
-#include <QTimer>
#include "prefs.h"
@@ -66,9 +65,9 @@
m_ai = new AI_Main (this, m_side);
m_steps = new QList<int>;
- connect (m_view, SIGNAL(mouseClick(int,int)), SLOT(startHumanMove(int,int)));
- connect (m_ai, SIGNAL(done(int)), SLOT(moveCalculationDone(int)));
- connect (m_view, SIGNAL(animationDone(int)), SLOT(animationDone(int)));
+ connect(m_view, &KCubeBoxWidget::mouseClick, this, &Game::startHumanMove);
+ connect(m_ai, &AI_Main::done, this, &Game::moveCalculationDone);
+ connect(m_view, &KCubeBoxWidget::animationDone, this, &Game::animationDone);
}
Game::~Game()
@@ -134,7 +133,7 @@
settings->setFaceType (KPageDialog::Plain);
SettingsWidget * widget = new SettingsWidget (m_parent);
settings->addPage (widget, i18n("General"), "games-config-options");
- connect (settings, SIGNAL(settingsChanged(QString)), SLOT(newSettings()));
+ connect(settings, &KConfigDialog::settingsChanged, this, &Game::newSettings);
m_settingsPage = widget; // Used when reverting/editing settings.
}
if (! show) return;
@@ -293,8 +292,7 @@
setStopAction();
emit setAction (HINT, false);
if (isComputer (m_currentPlayer)) {
- emit statusMessage (i18n("Computer player %1 is moving")
- .arg(m_currentPlayer), false);
+ emit statusMessage (i18n("Computer player %1 is moving", m_currentPlayer), false);
}
m_ai->getMove (m_currentPlayer, m_box);
}
@@ -564,10 +562,10 @@
{
if (saveAs || m_gameURL.isEmpty()) {
int result=0;
- KUrl url;
+ QUrl url;
do {
- url = KFileDialog::getSaveUrl (m_gameURL.url(), "*.kjc", m_view, 0);
+ url = QFileDialog::getSaveFileUrl (m_view, QString(), m_gameURL.url(), "*.kjc");
if (url.isEmpty())
return;
@@ -575,7 +573,8 @@
// check filename
QRegExp pattern ("*.kjc", Qt::CaseSensitive, QRegExp::Wildcard);
if (! pattern.exactMatch (url.fileName())) {
- url.setFileName (url.fileName()+".kjc");
+ url = url.adjusted(QUrl::RemoveFilename);
+ url.setPath(url.path() + url.fileName()+".kjc");
}
if (KIO::NetAccess::exists (url, KIO::NetAccess::DestinationSide,
@@ -592,7 +591,7 @@
m_gameURL = url;
}
- KTemporaryFile tempFile;
+ QTemporaryFile tempFile;
tempFile.open();
KConfig config (tempFile.fileName(), KConfig::SimpleConfig);
KConfigGroup main (&config, "KJumpingCube");
@@ -613,10 +612,10 @@
void Game::loadGame()
{
bool fileOk=true;
- KUrl url;
+ QUrl url;
do {
- url = KFileDialog::getOpenUrl (m_gameURL.url(), "*.kjc", m_view, 0);
+ url = QFileDialog::getOpenFileUrl (m_view, QString(), m_gameURL.url(), "*.kjc");
if (url.isEmpty())
return;
if (! KIO::NetAccess::exists(url, KIO::NetAccess::SourceSide, m_view)) {
@@ -699,7 +698,7 @@
if (m_settingsPage) {
m_settingsPage->kcfg_CubeDim->setValue (m_side);
}
- Prefs::self()->writeConfig();
+ Prefs::self()->save();
}
qDebug() << "CONTINUE GAME";
return false; // Continue the current game.
@@ -886,7 +885,7 @@
// Restore the game and player settings.
loadSavedSettings (config);
- Prefs::self()->writeConfig();
+ Prefs::self()->save();
setUpNextTurn();
}
@@ -966,4 +965,4 @@
}
}
-#include "game.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/game.h new/kjumpingcube-15.04.0/game.h
--- old/kjumpingcube-14.12.3/game.h 2014-12-31 07:59:19.000000000 +0100
+++ new/kjumpingcube-15.04.0/game.h 2015-03-25 13:23:44.000000000 +0100
@@ -25,7 +25,7 @@
#include <QTime> // IDW test.
-#include <KUrl>
+#include <QUrl>
#include <QList>
class KConfigGroup;
@@ -33,7 +33,6 @@
class SettingsWidget;
class AI_Main;
class AI_Box;
-class QTimer;
/**
* Codes for actions available to users of the Game class.
@@ -267,7 +266,7 @@
bool m_pauseForComputer; // If true, pause before each AI move.
bool m_pauseForStep; // If true, pause before animation step.
- KUrl m_gameURL; // Location of load/save file.
+ QUrl m_gameURL; // Location of load/save file.
private slots:
void newGame(); // Slot needed for queued invocation.
Files old/kjumpingcube-14.12.3/hi128-app-kjumpingcube.png and new/kjumpingcube-15.04.0/hi128-app-kjumpingcube.png differ
Files old/kjumpingcube-14.12.3/hi128-apps-kjumpingcube.png and new/kjumpingcube-15.04.0/hi128-apps-kjumpingcube.png differ
Files old/kjumpingcube-14.12.3/hi16-app-kjumpingcube.png and new/kjumpingcube-15.04.0/hi16-app-kjumpingcube.png differ
Files old/kjumpingcube-14.12.3/hi16-apps-kjumpingcube.png and new/kjumpingcube-15.04.0/hi16-apps-kjumpingcube.png differ
Files old/kjumpingcube-14.12.3/hi22-app-kjumpingcube.png and new/kjumpingcube-15.04.0/hi22-app-kjumpingcube.png differ
Files old/kjumpingcube-14.12.3/hi22-apps-kjumpingcube.png and new/kjumpingcube-15.04.0/hi22-apps-kjumpingcube.png differ
Files old/kjumpingcube-14.12.3/hi32-app-kjumpingcube.png and new/kjumpingcube-15.04.0/hi32-app-kjumpingcube.png differ
Files old/kjumpingcube-14.12.3/hi32-apps-kjumpingcube.png and new/kjumpingcube-15.04.0/hi32-apps-kjumpingcube.png differ
Files old/kjumpingcube-14.12.3/hi48-app-kjumpingcube.png and new/kjumpingcube-15.04.0/hi48-app-kjumpingcube.png differ
Files old/kjumpingcube-14.12.3/hi48-apps-kjumpingcube.png and new/kjumpingcube-15.04.0/hi48-apps-kjumpingcube.png differ
Files old/kjumpingcube-14.12.3/hi64-app-kjumpingcube.png and new/kjumpingcube-15.04.0/hi64-app-kjumpingcube.png differ
Files old/kjumpingcube-14.12.3/hi64-apps-kjumpingcube.png and new/kjumpingcube-15.04.0/hi64-apps-kjumpingcube.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/kcubeboxwidget.cpp new/kjumpingcube-15.04.0/kcubeboxwidget.cpp
--- old/kjumpingcube-14.12.3/kcubeboxwidget.cpp 2014-12-31 07:59:19.000000000 +0100
+++ new/kjumpingcube-15.04.0/kcubeboxwidget.cpp 2015-03-25 13:23:44.000000000 +0100
@@ -22,15 +22,14 @@
#include "kcubeboxwidget.h"
#include <KgTheme>
-#include <KStandardDirs>
-#include <KLocalizedString>
-#include <KMessageBox>
+
#include <QTimer>
#include <QLabel>
#include <QPainter>
#include
#include
+#include <QStandardPaths>
#include "prefs.h"
@@ -186,8 +185,7 @@
color0 = Prefs::color0();
KgTheme theme((QByteArray()));
- theme.readFromDesktopFile(KStandardDirs::locate("appdata",
- "pics/default.desktop"));
+ theme.readFromDesktopFile(QStandardPaths::locate(QStandardPaths::DataLocation, "pics/default.desktop"));
svg.load (theme.graphicsPath());
initCubes();
@@ -199,8 +197,8 @@
m_highlightTimer->setInterval (1500);
m_highlighted = -1;
- connect (animationTimer, SIGNAL(timeout()), SLOT(nextAnimationStep()));
- connect (m_highlightTimer, SIGNAL(timeout()), SLOT(highlightDone()));
+ connect(animationTimer, &QTimer::timeout, this, &KCubeBoxWidget::nextAnimationStep);
+ connect(m_highlightTimer, &QTimer::timeout, this, &KCubeBoxWidget::highlightDone);
setNormalCursor();
setPopup();
}
@@ -216,8 +214,7 @@
cubes.append (cube);
cube->setCoordinates (n / m_side, n % m_side, m_side - 1);
cube->setPixmaps (&elements);
- connect (cube, SIGNAL (clicked(int,int)),
- SLOT (checkClick(int,int)));
+ connect(cube, &KCubeWidget::clicked, this, &KCubeBoxWidget::checkClick);
cube->show();
}
}
@@ -513,4 +510,4 @@
update();
}
-#include "kcubeboxwidget.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/kcubeboxwidget.h new/kjumpingcube-15.04.0/kcubeboxwidget.h
--- old/kjumpingcube-14.12.3/kcubeboxwidget.h 2014-12-31 07:59:19.000000000 +0100
+++ new/kjumpingcube-15.04.0/kcubeboxwidget.h 2015-03-25 13:23:44.000000000 +0100
@@ -32,7 +32,6 @@
#include <QResizeEvent>
#include <QList>
-class KConfigGroup;
class QTimer;
class QLabel;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/kcubewidget.cpp new/kjumpingcube-15.04.0/kcubewidget.cpp
--- old/kjumpingcube-14.12.3/kcubewidget.cpp 2014-12-31 07:59:19.000000000 +0100
+++ new/kjumpingcube-15.04.0/kcubewidget.cpp 2015-03-25 13:23:44.000000000 +0100
@@ -286,4 +286,4 @@
p.end();
}
-#include "kcubewidget.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/kjumpingcube.cpp new/kjumpingcube-15.04.0/kjumpingcube.cpp
--- old/kjumpingcube-14.12.3/kjumpingcube.cpp 2014-12-31 07:59:19.000000000 +0100
+++ new/kjumpingcube-15.04.0/kjumpingcube.cpp 2015-03-25 13:23:44.000000000 +0100
@@ -26,17 +26,15 @@
#include "prefs.h"
#include <QSignalMapper>
-#include <QRegExp>
-
-#include
+#include <QStatusBar>
+#include <KLocalizedString>
#include
#include
-#include
+#include <QAction>
#include
-#include
#include
#include
-#include
+#include <QWidgetAction>
#define MESSAGE_TIME 2000
@@ -49,10 +47,10 @@
m_view->makeStatusPixmaps (30);
connect(m_game,SIGNAL(playerChanged(int)),SLOT(changePlayerColor(int)));
- connect(m_game,SIGNAL(buttonChange(bool,bool,const QString&)),
- SLOT(changeButton(bool,bool,const QString&)));
- connect(m_game,SIGNAL(statusMessage(const QString&, bool)),
- SLOT(statusMessage(const QString&, bool)));
+ connect(m_game,SIGNAL(buttonChange(bool,bool,QString)),
+ SLOT(changeButton(bool,bool,QString)));
+ connect(m_game,SIGNAL(statusMessage(QString,bool)),
+ SLOT(statusMessage(QString,bool)));
// Tell the KMainWindow that this is indeed the main widget.
setCentralWidget (m_view);
@@ -68,8 +66,8 @@
initKAction();
- connect (m_game, SIGNAL (setAction(const Action,const bool)),
- SLOT (setAction(const Action,const bool)));
+ connect (m_game, SIGNAL (setAction(Action,bool)),
+ SLOT (setAction(Action,bool)));
m_game->gameActions (NEW); // Start a new game.
}
@@ -132,8 +130,10 @@
gameMapper->setMapping (actionButton, BUTTON);
connect (actionButton, SIGNAL(clicked()), gameMapper, SLOT(map()));
- KAction * b = actionCollection()->addAction (QLatin1String ("action_button"));
- b->setDefaultWidget (actionButton); // Show the button on the toolbar.
+ QWidgetAction *widgetAction = new QWidgetAction(this);
+ widgetAction->setDefaultWidget(actionButton);
+ actionCollection()->addAction (QLatin1String ("action_button"), widgetAction);
+
changeButton (true, true); // Load the button's style sheet.
changeButton (false); // Set the button to be inactive.
@@ -189,4 +189,4 @@
}
}
-#include "kjumpingcube.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/kjumpingcube.desktop new/kjumpingcube-15.04.0/kjumpingcube.desktop
--- old/kjumpingcube-14.12.3/kjumpingcube.desktop 2014-12-31 07:59:19.000000000 +0100
+++ new/kjumpingcube-15.04.0/kjumpingcube.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,125 +0,0 @@
-[Desktop Entry]
-Name=KJumpingCube
-Name[af]=Kjumpingcube
-Name[ast]=KJumpingCube
-Name[be]=Скокаючы кубік
-Name[bn]=কে-জাম্পিংকিউব
-Name[br]=KDiñsALamm
-Name[bs]=KJumpingCube
-Name[ca]=KJumpingCube
-Name[ca@valencia]=KJumpingCube
-Name[cs]=KJumpingCube
-Name[cy]=KJumpingCube
-Name[da]=KJumpingCube
-Name[de]=KJumpingCube
-Name[el]=KJumpingCube
-Name[en_GB]=KJumpingCube
-Name[eo]=KJumpingCube
-Name[es]=KJumpingCube
-Name[et]=KJumpingCube
-Name[eu]=KJumpingCube
-Name[fa]=مکعب پرنده
-Name[fi]=KJumpingCube
-Name[fr]=KJumpingCube
-Name[ga]=KJumpingCube
-Name[gl]=KJumpingCube
-Name[he]=KJumpingCube
-Name[hne]=के-जम्पिंगक्यूब
-Name[hr]=KJumpingCube
-Name[hu]=Ugráló kocka
-Name[is]=Hoppandi kubbur
-Name[it]=KJumpingCube
-Name[ja]=KJumpingCube
-Name[kk]=KJumpingCube
-Name[km]=KJumpingCube
-Name[ko]=KJumpingCube
-Name[lt]=KJumpingCube
-Name[lv]=KJumpingCube
-Name[mk]=KJumpingCube
-Name[mr]=के-जम्पिंगक्यूब
-Name[nb]=KJumpingCube
-Name[nds]=KJumpingCube
-Name[ne]=केडीई जम्पिङ क्युब
-Name[nl]=KJumpingCube
-Name[nn]=KJumpingCube
-Name[pa]=ਕੇ-ਜੰਪ ਘਣ
-Name[pl]=KSkaczącySześcian
-Name[pt]=KJumpingCube
-Name[pt_BR]=KJumpingCube
-Name[ro]=Cubul săritor
-Name[ru]=KJumpingCube
-Name[se]=KJumpingCube
-Name[sk]=KJumpingCube
-Name[sl]=KJumpingCube
-Name[sq]=KJumpingCube
-Name[sr]=К‑скочикоцка
-Name[sr@ijekavian]=К‑скочикоцка
-Name[sr@ijekavianlatin]=K‑skočikocka
-Name[sr@latin]=K‑skočikocka
-Name[sv]=Hoppande kuben
-Name[ta]=கேகுதிக்கும் கனசதுரம்
-Name[tg]=KКубикҳои Ҷиҳанда
-Name[tr]=KJumpingCube
-Name[ug]=KJumpingCube
-Name[uk]=KJumpingCube
-Name[vi]=KJumpingCube
-Name[wa]=KJumpingCube
-Name[xh]=Ityhubhu yeKJumping
-Name[x-test]=xxKJumpingCubexx
-Name[zh_CN]=KJumpingCube
-Name[zh_TW]=KJumpingCube 跳躍立方體
-Exec=kjumpingcube -caption %c
-Icon=kjumpingcube
-Type=Application
-X-DocPath=kjumpingcube/index.html
-GenericName=Territory Capture Game
-GenericName[ast]=Xuegu de conquista del territoriu
-GenericName[bs]=Igra osvajanja teritorija
-GenericName[ca]=Joc de conquesta del territori
-GenericName[ca@valencia]=Joc de conquesta del territori
-GenericName[da]=Spil om at indtage områder
-GenericName[de]=Eroberungsspiel
-GenericName[el]=Παιχνίδι κατάληψης περιοχών
-GenericName[en_GB]=Territory Capture Game
-GenericName[es]=Juego de conquista del territorio
-GenericName[et]=Mänguala vallutamise mäng
-GenericName[eu]=Territorioak bereganatzeko jokoa
-GenericName[fi]=Alueenvaltauspeli
-GenericName[fr]=Jeu de capture de territoires
-GenericName[ga]=Cluiche Gabhála Talaimh
-GenericName[gl]=Xogo de captura de territorios
-GenericName[hu]=Területfoglaló
-GenericName[it]=Gioco di conquista del territorio
-GenericName[ja]=陣地獲得ゲーム
-GenericName[kk]=Жер жаулау ойны
-GenericName[km]=ល្បែងចាប់យកដែនដី
-GenericName[ko]=땅따먹기 게임
-GenericName[lt]=Teritorijos užgrobimo žaidimas
-GenericName[lv]=Teritorijas ieņemšanas spēle
-GenericName[mr]=क्षेत्र अंकित खेळ
-GenericName[nb]=Spill basert på områdekapring
-GenericName[nds]="Rebeden besetten"-Speel
-GenericName[nl]=Landverovertjespel
-GenericName[nn]=Spel basert på områdekapring
-GenericName[pl]=Gra w zajmowanie terytorium
-GenericName[pt]=Jogo de Captura do Território
-GenericName[pt_BR]=Jogo de captura de território
-GenericName[ro]=Joc de capturare a teritoriului
-GenericName[ru]=Захват территорий
-GenericName[sk]=Hra na obsadzovanie území
-GenericName[sl]=Igra osvajanja ozemlja
-GenericName[sr]=Игра заузимања територије
-GenericName[sr@ijekavian]=Игра заузимања територије
-GenericName[sr@ijekavianlatin]=Igra zauzimanja teritorije
-GenericName[sr@latin]=Igra zauzimanja teritorije
-GenericName[sv]=Terrängerövring
-GenericName[tr]=Bölge Ele Geçirme Oyunu
-GenericName[ug]=تېررىتورىيە ئىگىلەش ئويۇنى
-GenericName[uk]=Гра на захоплення територій
-GenericName[x-test]=xxTerritory Capture Gamexx
-GenericName[zh_CN]=版块占领游戏
-GenericName[zh_TW]=領土爭奪戰
-Terminal=false
-X-KDE-StartupNotify=true
-X-DBUS-StartupType=Multi
-Categories=Qt;KDE;Game;StrategyGame;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/main.cpp new/kjumpingcube-15.04.0/main.cpp
--- old/kjumpingcube-14.12.3/main.cpp 2014-12-31 07:59:19.000000000 +0100
+++ new/kjumpingcube-15.04.0/main.cpp 2015-03-25 13:23:44.000000000 +0100
@@ -21,11 +21,13 @@
**************************************************************************** */
#include "version.h"
#include "kjumpingcube.h"
-#include
-#include
-#include
-#include
-#include
+
+
+#include <KAboutData>
+#include <QApplication>
+#include <KLocalizedString>
+#include <QCommandLineParser>
+#include
static const char description[] =
@@ -33,30 +35,43 @@
int main(int argc, char *argv[])
{
- KAboutData aboutData( "kjumpingcube", 0, ki18n("KJumpingCube"),
- KJC_VERSION, ki18n(description), KAboutData::License_GPL,
- ki18n("(c) 1998-2000, Matthias Kiefer"), KLocalizedString(),
+ Kdelibs4ConfigMigrator migrate(QStringLiteral("kjumpingcube"));
+ migrate.setConfigFiles(QStringList() << QStringLiteral("kjumpingcuberc"));
+ migrate.setUiFiles(QStringList() << QStringLiteral("kjumpingcubeui.rc"));
+ migrate.migrate();
+ QApplication app(argc, argv);
+
+
+ KAboutData aboutData( "kjumpingcube", i18n("KJumpingCube"),
+ KJC_VERSION, i18n(description), KAboutLicense::GPL,
+ i18n("(c) 1998-2000, Matthias Kiefer"),
"http://games.kde.org/kjumpingcube" );
- aboutData.addAuthor(ki18n("Matthias Kiefer"),KLocalizedString(), "matthias.kiefer@gmx.de");
- aboutData.addAuthor(ki18n("Benjamin Meyer"),ki18n("Various improvements"), "ben+kjumpingcube@meyerhome.net");
- aboutData.addCredit(ki18n("Ian Wadham"),
- ki18n("Upgrade to KDE4 and SVG artwork support."),
+ aboutData.addAuthor(i18n("Matthias Kiefer"),QString(), "matthias.kiefer@gmx.de");
+ aboutData.addAuthor(i18n("Benjamin Meyer"),i18n("Various improvements"), "ben+kjumpingcube@meyerhome.net");
+ aboutData.addCredit(i18n("Ian Wadham"),
+ i18n("Upgrade to KDE4 and SVG artwork support."),
"iandw.au@gmail.com");
- aboutData.addCredit(ki18n("Eugene Trounev"),
- ki18n("Graphics for KDE 4.0 version."),
+ aboutData.addCredit(i18n("Eugene Trounev"),
+ i18n("Graphics for KDE 4.0 version."),
"irs_me@hotmail.com");
- KCmdLineArgs::init( argc, argv, &aboutData );
- KApplication application;
- KGlobal::locale()->insertCatalog( QLatin1String( "libkdegames" ));
+ QCommandLineParser parser;
+ KAboutData::setApplicationData(aboutData);
+ parser.addVersionOption();
+ parser.addHelpOption();
+ aboutData.setupCommandLine(&parser);
+ parser.process(app);
+ aboutData.processCommandLine(&parser);
+
+ app.setWindowIcon(QIcon::fromTheme(QLatin1String("kjumpingcube")));
// All session management is handled in the RESTORE macro
- if (application.isSessionRestored()) {
+ if (app.isSessionRestored()) {
RESTORE(KJumpingCube)
}
else {
KJumpingCube *kjumpingcube = new KJumpingCube;
kjumpingcube->show();
}
- return application.exec();
+ return app.exec();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjumpingcube-14.12.3/org.kde.kjumpingcube.desktop new/kjumpingcube-15.04.0/org.kde.kjumpingcube.desktop
--- old/kjumpingcube-14.12.3/org.kde.kjumpingcube.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/kjumpingcube-15.04.0/org.kde.kjumpingcube.desktop 2015-03-25 13:23:44.000000000 +0100
@@ -0,0 +1,126 @@
+[Desktop Entry]
+Name=KJumpingCube
+Name[af]=Kjumpingcube
+Name[ast]=KJumpingCube
+Name[be]=Скокаючы кубік
+Name[bn]=কে-জাম্পিংকিউব
+Name[br]=KDiñsALamm
+Name[bs]=KJumpingCube
+Name[ca]=KJumpingCube
+Name[ca@valencia]=KJumpingCube
+Name[cs]=KJumpingCube
+Name[cy]=KJumpingCube
+Name[da]=KJumpingCube
+Name[de]=KJumpingCube
+Name[el]=KJumpingCube
+Name[en_GB]=KJumpingCube
+Name[eo]=KJumpingCube
+Name[es]=KJumpingCube
+Name[et]=KJumpingCube
+Name[eu]=KJumpingCube
+Name[fa]=مکعب پرنده
+Name[fi]=KJumpingCube
+Name[fr]=KJumpingCube
+Name[ga]=KJumpingCube
+Name[gl]=KJumpingCube
+Name[he]=KJumpingCube
+Name[hne]=के-जम्पिंगक्यूब
+Name[hr]=KJumpingCube
+Name[hu]=Ugráló kocka
+Name[is]=Hoppandi kubbur
+Name[it]=KJumpingCube
+Name[ja]=KJumpingCube
+Name[kk]=KJumpingCube
+Name[km]=KJumpingCube
+Name[ko]=KJumpingCube
+Name[lt]=KJumpingCube
+Name[lv]=KJumpingCube
+Name[mk]=KJumpingCube
+Name[mr]=के-जम्पिंगक्यूब
+Name[nb]=KJumpingCube
+Name[nds]=KJumpingCube
+Name[ne]=केडीई जम्पिङ क्युब
+Name[nl]=KJumpingCube
+Name[nn]=KJumpingCube
+Name[pa]=ਕੇ-ਜੰਪ ਘਣ
+Name[pl]=KSkaczącySześcian
+Name[pt]=KJumpingCube
+Name[pt_BR]=KJumpingCube
+Name[ro]=Cubul săritor
+Name[ru]=KJumpingCube
+Name[se]=KJumpingCube
+Name[sk]=KJumpingCube
+Name[sl]=KJumpingCube
+Name[sq]=KJumpingCube
+Name[sr]=К‑скочикоцка
+Name[sr@ijekavian]=К‑скочикоцка
+Name[sr@ijekavianlatin]=K‑skočikocka
+Name[sr@latin]=K‑skočikocka
+Name[sv]=Hoppande kuben
+Name[ta]=கேகுதிக்கும் கனசதுரம்
+Name[tg]=KКубикҳои Ҷиҳанда
+Name[tr]=KJumpingCube
+Name[ug]=KJumpingCube
+Name[uk]=KJumpingCube
+Name[vi]=KJumpingCube
+Name[wa]=KJumpingCube
+Name[xh]=Ityhubhu yeKJumping
+Name[x-test]=xxKJumpingCubexx
+Name[zh_CN]=KJumpingCube
+Name[zh_TW]=KJumpingCube 跳躍立方體
+Exec=kjumpingcube -qwindowtitle %c
+Icon=kjumpingcube
+Type=Application
+X-DocPath=kjumpingcube/index.html
+GenericName=Territory Capture Game
+GenericName[ast]=Xuegu de conquista del territoriu
+GenericName[bs]=Igra osvajanja teritorija
+GenericName[ca]=Joc de conquesta del territori
+GenericName[ca@valencia]=Joc de conquesta del territori
+GenericName[da]=Spil om at indtage områder
+GenericName[de]=Eroberungsspiel
+GenericName[el]=Παιχνίδι κατάληψης περιοχών
+GenericName[en_GB]=Territory Capture Game
+GenericName[es]=Juego de conquista del territorio
+GenericName[et]=Mänguala vallutamise mäng
+GenericName[eu]=Territorioak bereganatzeko jokoa
+GenericName[fi]=Alueenvaltauspeli
+GenericName[fr]=Jeu de capture de territoires
+GenericName[ga]=Cluiche Gabhála Talaimh
+GenericName[gl]=Xogo de captura de territorios
+GenericName[hu]=Területfoglaló
+GenericName[it]=Gioco di conquista del territorio
+GenericName[ja]=陣地獲得ゲーム
+GenericName[kk]=Жер жаулау ойны
+GenericName[km]=ល្បែងចាប់យកដែនដី
+GenericName[ko]=땅따먹기 게임
+GenericName[lt]=Teritorijos užgrobimo žaidimas
+GenericName[lv]=Teritorijas ieņemšanas spēle
+GenericName[mr]=क्षेत्र अंकित खेळ
+GenericName[nb]=Spill basert på områdekapring
+GenericName[nds]="Rebeden besetten"-Speel
+GenericName[nl]=Landverovertjespel
+GenericName[nn]=Spel basert på områdekapring
+GenericName[pl]=Gra w zajmowanie terytorium
+GenericName[pt]=Jogo de Captura do Território
+GenericName[pt_BR]=Jogo de captura de território
+GenericName[ro]=Joc de capturare a teritoriului
+GenericName[ru]=Захват территорий
+GenericName[sk]=Hra na obsadzovanie území
+GenericName[sl]=Igra osvajanja ozemlja
+GenericName[sr]=Игра заузимања територије
+GenericName[sr@ijekavian]=Игра заузимања територије
+GenericName[sr@ijekavianlatin]=Igra zauzimanja teritorije
+GenericName[sr@latin]=Igra zauzimanja teritorije
+GenericName[sv]=Terrängerövring
+GenericName[tr]=Bölge Ele Geçirme Oyunu
+GenericName[ug]=تېررىتورىيە ئىگىلەش ئويۇنى
+GenericName[uk]=Гра на захоплення територій
+GenericName[x-test]=xxTerritory Capture Gamexx
+GenericName[zh_CN]=版块占领游戏
+GenericName[zh_TW]=領土爭奪戰
+Terminal=false
+StartupNotify=true
+X-DBUS-StartupType=Multi
+Categories=Qt;KDE;Game;StrategyGame;
+X-DBUS-ServiceName=org.kde.kjumpingcube