[Libreoffice-commits] core.git: solenv/clang-format vcl/inc vcl/source

[Caolán McNamara (via logerrit)]

 solenv/clang-format/excludelist |    1 
 vcl/inc/accel.h                 |   41 ----------------------------------------
 vcl/inc/accel.hxx               |   15 +++++++++++++-
 vcl/source/window/accel.cxx     |    1 
 vcl/source/window/accmgr.cxx    |    1 
 vcl/source/window/keycod.cxx    |    2 -
 6 files changed, 15 insertions(+), 46 deletions(-)

New commits:
commit 7a8d7c9bd97dd52bde2182e395167f2e3cc9fda6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Aug 4 20:18:11 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 5 11:50:41 2021 +0200

    merge accel.h and accel.hxx now both are vcl internals
    
    Change-Id: If73604d1e329f089a357021bdce2163f6f059160
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120014
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index c78867fd03db..83baec466610 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -14431,7 +14431,6 @@ vcl/inc/PhysicalFontFamily.hxx
 vcl/inc/ResampleKernel.hxx
 vcl/inc/WidgetThemeLibraryTypes.hxx
 vcl/inc/bitmap/bmpfast.hxx
-vcl/inc/accel.h
 vcl/inc/accel.hxx
 vcl/inc/accmgr.hxx
 vcl/inc/brdwin.hxx
diff --git a/vcl/inc/accel.h b/vcl/inc/accel.h
deleted file mode 100644
index 0c27a5411983..000000000000
--- a/vcl/inc/accel.h
+++ /dev/null
@@ -1,41 +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_INC_ACCEL_H
-#define INCLUDED_VCL_INC_ACCEL_H
-
-#include <vcl/keycod.hxx>
-
-class Accelerator;
-
-class ImplAccelEntry
-{
-public:
-    sal_uInt16      mnId;
-    vcl::KeyCode    maKeyCode;
-    Accelerator*    mpAccel;
-    Accelerator*    mpAutoAccel;
-    bool            mbEnabled;
-};
-
-bool ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 );
-
-#endif // INCLUDED_VCL_INC_ACCEL_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/accel.hxx b/vcl/inc/accel.hxx
index 53677cfcfb7c..fc763bd58f3d 100644
--- a/vcl/inc/accel.hxx
+++ b/vcl/inc/accel.hxx
@@ -26,9 +26,20 @@
 #include <memory>
 
 class ImplAccelData;
-class ImplAccelEntry;
 class CommandEvent;
 
+class Accelerator;
+
+class ImplAccelEntry
+{
+public:
+    sal_uInt16      mnId;
+    vcl::KeyCode    maKeyCode;
+    Accelerator*    mpAccel;
+    Accelerator*    mpAutoAccel;
+    bool            mbEnabled;
+};
+
 class Accelerator
 {
     friend class ImplAccelManager;
@@ -73,4 +84,6 @@ public:
     Accelerator&            operator=( const Accelerator& rAccel );
 };
 
+bool ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 );
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 1a0039bd2e0c..14861258c352 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -20,7 +20,6 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/solar.h>
-#include <accel.h>
 #include <accel.hxx>
 #include <map>
 #include <vector>
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index c588bb4d8f5a..26ea9846e8dc 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <accel.h>
 #include <accel.hxx>
 #include <accmgr.hxx>
 
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx
index 349e87ecbf43..e0ab290486ff 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/config.h>
 
-#include <accel.h>
+#include <accel.hxx>
 #include <salframe.hxx>
 #include <svdata.hxx>