Hello community, here is the log from the commit of package libyui-qt-pkg for openSUSE:Factory checked in at 2018-11-12 09:51:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt-pkg (Old) and /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt-pkg" Mon Nov 12 09:51:22 2018 rev:40 rq:647294 version:2.45.24 Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt-pkg/libyui-qt-pkg.changes 2018-11-02 10:50:50.998280801 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new/libyui-qt-pkg.changes 2018-11-12 09:51:47.408251641 +0100 @@ -1,0 +2,14 @@ +Wed Nov 7 14:00:54 UTC 2018 - Stefan Hundhammer <[email protected]> + +- Require and link against libQt5Svg (bsc#1114654) +- 2.45.24 + +------------------------------------------------------------------- +Tue Nov 6 15:21:12 UTC 2018 - Stefan Hundhammer <[email protected]> + +- Better error handling for missing icons (bsc#1114654): + Error message in the y2log plus displaying a small red square for + missing icons. +- 2.45.23 + +------------------------------------------------------------------- Old: ---- libyui-qt-pkg-2.45.22.tar.bz2 New: ---- libyui-qt-pkg-2.45.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-pkg-doc.spec ++++++ --- /var/tmp/diff_new_pack.QizSxf/_old 2018-11-12 09:51:50.052247685 +0100 +++ /var/tmp/diff_new_pack.QizSxf/_new 2018-11-12 09:51:50.056247679 +0100 @@ -20,7 +20,7 @@ %define so_version 9 Name: %{parent}-doc -Version: 2.45.22 +Version: 2.45.24 Release: 0 Source: %{parent}-%{version}.tar.bz2 ++++++ libyui-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.QizSxf/_old 2018-11-12 09:51:50.072247655 +0100 +++ /var/tmp/diff_new_pack.QizSxf/_new 2018-11-12 09:51:50.076247649 +0100 @@ -17,7 +17,7 @@ Name: libyui-qt-pkg -Version: 2.45.22 +Version: 2.45.24 Release: 0 Source: %{name}-%{version}.tar.bz2 @@ -54,6 +54,9 @@ %package -n %{bin_name} +# bsc#1114654: Need Qt SVG support for icons (built-in and from theme) +Requires: libQt5Svg5 + Requires: libyui%{so_version} Provides: %{name} = %{version} @@ -125,7 +128,7 @@ -DCMAKE_BUILD_TYPE=RELEASE %endif -make %{?jobs:-j%jobs} +make VERBOSE=1 %{?jobs:-j%jobs} %install cd build ++++++ libyui-qt-pkg-2.45.22.tar.bz2 -> libyui-qt-pkg-2.45.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/VERSION.cmake new/libyui-qt-pkg-2.45.24/VERSION.cmake --- old/libyui-qt-pkg-2.45.22/VERSION.cmake 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/VERSION.cmake 2018-11-08 12:02:15.000000000 +0100 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "2" ) SET( VERSION_MINOR "45" ) -SET( VERSION_PATCH "22" ) +SET( VERSION_PATCH "24" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/package/libyui-qt-pkg-doc.spec new/libyui-qt-pkg-2.45.24/package/libyui-qt-pkg-doc.spec --- old/libyui-qt-pkg-2.45.22/package/libyui-qt-pkg-doc.spec 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/package/libyui-qt-pkg-doc.spec 2018-11-08 12:02:15.000000000 +0100 @@ -20,7 +20,7 @@ %define so_version 9 Name: %{parent}-doc -Version: 2.45.22 +Version: 2.45.24 Release: 0 Source: %{parent}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/package/libyui-qt-pkg.changes new/libyui-qt-pkg-2.45.24/package/libyui-qt-pkg.changes --- old/libyui-qt-pkg-2.45.22/package/libyui-qt-pkg.changes 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/package/libyui-qt-pkg.changes 2018-11-08 12:02:15.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Nov 7 14:00:54 UTC 2018 - Stefan Hundhammer <[email protected]> + +- Require and link against libQt5Svg (bsc#1114654) +- 2.45.24 + +------------------------------------------------------------------- +Tue Nov 6 15:21:12 UTC 2018 - Stefan Hundhammer <[email protected]> + +- Better error handling for missing icons (bsc#1114654): + Error message in the y2log plus displaying a small red square for + missing icons. +- 2.45.23 + +------------------------------------------------------------------- Mon Oct 29 06:00:36 UTC 2018 - Stasiek Michalski <[email protected]> - New way of handling emblems with theming support (boo#1109382) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/package/libyui-qt-pkg.spec new/libyui-qt-pkg-2.45.24/package/libyui-qt-pkg.spec --- old/libyui-qt-pkg-2.45.22/package/libyui-qt-pkg.spec 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/package/libyui-qt-pkg.spec 2018-11-08 12:02:15.000000000 +0100 @@ -17,7 +17,7 @@ Name: libyui-qt-pkg -Version: 2.45.22 +Version: 2.45.24 Release: 0 Source: %{name}-%{version}.tar.bz2 @@ -54,6 +54,9 @@ %package -n %{bin_name} +# bsc#1114654: Need Qt SVG support for icons (built-in and from theme) +Requires: libQt5Svg5 + Requires: libyui%{so_version} Provides: %{name} = %{version} @@ -125,7 +128,7 @@ -DCMAKE_BUILD_TYPE=RELEASE %endif -make %{?jobs:-j%jobs} +make VERBOSE=1 %{?jobs:-j%jobs} %install cd build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/CMakeLists.txt new/libyui-qt-pkg-2.45.24/src/CMakeLists.txt --- old/libyui-qt-pkg-2.45.22/src/CMakeLists.txt 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/CMakeLists.txt 2018-11-08 12:02:15.000000000 +0100 @@ -1,13 +1,25 @@ # Find includes in corresponding build directories -set(CMAKE_INCLUDE_CURRENT_DIR ON) +set( CMAKE_INCLUDE_CURRENT_DIR ON ) + # Instruct CMake to run moc automatically when needed. -set(CMAKE_AUTOMOC ON) +set( CMAKE_AUTOMOC ON ) + +find_package( Qt5Core CONFIG REQUIRED ) +find_package( Qt5Gui CONFIG REQUIRED ) +find_package( Qt5Widgets CONFIG REQUIRED ) +find_package( Qt5Svg CONFIG REQUIRED ) +find_package( Qt5X11Extras CONFIG REQUIRED ) -set(CMAKE_INCLUDE_PATH ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH}) +set( CMAKE_INCLUDE_PATH ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH} ) PROCESS_SOURCES() -target_link_libraries( - ${TARGETLIB} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Svg Qt5::X11Extras - ) -SUBDIRS(icons) +target_link_libraries( ${TARGETLIB} + Qt5::Core + Qt5::Gui + Qt5::Widgets + Qt5::Svg + Qt5::X11Extras + ) + +SUBDIRS( icons ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQIconPool.cc new/libyui-qt-pkg-2.45.24/src/YQIconPool.cc --- old/libyui-qt-pkg-2.45.22/src/YQIconPool.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQIconPool.cc 2018-11-08 12:02:15.000000000 +0100 @@ -42,9 +42,12 @@ #define YUILogComponent "qt-ui" #include "YUILog.h" +#include "utf8.h" #include "YQIconPool.h" +using std::endl; + YQIconPool * YQIconPool::_iconPool = 0; @@ -113,19 +116,46 @@ if ( !iconPixmap ) { - if ( QIcon::hasThemeIcon(icon_name) ) - { - QIcon icon = QIcon::fromTheme(icon_name, QIcon( ":/" + icon_name )); - iconPixmap = icon.pixmap(QSize(16,16), enabled ? QIcon::Normal : QIcon::Disabled); - } - else + iconPixmap = loadIcon( icon_name, enabled ); + + if ( !iconPixmap ) { - QIcon icon = QIcon( ":/" + icon_name ); - iconPixmap = icon.pixmap(QSize(16,16), enabled ? QIcon::Normal : QIcon::Disabled); + // Create an icon for the cache to avoid more than one complaint + // and to have a clearly visible error icon (a small red square) + iconPixmap = QPixmap( 8, 8 ); + iconPixmap.fill( Qt::red ); } } - _iconCache.insert( icon_name + enabled, iconPixmap); + _iconCache.insert( icon_name + enabled, iconPixmap ); + + return iconPixmap; +} + + +QPixmap +YQIconPool::loadIcon( const QString icon_name, const bool enabled ) +{ + QPixmap iconPixmap = _iconCache[ icon_name + enabled ]; + + if ( QIcon::hasThemeIcon( icon_name ) ) + { + yuiDebug() << "Loading theme icon " << icon_name << endl; + + QIcon icon = QIcon::fromTheme( icon_name, QIcon( ":/" + icon_name ) ); + iconPixmap = icon.pixmap( QSize( 16, 16 ), enabled ? QIcon::Normal : QIcon::Disabled ); + } + else + { + yuiDebug() << "Loading built-in icon " << icon_name << endl; + + QIcon icon = QIcon( ":/" + icon_name ); + iconPixmap = icon.pixmap( QSize( 16, 16 ), enabled ? QIcon::Normal : QIcon::Disabled ); + } + + if ( !iconPixmap ) + yuiError() << "Could not load icon " << icon_name << endl; + return iconPixmap; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQIconPool.h new/libyui-qt-pkg-2.45.24/src/YQIconPool.h --- old/libyui-qt-pkg-2.45.22/src/YQIconPool.h 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQIconPool.h 2018-11-08 12:02:15.000000000 +0100 @@ -70,12 +70,12 @@ static QPixmap disabledPkgProtected(); static QPixmap disabledPkgTaboo(); static QPixmap disabledPkgUpdate(); - + static QPixmap normalPkgConflict(); static QPixmap treePlus(); static QPixmap treeMinus(); - + static QPixmap warningSign(); static QPixmap pkgSatisfied(); @@ -92,12 +92,20 @@ static YQIconPool * iconPool(); /** - * Return the cached icon for 'xpm_data' ( an included XPM file ). - * If the icon isn't in the cache yet, create it and store it in the - * cache. + * Return the cached icon for 'icon_name'. If the icon isn't in the cache + * yet, load it and store it in the cache. + * + * Return a red square as an error icon if there is no icon by that name. **/ QPixmap cachedIcon(const QString icon_name, const bool enabled ); + /** + * Load the icon for 'icon_name' from the icon theme or, if that fails, + * from the compiled-in icons (using the Qt resource system). Return a null + * pixmap if there is no such icon. + **/ + QPixmap loadIcon( const QString icon_name, const bool enabled ); + private: /** @@ -111,7 +119,7 @@ **/ virtual ~YQIconPool(); - + // // Data members // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPackageSelector.cc new/libyui-qt-pkg-2.45.24/src/YQPackageSelector.cc --- old/libyui-qt-pkg-2.45.22/src/YQPackageSelector.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPackageSelector.cc 2018-11-08 12:02:15.000000000 +0100 @@ -1850,4 +1850,3 @@ } -#include "YQPackageSelector.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPackageSelectorBase.cc new/libyui-qt-pkg-2.45.24/src/YQPackageSelectorBase.cc --- old/libyui-qt-pkg-2.45.22/src/YQPackageSelectorBase.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPackageSelectorBase.cc 2018-11-08 12:02:15.000000000 +0100 @@ -514,4 +514,3 @@ } -#include "YQPackageSelectorBase.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPatternSelector.cc new/libyui-qt-pkg-2.45.24/src/YQPatternSelector.cc --- old/libyui-qt-pkg-2.45.22/src/YQPatternSelector.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPatternSelector.cc 2018-11-08 12:02:15.000000000 +0100 @@ -341,4 +341,3 @@ -#include "YQPatternSelector.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgChangeLogView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgChangeLogView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgChangeLogView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgChangeLogView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -148,4 +148,3 @@ return msg.arg(QString::number(missing), cmd); } -#include "YQPkgChangeLogView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgChangesDialog.cc new/libyui-qt-pkg-2.45.24/src/YQPkgChangesDialog.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgChangesDialog.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgChangesDialog.cc 2018-11-08 12:02:15.000000000 +0100 @@ -416,4 +416,3 @@ } -#include "YQPkgChangesDialog.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgConflictDialog.cc new/libyui-qt-pkg-2.45.24/src/YQPkgConflictDialog.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgConflictDialog.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgConflictDialog.cc 2018-11-08 12:02:15.000000000 +0100 @@ -444,4 +444,3 @@ -#include "YQPkgConflictDialog.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgConflictList.cc new/libyui-qt-pkg-2.45.24/src/YQPkgConflictList.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgConflictList.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgConflictList.cc 2018-11-08 12:02:15.000000000 +0100 @@ -416,4 +416,3 @@ file.write( "\n\n" ); } -#include "YQPkgConflictList.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgDependenciesView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgDependenciesView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgDependenciesView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgDependenciesView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -202,4 +202,3 @@ } -#include "YQPkgDependenciesView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgDescriptionDialog.cc new/libyui-qt-pkg-2.45.24/src/YQPkgDescriptionDialog.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgDescriptionDialog.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgDescriptionDialog.cc 2018-11-08 12:02:15.000000000 +0100 @@ -199,4 +199,3 @@ -#include "YQPkgDescriptionDialog.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgDescriptionView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgDescriptionView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgDescriptionView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgDescriptionView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -359,4 +359,3 @@ } -#include "YQPkgDescriptionView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgDiskUsageList.cc new/libyui-qt-pkg-2.45.24/src/YQPkgDiskUsageList.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgDiskUsageList.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgDiskUsageList.cc 2018-11-08 12:02:15.000000000 +0100 @@ -428,4 +428,3 @@ -#include "YQPkgDiskUsageList.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgDiskUsageWarningDialog.cc new/libyui-qt-pkg-2.45.24/src/YQPkgDiskUsageWarningDialog.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgDiskUsageWarningDialog.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgDiskUsageWarningDialog.cc 2018-11-08 12:02:15.000000000 +0100 @@ -180,4 +180,3 @@ -#include "YQPkgDiskUsageWarningDialog.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgFileListView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgFileListView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgFileListView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgFileListView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -134,4 +134,3 @@ } -#include "YQPkgFileListView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgFilterTab.cc new/libyui-qt-pkg-2.45.24/src/YQPkgFilterTab.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgFilterTab.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgFilterTab.cc 2018-11-08 12:02:15.000000000 +0100 @@ -728,4 +728,3 @@ -#include "YQPkgFilterTab.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgGenericDetailsView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgGenericDetailsView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgGenericDetailsView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgGenericDetailsView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -261,4 +261,3 @@ } -#include "YQPkgGenericDetailsView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgHistoryDialog.cc new/libyui-qt-pkg-2.45.24/src/YQPkgHistoryDialog.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgHistoryDialog.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgHistoryDialog.cc 2018-11-08 12:02:15.000000000 +0100 @@ -319,4 +319,3 @@ } } -#include "YQPkgHistoryDialog.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgLangList.cc new/libyui-qt-pkg-2.45.24/src/YQPkgLangList.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgLangList.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgLangList.cc 2018-11-08 12:02:15.000000000 +0100 @@ -330,4 +330,3 @@ return QY2ListViewItem::operator<( otherListViewItem ); } -#include "YQPkgLangList.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgList.cc new/libyui-qt-pkg-2.45.24/src/YQPkgList.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgList.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgList.cc 2018-11-08 12:02:15.000000000 +0100 @@ -965,4 +965,3 @@ return YQPkgObjListItem::operator<( otherListViewItem ); } -#include "YQPkgList.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgObjList.cc new/libyui-qt-pkg-2.45.24/src/YQPkgObjList.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgObjList.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgObjList.cc 2018-11-08 12:02:15.000000000 +0100 @@ -394,7 +394,12 @@ actionSetCurrentKeepInstalled = createAction( S_KeepInstalled, "[<], [-]" ); actionSetCurrentDelete = createAction( S_Del, "[-]" ); actionSetCurrentUpdate = createAction( S_Update, "[>], [+]" ); - actionSetCurrentUpdateForce = createAction( _( "Update unconditionally" ), statusIcon( S_Update, true ) ,statusIcon( S_Update, false ) , "", true ) ; + + actionSetCurrentUpdateForce = createAction( _( "Update unconditionally" ), + statusIcon( S_Update, true ), + statusIcon( S_Update, false ) , + "", + true ) ; @@ -557,7 +562,7 @@ YQPkgObjList::updateActions( YQPkgObjListItem * item ) { if ( !item) - item = dynamic_cast<YQPkgObjListItem *> ( currentItem() ); + item = dynamic_cast<YQPkgObjListItem *> ( currentItem() ); if ( item ) { @@ -799,6 +804,7 @@ } } + void YQPkgObjList::applyExcludeRules( QTreeWidgetItem * listViewItem ) { @@ -1655,7 +1661,7 @@ QMenu * contextMenu = ! item->selectable()->installedEmpty() ? - installedContextMenu() : notInstalledContextMenu(); + installedContextMenu() : notInstalledContextMenu(); if ( contextMenu ) contextMenu->popup( viewport()->mapToGlobal( pos ) ); @@ -1675,4 +1681,3 @@ -#include "YQPkgObjList.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgPackageKitGroupsFilterView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgPackageKitGroupsFilterView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgPackageKitGroupsFilterView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgPackageKitGroupsFilterView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -232,8 +232,6 @@ group = itg->second; } - //std::cout << it.asString() << std::endl; - if ( _groupsMap.find(group) == _groupsMap.end() ) { _groupsMap[group] = new YQPkgPackageKitGroup( this, group ); @@ -462,4 +460,3 @@ } -#include "YQPkgPackageKitGroupsFilterView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgPatchFilterView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgPatchFilterView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgPatchFilterView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgPatchFilterView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -225,4 +225,3 @@ } -#include "YQPkgPatchFilterView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgPatchList.cc new/libyui-qt-pkg-2.45.24/src/YQPkgPatchList.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgPatchList.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgPatchList.cc 2018-11-08 12:02:15.000000000 +0100 @@ -672,4 +672,3 @@ -#include "YQPkgPatchList.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgPatternList.cc new/libyui-qt-pkg-2.45.24/src/YQPkgPatternList.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgPatternList.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgPatternList.cc 2018-11-08 12:02:15.000000000 +0100 @@ -61,42 +61,45 @@ using std::string; using std::set; + class YQPkgPatternItemDelegate : public QItemDelegate { - YQPkgPatternList *_view; + YQPkgPatternList *_view; + public: - YQPkgPatternItemDelegate( YQPkgPatternList *parent ) : QItemDelegate( parent ), _view( parent ) { + + YQPkgPatternItemDelegate( YQPkgPatternList *parent ) : QItemDelegate( parent ), _view( parent ) + { } + virtual void paint ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const { painter->save(); YQPkgPatternCategoryItem *citem = dynamic_cast<YQPkgPatternCategoryItem *>(_view->itemFromIndex(index)); + // special painting for category items if ( citem ) { - //std::cout << "printing category: " << index.column() << std::endl; QFont f = painter->font(); - f.setWeight(QFont::Bold); + f.setWeight( QFont::Bold ); QFontMetrics fm(f); f.setPixelSize( (int) ( fm.height() * 1.1 ) ); - citem->setFont(_view->summaryCol(), f); + citem->setFont( _view->summaryCol(), f ); - QItemDelegate::paint(painter, option, index); + QItemDelegate::paint( painter, option, index ); painter->restore(); return; } - - YQPkgPatternListItem *item = dynamic_cast<YQPkgPatternListItem *>(_view->itemFromIndex(index)); + YQPkgPatternListItem *item = dynamic_cast<YQPkgPatternListItem *>( _view->itemFromIndex( index ) ); + if ( item ) { //if ( index.column() == _view->howmanyCol() ) if ( false ) { - //std::cout << "printing percentage: " << index.column() << std::endl; - QColor background = option.palette.color(QPalette::Window); painter->setBackground( background ); @@ -107,7 +110,7 @@ QColor fillColor = option.palette.color(QPalette::Mid); if ( percent > 100.0 ) percent = 100.0; - if ( percent < 0.0 ) percent = 0.0; + if ( percent < 0.0 ) percent = 0.0; int x = option.rect.left() + 1; int y = option.rect.top() + 1; int w = option.rect.width() - 2; @@ -116,21 +119,19 @@ if ( w > 0 ) { fillWidth = (int) ( w * percent / 100.0 ); - //std::cout << "percent: " << percent << " fillw: " << fillWidth << " x: " << x << " y: " << y << "w: " << w << " h: " << h << std::endl; // Fill the desired percentage. - painter->fillRect( x, y, fillWidth, h, - fillColor ); + painter->fillRect( x, y, fillWidth, h, fillColor ); - QString percentageText; + QString percentageText; percentageText.sprintf("%d/%d", item->installedPackages(), item->totalPackages()); - painter->setPen( _view->palette().color( QPalette::Base ) ); - painter->drawText( QRect( x, y, - w, h ), - Qt::AlignHCenter, percentageText ); - painter->restore(); + painter->setPen( _view->palette().color( QPalette::Base ) ); + painter->drawText( QRect( x, y, + w, h ), + Qt::AlignHCenter, percentageText ); + painter->restore(); } painter->restore(); return; @@ -138,11 +139,9 @@ } else { - //std::cout << "printing other: " << index.column() << std::endl; painter->restore(); QItemDelegate::paint(painter, option, index); } - } } }; @@ -176,8 +175,8 @@ setIndentation(0); - setItemDelegateForColumn( _iconCol, new YQPkgPatternItemDelegate( this ) ); - setItemDelegateForColumn( _statusCol, new YQPkgPatternItemDelegate( this ) ); + setItemDelegateForColumn( _iconCol, new YQPkgPatternItemDelegate( this ) ); + setItemDelegateForColumn( _statusCol, new YQPkgPatternItemDelegate( this ) ); setItemDelegateForColumn( _summaryCol, new YQPkgPatternItemDelegate( this ) ); //setItemDelegateForColumn( _howmanyCol, new YQPkgPatternItemDelegate(this) ); @@ -195,9 +194,9 @@ setAllColumnsShowFocus( true ); - header()->setSectionResizeMode( statusCol(), QHeaderView::Fixed ); + header()->setSectionResizeMode( statusCol(), QHeaderView::Fixed ); header()->setSectionResizeMode( summaryCol(), QHeaderView::Stretch ); - header()->setSectionResizeMode( howmanyCol(), QHeaderView::Fixed ); + header()->setSectionResizeMode( howmanyCol(), QHeaderView::Fixed ); header()->resizeSection( statusCol(), 25 ); setColumnWidth( statusCol(), 25 ); @@ -210,8 +209,9 @@ if ( autoFilter ) { - connect( this, SIGNAL( currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * ) ), - this, SLOT ( filter() ) ); + connect( this, SIGNAL( currentItemChanged( QTreeWidgetItem *, + QTreeWidgetItem * ) ), + this, SLOT ( filter() ) ); } setIconSize(QSize(32,32)); @@ -223,6 +223,7 @@ fillList(); selectSomething(); } + yuiDebug() << "Creating pattern list done" << std::endl; } @@ -307,32 +308,32 @@ if ( selection() ) // The seleted QListViewItem { - ZyppPattern zyppPattern = selection()->zyppPattern(); + ZyppPattern zyppPattern = selection()->zyppPattern(); - if ( zyppPattern ) - { - int total = 0; - int installed = 0; + if ( zyppPattern ) + { + int total = 0; + int installed = 0; - zypp::Pattern::Contents c(zyppPattern->contents()); - for ( zypp::Pattern::Contents::Selectable_iterator it = c.selectableBegin(); - it != c.selectableEnd(); - ++it ) - { - ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); - if ( zyppPkg ) - { - if ( (*it)->installedSize() > 0 ) - ++installed; - ++total; + zypp::Pattern::Contents c(zyppPattern->contents()); + for ( zypp::Pattern::Contents::Selectable_iterator it = c.selectableBegin(); + it != c.selectableEnd(); + ++it ) + { + ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); + if ( zyppPkg ) + { + if ( (*it)->installedSize() > 0 ) + ++installed; + ++total; - emit filterMatch( *it, zyppPkg ); - } - } - selection()->setInstalledPackages(installed); - selection()->setTotalPackages(total); - selection()->resetToolTip(); - } + emit filterMatch( *it, zyppPkg ); + } + } + selection()->setInstalledPackages(installed); + selection()->setTotalPackages(total); + selection()->resetToolTip(); + } } emit filterFinished(); @@ -355,11 +356,11 @@ if ( cat ) { - item = new YQPkgPatternListItem( this, cat, selectable, zyppPattern ); + item = new YQPkgPatternListItem( this, cat, selectable, zyppPattern ); } else { - item = new YQPkgPatternListItem( this, selectable, zyppPattern ); + item = new YQPkgPatternListItem( this, selectable, zyppPattern ); } resizeColumnToContents(_howmanyCol); @@ -393,18 +394,18 @@ if ( categoryItem ) { - if ( button == Qt::LeftButton ) - { - if ( col == 0 ) - { - categoryItem->setExpanded( ! categoryItem->isExpanded() ); - } - } + if ( button == Qt::LeftButton ) + { + if ( col == 0 ) + { + categoryItem->setExpanded( ! categoryItem->isExpanded() ); + } + } } else { - YQPkgObjList::pkgObjClicked( button, listViewItem, col, pos ); + YQPkgObjList::pkgObjClicked( button, listViewItem, col, pos ); } } @@ -432,6 +433,7 @@ #endif } + YQPkgPatternListItem::YQPkgPatternListItem( YQPkgPatternList * patternList, ZyppSel selectable, ZyppPattern zyppPattern ) @@ -466,25 +468,24 @@ if (_zyppPattern) { - string icon = _zyppPattern->icon().asString(); - // HACK most patterns have wrong default icon - if ( (icon == zypp::Pathname("yast-system").asString()) || - icon.empty() ) - icon = "pattern-generic"; + string icon = _zyppPattern->icon().asString(); + // HACK most patterns have wrong default icon + if ( (icon == zypp::Pathname("yast-system").asString()) || + icon.empty() ) + icon = "pattern-generic"; + + + QString iconName = QString::fromStdString(icon); + if ( QIcon::hasThemeIcon(iconName) ) + { + setIcon( _patternList->iconCol(), QIcon::fromTheme(iconName) ); + } + else + { + std::string iconpath = YQPackageSelector::iconPath(icon, 32); + setIcon(_patternList->iconCol(), QIcon(QString(iconpath.c_str()))); + } - - //std::cout << icon << " | "<< iconpath << std::endl; - QString iconName = QString::fromStdString(icon); - if ( QIcon::hasThemeIcon(iconName) ) - { - setIcon( _patternList->iconCol(), QIcon::fromTheme(iconName) ); - } - else - { - std::string iconpath = YQPackageSelector::iconPath(icon, 32); - setIcon(_patternList->iconCol(), QIcon(QString(iconpath.c_str()))); - } - } @@ -526,7 +527,7 @@ break; case S_AutoInstall: - newStatus = S_NoInst; + newStatus = S_NoInst; break; default: @@ -560,12 +561,13 @@ if ( totalPackages() > 0 ) { - infoToolTip += ("<p>" + zypp::str::form("%d / %d", installedPackages(), totalPackages() ) + "</p>"); + infoToolTip += ("<p>" + zypp::str::form("%d / %d", installedPackages(), totalPackages() ) + "</p>"); } setToolTip(_patternList->summaryCol(), fromUTF8(infoToolTip)); } + void YQPkgPatternListItem::applyChanges() { @@ -577,15 +579,12 @@ { const YQPkgPatternListItem * otherPatternListitem = dynamic_cast<const YQPkgPatternListItem *>(&otherListViewItem); - //std::cout << _zyppPattern->order()<< " | " << otherPatternListitem->zyppPattern()->order() << std::endl; - - if ( _zyppPattern && otherPatternListitem && otherPatternListitem->zyppPattern() ) { - if ( _zyppPattern->order() != otherPatternListitem->zyppPattern()->order() ) - return _zyppPattern->order() < otherPatternListitem->zyppPattern()->order(); - else - return _zyppPattern->name() < otherPatternListitem->zyppPattern()->name(); + if ( _zyppPattern->order() != otherPatternListitem->zyppPattern()->order() ) + return _zyppPattern->order() < otherPatternListitem->zyppPattern()->order(); + else + return _zyppPattern->name() < otherPatternListitem->zyppPattern()->name(); } const YQPkgPatternCategoryItem * otherCategoryItem = dynamic_cast<const YQPkgPatternCategoryItem *>(&otherListViewItem); @@ -596,6 +595,7 @@ return QTreeWidgetItem::operator<( otherListViewItem ); } + YQPkgPatternCategoryItem::YQPkgPatternCategoryItem( YQPkgPatternList * patternList, const QString & category ) : QY2ListViewItem( patternList ) @@ -613,6 +613,7 @@ // NOP } + void YQPkgPatternCategoryItem::addPattern( ZyppPattern pattern ) { @@ -640,9 +641,9 @@ YQPkgPatternCategoryItem::setTreeIcon() { setIcon( 0, - isExpanded() ? - YQIconPool::arrowDown() : - YQIconPool::arrowRight() ); + isExpanded() ? + YQIconPool::arrowDown() : + YQIconPool::arrowRight() ); } @@ -652,7 +653,7 @@ const YQPkgPatternCategoryItem * otherCategoryItem = dynamic_cast<const YQPkgPatternCategoryItem *>(&otherListViewItem); if ( _firstPattern && otherCategoryItem && otherCategoryItem->firstPattern() ) - return _firstPattern->order() < otherCategoryItem->firstPattern()->order(); + return _firstPattern->order() < otherCategoryItem->firstPattern()->order(); const YQPkgPatternListItem * otherPatternListitem = dynamic_cast<const YQPkgPatternListItem *>(&otherListViewItem); @@ -665,4 +666,3 @@ -#include "YQPkgPatternList.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgProductDialog.cc new/libyui-qt-pkg-2.45.24/src/YQPkgProductDialog.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgProductDialog.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgProductDialog.cc 2018-11-08 12:02:15.000000000 +0100 @@ -177,4 +177,3 @@ -#include "YQPkgProductDialog.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgProductList.cc new/libyui-qt-pkg-2.45.24/src/YQPkgProductList.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgProductList.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgProductList.cc 2018-11-08 12:02:15.000000000 +0100 @@ -173,4 +173,3 @@ -#include "YQPkgProductList.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgRepoFilterView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgRepoFilterView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgRepoFilterView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgRepoFilterView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -91,4 +91,3 @@ _repoList->filterIfVisible(); } -#include "YQPkgRepoFilterView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgRepoList.cc new/libyui-qt-pkg-2.45.24/src/YQPkgRepoList.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgRepoList.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgRepoList.cc 2018-11-08 12:02:15.000000000 +0100 @@ -297,4 +297,3 @@ return zyppRepo().info().name() < otherItem->zyppRepo().info().name(); } -#include "YQPkgRepoList.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgSearchFilterView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgSearchFilterView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgSearchFilterView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgSearchFilterView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -464,4 +464,3 @@ return false; } -#include "YQPkgSearchFilterView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgSecondaryFilterView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgSecondaryFilterView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgSecondaryFilterView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgSecondaryFilterView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -193,4 +193,3 @@ return true; } -#include "YQPkgSecondaryFilterView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgSelDescriptionView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgSelDescriptionView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgSelDescriptionView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgSelDescriptionView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -191,4 +191,3 @@ } -#include "YQPkgSelDescriptionView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgSelList.cc new/libyui-qt-pkg-2.45.24/src/YQPkgSelList.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgSelList.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgSelList.cc 2018-11-08 12:02:15.000000000 +0100 @@ -256,4 +256,3 @@ -#include "YQPkgSelList.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgServiceFilterView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgServiceFilterView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgServiceFilterView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgServiceFilterView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -63,4 +63,3 @@ return ret; } -#include "YQPkgServiceFilterView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgServiceList.cc new/libyui-qt-pkg-2.45.24/src/YQPkgServiceList.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgServiceList.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgServiceList.cc 2018-11-08 12:02:15.000000000 +0100 @@ -248,4 +248,3 @@ return QString::compare(fromUTF8(zyppServiceName()), fromUTF8(otherItem->zyppServiceName()), Qt::CaseInsensitive) < 0; } -#include "YQPkgServiceList.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgStatusFilterView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgStatusFilterView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgStatusFilterView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgStatusFilterView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -313,4 +313,3 @@ -#include "YQPkgStatusFilterView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgTechnicalDetailsView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgTechnicalDetailsView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgTechnicalDetailsView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgTechnicalDetailsView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -218,4 +218,3 @@ } -#include "YQPkgTechnicalDetailsView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgTextDialog.cc new/libyui-qt-pkg-2.45.24/src/YQPkgTextDialog.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgTextDialog.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgTextDialog.cc 2018-11-08 12:02:15.000000000 +0100 @@ -350,4 +350,3 @@ -#include "YQPkgTextDialog.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgUpdateProblemFilterView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgUpdateProblemFilterView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgUpdateProblemFilterView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgUpdateProblemFilterView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -133,4 +133,3 @@ } -#include "YQPkgUpdateProblemFilterView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQPkgVersionsView.cc new/libyui-qt-pkg-2.45.24/src/YQPkgVersionsView.cc --- old/libyui-qt-pkg-2.45.22/src/YQPkgVersionsView.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQPkgVersionsView.cc 2018-11-08 12:02:15.000000000 +0100 @@ -709,4 +709,3 @@ -#include "YQPkgVersionsView.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.45.22/src/YQSimplePatchSelector.cc new/libyui-qt-pkg-2.45.24/src/YQSimplePatchSelector.cc --- old/libyui-qt-pkg-2.45.22/src/YQSimplePatchSelector.cc 2018-10-29 12:37:07.000000000 +0100 +++ new/libyui-qt-pkg-2.45.24/src/YQSimplePatchSelector.cc 2018-11-08 12:02:15.000000000 +0100 @@ -280,4 +280,3 @@ -#include "YQSimplePatchSelector.moc"
