2 files changed, 38 insertions, 54 deletions
diff --git a/include/vcl/locktoplevels.hxx b/include/vcl/locktoplevels.hxx
new file mode 100644
index 000000000000..9d0bf5f39b44
--- /dev/null
+++ b/include/vcl/locktoplevels.hxx
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#pragma once
+
+#include <vcl/dllapi.h>
+#include <memory>
+
+namespace weld
+{
+class Widget;
+}
+
+struct TopLevelWindowLockerImpl;
+
+class VCL_DLLPUBLIC TopLevelWindowLocker
+{
+private:
+    std::unique_ptr<TopLevelWindowLockerImpl> m_xImpl;
+
+public:
+    TopLevelWindowLocker();
+    ~TopLevelWindowLocker();
+
+    // lock all toplevels, except the argument
+    void incBusy(const weld::Widget* pIgnore);
+    // unlock previous lock
+    void decBusy();
+    bool isBusy() const;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/include/vcl/waitobj.hxx b/include/vcl/waitobj.hxx
deleted file mode 100644
index cd6b0c5cfe95..000000000000
--- a/include/vcl/waitobj.hxx
+++ /dev/null
@@ -1,54 +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 .
- */
-
-#ifndef INCLUDED_VCL_WAITOBJ_HXX
-#define INCLUDED_VCL_WAITOBJ_HXX
-
-#include <vcl/dllapi.h>
-#include <vcl/window.hxx>
-
-#include <stack>
-#include <vector>
-
-namespace weld { class Widget; }
-
-class VCL_DLLPUBLIC WaitObject
-{
-private:
-    VclPtr<vcl::Window>  mpWindow;
-public:
-    WaitObject(vcl::Window* pWindow);
-    ~WaitObject();
-};
-
-class VCL_DLLPUBLIC TopLevelWindowLocker
-{
-private:
-    std::stack<std::vector<VclPtr<vcl::Window>>> m_aBusyStack;
-public:
-    // lock all toplevels, except the argument
-    void incBusy(const weld::Widget* pIgnore);
-    // unlock previous lock
-    void decBusy();
-    bool isBusy() const { return !m_aBusyStack.empty(); }
-};
-
-#endif // INCLUDED_VCL_WAITOBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */