Build TerminalPanel also on Windows

[dolphin.git] / src / settings / kcm / kcmdolphinservices.cpp

diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index 82c4275a377b6603590ed2b78ce3ecaa0383f9fd..5d011c627343bb15271b584121098ec3f784f811 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2009 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2009 by Peter Penz <peter.penz19@gmail.com>             *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -19,9 +19,6 @@
 
 #include "kcmdolphinservices.h"
 
 
 #include "kcmdolphinservices.h"
 

-#include <KTabWidget>
-#include <KDialog>
-#include <KLocale>

 #include <KPluginFactory>
 #include <KPluginLoader>
 
 #include <KPluginFactory>
 #include <KPluginLoader>
 


@@ -29,26 +26,22 @@
 
 #include <QVBoxLayout>
 
 
 #include <QVBoxLayout>
 

-K_PLUGIN_FACTORY(KCMDolphinServicesConfigFactory, registerPlugin<DolphinServicesConfigModule>("dolphinservices");)
-K_EXPORT_PLUGIN(KCMDolphinServicesConfigFactory("kcmdolphinservices"))
+K_PLUGIN_FACTORY(KCMDolphinServicesConfigFactory, registerPlugin<DolphinServicesConfigModule>(QStringLiteral("dolphinservices"));)

 
 DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const QVariantList& args) :
 
 DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const QVariantList& args) :

-    KCModule(KCMDolphinServicesConfigFactory::componentData(), parent),
-    m_services(0)
+    KCModule(parent),
+    m_services(nullptr)

 {
     Q_UNUSED(args);
 
 {
     Q_UNUSED(args);
 

-    KGlobal::locale()->insertCatalog("dolphin");
-

     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);

-    topLayout->setSpacing(KDialog::spacingHint());

 
     m_services = new ServicesSettingsPage(this);
 
     m_services = new ServicesSettingsPage(this);

-    connect(m_services, SIGNAL(changed()), this, SLOT(changed()));
-    topLayout->addWidget(m_services, 0, 0);
+    connect(m_services, &ServicesSettingsPage::changed, this, static_cast<void(DolphinServicesConfigModule::*)()>(&DolphinServicesConfigModule::changed));
+    topLayout->addWidget(m_services, 0, nullptr);

 }
 
 DolphinServicesConfigModule::~DolphinServicesConfigModule()
 }
 
 DolphinServicesConfigModule::~DolphinServicesConfigModule()