From 6fb127a62e8f6f55b41eb75e5f7c20339886e021 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 22 Aug 2012 15:11:52 +0200 Subject: Replace use_internal_api with use_udk_api etc. where appropriate Change-Id: I5e216ca01830a6568159ee8e9265938667f201a1 --- io/InternalUnoApi_acceptor.mk | 32 ----- io/InternalUnoApi_connectr.mk | 32 ----- io/InternalUnoApi_stm.mk | 32 ----- io/Library_acceptor.mk | 4 +- io/Library_connector.mk | 4 +- io/Library_streams.mk | 4 +- io/Module_io.mk | 3 - io/source/acceptor/acceptor.xml | 59 -------- io/source/connector/connectr.xml | 59 -------- io/source/stm/stm.xml | 295 --------------------------------------- 10 files changed, 3 insertions(+), 521 deletions(-) delete mode 100644 io/InternalUnoApi_acceptor.mk delete mode 100644 io/InternalUnoApi_connectr.mk delete mode 100644 io/InternalUnoApi_stm.mk delete mode 100644 io/source/acceptor/acceptor.xml delete mode 100644 io/source/connector/connectr.xml delete mode 100644 io/source/stm/stm.xml (limited to 'io') diff --git a/io/InternalUnoApi_acceptor.mk b/io/InternalUnoApi_acceptor.mk deleted file mode 100644 index ddd31d2252b2..000000000000 --- a/io/InternalUnoApi_acceptor.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# 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) 2012 Red Hat, Inc., David Tardon -# (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. - -$(eval $(call gb_InternalUnoApi_InternalUnoApi,acceptor)) - -$(eval $(call gb_InternalUnoApi_set_xmlfile,acceptor,io/source/acceptor/acceptor.xml)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/InternalUnoApi_connectr.mk b/io/InternalUnoApi_connectr.mk deleted file mode 100644 index 489606978772..000000000000 --- a/io/InternalUnoApi_connectr.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# 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) 2012 Red Hat, Inc., David Tardon -# (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. - -$(eval $(call gb_InternalUnoApi_InternalUnoApi,connectr)) - -$(eval $(call gb_InternalUnoApi_set_xmlfile,connectr,io/source/connector/connectr.xml)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/InternalUnoApi_stm.mk b/io/InternalUnoApi_stm.mk deleted file mode 100644 index 723e5fa689d1..000000000000 --- a/io/InternalUnoApi_stm.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# 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) 2012 Red Hat, Inc., David Tardon -# (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. - -$(eval $(call gb_InternalUnoApi_InternalUnoApi,stm)) - -$(eval $(call gb_InternalUnoApi_set_xmlfile,stm,io/source/stm/stm.xml)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk index 426460012f06..80062249654c 100644 --- a/io/Library_acceptor.mk +++ b/io/Library_acceptor.mk @@ -27,9 +27,7 @@ $(eval $(call gb_Library_Library,acceptor)) -$(eval $(call gb_Library_use_internal_api,acceptor,\ - acceptor \ -)) +$(eval $(call gb_Library_use_udk_api,acceptor)) $(eval $(call gb_Library_use_libraries,acceptor,\ cppu \ diff --git a/io/Library_connector.mk b/io/Library_connector.mk index 95a03c0a8429..c2147e7d3f31 100644 --- a/io/Library_connector.mk +++ b/io/Library_connector.mk @@ -27,9 +27,7 @@ $(eval $(call gb_Library_Library,connector)) -$(eval $(call gb_Library_use_internal_api,connector,\ - connectr \ -)) +$(eval $(call gb_Library_use_udk_api,connector)) $(eval $(call gb_Library_use_libraries,connector,\ cppu \ diff --git a/io/Library_streams.mk b/io/Library_streams.mk index 2745bf3e6af8..696bc4716c77 100644 --- a/io/Library_streams.mk +++ b/io/Library_streams.mk @@ -27,9 +27,7 @@ $(eval $(call gb_Library_Library,streams)) -$(eval $(call gb_Library_use_internal_api,streams,\ - stm \ -)) +$(eval $(call gb_Library_use_udk_api,streams)) $(eval $(call gb_Library_use_libraries,streams,\ cppu \ diff --git a/io/Module_io.mk b/io/Module_io.mk index b66e33d2ef95..44a4b02f8037 100644 --- a/io/Module_io.mk +++ b/io/Module_io.mk @@ -28,9 +28,6 @@ $(eval $(call gb_Module_Module,io)) $(eval $(call gb_Module_add_targets,io,\ - InternalUnoApi_acceptor \ - InternalUnoApi_connectr \ - InternalUnoApi_stm \ Library_acceptor \ Library_connector \ Library_streams \ diff --git a/io/source/acceptor/acceptor.xml b/io/source/acceptor/acceptor.xml deleted file mode 100644 index 60589de6f7f8..000000000000 --- a/io/source/acceptor/acceptor.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - acceptor.uno - - Joerg Budischewski - com.sun.star.comp.io.Acceptor - - This component allows - to accept an connect-attempt from a different process. - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.connection.Acceptor - ... - com.sun.star.connection.XAcceptor - com.sun.star.connection.XConnectionBroadcaster - com.sun.star.io.UnexpectedEOFException - com.sun.star.io.WrongFormatException - com.sun.star.lang.XComponent - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XTypeProvider - com.sun.star.lang.IllegalArgumentException - com.sun.star.registry.XRegistryKey - com.sun.star.registry.XImplementationRegistration - com.sun.star.test.XSimpleTest - com.sun.star.lang.XSingleComponentFactory - com.sun.star.uno.XComponentContext - com.sun.star.uno.TypeClass - com.sun.star.uno.XWeak - com.sun.star.uno.XAggregation - - cppuhelper - cppu - sal - cppuhelper - cppu2 - sal2 - diff --git a/io/source/connector/connectr.xml b/io/source/connector/connectr.xml deleted file mode 100644 index 82d8f16a9198..000000000000 --- a/io/source/connector/connectr.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - connector.uno - - Joerg Budischewski - com.sun.star.comp.io.Connector - - This component allows - to establish a connection to another process. - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.connection.Connector - ... - com.sun.star.connection.XConnector - com.sun.star.connection.XConnectionBroadcaster - com.sun.star.io.UnexpectedEOFException - com.sun.star.io.WrongFormatException - com.sun.star.lang.XComponent - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XTypeProvider - com.sun.star.lang.IllegalArgumentException - com.sun.star.registry.XRegistryKey - com.sun.star.registry.XImplementationRegistration - com.sun.star.test.XSimpleTest - com.sun.star.lang.XSingleComponentFactory - com.sun.star.uno.XComponentContext - com.sun.star.uno.TypeClass - com.sun.star.uno.XWeak - com.sun.star.uno.XAggregation - - cppuhelper - cppu - sal - cppuhelper2 - cppu2 - sal2 - diff --git a/io/source/stm/stm.xml b/io/source/stm/stm.xml deleted file mode 100644 index 154c76eb0d08..000000000000 --- a/io/source/stm/stm.xml +++ /dev/null @@ -1,295 +0,0 @@ - - - - - streams.uno - - - Joerg Budischewski - com.sun.star.comp.io.stm.Pipe - - This component provides ... - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.io.Pipe - ... - com.sun.star.io.XObjectInputStream - com.sun.star.io.XObjectOutputStream - com.sun.star.io.XActiveDataSource - com.sun.star.io.XActiveDataSink - com.sun.star.io.XMarkableStream - com.sun.star.io.UnexpectedEOFException - com.sun.star.io.WrongFormatException - com.sun.star.lang.XComponent - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XTypeProvider - com.sun.star.lang.IllegalArgumentException - com.sun.star.registry.XRegistryKey - com.sun.star.registry.XImplementationRegistration - com.sun.star.test.XSimpleTest - com.sun.star.lang.XSingleComponentFactory - com.sun.star.uno.XComponentContext - com.sun.star.uno.TypeClass - com.sun.star.uno.XWeak - com.sun.star.uno.XAggregation - - - - Joerg Budischewski - com.sun.star.comp.io.stm.DataInputStream - - This component provides ... - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.io.DataInputStream - ... - com.sun.star.io.XObjectInputStream - com.sun.star.io.XObjectOutputStream - com.sun.star.io.XActiveDataSource - com.sun.star.io.XActiveDataSink - com.sun.star.io.XMarkableStream - com.sun.star.io.UnexpectedEOFException - com.sun.star.io.WrongFormatException - com.sun.star.lang.XComponent - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XTypeProvider - com.sun.star.lang.IllegalArgumentException - com.sun.star.registry.XRegistryKey - com.sun.star.registry.XImplementationRegistration - com.sun.star.test.XSimpleTest - com.sun.star.uno.TypeClass - com.sun.star.uno.XWeak - com.sun.star.uno.XAggregation - - - - Joerg Budischewski - com.sun.star.comp.io.stm.DataOutputStream - - This component provides ... - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.io.DataOutputStream - ... - com.sun.star.io.XObjectInputStream - com.sun.star.io.XObjectOutputStream - com.sun.star.io.XActiveDataSource - com.sun.star.io.XActiveDataSink - com.sun.star.io.XMarkableStream - com.sun.star.io.UnexpectedEOFException - com.sun.star.io.WrongFormatException - com.sun.star.lang.XComponent - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XTypeProvider - com.sun.star.lang.IllegalArgumentException - com.sun.star.registry.XRegistryKey - com.sun.star.registry.XImplementationRegistration - com.sun.star.test.XSimpleTest - com.sun.star.lang.XSingleComponentFactory - com.sun.star.uno.XComponentContext - com.sun.star.uno.TypeClass - com.sun.star.uno.XWeak - com.sun.star.uno.XAggregation - - - - Joerg Budischewski - com.sun.star.comp.io.stm.ObjectInputStream - - This component provides ... - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.io.ObjectInputStream - ... - com.sun.star.io.XObjectInputStream - com.sun.star.io.XObjectOutputStream - com.sun.star.io.XActiveDataSource - com.sun.star.io.XActiveDataSink - com.sun.star.io.XMarkableStream - com.sun.star.io.UnexpectedEOFException - com.sun.star.io.WrongFormatException - com.sun.star.lang.XComponent - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XTypeProvider - com.sun.star.lang.IllegalArgumentException - com.sun.star.registry.XRegistryKey - com.sun.star.registry.XImplementationRegistration - com.sun.star.test.XSimpleTest - com.sun.star.lang.XSingleComponentFactory - com.sun.star.uno.XComponentContext - com.sun.star.uno.TypeClass - com.sun.star.uno.XWeak - com.sun.star.uno.XAggregation - - - - Joerg Budischewski - com.sun.star.comp.io.stm.ObjectOutputStream - - This component provides ... - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.io.ObjectOutputStream - ... - com.sun.star.io.XObjectInputStream - com.sun.star.io.XObjectOutputStream - com.sun.star.io.XActiveDataSource - com.sun.star.io.XActiveDataSink - com.sun.star.io.XMarkableStream - com.sun.star.io.UnexpectedEOFException - com.sun.star.io.WrongFormatException - com.sun.star.lang.XComponent - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XTypeProvider - com.sun.star.lang.IllegalArgumentException - com.sun.star.registry.XRegistryKey - com.sun.star.registry.XImplementationRegistration - com.sun.star.test.XSimpleTest - com.sun.star.lang.XSingleComponentFactory - com.sun.star.uno.XComponentContext - com.sun.star.uno.TypeClass - com.sun.star.uno.XWeak - com.sun.star.uno.XAggregation - - - - Joerg Budischewski - com.sun.star.comp.io.stm.MarkableInputStream - - This component provides ... - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.io.MarkableInputStream - ... - com.sun.star.io.XObjectInputStream - com.sun.star.io.XObjectOutputStream - com.sun.star.io.XActiveDataSource - com.sun.star.io.XActiveDataSink - com.sun.star.io.XMarkableStream - com.sun.star.io.UnexpectedEOFException - com.sun.star.io.WrongFormatException - com.sun.star.lang.XComponent - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XTypeProvider - com.sun.star.lang.IllegalArgumentException - com.sun.star.registry.XRegistryKey - com.sun.star.registry.XImplementationRegistration - com.sun.star.test.XSimpleTest - com.sun.star.lang.XSingleComponentFactory - com.sun.star.uno.XComponentContext - com.sun.star.uno.TypeClass - com.sun.star.uno.XWeak - com.sun.star.uno.XAggregation - - - - Joerg Budischewski - com.sun.star.comp.io.stm.MarkableOutputStream - - This component provides ... - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.io.MarkableOutputStream - ... - com.sun.star.io.XObjectInputStream - com.sun.star.io.XObjectOutputStream - com.sun.star.io.XActiveDataSource - com.sun.star.io.XActiveDataSink - com.sun.star.io.XMarkableStream - com.sun.star.io.UnexpectedEOFException - com.sun.star.io.WrongFormatException - com.sun.star.lang.XComponent - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XTypeProvider - com.sun.star.lang.IllegalArgumentException - com.sun.star.registry.XRegistryKey - com.sun.star.registry.XImplementationRegistration - com.sun.star.test.XSimpleTest - com.sun.star.lang.XSingleComponentFactory - com.sun.star.uno.XComponentContext - com.sun.star.uno.TypeClass - com.sun.star.uno.XWeak - com.sun.star.uno.XAggregation - - - - Joerg Budischewski - com.sun.star.comp.stoc.Pump - - This component provides ... - - com.sun.star.loader.SharedLibrary - c++ - - com.sun.star.io.Pump - ... - com.sun.star.io.XConnectable - com.sun.star.io.XActiveDataSource - com.sun.star.io.XActiveDataSink - com.sun.star.io.XActiveDataControl - com.sun.star.lang.DisposedException - com.sun.star.lang.XTypeProvider - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XMultiServiceFactory - com.sun.star.registry.XRegistryKey - com.sun.star.lang.XSingleComponentFactory - com.sun.star.uno.XComponentContext - com.sun.star.uno.XAggregation - com.sun.star.uno.XWeak - com.sun.star.uno.TypeClass - - - cppuhelper - cppu - sal - - cppuhelper - cppu2 - sal2 - - -- cgit