disable -Wshadow for KDE backends

KDE/Qt consider -Wshadow not worth the trouble, and the qhash
workaround shows why.
This commit is contained in:
Luboš Luňák 2012-02-24 17:27:21 +01:00
parent 361b7fc217
commit 9974eed353
7 changed files with 28 additions and 59 deletions

View file

@ -58,4 +58,9 @@ $(eval $(call gb_Executable_add_generated_cxxobjects,kdefilepicker,\
$(eval $(call gb_Executable_set_warnings_not_errors,kdefilepicker))
# KDE/Qt consider -Wshadow more trouble than benefit
$(eval $(call gb_Executable_add_cxxflags,kdefilepicker,\
-Wno-shadow \
))
# vim: set noet sw=4 ts=4:

View file

@ -48,4 +48,9 @@ $(eval $(call gb_Library_add_exception_objects,fps_kde,\
fpicker/source/unx/kde_unx/UnxNotifyThread \
))
# KDE/Qt consider -Wshadow more trouble than benefit
$(eval $(call gb_Library_add_cxxflags,fps_kde,\
-Wno-shadow \
))
# vim: set noet sw=4 ts=4:

View file

@ -65,4 +65,9 @@ $(eval $(call gb_Library_add_generated_cxxobjects,fps_kde4,\
CustomTarget/fpicker/source/unx/kde4/KDE4FilePicker.moc \
))
# KDE/Qt consider -Wshadow more trouble than benefit
$(eval $(call gb_Library_add_cxxflags,fps_kde4,\
-Wno-shadow \
))
# vim: set noet sw=4 ts=4:

View file

@ -85,6 +85,12 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
vcl/unx/kde/salnativewidgets-kde \
))
# KDE/Qt consider -Wshadow more trouble than benefit
$(eval $(call gb_Library_add_cxxflags,vclplug_kde,\
-Wno-shadow \
))
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
dl \

View file

@ -94,6 +94,12 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
vcl/unx/kde4/VCLKDEApplication \
))
# KDE/Qt consider -Wshadow more trouble than benefit
$(eval $(call gb_Library_add_cxxflags,fps_kde4,\
-Wno-shadow \
))
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
dl \

View file

@ -32,7 +32,7 @@
#include <fixx11h.h>
#include "warning_guard_qhash.h"
#include <qhash.h>
#include <qsocketnotifier.h>
#include <qtimer.h>

View file

@ -1,58 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License or as specified alternatively below. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* Major Contributor(s):
* Copyright (C) 2011 Red Hat, Inc., Eike Rathke <erack@redhat.com>
* (initial developer)
*
* All Rights Reserved.
*
* For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
* the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
#ifndef INCLUDED_WARNINGS_GUARD_QHASH_H
#define INCLUDED_WARNINGS_GUARD_QHASH_H
// Because the GCC system_header mechanism doesn't work in .c/.cxx compilation
// units and more important affects the rest of the current include file, the
// warnings guard is separated into this header file on its own.
/*
Silence down this WaE:
/usr/include/qt4/QtCore/qscopedpointer.h:83:47: error: declaration of pointer
shadows a global declaration [-Werror=shadow]
Reported upstream as <https://bugreports.qt.nokia.com/browse/QTBUG-22908>.
And suggested to be closed, because there is no problem in Qt. This is a workaround, at best.
*/
#ifdef _MSC_VER
#pragma warning(push, 1)
#elif defined __GNUC__
#pragma GCC system_header
#endif
#include <qhash.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#endif // INCLUDED_WARNINGS_GUARD_QHASH_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */