Merge remote-tracking branch 'origin/master' into frameworks

Since the master branch had never been merged into frameworks since the
creation of the frameworks branch, I had to fix a couple of merge
conflicts and make another change in order to make it build - I hope I
did not get anything wrong.

We should probably merge master into frameworks on a regular basis from
now on.

CCMAIL:kfm-devel@kde.org

Conflicts:
	dolphin/src/dolphinmainwindow.cpp
	dolphin/src/search/dolphinfacetswidget.cpp
	dolphin/src/statusbar/dolphinstatusbar.cpp
	dolphin/src/views/dolphinview.cpp

diff --cc src/dolphinmainwindow.cpp
index 53f9826c95cc5f87015045a040171fbfa0fb069d,e6b9112091f466004453c28d20fd5318afeba685..dc5e37ff7a9d6eb25773950ed1d48df0dfcc1655
--- 1/src/dolphinmainwindow.cpp
--- 2/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@@ -1634,17 -1633,21 +1638,21 @@@ void DolphinMainWindow::setupActions(
      nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab));
  
      QList<QKeySequence> prevTabKeys;
 -    prevTabKeys.append(KStandardShortcut::tabPrev().primary());
 +    prevTabKeys.append(KStandardShortcut::tabPrev().first()); //TODO: is this correct
      prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab));
  
 -    KAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
 +    QAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
+     activateNextTab->setIconText(i18nc("@action:inmenu", "Next Tab"));
      activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
 -    connect(activateNextTab, SIGNAL(triggered()), SLOT(activateNextTab()));
+     activateNextTab->setEnabled(false);
 +    connect(activateNextTab, &QAction::triggered, this, &DolphinMainWindow::activateNextTab);
      activateNextTab->setShortcuts(QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys);
  
 -    KAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab");
 +    QAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab");
+     activatePrevTab->setIconText(i18nc("@action:inmenu", "Previous Tab"));
      activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab"));
 -    connect(activatePrevTab, SIGNAL(triggered()), SLOT(activatePrevTab()));
+     activatePrevTab->setEnabled(false);
 +    connect(activatePrevTab, &QAction::triggered, this, &DolphinMainWindow::activatePrevTab);
      activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys);
  
      // for context menu

diff --cc src/dolphinviewcontainer.cpp
Simple merge

diff --cc src/kitemviews/kfileitemmodel.cpp
Simple merge

diff --cc src/kitemviews/kitemlistcontroller.cpp
Simple merge

diff --cc src/kitemviews/kitemlistview.cpp
Simple merge

diff --cc src/kitemviews/kitemlistwidget.cpp
Simple merge

diff --cc src/kitemviews/kstandarditemlistwidget.cpp
Simple merge

diff --cc src/kitemviews/private/kdirectorycontentscounter.cpp
Simple merge

diff --cc src/kitemviews/private/kitemlistviewanimation.cpp
Simple merge

diff --cc src/panels/information/informationpanelcontent.cpp
Simple merge

diff --cc src/panels/places/placesitemmodel.cpp
Simple merge

diff --cc src/panels/places/placespanel.cpp
Simple merge

diff --cc src/search/dolphinfacetswidget.cpp
Simple merge

diff --cc src/search/dolphinsearchbox.cpp
index d47996a78ec1bab04cb0c734081849373628ee32,46ca01a4cef85d9a246917531b6851431ab6275d..f9942f98e6bf1bfc3a1879cba6741bae21fcd3f7
--- 1/src/search/dolphinsearchbox.cpp
--- 2/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@@ -424,10 -422,9 +423,9 @@@ void DolphinSearchBox::init(
      m_startSearchTimer = new QTimer(this);
      m_startSearchTimer->setSingleShot(true);
      m_startSearchTimer->setInterval(1000);
 -    connect(m_startSearchTimer, SIGNAL(timeout()), this, SLOT(emitSearchRequest()));
 +    connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);
  
      updateFacetsToggleButton();
