Merge branch 'master' into kf6

12 files changed, 28 insertions, 4 deletions

diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp
index 429060221..921baf73f 100644
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -124,3 +124,5 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVe
 
     return QIcon::fromTheme(iconName).pixmap(QSize(overlayHeight, overlayHeight));
 }
+
+#include "moc_dolphinfileitemlistwidget.cpp"
diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index 9902f651b..0efea844c 100644
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -237,3 +237,5 @@ void DolphinItemListView::updateGridSize()
     setItemSize(QSizeF(itemWidth, itemHeight));
     endTransaction();
 }
+
+#include "moc_dolphinitemlistview.cpp"
diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp
index a1e2fe1d0..fa549cf84 100644
--- a/src/views/dolphinnewfilemenuobserver.cpp
+++ b/src/views/dolphinnewfilemenuobserver.cpp
@@ -42,3 +42,5 @@ DolphinNewFileMenuObserver::DolphinNewFileMenuObserver()
 DolphinNewFileMenuObserver::~DolphinNewFileMenuObserver()
 {
 }
+
+#include "moc_dolphinnewfilemenuobserver.cpp"
diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index 35b50f07c..32dd6bd29 100644
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -215,3 +215,5 @@ void DolphinRemoteEncoding::updateView()
     m_actionHandler->currentView()->setUrl(m_currentURL);
     m_actionHandler->currentView()->reload();
 }
+
+#include "moc_dolphinremoteencoding.cpp"
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index a557fa8d1..ebbf324b0 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -2317,7 +2317,7 @@ void DolphinView::slotSwipeUp()
 
 void DolphinView::showLoadingPlaceholder()
 {
-    m_placeholderLabel->setText(i18n("Loading..."));
+    m_placeholderLabel->setText(i18n("Loading…"));
     m_placeholderLabel->setVisible(true);
 }
 
@@ -2392,3 +2392,5 @@ bool DolphinView::tryShowNameToolTip(QHelpEvent *event)
     }
     return false;
 }
+
+#include "moc_dolphinview.cpp"
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index d30464626..4408a9e47 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -77,7 +77,7 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
     // This action doesn't appear in the GUI, it's for the shortcut only.
     // KNewFileMenu takes care of the GUI stuff.
     QAction *newDirAction = m_actionCollection->addAction(QStringLiteral("create_dir"));
-    newDirAction->setText(i18nc("@action", "Create Folder..."));
+    newDirAction->setText(i18nc("@action", "Create Folder…"));
     m_actionCollection->setDefaultShortcuts(newDirAction, KStandardShortcut::createFolder());
     newDirAction->setIcon(QIcon::fromTheme(QStringLiteral("folder-new")));
     newDirAction->setEnabled(false); // Will be enabled in slotWriteStateChanged(bool) if the current URL is writable
@@ -327,7 +327,7 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
     connect(showHiddenFiles, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleShowHiddenFiles);
 
     QAction *adjustViewProps = m_actionCollection->addAction(QStringLiteral("view_properties"));
-    adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Display Style..."));
+    adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Display Style…"));
     adjustViewProps->setIcon(QIcon::fromTheme(QStringLiteral("view-choose")));
     adjustViewProps->setWhatsThis(i18nc("@info:whatsthis",
                                         "This opens a window "
@@ -820,3 +820,5 @@ void DolphinViewActionHandler::slotSelectionChanged(const KFileItemList &selecti
         }
     }
 }
+
+#include "moc_dolphinviewactionhandler.cpp"
diff --git a/src/views/tooltips/dolphinfilemetadatawidget.cpp b/src/views/tooltips/dolphinfilemetadatawidget.cpp
index 3686b0f18..ba068d3f4 100644
--- a/src/views/tooltips/dolphinfilemetadatawidget.cpp
+++ b/src/views/tooltips/dolphinfilemetadatawidget.cpp
@@ -131,3 +131,5 @@ KFileItemList DolphinFileMetaDataWidget::items() const
 {
     return m_fileMetaDataWidget->items();
 }
+
+#include "moc_dolphinfilemetadatawidget.cpp"
diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp
index c9d22eedf..b8c93b051 100644
--- a/src/views/tooltips/tooltipmanager.cpp
+++ b/src/views/tooltips/tooltipmanager.cpp
@@ -219,3 +219,5 @@ void ToolTipManager::showToolTip()
 
     m_toolTipRequested = false;
 }
+
+#include "moc_tooltipmanager.cpp"
diff --git a/src/views/versioncontrol/kversioncontrolplugin.cpp b/src/views/versioncontrol/kversioncontrolplugin.cpp
index 0190bb365..76688f56e 100644
--- a/src/views/versioncontrol/kversioncontrolplugin.cpp
+++ b/src/views/versioncontrol/kversioncontrolplugin.cpp
@@ -20,3 +20,5 @@ QString KVersionControlPlugin::localRepositoryRoot(const QString & /*directory*/
 {
     return QString();
 }
+
+#include "moc_kversioncontrolplugin.cpp"
diff --git a/src/views/versioncontrol/updateitemstatesthread.cpp b/src/views/versioncontrol/updateitemstatesthread.cpp
index 37c36f40c..ad53517ae 100644
--- a/src/views/versioncontrol/updateitemstatesthread.cpp
+++ b/src/views/versioncontrol/updateitemstatesthread.cpp
@@ -49,3 +49,5 @@ QMap<QString, QVector<VersionControlObserver::ItemState>> UpdateItemStatesThread
 {
     return m_itemStates;
 }
+
+#include "moc_updateitemstatesthread.cpp"
diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 28fbbef1a..e3bd29390 100644
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -218,7 +218,7 @@ void VersionControlObserver::updateItemStates()
 
     if (!itemStates.isEmpty()) {
         if (!m_silentUpdate) {
-            Q_EMIT infoMessage(i18nc("@info:status", "Updating version information..."));
+            Q_EMIT infoMessage(i18nc("@info:status", "Updating version information…"));
         }
         m_updateItemStatesThread = new UpdateItemStatesThread(m_plugin, itemStates);
         connect(m_updateItemStatesThread, &UpdateItemStatesThread::finished, this, &VersionControlObserver::slotThreadFinished);
@@ -323,3 +323,5 @@ bool VersionControlObserver::isVersionControlled() const
 {
     return m_plugin != nullptr;
 }
+
+#include "moc_versioncontrolobserver.cpp"
diff --git a/src/views/viewmodecontroller.cpp b/src/views/viewmodecontroller.cpp
index 55be625d7..9e285511a 100644
--- a/src/views/viewmodecontroller.cpp
+++ b/src/views/viewmodecontroller.cpp
@@ -71,3 +71,5 @@ void ViewModeController::setUrl(const QUrl &url)
         Q_EMIT urlChanged(url);
     }
 }
+
+#include "moc_viewmodecontroller.cpp"