┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Chornoivan <[email protected]>2015-03-19 20:13:40 +0200
committerYuri Chornoivan <[email protected]>2015-03-19 20:13:40 +0200
commite63b1de286b09af7a39f27fbc58817d5f9c18f48 (patch)
tree1c29a5f92e1368582ec4442d6049066e92d15a38
parenta7484d2ce51a6734a59a7b3f3ad9ef43c54717ee (diff)
Fix some EBN issues
-rw-r--r--src/kitemviews/kfileitemlistview.cpp2
-rw-r--r--src/kitemviews/kitemlistview.cpp4
-rw-r--r--src/kitemviews/kitemlistview.h2
-rw-r--r--src/kitemviews/private/kdirectorycontentscounter.h2
-rw-r--r--src/settings/general/configurepreviewplugindialog.cpp2
-rw-r--r--src/settings/startup/startupsettingspage.cpp1
-rw-r--r--src/views/dolphinview.cpp1
7 files changed, 6 insertions, 8 deletions
diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index d249bef91..d912a6c5c 100644
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -41,7 +41,7 @@ namespace {
// If the icon size changes, a longer delay is used. This prevents that
// the expensive re-generation of all previews is triggered repeatedly when
- // chaning the zoom level.
+ // changing the zoom level.
const int LongInterval = 300;
}
diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 9416f0dd7..df6539929 100644
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -1121,7 +1121,7 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges)
const int firstRemovedIndex = index;
const int lastRemovedIndex = index + count - 1;
- // Remeber which items have to be moved because they are behind the removed range.
+ // Remember which items have to be moved because they are behind the removed range.
QVector<int> itemsToMove;
// Remove all KItemListWidget instances that got deleted
@@ -2437,7 +2437,7 @@ int KItemListView::showDropIndicator(const QPointF& pos)
if (mappedPos.y() >= 0 && mappedPos.y() <= rect.height()) {
if (m_model->supportsDropping(widget->index())) {
// Keep 30% of the rectangle as the gap instead of always having a fixed gap
- const int gap = qMax(4.0, 0.3 * rect.height());
+ const int gap = qMax(qreal(4.0), qreal(0.3) * rect.height());
if (mappedPos.y() >= gap && mappedPos.y() <= rect.height() - gap) {
return -1;
}
diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index f20180289..9adf9f86f 100644
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -642,7 +642,7 @@ private:
/**
* Shows a drop-indicator between items dependent on the given
- * cursor position. The cursor position is relative the the upper left
+ * cursor position. The cursor position is relative to the upper left
* edge of the view.
* @return Index of the item where the dropping is done. An index of -1
* indicates that the item has been dropped after the last item.
diff --git a/src/kitemviews/private/kdirectorycontentscounter.h b/src/kitemviews/private/kdirectorycontentscounter.h
index c03d0249c..988208e02 100644
--- a/src/kitemviews/private/kdirectorycontentscounter.h
+++ b/src/kitemviews/private/kdirectorycontentscounter.h
@@ -89,4 +89,4 @@ private:
// to get all watched directories.
};
-#endif \ No newline at end of file
+#endif
diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp
index 15cd92667..f0ac54984 100644
--- a/src/settings/general/configurepreviewplugindialog.cpp
+++ b/src/settings/general/configurepreviewplugindialog.cpp
@@ -81,4 +81,4 @@ ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& plugin
auto okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
okButton->setDefault(true);
-} \ No newline at end of file
+}
diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index 21b213cd5..48d2a7b75 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -34,7 +34,6 @@
#include <QLabel>
#include <QPushButton>
#include <QHBoxLayout>
-#include <QVBoxLayout>
#include <QFileDialog>
#include "views/dolphinview.h"
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 191cd6511..d3023585a 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -54,7 +54,6 @@
#include <KIO/PasteJob>
#include <KIO/Paste>
#include <KJob>
-#include <QMenu>
#include <KMessageBox>
#include <KJobWidgets>
#include <QUrl>