Hello community, here is the log from the commit of package libkmahjongg for openSUSE:Factory checked in at 2015-05-11 19:21:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkmahjongg (Old) and /work/SRC/openSUSE:Factory/.libkmahjongg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkmahjongg" Changes: -------- --- /work/SRC/openSUSE:Factory/libkmahjongg/libkmahjongg.changes 2015-03-11 09:54:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkmahjongg.new/libkmahjongg.changes 2015-05-11 19:21:23.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Apr 11 13:25:58 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:23:20 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:51:33 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- Old: ---- libkmahjongg-14.12.3.tar.xz New: ---- libkmahjongg-15.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkmahjongg.spec ++++++ --- /var/tmp/diff_new_pack.LfDoSH/_old 2015-05-11 19:21:24.000000000 +0200 +++ /var/tmp/diff_new_pack.LfDoSH/_new 2015-05-11 19:21:24.000000000 +0200 @@ -21,33 +21,45 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 14.12.3 +Version: 15.04.0 Release: 0 Source0: libkmahjongg-%{version}.tar.xz BuildRequires: fdupes -BuildRequires: libkde4-devel -BuildRequires: libkdegames-devel BuildRequires: xz -Requires: libkmahjongglib4 = %{version} +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: kconfig-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kcompletion-devel +BuildRequires: ki18n-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kwidgetsaddons-devel +Obsoletes: %{name}-kf5 < %{version} +Provides: %{name}-kf5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains data which is required by KDE games. -%package -n libkmahjongglib4 +%package -n libKF5KMahjongglib5 Summary: Library for Mahjongg tiles License: LGPL-2.1+ Group: System/GUI/KDE Requires: libkmahjongg -%description -n libkmahjongglib4 +%description -n libKF5KMahjongglib5 This package contains the library for Mahjongg tiles. %package devel Summary: Library for Mahjongg tiles: Build Environment License: LGPL-2.1+ Group: Development/Libraries/KDE -Requires: libkmahjongglib4 = %{version} +Requires: libKF5KMahjongglib5 = %{version} +Obsoletes: %{name}-kf5-devel < %{version} +Provides: %{name}-kf5-devel = %{version} + %description devel This package contains all necessary files and libraries needed to @@ -57,32 +69,32 @@ %setup -q %build -%cmake_kde4 -d build +%cmake_kf5 -d build %make_jobs %install -%kde4_makeinstall -C build -%kde_post_install +%kf5_makeinstall -C build %fdupes -s %{buildroot} -%post -n libkmahjongglib4 -p /sbin/ldconfig +%post -n libKF5KMahjongglib5 -p /sbin/ldconfig -%postun -n libkmahjongglib4 -p /sbin/ldconfig +%postun -n libKF5KMahjongglib5 -p /sbin/ldconfig %files %defattr(-,root,root) %doc COPYING COPYING.DOC README -%{_kde4_appsdir}/kmahjongglib/ +%{_kf5_sharedir}/kmahjongglib/ -%files -n libkmahjongglib4 +%files -n libKF5KMahjongglib5 %defattr(-,root,root) %doc COPYING COPYING.DOC README -%{_kde4_libdir}/libkmahjongglib.so.* +%{_kf5_libdir}/libKF5KMahjongglib.so.* %files devel %defattr(-,root,root) %doc COPYING COPYING.DOC README -%{_kde4_includedir}/*.h -%{_kde4_libdir}/libkmahjongglib.so +%{_kf5_includedir}/KF5KMahjongg/ +%{_kf5_libdir}/libKF5KMahjongglib.so +%{_kf5_libdir}/cmake/KF5KMahjongglib %changelog ++++++ libkmahjongg-14.12.3.tar.xz -> libkmahjongg-15.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/CMakeLists.txt new/libkmahjongg-15.04.0/CMakeLists.txt --- old/libkmahjongg-14.12.3/CMakeLists.txt 2015-02-10 10:09:51.000000000 +0100 +++ new/libkmahjongg-15.04.0/CMakeLists.txt 2015-02-10 12:20:16.000000000 +0100 @@ -1,41 +1,110 @@ project(libkmahjongg) -find_package(KDE4 REQUIRED) -include(KDE4Defaults) -include(MacroLibrary) +cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) + +set (QT_MIN_VERSION "5.2.0") + +find_package(ECM 1.3.0 REQUIRED NO_MODULE) + +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Test Svg) +find_package(KF5 REQUIRED COMPONENTS CoreAddons Config ConfigWidgets WidgetsAddons Completion I18n) + +include(FeatureSummary) +include(GenerateExportHeader) +include(ECMPackageConfigHelpers) +include(ECMSetupVersion) +include(ECMGenerateHeaders) +include(ECMMarkNonGuiExecutable) +include(KDEInstallDirs) +include(KDECompilerSettings) +include(KDECMakeSettings) -add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) -include_directories(${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR}/includes) +add_definitions(-DTRANSLATION_DOMAIN="libkmahjongg5") + +include_directories(${CMAKE_SOURCE_DIR}/includes) add_subdirectory( tilesets ) add_subdirectory( backgrounds ) ########### next target ############### +set(KMAHJONGGLIB_VERSION 5.0.0) +set(KMAHJONGGLIB_SOVERSION 5) + set(kmahjongg_LIB_SRCS + libkmahjong_debug.cpp kmahjonggtileset.cpp kmahjonggbackground.cpp kmahjonggtilesetselector.cpp kmahjonggbackgroundselector.cpp kmahjonggconfigdialog.cpp ) -kde4_add_ui_files(kmahjongg_LIB_SRCS kmahjonggtilesetselector.ui kmahjonggbackgroundselector.ui ) +ki18n_wrap_ui(kmahjongg_LIB_SRCS kmahjonggtilesetselector.ui kmahjonggbackgroundselector.ui ) + +add_library(KF5KMahjongglib SHARED ${kmahjongg_LIB_SRCS}) +generate_export_header(KF5KMahjongglib BASE_NAME libkmahjongg) + +target_link_libraries(KF5KMahjongglib PRIVATE Qt5::Core Qt5::Svg KF5::WidgetsAddons KF5::I18n KF5::Completion KF5::ConfigGui + PUBLIC Qt5::Gui KF5::ConfigWidgets) -kde4_add_library(kmahjongglib SHARED ${kmahjongg_LIB_SRCS}) +target_include_directories(KF5KMahjongglib INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KF5KMahjongg>" INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}>") -target_link_libraries(kmahjongglib ${KDE4_KDEUI_LIBS}) +set_target_properties(KF5KMahjongglib PROPERTIES VERSION ${KMAHJONGGLIB_VERSION} + SOVERSION ${KMAHJONGGLIB_SOVERSION} + EXPORT_NAME KF5KMahjongglib) -set_target_properties(kmahjongglib PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) +ecm_setup_version(${KMAHJONGGLIB_VERSION} VARIABLE_PREFIX KF5KMAHJONGGLIB + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kmahjongglib_version.h" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfigVersion.cmake" + SOVERSION 6) -install(TARGETS kmahjongglib ${INSTALL_TARGETS_DEFAULT_ARGS}) + +install(TARGETS KF5KMahjongglib EXPORT KF5KMahjonggLibraryDepends + ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) + +install(TARGETS KF5KMahjongglib ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### install(FILES - libkmahjongg_export.h + ${CMAKE_CURRENT_BINARY_DIR}/libkmahjongg_export.h kmahjonggtileset.h kmahjonggbackground.h kmahjonggconfigdialog.h -DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) +DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KF5KMahjongg COMPONENT Devel) + +########### generate exports ############### +# add libraries to the build-tree export set +export(TARGETS KF5KMahjongglib + FILE "${PROJECT_BINARY_DIR}/KF5KMahjonggLibraryDepends.cmake") + +# define the installation directory for the CMake files +set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5KMahjongglib") + +# create the Config.cmake and ConfigVersion.cmake files +ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5KMahjongglibConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + ) + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel ) + +# install the export set for use with the install-tree +install(EXPORT KF5KMahjonggLibraryDepends DESTINATION + ${CMAKECONFIG_INSTALL_DIR} COMPONENT Devel) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kmahjongglib_version.h + DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KF5KMahjongg + COMPONENT Devel) + +########### Display Summary ############### +feature_summary(WHAT ALL + INCLUDE_QUIET_PACKAGES + FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/KF5KMahjongglibConfig.cmake.in new/libkmahjongg-15.04.0/KF5KMahjongglibConfig.cmake.in --- old/libkmahjongg-14.12.3/KF5KMahjongglibConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libkmahjongg-15.04.0/KF5KMahjongglibConfig.cmake.in 2015-02-10 12:20:16.000000000 +0100 @@ -0,0 +1,9 @@ +@PACKAGE_INIT@ + +# Any changes in this file will be overwritten by CMake. + +find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) +find_dependency(KF5ConfigWidgets) + + +include("${CMAKE_CURRENT_LIST_DIR}/KF5KMahjonggLibraryDepends.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/Messages.sh new/libkmahjongg-15.04.0/Messages.sh --- old/libkmahjongg-14.12.3/Messages.sh 2015-02-10 10:09:51.000000000 +0100 +++ new/libkmahjongg-15.04.0/Messages.sh 2015-02-10 12:20:16.000000000 +0100 @@ -1,3 +1,3 @@ #! /usr/bin/env bash $EXTRACTRC *.ui >> rc.cpp -$XGETTEXT *.cpp -o $podir/libkmahjongg.pot +$XGETTEXT *.cpp -o $podir/libkmahjongg5.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/kmahjonggbackground.cpp new/libkmahjongg-15.04.0/kmahjonggbackground.cpp --- old/libkmahjongg-14.12.3/kmahjonggbackground.cpp 2015-02-10 10:09:51.000000000 +0100 +++ new/libkmahjongg-15.04.0/kmahjonggbackground.cpp 2015-02-10 12:20:16.000000000 +0100 @@ -19,8 +19,7 @@ #include "kmahjonggbackground.h" -#include <kstandarddirs.h> -#include <klocale.h> +#include <KLocalizedString> #include <kconfig.h> #include <kconfiggroup.h> #include <qsvgrenderer.h> @@ -30,7 +29,7 @@ #include <QPixmap> #include <QPixmapCache> #include <QPainter> -#include <KDebug> +#include "libkmahjong_debug.h" class KMahjonggBackgroundPrivate { @@ -65,9 +64,6 @@ static bool _inited = false; if (_inited) return; - KGlobal::dirs()->addResourceType("kmahjonggbackground", "data", QString::fromLatin1("kmahjongglib/backgrounds/")); - - KGlobal::locale()->insertCatalog( QLatin1String( "libkmahjongglib" )); _inited = true; } @@ -79,8 +75,8 @@ { QLatin1String idx( "default.desktop" ); - QString bgPath = KStandardDirs::locate("kmahjonggbackground", idx); - kDebug() << "Inside LoadDefault(), located background at" << bgPath; + QString bgPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kmahjongglib/backgrounds/" + idx); + qCDebug(LIBKMAHJONG_LOG) << "Inside LoadDefault(), located background at" << bgPath; if (bgPath.isEmpty()) { return false; } @@ -90,10 +86,10 @@ #define kBGVersionFormat 1 bool KMahjonggBackground::load(const QString &file, short width, short height) { - kDebug() << "Background loading"; + //qCDebug(LIBKMAHJONG_LOG) << "Background loading"; d->isSVG = false; - kDebug() << "Attempting to load .desktop at" << file; + //qCDebug(LIBKMAHJONG_LOG) << "Attempting to load .desktop at" << file; // verify if it is a valid file first and if we can open it QFile bgfile(file); @@ -121,7 +117,7 @@ } if (d->isPlain) { - kDebug() << "Using plain background"; + //qCDebug(LIBKMAHJONG_LOG) << "Using plain background"; d->graphicspath.clear(); d->filename = file; return true; @@ -129,8 +125,9 @@ QString graphName = group.readEntry("FileName"); - d->graphicspath = KStandardDirs::locate("kmahjonggbackground", graphName); - kDebug() << "Using background at" << d->graphicspath; + d->graphicspath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kmahjongglib/backgrounds/" + graphName); + + qCDebug(LIBKMAHJONG_LOG) << "Using background at" << d->graphicspath; if (d->graphicspath.isEmpty()) return (false); @@ -155,7 +152,7 @@ if (d->svg.isValid()) { d->isSVG = true; } else { - kDebug() << "could not load svg"; + //qCDebug(LIBKMAHJONG_LOG) << "could not load svg"; return( false ); } return (true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/kmahjonggbackground.h new/libkmahjongg-15.04.0/kmahjonggbackground.h --- old/libkmahjongg-14.12.3/kmahjonggbackground.h 2015-02-10 10:09:51.000000000 +0100 +++ new/libkmahjongg-15.04.0/kmahjonggbackground.h 2015-02-10 12:20:16.000000000 +0100 @@ -26,7 +26,7 @@ class KMahjonggBackgroundPrivate; -class KMAHJONGGLIB_EXPORT KMahjonggBackground +class LIBKMAHJONGG_EXPORT KMahjonggBackground { public: KMahjonggBackground(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/kmahjonggbackgroundselector.cpp new/libkmahjongg-15.04.0/kmahjonggbackgroundselector.cpp --- old/libkmahjongg-14.12.3/kmahjonggbackgroundselector.cpp 2015-02-10 10:09:51.000000000 +0100 +++ new/libkmahjongg-15.04.0/kmahjonggbackgroundselector.cpp 2015-02-10 12:20:16.000000000 +0100 @@ -18,10 +18,10 @@ #include "kmahjonggbackgroundselector.h" -#include <klocale.h> -#include <kstandarddirs.h> +#include <KLocalizedString> #include <QPainter> #include "kmahjonggbackground.h" +#include <QDir> KMahjonggBackgroundSelector::KMahjonggBackgroundSelector( QWidget* parent, KConfigSkeleton * aconfig ) : QWidget( parent ) @@ -47,8 +47,16 @@ KMahjonggBackground bg; - //Now get our tilesets into a list - QStringList bgsAvailable = KGlobal::dirs()->findAllResources("kmahjonggbackground", QLatin1String( "*.desktop"), KStandardDirs::Recursive); + //Now get our backgrounds into a list + QStringList bgsAvailable; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "kmahjongglib/backgrounds/", QStandardPaths::LocateDirectory); + Q_FOREACH (const QString& dir, dirs) { + const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop")); + Q_FOREACH (const QString& file, fileNames) { + bgsAvailable.append(dir + '/' + file); + } + } + QLatin1String namestr("Name"); int numvalidentries = 0; for (int i = 0; i < bgsAvailable.size(); ++i) @@ -70,7 +78,7 @@ } } - connect(backgroundList, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(backgroundChanged())); + connect(backgroundList, &QListWidget::currentItemChanged, this, &KMahjonggBackgroundSelector::backgroundChanged); } void KMahjonggBackgroundSelector::backgroundChanged() @@ -108,4 +116,4 @@ } -#include "kmahjonggbackgroundselector.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/kmahjonggconfigdialog.cpp new/libkmahjongg-15.04.0/kmahjonggconfigdialog.cpp --- old/libkmahjongg-14.12.3/kmahjonggconfigdialog.cpp 2015-02-10 10:09:51.000000000 +0100 +++ new/libkmahjongg-15.04.0/kmahjonggconfigdialog.cpp 2015-02-10 12:20:16.000000000 +0100 @@ -15,14 +15,20 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <kconfigdialogmanager.h> +#include <kstandardguiitem.h> +#include <QDialog> #include "kmahjonggconfigdialog.h" -#include <klocale.h> -#include <kstandarddirs.h> +#include <KLocalizedString> #include <krandom.h> #include <kconfig.h> -#include <kdebug.h> +#include "libkmahjong_debug.h" +#include <KConfigGroup> +#include <QDialogButtonBox> +#include <QPushButton> +#include <QVBoxLayout> #include "kmahjonggtilesetselector.h" #include "kmahjonggbackgroundselector.h" @@ -39,8 +45,16 @@ d(new KMahjonggConfigDialogPrivate) { setFaceType(List); - setButtons(Ok | Apply | Cancel | Help); - setDefaultButton(Ok); + QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Apply); + QVBoxLayout *mainLayout = new QVBoxLayout; + setLayout(mainLayout); + QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); + okButton->setDefault(true); + okButton->setShortcut(Qt::CTRL | Qt::Key_Return); + connect(buttonBox, &QDialogButtonBox::accepted, this, &KMahjonggConfigDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &KMahjonggConfigDialog::reject); + mainLayout->addWidget(buttonBox); + buttonBox->button(QDialogButtonBox::Ok)->setDefault(true); setModal(true); d->m_config = config; } @@ -66,15 +80,15 @@ void KMahjonggConfigDialog::updateWidgetsDefault() { - kDebug() << "updateWidgetsDefault"; + //qCDebug(LIBKMAHJONG_LOG) << "updateWidgetsDefault"; } /*void KMahjonggConfigDialog::updateWidgets() { - kDebug() << "updateWidgets"; + //qCDebug(LIBKMAHJONG_LOG) << "updateWidgets"; } void KMahjonggConfigDialog::updateSettings() { - kDebug() << "updateSettings"; + //qCDebug(LIBKMAHJONG_LOG) << "updateSettings"; }*/ -#include "kmahjonggconfigdialog.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/kmahjonggconfigdialog.h new/libkmahjongg-15.04.0/kmahjonggconfigdialog.h --- old/libkmahjongg-14.12.3/kmahjonggconfigdialog.h 2015-02-10 10:09:51.000000000 +0100 +++ new/libkmahjongg-15.04.0/kmahjonggconfigdialog.h 2015-02-10 12:20:16.000000000 +0100 @@ -22,9 +22,11 @@ #include <kconfigdialog.h> #include <libkmahjongg_export.h> +#include <KConfigSkeleton> + class KMahjonggConfigDialogPrivate; -class KMAHJONGGLIB_EXPORT KMahjonggConfigDialog : public KConfigDialog +class LIBKMAHJONGG_EXPORT KMahjonggConfigDialog : public KConfigDialog { Q_OBJECT public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/kmahjonggtileset.cpp new/libkmahjongg-15.04.0/kmahjonggtileset.cpp --- old/libkmahjongg-14.12.3/kmahjonggtileset.cpp 2015-02-10 10:09:51.000000000 +0100 +++ new/libkmahjongg-15.04.0/kmahjonggtileset.cpp 2015-02-10 12:20:16.000000000 +0100 @@ -19,17 +19,17 @@ #include "kmahjonggtileset.h" -#include <klocale.h> +#include <KLocalizedString> #include <kconfig.h> #include <kconfiggroup.h> #include <qimage.h> -#include <kstandarddirs.h> #include <qsvgrenderer.h> #include <QPainter> #include <QPixmapCache> #include <QFile> -#include <KDebug> +#include "libkmahjong_debug.h" #include <QMap> +#include <QStandardPaths> #include <stdlib.h> @@ -75,9 +75,6 @@ static bool _inited = false; if (_inited) return; - KGlobal::dirs()->addResourceType("kmahjonggtileset", "data", QString::fromLatin1("kmahjongglib/tilesets/")); - - KGlobal::locale()->insertCatalog( QLatin1String( "libkmahjongglib" )); _inited = true; } @@ -126,8 +123,8 @@ { QString idx = QLatin1String( "default.desktop" ); - QString tilesetPath = KStandardDirs::locate("kmahjonggtileset", idx); - kDebug() << "Inside LoadDefault(), located path at" << tilesetPath; + QString tilesetPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kmahjongglib/tilesets/" + idx); + qCDebug(LIBKMAHJONG_LOG) << "Inside LoadDefault(), located path at" << tilesetPath; if (tilesetPath.isEmpty()) { return false; } @@ -181,7 +178,7 @@ { QImage qiTiles; - kDebug() << "Attempting to load .desktop at" << tilesetPath; + //qCDebug(LIBKMAHJONG_LOG) << "Attempting to load .desktop at" << tilesetPath; //clear our properties map d->authorproperties.clear(); @@ -210,8 +207,8 @@ QString graphName = group.readEntry("FileName"); - d->graphicspath = KStandardDirs::locate("kmahjonggtileset", graphName); - kDebug() << "Using tileset at" << d->graphicspath; + d->graphicspath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kmahjongglib/tilesets/" + graphName); + //qCDebug(LIBKMAHJONG_LOG) << "Using tileset at" << d->graphicspath; //d->filename = graphicsPath; //only SVG for now @@ -334,7 +331,7 @@ } QPixmap KMahjonggTileset::renderElement(short width, short height, const QString & elementid) { - //kDebug() << "render element" << elementid << width << height; + ////qCDebug(LIBKMAHJONG_LOG) << "render element" << elementid << width << height; QImage qiRend(QSize(width, height),QImage::Format_ARGB32_Premultiplied); qiRend.fill(0); @@ -370,7 +367,7 @@ QPixmap KMahjonggTileset::tileface(int num) { QPixmap pm; if ((num + 8) >= d->elementIdTable.count()) { - kDebug() << "Client asked for invalid tileface id"; + //qCDebug(LIBKMAHJONG_LOG) << "Client asked for invalid tileface id"; return pm; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/kmahjonggtileset.h new/libkmahjongg-15.04.0/kmahjonggtileset.h --- old/libkmahjongg-14.12.3/kmahjonggtileset.h 2015-02-10 10:09:51.000000000 +0100 +++ new/libkmahjongg-15.04.0/kmahjonggtileset.h 2015-02-10 12:20:16.000000000 +0100 @@ -27,7 +27,7 @@ class KMahjonggTilesetPrivate; -class KMAHJONGGLIB_EXPORT KMahjonggTileset { +class LIBKMAHJONGG_EXPORT KMahjonggTileset { public: KMahjonggTileset(); ~KMahjonggTileset(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/kmahjonggtilesetselector.cpp new/libkmahjongg-15.04.0/kmahjonggtilesetselector.cpp --- old/libkmahjongg-14.12.3/kmahjonggtilesetselector.cpp 2015-02-10 10:09:51.000000000 +0100 +++ new/libkmahjongg-15.04.0/kmahjonggtilesetselector.cpp 2015-02-10 12:20:16.000000000 +0100 @@ -18,9 +18,10 @@ #include "kmahjonggtilesetselector.h" -#include <klocale.h> -#include <kstandarddirs.h> +#include <KLocalizedString> #include <QPainter> +#include <qstandardpaths.h> +#include <QDir> #include "kmahjonggtileset.h" @@ -50,7 +51,14 @@ KMahjonggTileset tile; //Now get our tilesets into a list - QStringList tilesAvailable = KGlobal::dirs()->findAllResources("kmahjonggtileset", QLatin1String( "*.desktop"), KStandardDirs::Recursive); + QStringList tilesAvailable; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "kmahjongglib/tilesets", QStandardPaths::LocateDirectory); + Q_FOREACH (const QString& dir, dirs) { + const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop")); + Q_FOREACH (const QString& file, fileNames) { + tilesAvailable.append(dir + '/' + file); + } + } QLatin1String namestr("Name"); int numvalidentries = 0; @@ -73,7 +81,7 @@ } } - connect(tilesetList, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(tilesetChanged())); + connect(tilesetList, &QListWidget::currentItemChanged, this, &KMahjonggTilesetSelector::tilesetChanged); } void KMahjonggTilesetSelector::tilesetChanged() @@ -111,4 +119,4 @@ } -#include "kmahjonggtilesetselector.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/libkmahjong_debug.cpp new/libkmahjongg-15.04.0/libkmahjong_debug.cpp --- old/libkmahjongg-14.12.3/libkmahjong_debug.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/libkmahjongg-15.04.0/libkmahjong_debug.cpp 2015-02-10 12:20:16.000000000 +0100 @@ -0,0 +1,23 @@ +/* This file is part of the KDE project + Copyright (C) 2014 Laurent Montel <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "libkmahjong_debug.h" +Q_LOGGING_CATEGORY(LIBKMAHJONG_LOG, "log_libkmahjongg") + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/libkmahjong_debug.h new/libkmahjongg-15.04.0/libkmahjong_debug.h --- old/libkmahjongg-14.12.3/libkmahjong_debug.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libkmahjongg-15.04.0/libkmahjong_debug.h 2015-02-10 12:20:16.000000000 +0100 @@ -0,0 +1,27 @@ +/* This file is part of the KDE project + Copyright (C) 2014 Laurent Montel <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef LIBKMAHJONG_DEBUG_H +#define LIBKMAHJONG_DEBUG_H + +#include <QLoggingCategory> +Q_DECLARE_LOGGING_CATEGORY(LIBKMAHJONG_LOG) + +#endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-14.12.3/libkmahjongg_export.h new/libkmahjongg-15.04.0/libkmahjongg_export.h --- old/libkmahjongg-14.12.3/libkmahjongg_export.h 2015-02-10 10:09:51.000000000 +0100 +++ new/libkmahjongg-15.04.0/libkmahjongg_export.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2007 David Faure <[email protected]> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef LIBKMAHJONGG_EXPORT_H -#define LIBKMAHJONGG_EXPORT_H - -/* needed for KDE_EXPORT and KDE_IMPORT macros */ -#include <kdemacros.h> - -#ifndef KMAHJONGGLIB_EXPORT -# if defined(MAKE_KMAHJONGGLIB_LIB) - /* We are building this library */ -# define KMAHJONGGLIB_EXPORT KDE_EXPORT -# else - /* We are using this library */ -# define KMAHJONGGLIB_EXPORT KDE_IMPORT -# endif -#endif - -# ifndef KMAHJONGGLIB_EXPORT_DEPRECATED -# define KMAHJONGGLIB_EXPORT_DEPRECATED KDE_DEPRECATED KMAHJONGGLIB_EXPORT -# endif - -#endif
