diff options
author | Michael Dunphy <michael.w.dunphy@gmail.com> | 2013-04-19 19:10:54 -0400 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-04-21 05:51:29 +0000 |
commit | 8f4fc74c34df6efd6b74aacc610bf6f52b615aa5 (patch) | |
tree | b23f3137d9755999b95876da38cbf36a9229473e /vcl | |
parent | fd179c5f308a0a611bc2b5a479e28ff3ced79647 (diff) |
fdo#62699 Remove a few more pass-through headers
Change-Id: I4cc2dc7f1da3bc15921939e3bd5908a3f7049eab
Reviewed-on: https://gerrit.libreoffice.org/3492
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/Package_inc.mk | 1 | ||||
-rw-r--r-- | vcl/inc/vcl/button.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/decoview.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/symbol.hxx | 28 | ||||
-rw-r--r-- | vcl/source/window/splitwin.cxx | 4 |
5 files changed, 5 insertions, 32 deletions
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk index 08be3a2dd72a..69fff7d6c03c 100644 --- a/vcl/Package_inc.mk +++ b/vcl/Package_inc.mk @@ -137,7 +137,6 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/stdtext.hxx,vcl/stdtext.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/strhelper.hxx,vcl/strhelper.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svapp.hxx,vcl/svapp.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svgdata.hxx,vcl/svgdata.hxx)) -$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/symbol.hxx,vcl/symbol.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syschild.hxx,vcl/syschild.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sysdata.hxx,vcl/sysdata.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syswin.hxx,vcl/syswin.hxx)) diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx index 71fffc718deb..8c116b0644dd 100644 --- a/vcl/inc/vcl/button.hxx +++ b/vcl/inc/vcl/button.hxx @@ -23,10 +23,10 @@ #include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/image.hxx> -#include <vcl/symbol.hxx> #include <vcl/ctrl.hxx> #include <vcl/bitmap.hxx> #include <vcl/salnativewidgets.hxx> +#include <rsc/rsc-vcl-shared-types.hxx> #include <vector> diff --git a/vcl/inc/vcl/decoview.hxx b/vcl/inc/vcl/decoview.hxx index add5d20b828d..31e6529c5e55 100644 --- a/vcl/inc/vcl/decoview.hxx +++ b/vcl/inc/vcl/decoview.hxx @@ -22,7 +22,7 @@ #include <tools/solar.h> #include <vcl/dllapi.h> -#include <vcl/symbol.hxx> +#include <rsc/rsc-vcl-shared-types.hxx> class Rectangle; class Point; diff --git a/vcl/inc/vcl/symbol.hxx b/vcl/inc/vcl/symbol.hxx deleted file mode 100644 index 1b19ec3ceafd..000000000000 --- a/vcl/inc/vcl/symbol.hxx +++ /dev/null @@ -1,28 +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 _SV_SYMBOL_HXX -#define _SV_SYMBOL_HXX - -#include <tools/solar.h> -#include <rsc/rsc-vcl-shared-types.hxx> - -#endif // _SV_SYMBOL_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index a0967ce33378..c411b51f134a 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -22,16 +22,18 @@ #include <tools/debug.hxx> #include <tools/rcid.h> +#include <tools/solar.h> #include <vcl/event.hxx> #include <vcl/wall.hxx> #include <vcl/bitmap.hxx> #include <vcl/decoview.hxx> -#include <vcl/symbol.hxx> #include <vcl/image.hxx> #include <vcl/help.hxx> #include <vcl/splitwin.hxx> +#include <rsc/rsc-vcl-shared-types.hxx> + #include <svdata.hxx> #include <svids.hrc> |