Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: remove bogus KMultiTabBarInternal and KACLListView reimplementations

Browse source 
there are no virtual QFrame::contentsMousePressEvent() and
QTreeWidget::contentsMousePressEvent() methods

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-20 01:49:01 +03:00
parent c311f7032f
commit 59b6598599
5 changed files with 48 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kdeui/widgets/kmultitabbar.cpp
View file

@ -86,11 +86,6 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style)
updateGeometry();
}
void KMultiTabBarInternal::contentsMousePressEvent(QMouseEvent *ev)
{
ev->ignore();
}
void KMultiTabBarInternal::mousePressEvent(QMouseEvent *ev)
{
ev->ignore();

13
kdeui/widgets/kmultitabbar_p.h
View file

@ -33,28 +33,29 @@ class KMultiTabBarInternal: public QFrame
public:
KMultiTabBarInternal(QWidget *parent, KMultiTabBar::KMultiTabBarPosition pos);
virtual ~KMultiTabBarInternal();
int appendTab(const QPixmap &,int=-1,const QString& =QString());
int appendTab(const QPixmap &, int = -1,const QString & = QString());
KMultiTabBarTab *tab(int) const;
void removeTab(int);
void setPosition(enum KMultiTabBar::KMultiTabBarPosition pos);
void setStyle(enum KMultiTabBar::KMultiTabBarStyle style);
void showActiveTabTexts(bool show);
QList<KMultiTabBarTab*>* tabs(){return &m_tabs;}
QList<KMultiTabBarTab*>* tabs() { return &m_tabs; }
private:
friend class KMultiTabBar;
QBoxLayout *mainLayout;
QList<KMultiTabBarTab*> m_tabs;
enum KMultiTabBar::KMultiTabBarPosition m_position;
enum KMultiTabBar::KMultiTabBarStyle m_style;
protected:
protected:
/**
* [contentsM|m]ousePressEvent are reimplemented from QScrollView
* mousePressEvent is reimplemented from QFrame
* in order to ignore all mouseEvents on the viewport, so that the
* parent can handle them.
*/
virtual void contentsMousePressEvent(QMouseEvent *);
virtual void mousePressEvent(QMouseEvent *);
void mousePressEvent(QMouseEvent *ev) final;
};
#endif

39
kio/kfile/kacleditwidget.cpp
View file

