[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/CustomTarget_kde5_moc.mk vcl/inc vcl/unx
Jan-Marek Glogowski (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jul 12 08:49:51 UTC 2019
vcl/CustomTarget_kde5_moc.mk | 4 -
vcl/inc/qt5/tst_exclude_posted_events.hxx | 67 ----------------------
vcl/inc/qt5/tst_exclude_socket_notifiers.hxx | 78 --------------------------
vcl/unx/kde5/tst_exclude_posted_events.hxx | 67 ----------------------
vcl/unx/kde5/tst_exclude_socket_notifiers.hxx | 78 --------------------------
5 files changed, 1 insertion(+), 293 deletions(-)
New commits:
commit 53052d8a860f5ad19fae289f5854e931fd1bfd7a
Author: Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Thu Jul 11 16:08:05 2019 +0000
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Fri Jul 12 10:48:57 2019 +0200
Qt5 / KDE5 drop unused configure.ac bug tests
These were moved from the kde4 backend but never used. The tested
bugs don't exists in Qt5 AFAIK, so just remove them.
Change-Id: Ib30c3aee8caf0addd6cf17938f7915a65733e328
Reviewed-on: https://gerrit.libreoffice.org/75428
Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
Tested-by: Jenkins
(cherry picked from commit b88927fbc73c61f77a5159e240f6d11010aef451)
Reviewed-on: https://gerrit.libreoffice.org/75430
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
diff --git a/vcl/CustomTarget_kde5_moc.mk b/vcl/CustomTarget_kde5_moc.mk
index 5c7fea94428b..8f9d65c27f31 100644
--- a/vcl/CustomTarget_kde5_moc.mk
+++ b/vcl/CustomTarget_kde5_moc.mk
@@ -10,9 +10,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde5))
$(call gb_CustomTarget_get_target,vcl/unx/kde5) : \
- $(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
+ $(call gb_CustomTarget_get_workdir,vcl/unx/kde5)/KDE5FilePicker.moc
$(call gb_CustomTarget_get_workdir,vcl/unx/kde5)/%.moc : \
$(SRCDIR)/vcl/unx/kde5/%.hxx \
diff --git a/vcl/inc/qt5/tst_exclude_posted_events.hxx b/vcl/inc/qt5/tst_exclude_posted_events.hxx
deleted file mode 100644
index 79c9887f843e..000000000000
--- a/vcl/inc/qt5/tst_exclude_posted_events.hxx
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- *
- * This code is based on the SocketEventsTester from the Qt4 test suite.
- */
-
-#pragma once
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QEventLoop>
-
-const QEvent::Type eventType = QEvent::User;
-
-class TestExcludePostedEvents : public QObject
-{
- Q_OBJECT
-public:
- TestExcludePostedEvents();
- virtual bool event(QEvent* e) override;
- bool processed;
-};
-
-TestExcludePostedEvents::TestExcludePostedEvents()
- : processed(false)
-{
-}
-
-bool TestExcludePostedEvents::event(QEvent* e)
-{
- if (e->type() == eventType)
- processed = true;
- return QObject::event(e);
-}
-
-#define QVERIFY(a) \
- if (!a) \
- return 1;
-
-static int tst_excludePostedEvents()
-{
- TestExcludePostedEvents test;
- QCoreApplication::postEvent(&test, new QEvent(eventType));
- QEventLoop loop;
- loop.processEvents(QEventLoop::ExcludeUserInputEvents
- | QEventLoop::ExcludeSocketNotifiers
- // | QEventLoop::WaitForMoreEvents
- | QEventLoop::X11ExcludeTimers);
- QVERIFY(!test.processed);
- loop.processEvents();
- QVERIFY(test.processed);
- return 0;
-}
diff --git a/vcl/inc/qt5/tst_exclude_socket_notifiers.hxx b/vcl/inc/qt5/tst_exclude_socket_notifiers.hxx
deleted file mode 100644
index 7f4d2e3d6244..000000000000
--- a/vcl/inc/qt5/tst_exclude_socket_notifiers.hxx
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- *
- * This code is based on the SocketEventsTester from the Qt4 test suite.
- */
-
-#pragma once
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QEventLoop>
-#include <QtCore/QSocketNotifier>
-#include <unistd.h>
-
-class TestExcludeSocketNotifiers : public QObject
-{
- Q_OBJECT
-public:
- TestExcludeSocketNotifiers(const int* pipes);
- virtual ~TestExcludeSocketNotifiers() override;
- bool received;
-public slots:
- void slotReceived();
-
-private:
- const int* pipes;
-};
-
-TestExcludeSocketNotifiers::TestExcludeSocketNotifiers(const int* thePipes)
- : received(false)
- , pipes(thePipes)
-{
-}
-
-TestExcludeSocketNotifiers::~TestExcludeSocketNotifiers()
-{
- close(pipes[0]);
- close(pipes[1]);
-}
-
-void TestExcludeSocketNotifiers::slotReceived() { received = true; }
-
-#define QVERIFY(a) \
- if (!a) \
- return 1;
-
-static int tst_processEventsExcludeSocket()
-{
- int pipes[2];
- if (pipe(pipes) < 0)
- return 1;
- TestExcludeSocketNotifiers test(pipes);
- QSocketNotifier notifier(pipes[0], QSocketNotifier::Read);
- QObject::connect(¬ifier, SIGNAL(activated(int)), &test, SLOT(slotReceived()));
- char dummy = 'a';
- if (1 != write(pipes[1], &dummy, 1))
- return 1;
- QEventLoop loop;
- loop.processEvents(QEventLoop::ExcludeSocketNotifiers);
- QVERIFY(!test.received);
- loop.processEvents();
- QVERIFY(test.received);
- return 0;
-}
diff --git a/vcl/unx/kde5/tst_exclude_posted_events.hxx b/vcl/unx/kde5/tst_exclude_posted_events.hxx
deleted file mode 100644
index 79c9887f843e..000000000000
--- a/vcl/unx/kde5/tst_exclude_posted_events.hxx
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- *
- * This code is based on the SocketEventsTester from the Qt4 test suite.
- */
-
-#pragma once
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QEventLoop>
-
-const QEvent::Type eventType = QEvent::User;
-
-class TestExcludePostedEvents : public QObject
-{
- Q_OBJECT
-public:
- TestExcludePostedEvents();
- virtual bool event(QEvent* e) override;
- bool processed;
-};
-
-TestExcludePostedEvents::TestExcludePostedEvents()
- : processed(false)
-{
-}
-
-bool TestExcludePostedEvents::event(QEvent* e)
-{
- if (e->type() == eventType)
- processed = true;
- return QObject::event(e);
-}
-
-#define QVERIFY(a) \
- if (!a) \
- return 1;
-
-static int tst_excludePostedEvents()
-{
- TestExcludePostedEvents test;
- QCoreApplication::postEvent(&test, new QEvent(eventType));
- QEventLoop loop;
- loop.processEvents(QEventLoop::ExcludeUserInputEvents
- | QEventLoop::ExcludeSocketNotifiers
- // | QEventLoop::WaitForMoreEvents
- | QEventLoop::X11ExcludeTimers);
- QVERIFY(!test.processed);
- loop.processEvents();
- QVERIFY(test.processed);
- return 0;
-}
diff --git a/vcl/unx/kde5/tst_exclude_socket_notifiers.hxx b/vcl/unx/kde5/tst_exclude_socket_notifiers.hxx
deleted file mode 100644
index 7f4d2e3d6244..000000000000
--- a/vcl/unx/kde5/tst_exclude_socket_notifiers.hxx
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- *
- * This code is based on the SocketEventsTester from the Qt4 test suite.
- */
-
-#pragma once
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QEventLoop>
-#include <QtCore/QSocketNotifier>
-#include <unistd.h>
-
-class TestExcludeSocketNotifiers : public QObject
-{
- Q_OBJECT
-public:
- TestExcludeSocketNotifiers(const int* pipes);
- virtual ~TestExcludeSocketNotifiers() override;
- bool received;
-public slots:
- void slotReceived();
-
-private:
- const int* pipes;
-};
-
-TestExcludeSocketNotifiers::TestExcludeSocketNotifiers(const int* thePipes)
- : received(false)
- , pipes(thePipes)
-{
-}
-
-TestExcludeSocketNotifiers::~TestExcludeSocketNotifiers()
-{
- close(pipes[0]);
- close(pipes[1]);
-}
-
-void TestExcludeSocketNotifiers::slotReceived() { received = true; }
-
-#define QVERIFY(a) \
- if (!a) \
- return 1;
-
-static int tst_processEventsExcludeSocket()
-{
- int pipes[2];
- if (pipe(pipes) < 0)
- return 1;
- TestExcludeSocketNotifiers test(pipes);
- QSocketNotifier notifier(pipes[0], QSocketNotifier::Read);
- QObject::connect(¬ifier, SIGNAL(activated(int)), &test, SLOT(slotReceived()));
- char dummy = 'a';
- if (1 != write(pipes[1], &dummy, 1))
- return 1;
- QEventLoop loop;
- loop.processEvents(QEventLoop::ExcludeSocketNotifiers);
- QVERIFY(!test.received);
- loop.processEvents();
- QVERIFY(test.received);
- return 0;
-}
More information about the Libreoffice-commits
mailing list