mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
generic: remove bogus KMultiTabBarInternal and KACLListView reimplementations
there are no virtual QFrame::contentsMousePressEvent() and QTreeWidget::contentsMousePressEvent() methods Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
c311f7032f
commit
59b6598599
5 changed files with 48 additions and 92 deletions
|
@ -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();
|
||||
|
|
|
@ -33,6 +33,7 @@ class KMultiTabBarInternal: public QFrame
|
|||
public:
|
||||
KMultiTabBarInternal(QWidget *parent, KMultiTabBar::KMultiTabBarPosition pos);
|
||||
virtual ~KMultiTabBarInternal();
|
||||
|
||||
int appendTab(const QPixmap &, int = -1,const QString & = QString());
|
||||
KMultiTabBarTab *tab(int) const;
|
||||
void removeTab(int);
|
||||
|
@ -40,21 +41,21 @@ public:
|
|||
void setStyle(enum KMultiTabBar::KMultiTabBarStyle style);
|
||||
void showActiveTabTexts(bool show);
|
||||
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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -49,8 +49,7 @@ class KACLListView : public QTreeWidget
|
|||
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,
|
||||
|
||||
enum EntryType {
|
||||
User = 1,
|
||||
Group = 2,
|
||||
Others = 4,
|
||||
Mask = 8,
|
||||
NamedUser = 16,
|
||||
NamedGroup = 32,
|
||||
AllTypes = 63 };
|
||||
AllTypes = 63
|
||||
};
|
||||
|
||||
KACLListView( QWidget* parent = 0 );
|
||||
KACLListView(QWidget *parent = nullptr);
|
||||
~KACLListView();
|
||||
|
||||
bool hasMaskEntry() const { return m_hasMask; }
|
||||
|
@ -88,8 +90,8 @@ public:
|
|||
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();
|
||||
|
||||
|
@ -107,8 +109,6 @@ public Q_SLOTS:
|
|||
|
||||
protected Q_SLOTS:
|
||||
void slotItemClicked(QTreeWidgetItem* pItem, int col);
|
||||
protected:
|
||||
void contentsMousePressEvent( QMouseEvent * e );
|
||||
|
||||
private:
|
||||
void fillItemsFromACL(const KACL &pACL, bool defaults = false);
|
||||
|
|
|
@ -80,7 +80,6 @@ QString KDiskFreeSpaceInfo::mountPoint() const
|
|||
return d->mountPoint;
|
||||
}
|
||||
|
||||
|
||||
KIO::filesize_t KDiskFreeSpaceInfo::size() const
|
||||
{
|
||||
return d->size;
|
||||
|
|
Loading…
Add table
Reference in a new issue