[Libreoffice-commits] core.git: vcl/CustomTarget_kde5_moc.mk vcl/unx
Jan-Marek Glogowski (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jun 3 18:19:52 UTC 2019
vcl/CustomTarget_kde5_moc.mk | 1
vcl/unx/kde5/KDE5FilePicker.hxx | 35 --------------------------------
vcl/unx/kde5/KDE5FilePicker2.cxx | 42 +++------------------------------------
vcl/unx/kde5/KDE5SalInstance.cxx | 6 -----
vcl/unx/kde5/KDE5SalInstance.hxx | 9 --------
5 files changed, 5 insertions(+), 88 deletions(-)
New commits:
commit 81307dd74f26ba5c054dccd32dad507dc1510298
Author: Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sun Jun 2 19:58:50 2019 +0000
Commit: Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Mon Jun 3 20:18:47 2019 +0200
KDE5 header cleanup and Q_OBJECT drop
Uneeded since the merge of most of the KDE5FilePicker code into
Qt5FilePicker. KDE5SalInstance also uses no signals or slots, so
Q_OBJECT + moc can go for them.
Change-Id: If48c677106b78c759ca165563ad3c081ca5442a5
Reviewed-on: https://gerrit.libreoffice.org/73393
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
diff --git a/vcl/CustomTarget_kde5_moc.mk b/vcl/CustomTarget_kde5_moc.mk
index 7d68658fc279..5c7fea94428b 100644
--- a/vcl/CustomTarget_kde5_moc.mk
+++ b/vcl/CustomTarget_kde5_moc.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde5))
$(call gb_CustomTarget_get_target,vcl/unx/kde5) : \
- $(call gb_CustomTarget_get_workdir,vcl/unx/kde5)/KDE5SalInstance.moc \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde5)/KDE5FilePicker.moc \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde5)/tst_exclude_socket_notifiers.moc \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde5)/tst_exclude_posted_events.moc
diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index dc3f5c0f63a4..32cbd4c92e7d 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -21,34 +21,12 @@
#include <Qt5FilePicker.hxx>
-#include <cppuhelper/compbase.hxx>
-
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-#include <osl/conditn.hxx>
-#include <rtl/ustrbuf.hxx>
-
-#include <functional>
-
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QHash>
-#include <QtWidgets/QFileDialog>
-
-class QFileDialog;
class QGridLayout;
-class QWidget;
-class QComboBox;
class KDE5FilePicker : public Qt5FilePicker
{
Q_OBJECT
+
protected:
//layout for extra custom controls
QGridLayout* _layout;
@@ -70,17 +48,6 @@ public:
virtual void SAL_CALL setLabel(sal_Int16 nControlId, const OUString& rLabel) override;
virtual OUString SAL_CALL getLabel(sal_Int16 nControlId) override;
- /* TODO XFilePreview
-
- virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( );
- virtual sal_Int32 SAL_CALL getTargetColorDepth( );
- virtual sal_Int32 SAL_CALL getAvailableWidth( );
- virtual sal_Int32 SAL_CALL getAvailableHeight( );
- virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any &rImage );
- virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState );
- virtual sal_Bool SAL_CALL getShowState( );
- */
-
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override;
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index 6eab819a1c03..ac99b5d21066 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -18,53 +18,21 @@
*/
#include "KDE5FilePicker.hxx"
+#include <KDE5FilePicker.moc>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/supportsservice.hxx>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/ControlActions.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-
+#include <cppuhelper/supportsservice.hxx>
#include <osl/mutex.hxx>
-#include <sal/log.hxx>
-
-#undef Region
-#include <unx/geninst.h>
-#include <qt5/Qt5Tools.hxx>
#include <qt5/Qt5Instance.hxx>
-#include <QtCore/QDebug>
-#include <QtCore/QThread>
-#include <QtCore/QUrl>
-#include <QtGui/QClipboard>
-#include <QtGui/QWindow>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QApplication>
#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QLabel>
#include <QtWidgets/QWidget>
-#include <QtWidgets/QApplication>
#include <KFileWidget>
-#include <fpicker/strings.hrc>
-#include <strings.hrc>
-
using namespace ::com::sun::star;
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
-using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
-using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::uno;
-
-// helper functions
+using ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION;
namespace
{
@@ -238,6 +206,4 @@ bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
return QObject::eventFilter(o, e);
}
-#include <KDE5FilePicker.moc>
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index b7e2952fd347..63ce689518f5 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -21,13 +21,8 @@
#include <utility>
-#include <QtCore/QAbstractEventDispatcher>
-#include <QtCore/QThread>
#include <QtWidgets/QApplication>
-#include <QtGui/QClipboard>
-#include <QtWidgets/QFrame>
-#include <osl/process.h>
#include <sal/log.hxx>
#include <Qt5Data.hxx>
@@ -105,5 +100,4 @@ VCLPLUG_KDE5_PUBLIC SalInstance* create_SalInstance()
}
}
-#include <KDE5SalInstance.moc>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx
index a8ba073c2047..11276be3f4ec 100644
--- a/vcl/unx/kde5/KDE5SalInstance.hxx
+++ b/vcl/unx/kde5/KDE5SalInstance.hxx
@@ -19,21 +19,12 @@
#pragma once
-#include <sal/config.h>
-#include <memory>
-
-#include <QtCore/QObject>
#include <qt5/Qt5Instance.hxx>
-#include "KDE5SalFrame.hxx"
class QApplication;
-class SalYieldMutex;
-class SalFrame;
class KDE5SalInstance : public Qt5Instance
{
- Q_OBJECT
-
public:
explicit KDE5SalInstance(std::unique_ptr<QApplication>& pQApp);
More information about the Libreoffice-commits
mailing list