Fix some low-hanging warning fruits

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index b834e951fbd098aad671516052e419eb38f5ad94..9c31155b3e35ce88723d4a63b0132870fd0f1b1a 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -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.state = styleState;
     viewItemOption.initFrom(widget);
     viewItemOption.state = styleState;

-    viewItemOption.viewItemPosition = QStyleOptionViewItemV4::OnlyOne;
+    viewItemOption.viewItemPosition = QStyleOptionViewItem::OnlyOne;

     viewItemOption.showDecorationSelected = true;
     viewItemOption.rect = selectionRect().toRect();
     widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);
     viewItemOption.showDecorationSelected = true;
     viewItemOption.rect = selectionRect().toRect();
     widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);

diff --git a/src/kitemviews/private/kbaloorolesprovider.h b/src/kitemviews/private/kbaloorolesprovider.h
index 9673bff4fa9a8a759d9a736a21c8a90435393e2f..a9bd2e8ef335f50bcaba1d990beba352ab505b2c 100644 (file)
--- a/src/kitemviews/private/kbaloorolesprovider.h
+++ b/src/kitemviews/private/kbaloorolesprovider.h
@@ -82,7 +82,7 @@ private:
     QSet<QByteArray> m_roles;
     QHash<QString, QByteArray> m_roleForProperty;
 
     QSet<QByteArray> m_roles;
     QHash<QString, QByteArray> m_roleForProperty;
 

-    friend class KBalooRolesProviderSingleton;
+    friend struct KBalooRolesProviderSingleton;

 };
 
 #endif
 };
 
 #endif

diff --git a/src/panels/places/placesitemlistgroupheader.h b/src/panels/places/placesitemlistgroupheader.h
index 7daaba602f0ff680349179d258d3af71325c406e..ec845e0ae8fadae778099e3042586f90d67d4129 100644 (file)
--- a/src/panels/places/placesitemlistgroupheader.h
+++ b/src/panels/places/placesitemlistgroupheader.h
@@ -33,7 +33,7 @@ public:
 protected:
     virtual void paintSeparator(QPainter* painter, const QColor& color) Q_DECL_OVERRIDE;
 
 protected:
     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
 

diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h
index 81aeedb280ca924b97b6cbcacb44db45230fe8ea..0c8b5f7f23b746a218eb013e1a676d87a450a507 100644 (file)
--- a/src/panels/places/placespanel.h
+++ b/src/panels/places/placespanel.h
@@ -52,7 +52,7 @@ protected:
     virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 
 public slots:
     virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 
 public slots:

-    virtual void readSettings();
+    virtual void readSettings() Q_DECL_OVERRIDE;

 
 private slots:
     void slotItemActivated(int index);
 
 private slots:
     void slotItemActivated(int index);

diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp
index eba32e1e1caa341e1db26399b4027a86614309fc..6c45e114b65166888322936b842adc2aad7a155e 100644 (file)
--- a/src/tests/kfileitemmodeltest.cpp
+++ b/src/tests/kfileitemmodeltest.cpp
@@ -1674,7 +1674,7 @@ void KFileItemModelTest::testCollapseFolderWhileLoading()
     const KFileItem fileItemC1 = m_model->fileItem(2);
     KFileItem fileItemC2 = fileItemC1;
     QUrl urlC2 = fileItemC2.url();
     const KFileItem fileItemC1 = m_model->fileItem(2);
     KFileItem fileItemC2 = fileItemC1;
     QUrl urlC2 = fileItemC2.url();

-    urlC2.adjusted(QUrl::RemoveFilename);
+    urlC2 = urlC2.adjusted(QUrl::RemoveFilename);

     urlC2.setPath(urlC2.path() + "c2.txt");
     fileItemC2.setUrl(urlC2);
 
     urlC2.setPath(urlC2.path() + "c2.txt");
     fileItemC2.setUrl(urlC2);
 

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 5466fd38efc716351cb6264823208ffe15a37c06..a737dd0a632cf9b27a660aac53889b5dd299057f 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -75,10 +75,6 @@
 #endif
 #include <KFormat>
 
 #endif
 #include <KFormat>
 

-namespace {
-    const int MaxModeEnum = DolphinView::CompactView;
-}
-

 DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     QWidget(parent),
     m_active(true),
 DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     QWidget(parent),
     m_active(true),

diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp
index 8fbca290dea4cc0caad63171a8243b5b59533736..0d58717d4bda4053dc747bcf5ea34f1e12ab6366 100644 (file)
--- a/src/views/tooltips/filemetadatatooltip.cpp
+++ b/src/views/tooltips/filemetadatatooltip.cpp
@@ -48,7 +48,7 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
     m_fileMetaDataWidget(0)
 {
     setAttribute(Qt::WA_TranslucentBackground);
     m_fileMetaDataWidget(0)
 {
     setAttribute(Qt::WA_TranslucentBackground);

-    setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint);
+    setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint);

 
     // Create widget for file preview
     m_preview = new QLabel(this);
 
     // Create widget for file preview
     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());
 }