Build TerminalPanel also on Windows

[dolphin.git] / src / settings / general / previewssettingspage.cpp

diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 37e05197ac29198890c89d9b6b1c190fe377da04..e579a572d09d560fffc3612d7733f12795cd496f 100644 (file)
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -26,6 +26,7 @@
 #include <KLocalizedString>
 #include <KServiceTypeTrader>
 #include <KService>
 #include <KLocalizedString>
 #include <KServiceTypeTrader>
 #include <KService>

+#include <KIO/PreviewJob>

 
 #include <settings/serviceitemdelegate.h>
 #include <settings/servicemodel.h>
 
 #include <settings/serviceitemdelegate.h>
 #include <settings/servicemodel.h>


@@ -45,16 +46,15 @@
 
 // default settings
 namespace {
 
 // default settings
 namespace {

-    const bool UseThumbnails = true;

     const int MaxRemotePreviewSize = 0; // 0 MB
 }
 
 PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
     m_initialized(false),
     const int MaxRemotePreviewSize = 0; // 0 MB
 }
 
 PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
     m_initialized(false),

-    m_listView(0),
+    m_listView(nullptr),

     m_enabledPreviewPlugins(),
     m_enabledPreviewPlugins(),

-    m_remoteFileSizeBox(0)
+    m_remoteFileSizeBox(nullptr)

 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
 
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
 


@@ -79,10 +79,10 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
 
     m_remoteFileSizeBox = new QSpinBox(this);
     m_remoteFileSizeBox->setSingleStep(1);
 
     m_remoteFileSizeBox = new QSpinBox(this);
     m_remoteFileSizeBox->setSingleStep(1);

-    m_remoteFileSizeBox->setSuffix(QLatin1String(" MB"));
+    m_remoteFileSizeBox->setSuffix(QStringLiteral(" MB"));

     m_remoteFileSizeBox->setRange(0, 9999999); /* MB */
 
     m_remoteFileSizeBox->setRange(0, 9999999); /* MB */
 

-    QHBoxLayout* fileSizeBoxLayout = new QHBoxLayout(this);
+    QHBoxLayout* fileSizeBoxLayout = new QHBoxLayout();

     fileSizeBoxLayout->addWidget(remoteFileSizeLabel, 0, Qt::AlignRight);
     fileSizeBoxLayout->addWidget(m_remoteFileSizeBox);
 
     fileSizeBoxLayout->addWidget(remoteFileSizeLabel, 0, Qt::AlignRight);
     fileSizeBoxLayout->addWidget(m_remoteFileSizeBox);
 


@@ -116,7 +116,7 @@ void PreviewsSettingsPage::applySettings()
         }
     }
 
         }
     }
 

-    KConfigGroup globalConfig(KSharedConfig::openConfig(), QLatin1String("PreviewSettings"));
+    KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings"));

     globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins);
 
     const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024;
     globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins);
 
     const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024;


@@ -155,9 +155,9 @@ void PreviewsSettingsPage::loadPreviewPlugins()
 {
     QAbstractItemModel* model = m_listView->model();
 
 {
     QAbstractItemModel* model = m_listView->model();
 

-    const KService::List plugins = KServiceTypeTrader::self()->query(QLatin1String("ThumbCreator"));
+    const KService::List plugins = KServiceTypeTrader::self()->query(QStringLiteral("ThumbCreator"));

     foreach (const KService::Ptr& service, plugins) {
     foreach (const KService::Ptr& service, plugins) {

-        const bool configurable = service->property("Configurable", QVariant::Bool).toBool();
+        const bool configurable = service->property(QStringLiteral("Configurable"), QVariant::Bool).toBool();

         const bool show = m_enabledPreviewPlugins.contains(service->desktopEntryName());
 
         model->insertRow(0);
         const bool show = m_enabledPreviewPlugins.contains(service->desktopEntryName());
 
         model->insertRow(0);


@@ -173,11 +173,8 @@ void PreviewsSettingsPage::loadPreviewPlugins()
 
 void PreviewsSettingsPage::loadSettings()
 {
 
 void PreviewsSettingsPage::loadSettings()
 {

-    KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
-    m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", QStringList()
-                                                     << QLatin1String("directorythumbnail")
-                                                     << QLatin1String("imagethumbnail")
-                                                     << QLatin1String("jpegthumbnail"));
+    const KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings"));
+    m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins());

 
     const qulonglong defaultRemotePreview = static_cast<qulonglong>(MaxRemotePreviewSize) * 1024 * 1024;
     const qulonglong maxRemoteByteSize = globalConfig.readEntry("MaximumRemoteSize", defaultRemotePreview);
 
     const qulonglong defaultRemotePreview = static_cast<qulonglong>(MaxRemotePreviewSize) * 1024 * 1024;
     const qulonglong maxRemoteByteSize = globalConfig.readEntry("MaximumRemoteSize", defaultRemotePreview);