kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-17 15:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some low-hanging warning fruits

Browse source
This commit is contained in:
Martin T. H. Sandsmark 2016-08-06 13:03:48 +02:00
parent b7edab2244
commit 676cdcbbdb
7 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/kitemviews/kitemlistwidget.cpp
View file

@ -516,10 +516,10 @@ void KItemListWidget::clearHoverCache()
void KItemListWidget::drawItemStyleOption(QPainter* painter, QWidget* widget, QStyle::State styleState) void KItemListWidget::drawItemStyleOption(QPainter* painter, QWidget* widget, QStyle::State styleState)
{ {
QStyleOptionViewItemV4 viewItemOption; QStyleOptionViewItem viewItemOption;
viewItemOption.initFrom(widget); viewItemOption.initFrom(widget);
viewItemOption.state = styleState; viewItemOption.state = styleState;
viewItemOption.viewItemPosition = QStyleOptionViewItemV4::OnlyOne; viewItemOption.viewItemPosition = QStyleOptionViewItem::OnlyOne;
viewItemOption.showDecorationSelected = true; viewItemOption.showDecorationSelected = true;
viewItemOption.rect = selectionRect().toRect(); viewItemOption.rect = selectionRect().toRect();
widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget); widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);

2
src/kitemviews/private/kbaloorolesprovider.h
View file

@ -82,7 +82,7 @@ private:
QSet<QByteArray> m_roles; QSet<QByteArray> m_roles;
QHash<QString, QByteArray> m_roleForProperty; QHash<QString, QByteArray> m_roleForProperty;
friend class KBalooRolesProviderSingleton; friend struct KBalooRolesProviderSingleton;
}; };
#endif #endif

2
src/panels/places/placesitemlistgroupheader.h
View file

@ -33,7 +33,7 @@ public:
protected: protected:
virtual void paintSeparator(QPainter* painter, const QColor& color) Q_DECL_OVERRIDE; virtual void paintSeparator(QPainter* painter, const QColor& color) Q_DECL_OVERRIDE;
virtual QPalette::ColorRole normalTextColorRole() const; virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE;
}; };
#endif #endif

2
src/panels/places/placespanel.h
View file

@ -52,7 +52,7 @@ protected:
virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
public slots: public slots:
virtual void readSettings(); virtual void readSettings() Q_DECL_OVERRIDE;
private slots: private slots:
void slotItemActivated(int index); void slotItemActivated(int index);

2
src/tests/kfileitemmodeltest.cpp
View file

@ -1674,7 +1674,7 @@ void KFileItemModelTest::testCollapseFolderWhileLoading()
const KFileItem fileItemC1 = m_model->fileItem(2); const KFileItem fileItemC1 = m_model->fileItem(2);
KFileItem fileItemC2 = fileItemC1; KFileItem fileItemC2 = fileItemC1;
QUrl urlC2 = fileItemC2.url(); QUrl urlC2 = fileItemC2.url();
urlC2.adjusted(QUrl::RemoveFilename); urlC2 = urlC2.adjusted(QUrl::RemoveFilename);
urlC2.setPath(urlC2.path() + "c2.txt"); urlC2.setPath(urlC2.path() + "c2.txt");
fileItemC2.setUrl(urlC2); fileItemC2.setUrl(urlC2);

4
src/views/dolphinview.cpp
View file

@ -75,10 +75,6 @@
#endif #endif
#include <KFormat> #include <KFormat>
namespace {
const int MaxModeEnum = DolphinView::CompactView;
}
DolphinView::DolphinView(const QUrl& url, QWidget* parent) : DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
QWidget(parent), QWidget(parent),
m_active(true), m_active(true),

4
src/views/tooltips/filemetadatatooltip.cpp
View file

@ -48,7 +48,7 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
m_fileMetaDataWidget(0) m_fileMetaDataWidget(0)
{ {
setAttribute(Qt::WA_TranslucentBackground); setAttribute(Qt::WA_TranslucentBackground);
setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint); setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint);
// Create widget for file preview // Create widget for file preview
m_preview = new QLabel(this); m_preview = new QLabel(this);
@ -174,8 +174,6 @@ void FileMetaDataToolTip::paintEvent(QPaintEvent* event)
void FileMetaDataToolTip::showEvent(QShowEvent *) void FileMetaDataToolTip::showEvent(QShowEvent *)
{ {
#pragma message("TODO: port Plasma::WindowEffects::overrideShadow")
//Plasma::WindowEffects::overrideShadow(winId(), true);
KWindowEffects::enableBlurBehind(winId(), true, mask()); KWindowEffects::enableBlurBehind(winId(), true, mask());
} }