From ffd5175527666aff323a68950d5ca47c9e60c7d4 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 21 Sep 2022 18:32:30 +0300 Subject: [PATCH] kio: remove reference to non-existing QColorGroup class Signed-off-by: Ivailo Monev --- kio/kfile/kacleditwidget.cpp | 31 ------------------------------- kio/kfile/kacleditwidget_p.h | 16 +++++----------- kparts/statusbarextension.cpp | 2 +- 3 files changed, 6 insertions(+), 43 deletions(-) diff --git a/kio/kfile/kacleditwidget.cpp b/kio/kfile/kacleditwidget.cpp index 14d4b69f..d67b0fdf 100644 --- a/kio/kfile/kacleditwidget.cpp +++ b/kio/kfile/kacleditwidget.cpp @@ -217,37 +217,6 @@ bool KACLListViewItem::operator< ( const QTreeWidgetItem& other ) const return key() < static_cast(other).key(); } -#if 0 -void KACLListViewItem::paintCell( QPainter* p, const QColorGroup &cg, - int column, int width, int alignment ) -{ - if ( isDefault ) { - setForeground( QColor( 0, 0, 255 ) ); - } - if ( isPartial ) { - QFont font = p->font(); - font.setItalic( true ); - setForeground( QColor( 100, 100, 100 ) ); - p->setFont( font ); - } - QTreeWidgetItem::paintCell( p, mycg, column, width, alignment ); - - KACLListViewItem *below =0; - if ( itemBelow() ) - below = static_cast( itemBelow() ); - const bool lastUser = type == KACLListView::NamedUser && below && below->type == KACLListView::NamedGroup; - const bool lastNonDefault = !isDefault && below && below->isDefault; - if ( type == KACLListView::Mask || lastUser || lastNonDefault ) - { - p->setPen( QPen( Qt::gray, 0, Qt::DotLine ) ); - if ( type == KACLListView::Mask ) - p->drawLine( 0, 0, width - 1, 0 ); - p->drawLine( 0, height() - 1, width - 1, height() - 1 ); - } -} -#endif - - void KACLListViewItem::updatePermPixmaps() { unsigned int partialPerms = value; diff --git a/kio/kfile/kacleditwidget_p.h b/kio/kfile/kacleditwidget_p.h index cb705b59..ee2b1db5 100644 --- a/kio/kfile/kacleditwidget_p.h +++ b/kio/kfile/kacleditwidget_p.h @@ -28,19 +28,18 @@ #include #include -#include +#include +#include +#include +#include +#include #include #include #include class KACLListViewItem; -#include class KACLListView; -#include -#include -#include -class QColorGroup; /** @author Sean Harmer @@ -181,11 +180,6 @@ public: void togglePerm( acl_perm_t perm ); -#if 0 - virtual void paintCell( QPainter *p, const QColorGroup &cg, - int column, int width, int alignment ); -#endif - void updatePermPixmaps(); void repaint(); diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp index bac9e5f0..8c53d969 100644 --- a/kparts/statusbarextension.cpp +++ b/kparts/statusbarextension.cpp @@ -119,7 +119,7 @@ StatusBarExtension *StatusBarExtension::childObject( QObject *obj ) bool StatusBarExtension::eventFilter(QObject * watched, QEvent* ev) { if ( !GUIActivateEvent::test( ev ) || - !::qobject_cast(watched) ) + !qobject_cast(watched) ) return QObject::eventFilter(watched, ev); KStatusBar * sb = statusBar();