@ -772,45 +772,6 @@ KACL KACLListView::getDefaultACL()
return itemsToACL( true );
}
void KACLListView::contentsMousePressEvent( QMouseEvent * /*e*/ )
{
/*
QTreeWidgetItem *clickedItem = itemAt( e->pos() );
if ( !clickedItem ) return;
// if the click is on an as yet unselected item, select it first
if ( !clickedItem->isSelected() )
QAbstractItemView::contentsMousePressEvent( e );
if ( !currentItem() ) return;
int column = header()->sectionAt( e->x() );
acl_perm_t perm;
switch ( column )
{
case 2:
perm = ACL_READ;
break;
case 3:
perm = ACL_WRITE;
break;
case 4:
perm = ACL_EXECUTE;
break;
default:
return QTreeWidget::contentsMousePressEvent( e );
}
KACLListViewItem* referenceItem = static_cast<KACLListViewItem*>( clickedItem );
unsigned short referenceHadItSet = referenceItem->value & perm;
QTreeWidgetItemIterator it( this );
while ( KACLListViewItem* item = static_cast<KACLListViewItem*>( *it ) ) {
++it;
if ( !item->isSelected() ) continue;
// toggle those with the same value as the clicked item, leave the others
if ( referenceHadItSet == ( item->value & perm ) )
item->togglePerm( perm );
}
*/
}
void KACLListView::slotItemClicked( QTreeWidgetItem* pItem, int col )
{
if ( !pItem ) return;

82
kio/kfile/kacleditwidget_p.h
View file

@ -46,11 +46,10 @@ class KACLListView;
*/
class KACLListView : public QTreeWidget
{
Q_OBJECT
Q_OBJECT
friend class KACLListViewItem;
public:
enum Types
{
enum Types {
OWNER_IDX = 0,
GROUP_IDX,
OTHERS_IDX,
@ -59,15 +58,18 @@ public:
NAMED_GROUP_IDX,
LAST_IDX
};
enum EntryType { User = 1,
Group = 2,
Others = 4,
Mask = 8,
NamedUser = 16,
NamedGroup = 32,
AllTypes = 63 };
KACLListView( QWidget* parent = 0 );
enum EntryType {
User = 1,
Group = 2,
Others = 4,
Mask = 8,
NamedUser = 16,
NamedGroup = 32,
AllTypes = 63
};
KACLListView(QWidget *parent = nullptr);
~KACLListView();
bool hasMaskEntry() const { return m_hasMask; }
@ -75,21 +77,21 @@ public:
bool allowDefaults() const { return m_allowDefaults; }
void setAllowDefaults( bool v ) { m_allowDefaults = v; }
unsigned short maskPermissions() const;
void setMaskPermissions( unsigned short maskPerms );
void setMaskPermissions(unsigned short maskPerms);
acl_perm_t maskPartialPermissions() const;
void setMaskPartialPermissions( acl_perm_t maskPerms );
void setMaskPartialPermissions(acl_perm_t maskPerms);
bool maskCanBeDeleted() const;
bool defaultMaskCanBeDeleted() const;
const KACLListViewItem* findDefaultItemByType( EntryType type ) const;
const KACLListViewItem* findItemByType( EntryType type,
bool defaults = false ) const;
unsigned short calculateMaskValue( bool defaults ) const;
const KACLListViewItem* findDefaultItemByType(EntryType type) const;
const KACLListViewItem* findItemByType(EntryType type,
bool defaults = false) const;
unsigned short calculateMaskValue(bool defaults) const;
void calculateEffectiveRights();
QStringList allowedUsers( bool defaults, KACLListViewItem *allowedItem = 0 );
QStringList allowedGroups( bool defaults, KACLListViewItem *allowedItem = 0 );
QStringList allowedUsers(bool defaults, KACLListViewItem *allowedItem = nullptr);
QStringList allowedGroups(bool defaults, KACLListViewItem *allowedItem = nullptr);
KACL getACL();
@ -102,17 +104,15 @@ public Q_SLOTS:
void slotAddEntry();
void slotEditEntry();
void slotRemoveEntry();
void setACL( const KACL &anACL );
void setDefaultACL( const KACL &anACL );
void setACL(const KACL &anACL);
void setDefaultACL(const KACL &anACL);
protected Q_SLOTS:
void slotItemClicked( QTreeWidgetItem* pItem, int col );
protected:
void contentsMousePressEvent( QMouseEvent * e );
void slotItemClicked(QTreeWidgetItem* pItem, int col);
private:
void fillItemsFromACL( const KACL &pACL, bool defaults = false );
KACL itemsToACL( bool defaults ) const;
void fillItemsFromACL(const KACL &pACL, bool defaults = false);
KACL itemsToACL(bool defaults) const;
KACL m_ACL;
KACL m_defaultACL;
@ -129,18 +129,18 @@ class EditACLEntryDialog : public KDialog
{
Q_OBJECT
public:
EditACLEntryDialog( KACLListView *listView, KACLListViewItem *item,
const QStringList &users,
const QStringList &groups,
const QStringList &defaultUsers,
const QStringList &defaultGroups,
int allowedTypes = KACLListView::AllTypes,
int allowedDefaultTypes = KACLListView::AllTypes,
bool allowDefault = false );
EditACLEntryDialog(KACLListView *listView, KACLListViewItem *item,
const QStringList &users,
const QStringList &groups,
const QStringList &defaultUsers,
const QStringList &defaultGroups,
int allowedTypes = KACLListView::AllTypes,
int allowedDefaultTypes = KACLListView::AllTypes,
bool allowDefault = false);
KACLListViewItem* item() const { return m_item; }
public Q_SLOTS:
void slotOk();
void slotSelectionChanged( QAbstractButton* );
void slotSelectionChanged(QAbstractButton *);
private Q_SLOTS:
void slotUpdateAllowedUsersAndGroups();
void slotUpdateAllowedTypes();
@ -165,20 +165,20 @@ private:
class KACLListViewItem : public QTreeWidgetItem
{
public:
KACLListViewItem( QTreeWidget* parent, KACLListView::EntryType type,
unsigned short value,
bool defaultEntry,
const QString& qualifier = QString() );
KACLListViewItem(QTreeWidget *parent, KACLListView::EntryType type,
unsigned short value,
bool defaultEntry,
const QString &qualifier = QString());
virtual ~KACLListViewItem();
QString key() const;
bool operator< ( const QTreeWidgetItem & other ) const;
bool operator< (const QTreeWidgetItem &other) const;
void calcEffectiveRights();
bool isDeletable() const;
bool isAllowedToChangeType() const;
void togglePerm( acl_perm_t perm );
void togglePerm(acl_perm_t perm);
void updatePermPixmaps();
void repaint();

1
kio/kfile/kdiskfreespaceinfo.cpp
View file

@ -80,7 +80,6 @@ QString KDiskFreeSpaceInfo::mountPoint() const
return d->mountPoint;
}
KIO::filesize_t KDiskFreeSpaceInfo::size() const
{
return d->size;