-     applyReadOnlyState();
  }
  
  KUrl DolphinSearchBox::balooUrlForSearching() const

diff --cc src/search/filenamesearchprotocol.cpp
index fd56f68b7be9c57698619ecde39ad262e2f2211a,fd7f09a8806f5d04f526bb15c99d79f6647e2c4d..3333dcc07238a7b941fa2de2ced045aadf1ddc65
--- 1/src/search/filenamesearchprotocol.cpp
--- 2/src/search/filenamesearchprotocol.cpp
+++ b/src/search/filenamesearchprotocol.cpp
@@@ -92,8 -91,11 +92,11 @@@ void FileNameSearchProtocol::searchDire
          bool addItem = false;
          if (!m_regExp || item.name().contains(*m_regExp)) {
              addItem = true;
-         } else if (m_checkContent && item.mimetype().startsWith(QLatin1String("text/"))) {
 -        } else if (m_checkContent && item.determineMimeType()->is(QLatin1String("text/plain"))) {
++        } else if (m_checkContent && item.determineMimeType().inherits(QLatin1String("text/plain"))) {
+             qDebug() << "### Checking" << item;
              addItem = contentContainsPattern(item.url());
+         } else {
+             qDebug() << "### NOT Checking" << item;
          }
  
          if (addItem) {

diff --cc src/statusbar/dolphinstatusbar.cpp
index 79355fb55f4efa37792e8f381e3032dab9f05584,169395e633b4d8b968de1b14ae49b62d6830f7b6..9f17c8ecd864827df207bdb272cf220845829de8
--- 1/src/statusbar/dolphinstatusbar.cpp
--- 2/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@@ -72,8 -72,9 +72,9 @@@ DolphinStatusBar::DolphinStatusBar(QWid
      m_zoomSlider->setPageStep(1);
      m_zoomSlider->setRange(ZoomLevelInfo::minimumLevel(), ZoomLevelInfo::maximumLevel());
  
 -    connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SIGNAL(zoomLevelChanged(int)));
 -    connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(updateZoomSliderToolTip(int)));
 -    connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(showZoomSliderToolTip(int)));
 +    connect(m_zoomSlider, &QSlider::valueChanged, this, &DolphinStatusBar::zoomLevelChanged);
++    connect(m_zoomSlider, &QSlider::valueChanged, this, &DolphinStatusBar::updateZoomSliderToolTip);
 +    connect(m_zoomSlider, &QSlider::sliderMoved, this, &DolphinStatusBar::showZoomSliderToolTip);
  
      // Initialize space information
      m_spaceInfo = new StatusBarSpaceInfo(this);

diff --cc src/views/dolphinitemlistview.cpp
Simple merge

diff --cc src/views/dolphinview.cpp
index 247b10bc83e631e1327042fa8596cc2e46aa95b0,c1f585da9448cf8955355db9120921b6130b8e29..0e43dcda1386388f32868fc95a75afcdb28f9706
--- 1/src/views/dolphinview.cpp
--- 2/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@@ -1050,7 -1046,8 +1050,8 @@@ void DolphinView::slotItemDropEvent(in
      if (op && destUrl == url()) {
          // Mark the dropped urls as selected.
          m_clearSelectionBeforeSelectingNewItems = true;
 -        connect(op, SIGNAL(aboutToCreate(KUrl::List)), this, SLOT(slotAboutToCreate(KUrl::List)));
+         m_markFirstNewlySelectedItemAsCurrent = true;
 +        connect(op, static_cast<void(KonqOperations::*)(const KUrl::List&)>(&KonqOperations::aboutToCreate), this, &DolphinView::slotAboutToCreate);
      }
  
      setActive(true);

diff --cc src/views/dolphinview.h
Simple merge

diff --cc src/views/renamedialog.cpp
Simple merge

diff --cc src/views/versioncontrol/updateitemstatesthread.cpp
Simple merge

diff --cc src/views/versioncontrol/versioncontrolobserver.cpp
Simple merge