From eff811d437cc2bfe5ece3e7b79d3e95edbafded4 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 1 Feb 2025 12:44:12 +0100 Subject: [PATCH] Update atkmm -> ztkmm header location --- libs/tk/ytkmm/main.cc | 2 +- libs/tk/ytkmm/ytkmm/gtkmm/widget.h | 4 +- libs/tk/ztkmm/action.cc | 4 +- libs/tk/ztkmm/component.cc | 6 +- libs/tk/ztkmm/document.cc | 6 +- libs/tk/ztkmm/editabletext.cc | 6 +- libs/tk/ztkmm/hyperlink.cc | 6 +- libs/tk/ztkmm/hypertext.cc | 6 +- libs/tk/ztkmm/image.cc | 6 +- libs/tk/ztkmm/implementor.cc | 6 +- libs/tk/ztkmm/init.cc | 2 +- libs/tk/ztkmm/noopobject.cc | 4 +- libs/tk/ztkmm/object.cc | 12 +-- libs/tk/ztkmm/objectaccessible.cc | 4 +- libs/tk/ztkmm/relation.cc | 6 +- libs/tk/ztkmm/relationset.cc | 4 +- libs/tk/ztkmm/selection.cc | 6 +- libs/tk/ztkmm/stateset.cc | 4 +- libs/tk/ztkmm/streamablecontent.cc | 6 +- libs/tk/ztkmm/table.cc | 6 +- libs/tk/ztkmm/text.cc | 6 +- libs/tk/ztkmm/value.cc | 4 +- libs/tk/ztkmm/wrap_init.cc | 40 +++++----- libs/tk/ztkmm/wscript | 4 +- libs/tk/ztkmm/ztkmm/{atkmm => }/action.h | 0 libs/tk/ztkmm/ztkmm/atkmm.h | 73 ------------------- libs/tk/ztkmm/ztkmm/{atkmm => }/component.h | 0 libs/tk/ztkmm/ztkmm/{atkmm => }/document.h | 0 .../tk/ztkmm/ztkmm/{atkmm => }/editabletext.h | 2 +- libs/tk/ztkmm/ztkmm/{atkmm => }/hyperlink.h | 2 +- libs/tk/ztkmm/ztkmm/{atkmm => }/hypertext.h | 2 +- libs/tk/ztkmm/ztkmm/{atkmm => }/image.h | 2 +- libs/tk/ztkmm/ztkmm/{atkmm => }/implementor.h | 2 +- libs/tk/ztkmm/ztkmm/{atkmm => }/init.h | 0 libs/tk/ztkmm/ztkmm/{atkmm => }/noopobject.h | 18 ++--- libs/tk/ztkmm/ztkmm/{atkmm => }/object.h | 4 +- .../ztkmm/{atkmm => }/objectaccessible.h | 2 +- .../ztkmm/{atkmm => }/private/action_p.h | 0 .../ztkmm/{atkmm => }/private/component_p.h | 0 .../ztkmm/{atkmm => }/private/document_p.h | 0 .../{atkmm => }/private/editabletext_p.h | 0 .../ztkmm/{atkmm => }/private/hyperlink_p.h | 0 .../ztkmm/{atkmm => }/private/hypertext_p.h | 0 .../ztkmm/ztkmm/{atkmm => }/private/image_p.h | 0 .../ztkmm/{atkmm => }/private/implementor_p.h | 0 .../ztkmm/{atkmm => }/private/noopobject_p.h | 2 +- .../ztkmm/{atkmm => }/private/object_p.h | 0 .../{atkmm => }/private/objectaccessible_p.h | 2 +- .../ztkmm/{atkmm => }/private/relation_p.h | 0 .../ztkmm/{atkmm => }/private/relationset_p.h | 0 .../ztkmm/{atkmm => }/private/selection_p.h | 0 .../ztkmm/{atkmm => }/private/stateset_p.h | 0 .../{atkmm => }/private/streamablecontent_p.h | 0 .../ztkmm/ztkmm/{atkmm => }/private/table_p.h | 0 .../ztkmm/ztkmm/{atkmm => }/private/text_p.h | 0 .../ztkmm/ztkmm/{atkmm => }/private/value_p.h | 0 libs/tk/ztkmm/ztkmm/{atkmm => }/relation.h | 0 libs/tk/ztkmm/ztkmm/{atkmm => }/relationset.h | 4 +- libs/tk/ztkmm/ztkmm/{atkmm => }/selection.h | 0 libs/tk/ztkmm/ztkmm/{atkmm => }/stateset.h | 0 .../ztkmm/{atkmm => }/streamablecontent.h | 0 libs/tk/ztkmm/ztkmm/{atkmm => }/table.h | 0 libs/tk/ztkmm/ztkmm/{atkmm => }/text.h | 2 +- libs/tk/ztkmm/ztkmm/{atkmm => }/value.h | 0 libs/tk/ztkmm/ztkmm/{atkmm => }/wrap_init.h | 0 65 files changed, 102 insertions(+), 175 deletions(-) rename libs/tk/ztkmm/ztkmm/{atkmm => }/action.h (100%) delete mode 100644 libs/tk/ztkmm/ztkmm/atkmm.h rename libs/tk/ztkmm/ztkmm/{atkmm => }/component.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/document.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/editabletext.h (99%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/hyperlink.h (99%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/hypertext.h (99%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/image.h (99%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/implementor.h (99%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/init.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/noopobject.h (93%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/object.h (99%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/objectaccessible.h (99%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/action_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/component_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/document_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/editabletext_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/hyperlink_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/hypertext_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/image_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/implementor_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/noopobject_p.h (96%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/object_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/objectaccessible_p.h (96%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/relation_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/relationset_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/selection_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/stateset_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/streamablecontent_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/table_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/text_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/private/value_p.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/relation.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/relationset.h (99%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/selection.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/stateset.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/streamablecontent.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/table.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/text.h (99%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/value.h (100%) rename libs/tk/ztkmm/ztkmm/{atkmm => }/wrap_init.h (100%) diff --git a/libs/tk/ytkmm/main.cc b/libs/tk/ytkmm/main.cc index 6f28dda3e7..2be2c3065e 100644 --- a/libs/tk/ytkmm/main.cc +++ b/libs/tk/ytkmm/main.cc @@ -42,7 +42,7 @@ #include #include #ifdef GTKMM_ATKMM_ENABLED -#include +#include #endif //GTKMM_ATKMM_ENABLED #include #include diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/widget.h b/libs/tk/ytkmm/ytkmm/gtkmm/widget.h index d07dc13974..5a7f72fd9c 100644 --- a/libs/tk/ytkmm/ytkmm/gtkmm/widget.h +++ b/libs/tk/ytkmm/ytkmm/gtkmm/widget.h @@ -31,8 +31,8 @@ #include #ifdef GTKMM_ATKMM_ENABLED -#include -#include +#include +#include #endif //GTKMM_ATKMM_ENABLED #include diff --git a/libs/tk/ztkmm/action.cc b/libs/tk/ztkmm/action.cc index d24e17b902..6456f16b50 100644 --- a/libs/tk/ztkmm/action.cc +++ b/libs/tk/ztkmm/action.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- diff --git a/libs/tk/ztkmm/component.cc b/libs/tk/ztkmm/component.cc index dfcaede206..21ebf6171e 100644 --- a/libs/tk/ztkmm/component.cc +++ b/libs/tk/ztkmm/component.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include #include @@ -28,7 +28,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/libs/tk/ztkmm/document.cc b/libs/tk/ztkmm/document.cc index ac428d8245..ad9d88cb07 100644 --- a/libs/tk/ztkmm/document.cc +++ b/libs/tk/ztkmm/document.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/libs/tk/ztkmm/editabletext.cc b/libs/tk/ztkmm/editabletext.cc index 2b240c65cb..9f3ea914df 100644 --- a/libs/tk/ztkmm/editabletext.cc +++ b/libs/tk/ztkmm/editabletext.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/libs/tk/ztkmm/hyperlink.cc b/libs/tk/ztkmm/hyperlink.cc index 50a757fa56..4cbae34d7d 100644 --- a/libs/tk/ztkmm/hyperlink.cc +++ b/libs/tk/ztkmm/hyperlink.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include #include diff --git a/libs/tk/ztkmm/hypertext.cc b/libs/tk/ztkmm/hypertext.cc index b093986767..30d08a8dbf 100644 --- a/libs/tk/ztkmm/hypertext.cc +++ b/libs/tk/ztkmm/hypertext.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/libs/tk/ztkmm/image.cc b/libs/tk/ztkmm/image.cc index 62d691d9a7..365a3ad482 100644 --- a/libs/tk/ztkmm/image.cc +++ b/libs/tk/ztkmm/image.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/libs/tk/ztkmm/implementor.cc b/libs/tk/ztkmm/implementor.cc index 3d8d8a803a..6fa0a1460e 100644 --- a/libs/tk/ztkmm/implementor.cc +++ b/libs/tk/ztkmm/implementor.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/libs/tk/ztkmm/init.cc b/libs/tk/ztkmm/init.cc index 04c3cff947..82612b76fa 100644 --- a/libs/tk/ztkmm/init.cc +++ b/libs/tk/ztkmm/init.cc @@ -19,7 +19,7 @@ */ #include -#include +#include namespace Atk { diff --git a/libs/tk/ztkmm/noopobject.cc b/libs/tk/ztkmm/noopobject.cc index 261374779b..d5d9fd51ca 100644 --- a/libs/tk/ztkmm/noopobject.cc +++ b/libs/tk/ztkmm/noopobject.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- diff --git a/libs/tk/ztkmm/object.cc b/libs/tk/ztkmm/object.cc index 976f66e2a3..f7500275f3 100644 --- a/libs/tk/ztkmm/object.cc +++ b/libs/tk/ztkmm/object.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include #include @@ -28,10 +28,10 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/libs/tk/ztkmm/objectaccessible.cc b/libs/tk/ztkmm/objectaccessible.cc index dfeed23512..b086f19faa 100644 --- a/libs/tk/ztkmm/objectaccessible.cc +++ b/libs/tk/ztkmm/objectaccessible.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- diff --git a/libs/tk/ztkmm/relation.cc b/libs/tk/ztkmm/relation.cc index 4a5dbcecff..eca1346e1b 100644 --- a/libs/tk/ztkmm/relation.cc +++ b/libs/tk/ztkmm/relation.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include #include @@ -28,7 +28,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include #include diff --git a/libs/tk/ztkmm/relationset.cc b/libs/tk/ztkmm/relationset.cc index dabfc7d84f..36bd1d8059 100644 --- a/libs/tk/ztkmm/relationset.cc +++ b/libs/tk/ztkmm/relationset.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- diff --git a/libs/tk/ztkmm/selection.cc b/libs/tk/ztkmm/selection.cc index 51ea5430b6..82834f75a9 100644 --- a/libs/tk/ztkmm/selection.cc +++ b/libs/tk/ztkmm/selection.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/libs/tk/ztkmm/stateset.cc b/libs/tk/ztkmm/stateset.cc index 47c0102269..cdcc06f140 100644 --- a/libs/tk/ztkmm/stateset.cc +++ b/libs/tk/ztkmm/stateset.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include #include diff --git a/libs/tk/ztkmm/streamablecontent.cc b/libs/tk/ztkmm/streamablecontent.cc index 70d7335df8..f8b81205c4 100644 --- a/libs/tk/ztkmm/streamablecontent.cc +++ b/libs/tk/ztkmm/streamablecontent.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/libs/tk/ztkmm/table.cc b/libs/tk/ztkmm/table.cc index 2688de9546..29aedffffb 100644 --- a/libs/tk/ztkmm/table.cc +++ b/libs/tk/ztkmm/table.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- @@ -27,7 +27,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/libs/tk/ztkmm/text.cc b/libs/tk/ztkmm/text.cc index 455c6b3df1..319b3d6edc 100644 --- a/libs/tk/ztkmm/text.cc +++ b/libs/tk/ztkmm/text.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include #include @@ -28,7 +28,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include #include /* for std::swap() */ diff --git a/libs/tk/ztkmm/value.cc b/libs/tk/ztkmm/value.cc index 6f07e290f0..e6c14f46ff 100644 --- a/libs/tk/ztkmm/value.cc +++ b/libs/tk/ztkmm/value.cc @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include // -*- c++ -*- diff --git a/libs/tk/ztkmm/wrap_init.cc b/libs/tk/ztkmm/wrap_init.cc index dfb64486c5..dc555bf5f1 100644 --- a/libs/tk/ztkmm/wrap_init.cc +++ b/libs/tk/ztkmm/wrap_init.cc @@ -7,30 +7,30 @@ #undef G_GNUC_CONST #define G_GNUC_CONST /* empty */ -#include +#include #include #include // #include the widget headers so that we can call the get_type() static methods: -#include "atkmm/action.h" -#include "atkmm/component.h" -#include "atkmm/document.h" -#include "atkmm/editabletext.h" -#include "atkmm/hyperlink.h" -#include "atkmm/hypertext.h" -#include "atkmm/image.h" -#include "atkmm/implementor.h" -#include "atkmm/noopobject.h" -#include "atkmm/object.h" -#include "atkmm/objectaccessible.h" -#include "atkmm/relation.h" -#include "atkmm/relationset.h" -#include "atkmm/selection.h" -#include "atkmm/stateset.h" -#include "atkmm/streamablecontent.h" -#include "atkmm/table.h" -#include "atkmm/text.h" -#include "atkmm/value.h" +#include "ztkmm/action.h" +#include "ztkmm/component.h" +#include "ztkmm/document.h" +#include "ztkmm/editabletext.h" +#include "ztkmm/hyperlink.h" +#include "ztkmm/hypertext.h" +#include "ztkmm/image.h" +#include "ztkmm/implementor.h" +#include "ztkmm/noopobject.h" +#include "ztkmm/object.h" +#include "ztkmm/objectaccessible.h" +#include "ztkmm/relation.h" +#include "ztkmm/relationset.h" +#include "ztkmm/selection.h" +#include "ztkmm/stateset.h" +#include "ztkmm/streamablecontent.h" +#include "ztkmm/table.h" +#include "ztkmm/text.h" +#include "ztkmm/value.h" extern "C" { diff --git a/libs/tk/ztkmm/wscript b/libs/tk/ztkmm/wscript index 295e06ee9a..dcee2d2029 100644 --- a/libs/tk/ztkmm/wscript +++ b/libs/tk/ztkmm/wscript @@ -44,8 +44,8 @@ def build(bld): obj = bld.shlib(features = 'cxx cxxshlib', source=libztkmm_sources) obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'], '-w' ] obj.cflags = [ bld.env['compiler_flags_dict']['pic'], '-w' ] - obj.export_includes = ['ztkmm'] - obj.includes = ['ztkmm'] + obj.export_includes = ['.'] + obj.includes = ['.'] obj.name = 'libztkmm' obj.target = 'ztkmm' obj.use = 'libztk' diff --git a/libs/tk/ztkmm/ztkmm/atkmm/action.h b/libs/tk/ztkmm/ztkmm/action.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/action.h rename to libs/tk/ztkmm/ztkmm/action.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm.h b/libs/tk/ztkmm/ztkmm/atkmm.h deleted file mode 100644 index d593ea9c44..0000000000 --- a/libs/tk/ztkmm/ztkmm/atkmm.h +++ /dev/null @@ -1,73 +0,0 @@ -/* $Id$ */ - -/* atkmm - a C++ wrapper for the GLib toolkit - * - * Copyright 2002 The gtkmm Development Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef _ATKMM_H -#define _ATKMM_H - - -/** @mainpage atkmm Reference Manual - * - * @section description Description - * - * atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm. - * - * @section basics Basic usage - * - * Include the atkmm header: - * @code - * #include - * @endcode - * This includes every header installed by atkmm, so can slow down - * compilation, but suffices for this simple example. Assuming that your - * program source file is @c program.cc, compile it with: - * @code - * g++ program.cc -o program `pkg-config --cflags --libs atkmm-1.6` - * @endcode - * Alternatively, if using autoconf, use the following in @c configure.ac: - * @code - * PKG_CHECK_MODULES([ATKMM], [atkmm-1.6]) - * @endcode - * Then use the generated @c ATKMM_CFLAGS and @c ATKMM_LIBS variables in - * the project @c Makefile.am files. For example: - * @code - * program_CPPFLAGS = $(ATKMM_CFLAGS) - * program_LDADD = $(ATKMM_LIBS) - * @endcode - */ - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif /* _ATKMM_H */ diff --git a/libs/tk/ztkmm/ztkmm/atkmm/component.h b/libs/tk/ztkmm/ztkmm/component.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/component.h rename to libs/tk/ztkmm/ztkmm/component.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/document.h b/libs/tk/ztkmm/ztkmm/document.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/document.h rename to libs/tk/ztkmm/ztkmm/document.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/editabletext.h b/libs/tk/ztkmm/ztkmm/editabletext.h similarity index 99% rename from libs/tk/ztkmm/ztkmm/atkmm/editabletext.h rename to libs/tk/ztkmm/ztkmm/editabletext.h index eeb21490db..c4544df939 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/editabletext.h +++ b/libs/tk/ztkmm/ztkmm/editabletext.h @@ -27,7 +27,7 @@ */ -#include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS extern "C" diff --git a/libs/tk/ztkmm/ztkmm/atkmm/hyperlink.h b/libs/tk/ztkmm/ztkmm/hyperlink.h similarity index 99% rename from libs/tk/ztkmm/ztkmm/atkmm/hyperlink.h rename to libs/tk/ztkmm/ztkmm/hyperlink.h index 4124667e85..61891c6d93 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/hyperlink.h +++ b/libs/tk/ztkmm/ztkmm/hyperlink.h @@ -24,7 +24,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS diff --git a/libs/tk/ztkmm/ztkmm/atkmm/hypertext.h b/libs/tk/ztkmm/ztkmm/hypertext.h similarity index 99% rename from libs/tk/ztkmm/ztkmm/atkmm/hypertext.h rename to libs/tk/ztkmm/ztkmm/hypertext.h index 2a89ed3b49..8d25ff1a2a 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/hypertext.h +++ b/libs/tk/ztkmm/ztkmm/hypertext.h @@ -27,7 +27,7 @@ */ -#include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS extern "C" diff --git a/libs/tk/ztkmm/ztkmm/atkmm/image.h b/libs/tk/ztkmm/ztkmm/image.h similarity index 99% rename from libs/tk/ztkmm/ztkmm/atkmm/image.h rename to libs/tk/ztkmm/ztkmm/image.h index 37bc238cb0..b4d3355a62 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/image.h +++ b/libs/tk/ztkmm/ztkmm/image.h @@ -27,7 +27,7 @@ */ -#include /* for Atk::CoordType */ +#include /* for Atk::CoordType */ #ifndef DOXYGEN_SHOULD_SKIP_THIS extern "C" diff --git a/libs/tk/ztkmm/ztkmm/atkmm/implementor.h b/libs/tk/ztkmm/ztkmm/implementor.h similarity index 99% rename from libs/tk/ztkmm/ztkmm/atkmm/implementor.h rename to libs/tk/ztkmm/ztkmm/implementor.h index 2fd813a7a7..725eede955 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/implementor.h +++ b/libs/tk/ztkmm/ztkmm/implementor.h @@ -27,7 +27,7 @@ */ -#include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS extern "C" diff --git a/libs/tk/ztkmm/ztkmm/atkmm/init.h b/libs/tk/ztkmm/ztkmm/init.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/init.h rename to libs/tk/ztkmm/ztkmm/init.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/noopobject.h b/libs/tk/ztkmm/ztkmm/noopobject.h similarity index 93% rename from libs/tk/ztkmm/ztkmm/atkmm/noopobject.h rename to libs/tk/ztkmm/ztkmm/noopobject.h index 04b013e77f..25951d352b 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/noopobject.h +++ b/libs/tk/ztkmm/ztkmm/noopobject.h @@ -26,15 +26,15 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS diff --git a/libs/tk/ztkmm/ztkmm/atkmm/object.h b/libs/tk/ztkmm/ztkmm/object.h similarity index 99% rename from libs/tk/ztkmm/ztkmm/atkmm/object.h rename to libs/tk/ztkmm/ztkmm/object.h index 5c1899c060..4fd88e74b7 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/object.h +++ b/libs/tk/ztkmm/ztkmm/object.h @@ -28,8 +28,8 @@ #include -#include -#include +#include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS extern "C" { typedef struct _AtkPropertyValues AtkPropertyValues; } diff --git a/libs/tk/ztkmm/ztkmm/atkmm/objectaccessible.h b/libs/tk/ztkmm/ztkmm/objectaccessible.h similarity index 99% rename from libs/tk/ztkmm/ztkmm/atkmm/objectaccessible.h rename to libs/tk/ztkmm/ztkmm/objectaccessible.h index ffe23a984f..4f5d23c06a 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/objectaccessible.h +++ b/libs/tk/ztkmm/ztkmm/objectaccessible.h @@ -26,7 +26,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/action_p.h b/libs/tk/ztkmm/ztkmm/private/action_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/action_p.h rename to libs/tk/ztkmm/ztkmm/private/action_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/component_p.h b/libs/tk/ztkmm/ztkmm/private/component_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/component_p.h rename to libs/tk/ztkmm/ztkmm/private/component_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/document_p.h b/libs/tk/ztkmm/ztkmm/private/document_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/document_p.h rename to libs/tk/ztkmm/ztkmm/private/document_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/editabletext_p.h b/libs/tk/ztkmm/ztkmm/private/editabletext_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/editabletext_p.h rename to libs/tk/ztkmm/ztkmm/private/editabletext_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/hyperlink_p.h b/libs/tk/ztkmm/ztkmm/private/hyperlink_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/hyperlink_p.h rename to libs/tk/ztkmm/ztkmm/private/hyperlink_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/hypertext_p.h b/libs/tk/ztkmm/ztkmm/private/hypertext_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/hypertext_p.h rename to libs/tk/ztkmm/ztkmm/private/hypertext_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/image_p.h b/libs/tk/ztkmm/ztkmm/private/image_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/image_p.h rename to libs/tk/ztkmm/ztkmm/private/image_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/implementor_p.h b/libs/tk/ztkmm/ztkmm/private/implementor_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/implementor_p.h rename to libs/tk/ztkmm/ztkmm/private/implementor_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/noopobject_p.h b/libs/tk/ztkmm/ztkmm/private/noopobject_p.h similarity index 96% rename from libs/tk/ztkmm/ztkmm/atkmm/private/noopobject_p.h rename to libs/tk/ztkmm/ztkmm/private/noopobject_p.h index d692d2895b..973b65d94f 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/private/noopobject_p.h +++ b/libs/tk/ztkmm/ztkmm/private/noopobject_p.h @@ -4,7 +4,7 @@ #define _ATKMM_NOOPOBJECT_P_H -#include +#include #include diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/object_p.h b/libs/tk/ztkmm/ztkmm/private/object_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/object_p.h rename to libs/tk/ztkmm/ztkmm/private/object_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/objectaccessible_p.h b/libs/tk/ztkmm/ztkmm/private/objectaccessible_p.h similarity index 96% rename from libs/tk/ztkmm/ztkmm/atkmm/private/objectaccessible_p.h rename to libs/tk/ztkmm/ztkmm/private/objectaccessible_p.h index 62e35fc592..a97697b337 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/private/objectaccessible_p.h +++ b/libs/tk/ztkmm/ztkmm/private/objectaccessible_p.h @@ -4,7 +4,7 @@ #define _ATKMM_OBJECTACCESSIBLE_P_H -#include +#include #include diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/relation_p.h b/libs/tk/ztkmm/ztkmm/private/relation_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/relation_p.h rename to libs/tk/ztkmm/ztkmm/private/relation_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/relationset_p.h b/libs/tk/ztkmm/ztkmm/private/relationset_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/relationset_p.h rename to libs/tk/ztkmm/ztkmm/private/relationset_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/selection_p.h b/libs/tk/ztkmm/ztkmm/private/selection_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/selection_p.h rename to libs/tk/ztkmm/ztkmm/private/selection_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/stateset_p.h b/libs/tk/ztkmm/ztkmm/private/stateset_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/stateset_p.h rename to libs/tk/ztkmm/ztkmm/private/stateset_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/streamablecontent_p.h b/libs/tk/ztkmm/ztkmm/private/streamablecontent_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/streamablecontent_p.h rename to libs/tk/ztkmm/ztkmm/private/streamablecontent_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/table_p.h b/libs/tk/ztkmm/ztkmm/private/table_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/table_p.h rename to libs/tk/ztkmm/ztkmm/private/table_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/text_p.h b/libs/tk/ztkmm/ztkmm/private/text_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/text_p.h rename to libs/tk/ztkmm/ztkmm/private/text_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/private/value_p.h b/libs/tk/ztkmm/ztkmm/private/value_p.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/private/value_p.h rename to libs/tk/ztkmm/ztkmm/private/value_p.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/relation.h b/libs/tk/ztkmm/ztkmm/relation.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/relation.h rename to libs/tk/ztkmm/ztkmm/relation.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/relationset.h b/libs/tk/ztkmm/ztkmm/relationset.h similarity index 99% rename from libs/tk/ztkmm/ztkmm/atkmm/relationset.h rename to libs/tk/ztkmm/ztkmm/relationset.h index a1c6e92bc0..f9af8d2929 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/relationset.h +++ b/libs/tk/ztkmm/ztkmm/relationset.h @@ -27,8 +27,8 @@ */ -#include -#include +#include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS diff --git a/libs/tk/ztkmm/ztkmm/atkmm/selection.h b/libs/tk/ztkmm/ztkmm/selection.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/selection.h rename to libs/tk/ztkmm/ztkmm/selection.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/stateset.h b/libs/tk/ztkmm/ztkmm/stateset.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/stateset.h rename to libs/tk/ztkmm/ztkmm/stateset.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/streamablecontent.h b/libs/tk/ztkmm/ztkmm/streamablecontent.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/streamablecontent.h rename to libs/tk/ztkmm/ztkmm/streamablecontent.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/table.h b/libs/tk/ztkmm/ztkmm/table.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/table.h rename to libs/tk/ztkmm/ztkmm/table.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/text.h b/libs/tk/ztkmm/ztkmm/text.h similarity index 99% rename from libs/tk/ztkmm/ztkmm/atkmm/text.h rename to libs/tk/ztkmm/ztkmm/text.h index a9d116822b..8d47455b3d 100644 --- a/libs/tk/ztkmm/ztkmm/atkmm/text.h +++ b/libs/tk/ztkmm/ztkmm/text.h @@ -27,7 +27,7 @@ */ -#include /* for Atk::CoordType */ +#include /* for Atk::CoordType */ #include #include diff --git a/libs/tk/ztkmm/ztkmm/atkmm/value.h b/libs/tk/ztkmm/ztkmm/value.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/value.h rename to libs/tk/ztkmm/ztkmm/value.h diff --git a/libs/tk/ztkmm/ztkmm/atkmm/wrap_init.h b/libs/tk/ztkmm/ztkmm/wrap_init.h similarity index 100% rename from libs/tk/ztkmm/ztkmm/atkmm/wrap_init.h rename to libs/tk/ztkmm/ztkmm/wrap_init.h