execute move of global headers

see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details

Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a

5 files changed, 0 insertions, 324 deletions

diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 756d1f0bcf9a..5f936408a60a 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -48,7 +48,6 @@ endif
 
 ifneq ($(filter TRUE,$(ENABLE_KDE) $(ENABLE_TDE)),)
 $(eval $(call gb_Module_add_targets,shell,\
-	Package_inc \
 ))
 endif
 
diff --git a/shell/Package_inc.mk b/shell/Package_inc.mk
deleted file mode 100644
index 3242c4347ddc..000000000000
--- a/shell/Package_inc.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Package_Package,shell_inc,$(SRCDIR)/shell/inc/shell))
-
-$(eval $(call gb_Package_add_files,shell_inc,inc/shell,\
-	kde_headers.h \
-	tde_defines.h \
-	tde_headers.h \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/inc/shell/kde_headers.h b/shell/inc/shell/kde_headers.h
deleted file mode 100644
index 3ca3fa69ef26..000000000000
--- a/shell/inc/shell/kde_headers.h
+++ /dev/null
@@ -1,99 +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_KDE_HEADERS_H
-#define INCLUDED_VCL_KDE_HEADERS_H
-
-#include <config_vclplug.h>
-
-#if ENABLE_TDE
-
-#include "shell/tde_headers.h"
-
-#else // ENABLE_TDE
-
-/* ********* Suppress warnings if needed */
-#include "sal/config.h"
-
-#include <cstddef>
-
-#if defined __GNUC__
-#pragma GCC system_header
-#endif
-
-
-/* ********* Hack, but needed because of conflicting types... */
-#define Region QtXRegion
-
-
-/* ********* Qt headers */
-#include <qaccessible.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qfont.h>
-#include <qframe.h>
-#include <qlineedit.h>
-#include <qlistview.h>
-#include <qmainwindow.h>
-#include <qmenudata.h>
-#include <qpaintdevice.h>
-#include <qpainter.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qrangecontrol.h>
-#include <qstring.h>
-#include <qtabbar.h>
-#include <qtabwidget.h>
-#include <qtoolbar.h>
-#include <qtoolbutton.h>
-#include <qwidget.h>
-#include <qprogressbar.h>
-
-/* ********* See hack on top of this file */
-#undef Region
-
-
-/* ********* KDE base headers */
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kconfig.h>
-#include <kdeversion.h>
-#include <kemailsettings.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmainwindow.h>
-#include <kmenubar.h>
-#include <kprotocolmanager.h>
-#include <kstartupinfo.h>
-#include <kstyle.h>
-
-
-/* ********* KDE address book connectivity headers */
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
-#include <kabc/field.h>
-#include <kabc/stdaddressbook.h>
-
-#endif // ENABLE_TDE
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/shell/tde_defines.h b/shell/inc/shell/tde_defines.h
deleted file mode 100644
index 0dc91e931cee..000000000000
--- a/shell/inc/shell/tde_defines.h
+++ /dev/null
@@ -1,109 +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. 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.
- *
- * The Initial Developer of the Original Code is
- * Timothy Pearson <kb9vqf@pearsoncomputing.net> (C) 2012, All Rights Reserved.
- *
- * 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_VCL_TDE_DEFINE_HEADERS_H
-#define INCLUDED_VCL_TDE_DEFINE_HEADERS_H
-
-#define QObject         TQObject
-#define QWidget         TQWidget
-#define QVBox           TQVBox
-#define QHBox           TQHBox
-#define QGrid           TQGrid
-#define QString         TQString
-#define QStringList     TQStringList
-#define QCustomEvent    TQCustomEvent
-#define QMutex          TQMutex
-#define QEvent          TQEvent
-#define QFont           TQFont
-#define QDateTime       TQDateTime
-#define QThread         TQThread
-#define QStyle          TQStyle
-#define QApplication    TQApplication
-#define QRect           TQRect
-#define QProgressBar    TQProgressBar
-#define QPopupMenu      TQPopupMenu
-#define QMenuBar        TQMenuBar
-#define QToolButton     TQToolButton
-#define QToolBar        TQToolBar
-#define QScrollBar      TQScrollBar
-#define QListView       TQListView
-#define QSpinWidget     TQSpinWidget
-#define QScrollBar      TQScrollBar
-#define QLineEdit       TQLineEdit
-#define QComboBox       TQComboBox
-#define QCheckBox       TQCheckBox
-#define QRadioButton    TQRadioButton
-#define QPushButton     TQPushButton
-#define QPainter        TQPainter
-#define QResizeEvent    TQResizeEvent
-#define QShowEvent      TQShowEvent
-#define QPoint          TQPoint
-#define QDialog         TQDialog
-#define QFile           TQFile
-#define QLabel          TQLabel
-#define QObjectList     TQObjectList
-#define QCString        TQCString
-#define QRegExp         TQRegExp
-#define QSessionManager TQSessionManager
-#define QPaintDevice    TQPaintDevice
-#define QTextIStream    TQTextIStream
-#define QTextStream     TQTextStream
-#define QMutexLocker    TQMutexLocker
-#define QValueList      TQValueList
-#define QTab            TQTab
-#define QTabBar         TQTabBar
-#define QTabWidget      TQTabWidget
-#define QMainWindow     TQMainWindow
-#define QPixmap         TQPixmap
-#define QColorGroup     TQColorGroup
-#define QStyleOption    TQStyleOption
-#define QSize           TQSize
-#define QMenuItem       TQMenuItem
-#define QFontInfo       TQFontInfo
-
-#define qSwap           tqSwap
-#define qt_cast         tqt_cast
-#define qt_xdisplay     tqt_xdisplay
-#define qVersion        tqVersion
-
-#define KAboutData      TDEAboutData
-#define KApplication    TDEApplication
-#define KCmdLineArgs    TDECmdLineArgs
-#define KConfig         TDEConfig
-#define KGlobal         TDEGlobal
-#define KGlobalSettings TDEGlobalSettings
-#define KMainWindow     TDEMainWindow
-#define KStartupInfo    TDEStartupInfo
-#define KStyle          TDEStyle
-#define KToolBar        TDEToolBar
-
-#define drawKStylePrimitive    drawTDEStylePrimitive
-
-#define KIO             TDEIO
-#define KABC            TDEABC
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/shell/tde_headers.h b/shell/inc/shell/tde_headers.h
deleted file mode 100644
index ed3739eb2e43..000000000000
--- a/shell/inc/shell/tde_headers.h
+++ /dev/null
@@ -1,97 +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. 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.
- *
- * The Initial Developer of the Original Code is
- * Timothy Pearson <kb9vqf@pearsoncomputing.net> (C) 2012, All Rights Reserved.
- *
- * 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_VCL_TDE_HEADERS_H
-#define INCLUDED_VCL_TDE_HEADERS_H
-
-/* ********* Suppress warnings if needed */
-#include "sal/config.h"
-
-#include <cstddef>
-
-#if defined __GNUC__
-#pragma GCC system_header
-#endif
-
-
-/* ********* Hack, but needed because of conflicting types... */
-#define Region TQtXRegion
-
-
-/* ********* TQt headers */
-#include <tqaccessible.h>
-#include <tqcheckbox.h>
-#include <tqcombobox.h>
-#include <tqfont.h>
-#include <tqframe.h>
-#include <tqlineedit.h>
-#include <tqlistview.h>
-#include <tqmainwindow.h>
-#include <tqmenudata.h>
-#include <tqpaintdevice.h>
-#include <tqpainter.h>
-#include <tqpushbutton.h>
-#include <tqradiobutton.h>
-#include <tqrangecontrol.h>
-#include <tqstring.h>
-#include <tqtabbar.h>
-#include <tqtabwidget.h>
-#include <tqtoolbar.h>
-#include <tqtoolbutton.h>
-#include <tqwidget.h>
-#include <tqprogressbar.h>
-
-/* ********* See hack on top of this file */
-#undef Region
-
-
-/* ********* TDE base headers */
-#include <tdeaboutdata.h>
-#include <tdeapplication.h>
-#include <tdecmdlineargs.h>
-#include <tdeconfig.h>
-#include <tdeversion.h>
-#include <tdeemailsettings.h>
-#include <tdeglobal.h>
-#include <tdeglobalsettings.h>
-#include <tdelocale.h>
-#include <tdemainwindow.h>
-#include <tdemenubar.h>
-#include <tdeprotocolmanager.h>
-#include <tdestartupinfo.h>
-#include <tdestyle.h>
-
-
-/* ********* TDE address book connectivity headers */
-#include <tdeabc/addressbook.h>
-#include <tdeabc/addressee.h>
-#include <tdeabc/field.h>
-#include <tdeabc/stdaddressbook.h>
-
-#include "tde_defines.h"
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */