Menu
▾
▴
[Opensync-commits] r5385 - in trunk: opensync opensync/archive opensync/client opensync/db opensync/engine opensync/format opensync/group opensync/helper opensync/mapping opensync/plugin opensync/version tests tests/engine-tests tests/mock-plugin tools wrapper
|
From: <svn...@op...> - 2009-03-28 18:57:09
|
Author: dgollub Date: Sat Mar 28 19:57:03 2009 New Revision: 5385 URL: http://www.opensync.org/changeset/5385 Log: Include cleanup. Set #warning for legacy includes which get dropped before 0.39 release. Modified: trunk/opensync/archive/opensync_archive_internals.h trunk/opensync/client/opensync_client.c trunk/opensync/client/opensync_client_proxy.c trunk/opensync/db/opensync_db_internals.h trunk/opensync/engine/opensync_engine.c trunk/opensync/engine/opensync_obj_engine.c trunk/opensync/engine/opensync_sink_engine.h trunk/opensync/format/opensync_format_env.h trunk/opensync/group/opensync_member.c trunk/opensync/group/opensync_member.h trunk/opensync/helper/opensync_hashtable.h trunk/opensync/mapping/opensync_mapping_table.c trunk/opensync/opensync-context.h trunk/opensync/opensync-error.h trunk/opensync/opensync-merger.h trunk/opensync/opensync-plugin.h trunk/opensync/opensync-support.h trunk/opensync/opensync.h trunk/opensync/opensync_list.h trunk/opensync/plugin/opensync_context.c trunk/opensync/plugin/opensync_objtype_sink.c trunk/opensync/plugin/opensync_plugin_config.h trunk/opensync/plugin/opensync_plugin_info.c trunk/opensync/version/opensync_version.h trunk/tests/check_error.c trunk/tests/engine-tests/check_engine.c trunk/tests/engine-tests/check_engine_error.c trunk/tests/engine-tests/check_mapping_engine.c trunk/tests/mock-plugin/mock_format.c trunk/tests/mock-plugin/mock_sync.h trunk/tools/osyncplugin.c trunk/wrapper/opensync.i Modified: trunk/opensync/archive/opensync_archive_internals.h ============================================================================== --- trunk/opensync/archive/opensync_archive_internals.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/archive/opensync_archive_internals.h Sat Mar 28 19:57:03 2009 (r5385) @@ -25,8 +25,6 @@ #ifndef OPENSYNC_ARCHIVE_INTERNALS_H_ #define OPENSYNC_ARCHIVE_INTERNALS_H_ -#include <opensync/opensync_list.h> - /** * @defgroup OSyncArchiveInternalAPI OpenSync Archive Internals * @ingroup OSyncArchivePrivate Modified: trunk/opensync/client/opensync_client.c ============================================================================== --- trunk/opensync/client/opensync_client.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/client/opensync_client.c Sat Mar 28 19:57:03 2009 (r5385) @@ -21,7 +21,6 @@ #include "opensync.h" #include "opensync_internals.h" -#include "opensync-context.h" #include "opensync-plugin.h" #include "plugin/opensync_plugin_internals.h" #include "plugin/opensync_objtype_sink_internals.h" @@ -30,8 +29,6 @@ #include "opensync-helper.h" #include "helper/opensync_hashtable_internals.h" -#include "common/opensync_list.h" - #include "opensync-ipc.h" #include "ipc/opensync_serializer_internals.h" #include "ipc/opensync_message_internals.h" @@ -39,11 +36,10 @@ #include "opensync-format.h" +#include "opensync-capabilities.h" #include "opensync-version.h" #include "version/opensync_version_internals.h" -#include "opensync-merger.h" - #include "opensync-client.h" #include "opensync_client_internals.h" #include "opensync_client_private.h" Modified: trunk/opensync/client/opensync_client_proxy.c ============================================================================== --- trunk/opensync/client/opensync_client_proxy.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/client/opensync_client_proxy.c Sat Mar 28 19:57:03 2009 (r5385) @@ -29,9 +29,9 @@ #include "ipc/opensync_queue_internals.h" #include "plugin/opensync_objtype_sink_internals.h" +#include "opensync-capabilities.h" #include "opensync-group.h" #include "opensync-plugin.h" -#include "opensync-merger.h" #include "opensync-format.h" #include "opensync-version.h" Modified: trunk/opensync/db/opensync_db_internals.h ============================================================================== --- trunk/opensync/db/opensync_db_internals.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/db/opensync_db_internals.h Sat Mar 28 19:57:03 2009 (r5385) @@ -21,8 +21,6 @@ #ifndef _OPENSYNC_DB_H_ #define _OPENSYNC_DB_H_ -#include <opensync/opensync_list.h> - /** * @defgroup OSyncDB OpenSync Database Module * @ingroup OSyncPublic Modified: trunk/opensync/engine/opensync_engine.c ============================================================================== --- trunk/opensync/engine/opensync_engine.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/engine/opensync_engine.c Sat Mar 28 19:57:03 2009 (r5385) @@ -28,7 +28,6 @@ #include "opensync-format.h" #include "opensync-data.h" #include "opensync-plugin.h" -#include "opensync-merger.h" #include "opensync-xmlformat.h" #include "archive/opensync_archive_internals.h" Modified: trunk/opensync/engine/opensync_obj_engine.c ============================================================================== --- trunk/opensync/engine/opensync_obj_engine.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/engine/opensync_obj_engine.c Sat Mar 28 19:57:03 2009 (r5385) @@ -27,7 +27,6 @@ #include "opensync-data.h" #include "opensync-mapping.h" #include "opensync-format.h" -#include "opensync-merger.h" #include "opensync-plugin.h" #include "opensync-xmlformat.h" Modified: trunk/opensync/engine/opensync_sink_engine.h ============================================================================== --- trunk/opensync/engine/opensync_sink_engine.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/engine/opensync_sink_engine.h Sat Mar 28 19:57:03 2009 (r5385) @@ -22,8 +22,6 @@ #ifndef OPENSYNC_SINK_ENGINE_H_ #define OPENSYNC_SINK_ENGINE_H_ -#include <opensync/opensync_list.h> - /*! @brief Get list of OSyncMappingEntryEngines of the OSyncSinkEngine * * @param engine Pointer to an OSyncSinkEngine Modified: trunk/opensync/format/opensync_format_env.h ============================================================================== --- trunk/opensync/format/opensync_format_env.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/format/opensync_format_env.h Sat Mar 28 19:57:03 2009 (r5385) @@ -21,8 +21,6 @@ #ifndef _OPENSYNC_FORMAT_ENV_H_ #define _OPENSYNC_FORMAT_ENV_H_ -#include <opensync/opensync_list.h> - /** * @defgroup OSyncPublic OpenSync Public API * @brief The public API of opensync Modified: trunk/opensync/group/opensync_member.c ============================================================================== --- trunk/opensync/group/opensync_member.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/group/opensync_member.c Sat Mar 28 19:57:03 2009 (r5385) @@ -24,12 +24,12 @@ #include "opensync-plugin.h" #include "plugin/opensync_objtype_sink_internals.h" +#include "opensync-capabilities.h" #include "opensync-group.h" #include "opensync-format.h" #include "opensync_member_internals.h" #include "opensync_member_private.h" -#include "opensync-merger.h" #include "capabilities/opensync-capabilities_internals.h" #include "common/opensync_xml_internals.h" Modified: trunk/opensync/group/opensync_member.h ============================================================================== --- trunk/opensync/group/opensync_member.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/group/opensync_member.h Sat Mar 28 19:57:03 2009 (r5385) @@ -21,8 +21,6 @@ #ifndef _OPENSYNC_MEMBER_H_ #define _OPENSYNC_MEMBER_H_ -#include <opensync/opensync_list.h> - /** * @defgroup OSyncMemberAPI OpenSync Member * @ingroup OSyncGroup Modified: trunk/opensync/helper/opensync_hashtable.h ============================================================================== --- trunk/opensync/helper/opensync_hashtable.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/helper/opensync_hashtable.h Sat Mar 28 19:57:03 2009 (r5385) @@ -22,8 +22,6 @@ #ifndef OPENSYNC_HASHTABLE_H_ #define OPENSYNC_HASHTABLE_H_ -#include <opensync/opensync_list.h> - typedef void (*OSyncHashtableForEach) (const char *uid, const char *hash, void *user_data); /** Modified: trunk/opensync/mapping/opensync_mapping_table.c ============================================================================== --- trunk/opensync/mapping/opensync_mapping_table.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/mapping/opensync_mapping_table.c Sat Mar 28 19:57:03 2009 (r5385) @@ -22,7 +22,6 @@ #include "opensync_internals.h" #include "opensync-mapping.h" -#include "opensync-support.h" #include "opensync_mapping_table_internals.h" Modified: trunk/opensync/opensync-context.h ============================================================================== --- trunk/opensync/opensync-context.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/opensync-context.h Sat Mar 28 19:57:03 2009 (r5385) @@ -1,2 +1,3 @@ /* FIXME: Legacy include. Will be dropped for 0.39 */ +#warning "FIXME: Legacy include. Will be dropped before the 0.39 relase. Adapt your incldue: <opensync/opensync-plugin.h>" #include "opensync/plugin/opensync_context.h" Modified: trunk/opensync/opensync-error.h ============================================================================== --- trunk/opensync/opensync-error.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/opensync-error.h Sat Mar 28 19:57:03 2009 (r5385) @@ -1,3 +1,4 @@ /* FIXME: Legacy include of opensync-error.h. Will be dropped with 0.39 */ #include "opensync/common/opensync_error.h" +#warning "FIXME: Legacy include! adapt your include! Just include <opensync/opensync.h>" Modified: trunk/opensync/opensync-merger.h ============================================================================== --- trunk/opensync/opensync-merger.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/opensync-merger.h Sat Mar 28 19:57:03 2009 (r5385) @@ -1,3 +1,3 @@ /* FIXME: Legacy include - will be dropped with 0.39 adapt your incldue to <opensync/opensync-capabilities.h> */ #include <opensync/opensync-capabilities.h> - +#warning "FIXME: Legacy include! Dropt his include and include <opensync/opensync-capabilities.h>" Modified: trunk/opensync/opensync-plugin.h ============================================================================== --- trunk/opensync/opensync-plugin.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/opensync-plugin.h Sat Mar 28 19:57:03 2009 (r5385) @@ -23,6 +23,7 @@ OPENSYNC_BEGIN_DECLS +#include "plugin/opensync_context.h" #include "plugin/opensync_plugin.h" #include "plugin/opensync_plugin_env.h" #include "plugin/opensync_plugin_info.h" Modified: trunk/opensync/opensync-support.h ============================================================================== --- trunk/opensync/opensync-support.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/opensync-support.h Sat Mar 28 19:57:03 2009 (r5385) @@ -1,4 +1,5 @@ /* FIXME: Drop opensync-support.h with 0.39 release */ +#warning "FIXME: Legacy include. Drop this include and include <opensync/opensync.h>" #include "opensync-common.h" #include "opensync-debug.h" #include "opensync.h" Modified: trunk/opensync/opensync.h ============================================================================== --- trunk/opensync/opensync.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/opensync.h Sat Mar 28 19:57:03 2009 (r5385) @@ -271,7 +271,7 @@ OPENSYNC_END_DECLS -#include "opensync/opensync-support.h" -#include "opensync-error.h" +#include "opensync/opensync-common.h" +#include "opensync/opensync-debug.h" #endif Modified: trunk/opensync/opensync_list.h ============================================================================== --- trunk/opensync/opensync_list.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/opensync_list.h Sat Mar 28 19:57:03 2009 (r5385) @@ -1,2 +1,3 @@ /* FIXME: Legacy include. This file gets dropped with 0.39 */ #include "opensync/common/opensync_list.h" +#warning "FIXME: Legacy include. Adapt your include. Drop this include and include <opensync/opensync.h>" Modified: trunk/opensync/plugin/opensync_context.c ============================================================================== --- trunk/opensync/plugin/opensync_context.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/plugin/opensync_context.c Sat Mar 28 19:57:03 2009 (r5385) @@ -23,7 +23,7 @@ #include "opensync-data.h" -#include "opensync-context.h" +#include "opensync_context.h" #include "opensync_context_private.h" OSyncContext *osync_context_new(OSyncError **error) Modified: trunk/opensync/plugin/opensync_objtype_sink.c ============================================================================== --- trunk/opensync/plugin/opensync_objtype_sink.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/plugin/opensync_objtype_sink.c Sat Mar 28 19:57:03 2009 (r5385) @@ -21,9 +21,9 @@ #include "opensync.h" #include "opensync_internals.h" -#include "opensync-context.h" #include "opensync-format.h" #include "opensync-helper.h" +#include "opensync-plugin.h" #include "opensync/helper/opensync_anchor_internals.h" #include "opensync/helper/opensync_hashtable_internals.h" Modified: trunk/opensync/plugin/opensync_plugin_config.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_config.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/plugin/opensync_plugin_config.h Sat Mar 28 19:57:03 2009 (r5385) @@ -21,7 +21,6 @@ #ifndef _OPENSYNC_PLUGIN_CONFIG_H_ #define _OPENSYNC_PLUGIN_CONFIG_H_ -#include <opensync/opensync_list.h> /** \todo Review open OSyncPluginConfig documentation */ /** Modified: trunk/opensync/plugin/opensync_plugin_info.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin_info.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/plugin/opensync_plugin_info.c Sat Mar 28 19:57:03 2009 (r5385) @@ -21,13 +21,12 @@ #include "opensync.h" #include "opensync_internals.h" +#include "opensync-capabilities.h" #include "opensync-format.h" #include "opensync-plugin.h" #include "opensync_plugin_info_private.h" -#include "opensync-merger.h" #include "opensync-version.h" -#include "opensync_list.h" OSyncPluginInfo *osync_plugin_info_new(OSyncError **error) { Modified: trunk/opensync/version/opensync_version.h ============================================================================== --- trunk/opensync/version/opensync_version.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/opensync/version/opensync_version.h Sat Mar 28 19:57:03 2009 (r5385) @@ -23,8 +23,6 @@ #ifndef OPENSYNC_VERSION_H_ #define OPENSYNC_VERSION_H_ -#include <opensync/opensync_list.h> - /** * @defgroup OSyncVersion OpenSync Version Module * @ingroup OSyncPublic Modified: trunk/tests/check_error.c ============================================================================== --- trunk/tests/check_error.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/tests/check_error.c Sat Mar 28 19:57:03 2009 (r5385) @@ -1,5 +1,4 @@ #include "support.h" -#include <opensync/opensync-error.h> START_TEST (error_create) { Modified: trunk/tests/engine-tests/check_engine.c ============================================================================== --- trunk/tests/engine-tests/check_engine.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/tests/engine-tests/check_engine.c Sat Mar 28 19:57:03 2009 (r5385) @@ -6,7 +6,7 @@ #include <opensync/opensync-format.h> #include <opensync/opensync-client.h> #include <opensync/opensync-engine.h> -#include <opensync/opensync-context.h> +#include <opensync/opensync-plugin.h> #include "opensync/engine/opensync_engine_internals.h" #include "opensync/engine/opensync_engine_private.h" Modified: trunk/tests/engine-tests/check_engine_error.c ============================================================================== --- trunk/tests/engine-tests/check_engine_error.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/tests/engine-tests/check_engine_error.c Sat Mar 28 19:57:03 2009 (r5385) @@ -12,7 +12,7 @@ #include <opensync/opensync-format.h> #include <opensync/opensync-client.h> #include <opensync/opensync-engine.h> -#include <opensync/opensync-context.h> +#include <opensync/opensync-plugin.h> #include "../mock-plugin/mock_sync.h" Modified: trunk/tests/engine-tests/check_mapping_engine.c ============================================================================== --- trunk/tests/engine-tests/check_mapping_engine.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/tests/engine-tests/check_mapping_engine.c Sat Mar 28 19:57:03 2009 (r5385) @@ -8,7 +8,7 @@ #include <opensync/opensync-format.h> #include <opensync/opensync-client.h> #include <opensync/opensync-engine.h> -#include <opensync/opensync-context.h> +#include <opensync/opensync-plugin.h> #include "opensync/engine/opensync_engine_internals.h" #include "opensync/engine/opensync_engine_private.h" Modified: trunk/tests/mock-plugin/mock_format.c ============================================================================== --- trunk/tests/mock-plugin/mock_format.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/tests/mock-plugin/mock_format.c Sat Mar 28 19:57:03 2009 (r5385) @@ -20,7 +20,6 @@ #include <opensync/opensync.h> #include <opensync/opensync_internals.h> -#include <opensync/opensync-support.h> #include <opensync/opensync-serializer.h> #include <opensync/opensync-format.h> #include <glib.h> Modified: trunk/tests/mock-plugin/mock_sync.h ============================================================================== --- trunk/tests/mock-plugin/mock_sync.h Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/tests/mock-plugin/mock_sync.h Sat Mar 28 19:57:03 2009 (r5385) @@ -30,7 +30,6 @@ #include <opensync/opensync.h> #include <opensync/opensync-format.h> #include <opensync/opensync-plugin.h> -#include <opensync/opensync-context.h> #include <opensync/opensync-data.h> #include <opensync/opensync-helper.h> #include <opensync/opensync-version.h> Modified: trunk/tools/osyncplugin.c ============================================================================== --- trunk/tools/osyncplugin.c Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/tools/osyncplugin.c Sat Mar 28 19:57:03 2009 (r5385) @@ -35,8 +35,6 @@ #include <opensync/opensync-plugin.h> #include <opensync/opensync-format.h> -#include <opensync/opensync-context.h> - char *pluginpath = NULL; char *formatpath = NULL; char *pluginname = NULL; Modified: trunk/wrapper/opensync.i ============================================================================== --- trunk/wrapper/opensync.i Sat Mar 28 19:22:32 2009 (r5384) +++ trunk/wrapper/opensync.i Sat Mar 28 19:57:03 2009 (r5385) @@ -4,16 +4,13 @@ %{ #include <opensync/opensync.h> -#include <opensync/opensync-context.h> +#include <opensync/opensync-capabilities.h> #include <opensync/opensync-data.h> #include <opensync/opensync-engine.h> -#include <opensync/opensync-error.h> #include <opensync/opensync-format.h> #include <opensync/opensync-group.h> #include <opensync/opensync-helper.h> -#include <opensync/opensync-merger.h> #include <opensync/opensync-plugin.h> -#include <opensync/opensync-support.h> #include <opensync/opensync-version.h> #include <opensync/opensync-xmlformat.h> |
