Attachment #2581 for bug #2528

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2528
Collapse All | Expand All




SET(SOURCES
    apr.cpp
    client_annotate.cpp
    client_cat.cpp
    client.cpp
    client_diff.cpp
    client_ls.cpp
    client_modify.cpp
    client_property.cpp
    client_status.cpp
    context.cpp
    datetime.cpp
    dirent.cpp
    entry.cpp
    exception.cpp
    log_entry.cpp
    path.cpp
    pool.cpp
    revision.cpp
    status.cpp
    targets.cpp
    url.cpp
    version_check.cpp
    wc.cpp
    lock_entry.cpp
    client_lock.cpp
    info_entry.cpp
    client_impl.cpp
    contextdata.cpp
    commititem.cpp
    repository.cpp
    repositorydata.cpp
    repositorylistener.cpp
    svnstream.cpp
    diff_data.cpp
    svnfilestream.cpp
    stringarray.cpp
    diffoptions.cpp
    conflictdescription.cpp
    conflictresult.cpp
    client_merge.cpp
    cache/LogCache.cpp
    cache/ReposLog.cpp
    cache/DatabaseException.hpp
    cache/DatabaseException.cpp
    )

    IF (SQLITE_FOUND)
        MESSAGE(STATUS "Build own sqlite3 database modul")
        SET(SOURCES
            ${SOURCES}
            cache/sqlite3/qsqlcachedresult.cpp
            cache/sqlite3/qsql_sqlite3.cpp
            cache/sqlite3/qsqlcachedresult.h
            cache/sqlite3/qsql_sqlite3.h
        )
    ELSE (SQLITE_FOUND)
        MESSAGE(SEND_ERROR "The QT3 version requires sqlite3 but could not found")
    ENDIF (SQLITE_FOUND)

SET(CACHEINST_HEADERS
    cache/LogCache.hpp
    cache/ReposLog.hpp
    cache/DatabaseException.hpp
)

SET(INST_HEADERS
    annotate_line.hpp
    apr.hpp
    check.hpp
    client.hpp
    commititem.hpp
    context.hpp
    context_listener.hpp
    datetime.hpp
    dirent.hpp
    entry.hpp
    exception.hpp
    info_entry.hpp
    lock_entry.hpp
    log_entry.hpp
    path.hpp
    pool.hpp
    repository.hpp
    repositorylistener.hpp
    revision.hpp
    smart_pointer.hpp
    shared_pointer.hpp
    status.hpp
    svnfilestream.hpp
    svnstream.hpp
    svnqttypes.hpp
    targets.hpp
    url.hpp
    version_check.hpp
    wc.hpp
    stringarray.hpp
    diffoptions.hpp
    conflictdescription.hpp
    conflictresult.hpp
    )

FILE(GLOB svnhdr RELATIVE  ${CMAKE_CURRENT_SOURCE_DIR} "*.hpp")
SET(svnhdr ${svnhdr} ${CACHE_INST_HEADERS})


        SET(TOUTF8 "utf8")
        SET(FROMUTF8 "fromUtf8")
        SET(QLIST "TQValueList")
        SET(TOASCII "latin1")
        SET(HOMEDIR "homeDirPath")
        SET(QDATABASE "TQSqlDatabase*")
        SET(QLONG "TQ_LLONG")
    SET(svnqt-name svnqt)

IF (HAVE_GCC_VISIBILITY)
    SET(_SVNQT_EXPORT "__attribute__ ((visibility(\"default\")))")
    SET(_SVNQT_NOEXPORT "__attribute__ ((visibility(\"hidden\")))")
ENDIF (HAVE_GCC_VISIBILITY)

CONFIGURE_FILE(
    "${CMAKE_CURRENT_SOURCE_DIR}/svnqt_defines.hpp.in"
    "${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.hpp"
    IMMEDIATE
    @ONLY)

SET(INST_HEADERS ${INST_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.hpp)
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})

ADD_LIBRARY(${svnqt-name} SHARED ${SOURCES} ${svnhdr})
    SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX})
    SET_TARGET_PROPERTIES(${svnqt-name}
        PROPERTIES
        COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})

SET(LIB_MAJOR 4)
SET(LIB_MINOR 2)
SET(LIB_RELEASE 2)

SET(_soversion ${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE})

SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES
    SOVERSION ${LIB_MAJOR}
    VERSION ${_soversion})

SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS})

IF (SQLITE_FOUND)
    TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES})
    INCLUDE_DIRECTORIES(SQLITE_INCLUDE_DIR)
ELSE (SQLITE_FOUND)
    TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY})
ENDIF (SQLITE_FOUND)

# Just a small linking test
IF (BUILD_TESTS)
    ADD_EXECUTABLE(testlink testmain.cpp)
    TARGET_LINK_LIBRARIES(testlink ${svnqt-name})
ENDIF (BUILD_TESTS)

    INSTALL(TARGETS ${svnqt-name} DESTINATION ${LIB_INSTALL_DIR})
    INSTALL(FILES ${INST_HEADERS} DESTINATION include/${svnqt-name})
    INSTALL(FILES ${CACHEINST_HEADERS} DESTINATION include/${svnqt-name}/cache)

IF (BUILD_TESTS)
  ADD_SUBDIRECTORY(tests)
  ADD_SUBDIRECTORY(cache/test)
ENDIF (BUILD_TESTS)




A small section of code in client_impl.hpp and client_impl.cpp was taken and modified
from the source code of subversion 1.8.10, which is released under the following license.
---------------------------------------------------------------------------------


                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed 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

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.


SUBVERSION SUBCOMPONENTS:

Subversion includes a number of subcomponents with separate copyright
notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
licenses.

For portions of the Python bindings test suite at
subversion/bindings/swig/python/tests/trac/:

 I.  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

     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.

 II. Copyright (C) 2003, 2004, 2005 Edgewall Software
     Copyright (C) 2003, 2004, 2005 Jonas Borgström <jonas@edgewall.com>
     Copyright (C) 2005 Christopher Lenz <cmlenz@gmx.de>

     All rights reserved.

     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
     are met:

     1. Redistributions of source code must retain the above copyright
        notice, this list of conditions and the following disclaimer.
     2. Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        the documentation and/or other materials provided with the
        distribution.
     3. The name of the author may not be used to endorse or promote
        products derived from this software without specific prior written
        permission.

     THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS
     OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
     ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
     DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
     DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
     GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
     IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

For the file subversion/libsvn_subr/utf_width.c

 * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
 *
 * Permission to use, copy, modify, and distribute this software
 * for any purpose and without fee is hereby granted. The author
 * disclaims all warranties with regard to this software.





#include <tqmap.h>
#include <tqstringlist.h>

#if (!(SVN_VER_MAJOR == 1 && SVN_VER_MINOR <= 8))
apr_array_header_t* svn_sort__hash(apr_hash_t *ht,
        int (*comparison_func)(const svn_sort__item_t*, const svn_sort__item_t*), apr_pool_t *pool)
{
  apr_hash_index_t *hi;
  apr_array_header_t *ary;
  svn_boolean_t sorted;
  svn_sort_item_type *prev_item;

  /* allocate an array with enough elements to hold all the keys. */
  ary = apr_array_make(pool, apr_hash_count(ht), sizeof(svn_sort_item_type));

  /* loop over hash table and push all keys into the array */
  sorted = TRUE;
  prev_item = NULL;
  for (hi = apr_hash_first(pool, ht); hi; hi = apr_hash_next(hi))
	{
		svn_sort_item_type *item = (svn_sort_item_type*)apr_array_push(ary);
		apr_hash_this(hi, &item->key, &item->klen, &item->value);

		if (prev_item == NULL)
		{
			prev_item = item;
			continue;
		}

		if (sorted)
		{
			sorted = (comparison_func((svn_sort__item_t*)prev_item, (svn_sort__item_t*)item) < 0);
			prev_item = item;
		}
	}

  /* quicksort the array if it isn't already sorted.  */
  if (!sorted)
  {
    qsort(ary->elts, ary->nelts, ary->elt_size,
          (int (*)(const void*, const void*))comparison_func);
  }

  return ary;
}
#endif

namespace svn
{


Lines 31-36 Link Here

(-)a/src/svnqt/client_impl.hpp (+19 lines)
31	#ifndef _SVNCPP_CLIENT_IMPL_H_	31	#ifndef _SVNCPP_CLIENT_IMPL_H_
32	#define _SVNCPP_CLIENT_IMPL_H_	32	#define _SVNCPP_CLIENT_IMPL_H_
33		33
		34	#include "svn_sorts.h"
		35	#include <svn_version.h>
		36
34	#include "svnqt/client.hpp"	37	#include "svnqt/client.hpp"
35	#include "svnqt/svnqt_defines.hpp"	38	#include "svnqt/svnqt_defines.hpp"
36		39
Lines 46-51 Link Here
46		49
47	class TQStringList;	50	class TQStringList;
48		51
		52	#if (SVN_VER_MAJOR == 1 && SVN_VER_MINOR <= 8)
		53	typedef svn_sort__item_t svn_sort_item_type;
		54	#else
		55	// Taken from subversion 1.8.10 source code and modified where needed
		56
		57	// Same as svn_sort__item_t
		58	typedef struct svn_sort_item_type {
		59	const void *key; // pointer to the key
		60	apr_ssize_t klen; // size of the key
		61	void *value; // pointer to the value
		62	} svn_sort_item_type;
		63
		64	apr_array_header_t* svn_sort__hash(apr_hash_t *ht,
		65	int (comparison_func)(const svn_sort__item_t, const svn_sort__item_t), apr_pool_t pool);
		66	#endif
		67
49	namespace svn	68	namespace svn
50	{	69	{
51	namespace stream {	70	namespace stream {




// subversion api
#include "svn_client.h"
#include "svn_path.h"
#include "svn_sorts.h"
//#include "svn_utf.h"

#include "svnqt/dirent.hpp"


#include "svnqt/helper.hpp"

static int
compare_items_as_paths (const svn_sort__item_t *a, const svn_sort__item_t *b)
{
  return svn_path_compare_paths ((const char *)a->key, (const char *)b->key);
}

namespace svn
{



    apr_array_header_t *
      array = svn_sort__hash (
        hash, svn_sort_compare_items_as_paths, pool);

    DirEntries entries;


    {
      const char *entryname;
      svn_dirent_t *dirent;
      svn_sort_item_type *item;

      item = &APR_ARRAY_IDX (array, i, svn_sort_item_type);

      entryname = static_cast<const char *>(item->key);



    apr_array_header_t *
      array = svn_sort__hash (
        hash, svn_sort_compare_items_as_paths, pool);

    DirEntries entries;


      const char *entryname;
      svn_dirent_t *dirent;
      svn_lock_t * lockent;
      svn_sort_item_type *item;

      item = &APR_ARRAY_IDX (array, i, svn_sort_item_type);

      entryname = static_cast<const char *>(item->key);






// Subversion api
#include "svn_client.h"
#include "svn_sorts.h"
#include "svn_path.h"
//#include "svn_utf.h"


    /* Loop over array, printing each name/status-structure */
    for (i = 0; i < statusarray->nelts; ++i)
    {
      const svn_sort_item_type *item;
      const char *filePath;
      svn_wc_status2_t *status = NULL;

      item = &APR_ARRAY_IDX (statusarray, i, const svn_sort_item_type);
      status = (svn_wc_status2_t *) item->value;

      filePath = (const char *) item->key;

    apr_array_header_t *statusarray =
      svn_sort__hash (status_hash, svn_sort_compare_items_as_paths,
                            pool);
    const svn_sort_item_type *item;
    const char *filePath;
    svn_wc_status2_t *status = NULL;

    item = &APR_ARRAY_IDX (statusarray, 0, const svn_sort_item_type);
    status = (svn_wc_status2_t *) item->value;
    filePath = (const char *) item->key;


    /* Loop over array, printing each name/status-structure */
    for (i=0; i< statusarray->nelts; ++i)
    {
      const svn_sort_item_type *item;
      InfoEntry*e = NULL;
      item = &APR_ARRAY_IDX (statusarray, i, const svn_sort_item_type);
      e = (InfoEntry *) item->value;
      ientries.push_back(*e);
      delete e;

Return to bug 2528

Lines 38-44 Link Here

(-)a/src/svnqt/client_ls.cpp (-13 / +6 lines)
38	// subversion api	38	// subversion api
39	#include "svn_client.h"	39	#include "svn_client.h"
40	#include "svn_path.h"	40	#include "svn_path.h"
41	#include "svn_sorts.h"
42	//#include "svn_utf.h"	41	//#include "svn_utf.h"
43		42
44	#include "svnqt/dirent.hpp"	43	#include "svnqt/dirent.hpp"
Lines 47-58 Link Here
47		46
48	#include "svnqt/helper.hpp"	47	#include "svnqt/helper.hpp"
49		48
50	static int
51	compare_items_as_paths (const svn_sort__item_t a, const svn_sort__item_t b)
52	{
53	return svn_path_compare_paths ((const char )a->key, (const char )b->key);
54	}
55
56	namespace svn	49	namespace svn
57	{	50	{
58		51
Lines 82-88 namespace svn Link Here
82		75
83	apr_array_header_t *	76	apr_array_header_t *
84	array = svn_sort__hash (	77	array = svn_sort__hash (
85	hash, compare_items_as_paths, pool);	78	hash, svn_sort_compare_items_as_paths, pool);
86		79
87	DirEntries entries;	80	DirEntries entries;
88		81
Lines 90-98 namespace svn Link Here
90	{	83	{
91	const char *entryname;	84	const char *entryname;
92	svn_dirent_t *dirent;	85	svn_dirent_t *dirent;
93	svn_sort__item_t *item;	86	svn_sort_item_type *item;
94		87
95	item = &APR_ARRAY_IDX (array, i, svn_sort__item_t);	88	item = &APR_ARRAY_IDX (array, i, svn_sort_item_type);
96		89
97	entryname = static_cast<const char *>(item->key);	90	entryname = static_cast<const char *>(item->key);
98		91
Lines 131-137 namespace svn Link Here
131		124
132	apr_array_header_t *	125	apr_array_header_t *
133	array = svn_sort__hash (	126	array = svn_sort__hash (
134	hash, compare_items_as_paths, pool);	127	hash, svn_sort_compare_items_as_paths, pool);
135		128
136	DirEntries entries;	129	DirEntries entries;
137		130
Lines 140-148 namespace svn Link Here
140	const char *entryname;	133	const char *entryname;
141	svn_dirent_t *dirent;	134	svn_dirent_t *dirent;
142	svn_lock_t * lockent;	135	svn_lock_t * lockent;
143	svn_sort__item_t *item;	136	svn_sort_item_type *item;
144		137
145	item = &APR_ARRAY_IDX (array, i, svn_sort__item_t);	138	item = &APR_ARRAY_IDX (array, i, svn_sort_item_type);
146		139
147	entryname = static_cast<const char *>(item->key);	140	entryname = static_cast<const char *>(item->key);
148		141

Lines 38-44 Link Here

(-)a/src/svnqt/client_status.cpp (-7 / +6 lines)
38		38
39	// Subversion api	39	// Subversion api
40	#include "svn_client.h"	40	#include "svn_client.h"
41	#include "svn_sorts.h"
42	#include "svn_path.h"	41	#include "svn_path.h"
43	//#include "svn_utf.h"	42	//#include "svn_utf.h"
44		43
Lines 334-344 namespace svn Link Here
334	/* Loop over array, printing each name/status-structure */	333	/* Loop over array, printing each name/status-structure */
335	for (i = 0; i < statusarray->nelts; ++i)	334	for (i = 0; i < statusarray->nelts; ++i)
336	{	335	{
337	const svn_sort__item_t *item;	336	const svn_sort_item_type *item;
338	const char *filePath;	337	const char *filePath;
339	svn_wc_status2_t *status = NULL;	338	svn_wc_status2_t *status = NULL;
340		339
341	item = &APR_ARRAY_IDX (statusarray, i, const svn_sort__item_t);	340	item = &APR_ARRAY_IDX (statusarray, i, const svn_sort_item_type);
342	status = (svn_wc_status2_t *) item->value;	341	status = (svn_wc_status2_t *) item->value;
343		342
344	filePath = (const char *) item->key;	343	filePath = (const char *) item->key;
Lines 462-472 namespace svn Link Here
462	apr_array_header_t *statusarray =	461	apr_array_header_t *statusarray =
463	svn_sort__hash (status_hash, svn_sort_compare_items_as_paths,	462	svn_sort__hash (status_hash, svn_sort_compare_items_as_paths,
464	pool);	463	pool);
465	const svn_sort__item_t *item;	464	const svn_sort_item_type *item;
466	const char *filePath;	465	const char *filePath;
467	svn_wc_status2_t *status = NULL;	466	svn_wc_status2_t *status = NULL;
468		467
469	item = &APR_ARRAY_IDX (statusarray, 0, const svn_sort__item_t);	468	item = &APR_ARRAY_IDX (statusarray, 0, const svn_sort_item_type);
470	status = (svn_wc_status2_t *) item->value;	469	status = (svn_wc_status2_t *) item->value;
471	filePath = (const char *) item->key;	470	filePath = (const char *) item->key;
472		471
Lines 715-723 namespace svn Link Here
715	/* Loop over array, printing each name/status-structure */	714	/* Loop over array, printing each name/status-structure */
716	for (i=0; i< statusarray->nelts; ++i)	715	for (i=0; i< statusarray->nelts; ++i)
717	{	716	{
718	const svn_sort__item_t *item;	717	const svn_sort_item_type *item;
719	InfoEntry*e = NULL;	718	InfoEntry*e = NULL;
720	item = &APR_ARRAY_IDX (statusarray, i, const svn_sort__item_t);	719	item = &APR_ARRAY_IDX (statusarray, i, const svn_sort_item_type);
721	e = (InfoEntry *) item->value;	720	e = (InfoEntry *) item->value;
722	ientries.push_back(*e);	721	ientries.push_back(*e);
723	delete e;	722	delete e;

Lines 1-171 Link Here

(-)a/src/svnqt/CMakeLists.txt.orig (-171 lines)
1	SET(SOURCES
2	apr.cpp
3	client_annotate.cpp
4	client_cat.cpp
5	client.cpp
6	client_diff.cpp
7	client_ls.cpp
8	client_modify.cpp
9	client_property.cpp
10	client_status.cpp
11	context.cpp
12	datetime.cpp
13	dirent.cpp
14	entry.cpp
15	exception.cpp
16	log_entry.cpp
17	path.cpp
18	pool.cpp
19	revision.cpp
20	status.cpp
21	targets.cpp
22	url.cpp
23	version_check.cpp
24	wc.cpp
25	lock_entry.cpp
26	client_lock.cpp
27	info_entry.cpp
28	client_impl.cpp
29	contextdata.cpp
30	commititem.cpp
31	repository.cpp
32	repositorydata.cpp
33	repositorylistener.cpp
34	svnstream.cpp
35	diff_data.cpp
36	svnfilestream.cpp
37	stringarray.cpp
38	diffoptions.cpp
39	conflictdescription.cpp
40	conflictresult.cpp
41	client_merge.cpp
42	cache/LogCache.cpp
43	cache/ReposLog.cpp
44	cache/DatabaseException.hpp
45	cache/DatabaseException.cpp
46	)
47
48	IF (SQLITE_FOUND)
49	MESSAGE(STATUS "Build own sqlite3 database modul")
50	SET(SOURCES
51	${SOURCES}
52	cache/sqlite3/qsqlcachedresult.cpp
53	cache/sqlite3/qsql_sqlite3.cpp
54	cache/sqlite3/qsqlcachedresult.h
55	cache/sqlite3/qsql_sqlite3.h
56	)
57	ELSE (SQLITE_FOUND)
58	MESSAGE(SEND_ERROR "The QT3 version requires sqlite3 but could not found")
59	ENDIF (SQLITE_FOUND)
60
61	SET(CACHEINST_HEADERS
62	cache/LogCache.hpp
63	cache/ReposLog.hpp
64	cache/DatabaseException.hpp
65	)
66
67	SET(INST_HEADERS
68	annotate_line.hpp
69	apr.hpp
70	check.hpp
71	client.hpp
72	commititem.hpp
73	context.hpp
74	context_listener.hpp
75	datetime.hpp
76	dirent.hpp
77	entry.hpp
78	exception.hpp
79	info_entry.hpp
80	lock_entry.hpp
81	log_entry.hpp
82	path.hpp
83	pool.hpp
84	repository.hpp
85	repositorylistener.hpp
86	revision.hpp
87	smart_pointer.hpp
88	shared_pointer.hpp
89	status.hpp
90	svnfilestream.hpp
91	svnstream.hpp
92	svnqttypes.hpp
93	targets.hpp
94	url.hpp
95	version_check.hpp
96	wc.hpp
97	stringarray.hpp
98	diffoptions.hpp
99	conflictdescription.hpp
100	conflictresult.hpp
101	)
102
103	FILE(GLOB svnhdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.hpp")
104	SET(svnhdr ${svnhdr} ${CACHE_INST_HEADERS})
105
106
107	SET(TOUTF8 "utf8")
108	SET(FROMUTF8 "fromUtf8")
109	SET(QLIST "TQValueList")
110	SET(TOASCII "latin1")
111	SET(HOMEDIR "homeDirPath")
112	SET(QDATABASE "TQSqlDatabase*")
113	SET(QLONG "TQ_LLONG")
114	SET(svnqt-name svnqt)
115
116	IF (HAVE_GCC_VISIBILITY)
117	SET(_SVNQT_EXPORT "__attribute__ ((visibility(\"default\")))")
118	SET(_SVNQT_NOEXPORT "__attribute__ ((visibility(\"hidden\")))")
119	ENDIF (HAVE_GCC_VISIBILITY)
120
121	CONFIGURE_FILE(
122	"${CMAKE_CURRENT_SOURCE_DIR}/svnqt_defines.hpp.in"
123	"${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.hpp"
124	IMMEDIATE
125	@ONLY)
126
127	SET(INST_HEADERS ${INST_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.hpp)
128	INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
129
130	ADD_LIBRARY(${svnqt-name} SHARED ${SOURCES} ${svnhdr})
131	SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX})
132	SET_TARGET_PROPERTIES(${svnqt-name}
133	PROPERTIES
134	COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
135
136	SET(LIB_MAJOR 4)
137	SET(LIB_MINOR 2)
138	SET(LIB_RELEASE 2)
139
140	SET(_soversion ${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE})
141
142	SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES
143	SOVERSION ${LIB_MAJOR}
144	VERSION ${_soversion})
145
146	SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
147	SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
148	SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
149	TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS})
150
151	IF (SQLITE_FOUND)
152	TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES})
153	INCLUDE_DIRECTORIES(SQLITE_INCLUDE_DIR)
154	ELSE (SQLITE_FOUND)
155	TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY})
156	ENDIF (SQLITE_FOUND)
157
158	# Just a small linking test
159	IF (BUILD_TESTS)
160	ADD_EXECUTABLE(testlink testmain.cpp)
161	TARGET_LINK_LIBRARIES(testlink ${svnqt-name})
162	ENDIF (BUILD_TESTS)
163
164	INSTALL(TARGETS ${svnqt-name} DESTINATION ${LIB_INSTALL_DIR})
165	INSTALL(FILES ${INST_HEADERS} DESTINATION include/${svnqt-name})
166	INSTALL(FILES ${CACHEINST_HEADERS} DESTINATION include/${svnqt-name}/cache)
167
168	IF (BUILD_TESTS)
169	ADD_SUBDIRECTORY(tests)
170	ADD_SUBDIRECTORY(cache/test)
171	ENDIF (BUILD_TESTS)

Line 0 Link Here

(-)a/src/svnqt/LICENSE_SVN (+274 lines)
		1	A small section of code in client_impl.hpp and client_impl.cpp was taken and modified
		2	from the source code of subversion 1.8.10, which is released under the following license.
		3	---------------------------------------------------------------------------------
		4
		5
		6	Apache License
		7	Version 2.0, January 2004
		8	http://www.apache.org/licenses/
		9
		10	TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
		11
		12	1. Definitions.
		13
		14	"License" shall mean the terms and conditions for use, reproduction,
		15	and distribution as defined by Sections 1 through 9 of this document.
		16
		17	"Licensor" shall mean the copyright owner or entity authorized by
		18	the copyright owner that is granting the License.
		19
		20	"Legal Entity" shall mean the union of the acting entity and all
		21	other entities that control, are controlled by, or are under common
		22	control with that entity. For the purposes of this definition,
		23	"control" means (i) the power, direct or indirect, to cause the
		24	direction or management of such entity, whether by contract or
		25	otherwise, or (ii) ownership of fifty percent (50%) or more of the
		26	outstanding shares, or (iii) beneficial ownership of such entity.
		27
		28	"You" (or "Your") shall mean an individual or Legal Entity
		29	exercising permissions granted by this License.
		30
		31	"Source" form shall mean the preferred form for making modifications,
		32	including but not limited to software source code, documentation
		33	source, and configuration files.
		34
		35	"Object" form shall mean any form resulting from mechanical
		36	transformation or translation of a Source form, including but
		37	not limited to compiled object code, generated documentation,
		38	and conversions to other media types.
		39
		40	"Work" shall mean the work of authorship, whether in Source or
		41	Object form, made available under the License, as indicated by a
		42	copyright notice that is included in or attached to the work
		43	(an example is provided in the Appendix below).
		44
		45	"Derivative Works" shall mean any work, whether in Source or Object
		46	form, that is based on (or derived from) the Work and for which the
		47	editorial revisions, annotations, elaborations, or other modifications
		48	represent, as a whole, an original work of authorship. For the purposes
		49	of this License, Derivative Works shall not include works that remain
		50	separable from, or merely link (or bind by name) to the interfaces of,
		51	the Work and Derivative Works thereof.
		52
		53	"Contribution" shall mean any work of authorship, including
		54	the original version of the Work and any modifications or additions
		55	to that Work or Derivative Works thereof, that is intentionally
		56	submitted to Licensor for inclusion in the Work by the copyright owner
		57	or by an individual or Legal Entity authorized to submit on behalf of
		58	the copyright owner. For the purposes of this definition, "submitted"
		59	means any form of electronic, verbal, or written communication sent
		60	to the Licensor or its representatives, including but not limited to
		61	communication on electronic mailing lists, source code control systems,
		62	and issue tracking systems that are managed by, or on behalf of, the
		63	Licensor for the purpose of discussing and improving the Work, but
		64	excluding communication that is conspicuously marked or otherwise
65	designated in writing by the copyright owner as "Not a Contribution."
66
67	"Contributor" shall mean Licensor and any individual or Legal Entity
68	on behalf of whom a Contribution has been received by Licensor and
69	subsequently incorporated within the Work.
70
71	2. Grant of Copyright License. Subject to the terms and conditions of
72	this License, each Contributor hereby grants to You a perpetual,
73	worldwide, non-exclusive, no-charge, royalty-free, irrevocable
74	copyright license to reproduce, prepare Derivative Works of,
75	publicly display, publicly perform, sublicense, and distribute the
76	Work and such Derivative Works in Source or Object form.
77
78	3. Grant of Patent License. Subject to the terms and conditions of
79	this License, each Contributor hereby grants to You a perpetual,
80	worldwide, non-exclusive, no-charge, royalty-free, irrevocable
81	(except as stated in this section) patent license to make, have made,
82	use, offer to sell, sell, import, and otherwise transfer the Work,
83	where such license applies only to those patent claims licensable
84	by such Contributor that are necessarily infringed by their
85	Contribution(s) alone or by combination of their Contribution(s)
86	with the Work to which such Contribution(s) was submitted. If You
87	institute patent litigation against any entity (including a
88	cross-claim or counterclaim in a lawsuit) alleging that the Work
89	or a Contribution incorporated within the Work constitutes direct
90	or contributory patent infringement, then any patent licenses
91	granted to You under this License for that Work shall terminate
92	as of the date such litigation is filed.
93
94	4. Redistribution. You may reproduce and distribute copies of the
95	Work or Derivative Works thereof in any medium, with or without
96	modifications, and in Source or Object form, provided that You
97	meet the following conditions:
98
99	(a) You must give any other recipients of the Work or
100	Derivative Works a copy of this License; and
101
102	(b) You must cause any modified files to carry prominent notices
103	stating that You changed the files; and
104
105	(c) You must retain, in the Source form of any Derivative Works
106	that You distribute, all copyright, patent, trademark, and
107	attribution notices from the Source form of the Work,
108	excluding those notices that do not pertain to any part of
109	the Derivative Works; and
110
111	(d) If the Work includes a "NOTICE" text file as part of its
112	distribution, then any Derivative Works that You distribute must
113	include a readable copy of the attribution notices contained
114	within such NOTICE file, excluding those notices that do not
115	pertain to any part of the Derivative Works, in at least one
116	of the following places: within a NOTICE text file distributed
117	as part of the Derivative Works; within the Source form or
118	documentation, if provided along with the Derivative Works; or,
119	within a display generated by the Derivative Works, if and
120	wherever such third-party notices normally appear. The contents
121	of the NOTICE file are for informational purposes only and
122	do not modify the License. You may add Your own attribution
123	notices within Derivative Works that You distribute, alongside
124	or as an addendum to the NOTICE text from the Work, provided
125	that such additional attribution notices cannot be construed
126	as modifying the License.
127
128	You may add Your own copyright statement to Your modifications and
129	may provide additional or different license terms and conditions
130	for use, reproduction, or distribution of Your modifications, or
131	for any such Derivative Works as a whole, provided Your use,
132	reproduction, and distribution of the Work otherwise complies with
133	the conditions stated in this License.
134
135	5. Submission of Contributions. Unless You explicitly state otherwise,
136	any Contribution intentionally submitted for inclusion in the Work
137	by You to the Licensor shall be under the terms and conditions of
138	this License, without any additional terms or conditions.
139	Notwithstanding the above, nothing herein shall supersede or modify
140	the terms of any separate license agreement you may have executed
141	with Licensor regarding such Contributions.
142
143	6. Trademarks. This License does not grant permission to use the trade
144	names, trademarks, service marks, or product names of the Licensor,
145	except as required for reasonable and customary use in describing the
146	origin of the Work and reproducing the content of the NOTICE file.
147
148	7. Disclaimer of Warranty. Unless required by applicable law or
149	agreed to in writing, Licensor provides the Work (and each
150	Contributor provides its Contributions) on an "AS IS" BASIS,
151	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
152	implied, including, without limitation, any warranties or conditions
153	of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
154	PARTICULAR PURPOSE. You are solely responsible for determining the
155	appropriateness of using or redistributing the Work and assume any
156	risks associated with Your exercise of permissions under this License.
157
158	8. Limitation of Liability. In no event and under no legal theory,
159	whether in tort (including negligence), contract, or otherwise,
160	unless required by applicable law (such as deliberate and grossly
161	negligent acts) or agreed to in writing, shall any Contributor be
162	liable to You for damages, including any direct, indirect, special,
163	incidental, or consequential damages of any character arising as a
164	result of this License or out of the use or inability to use the
165	Work (including but not limited to damages for loss of goodwill,
166	work stoppage, computer failure or malfunction, or any and all
167	other commercial damages or losses), even if such Contributor
168	has been advised of the possibility of such damages.
169
170	9. Accepting Warranty or Additional Liability. While redistributing
171	the Work or Derivative Works thereof, You may choose to offer,
172	and charge a fee for, acceptance of support, warranty, indemnity,
173	or other liability obligations and/or rights consistent with this
174	License. However, in accepting such obligations, You may act only
175	on Your own behalf and on Your sole responsibility, not on behalf
176	of any other Contributor, and only if You agree to indemnify,
177	defend, and hold each Contributor harmless for any liability
178	incurred by, or claims asserted against, such Contributor by reason
179	of your accepting any such warranty or additional liability.
180
181	END OF TERMS AND CONDITIONS
182
183	APPENDIX: How to apply the Apache License to your work.
184
185	To apply the Apache License to your work, attach the following
186	boilerplate notice, with the fields enclosed by brackets "[]"
187	replaced with your own identifying information. (Don't include
188	the brackets!) The text should be enclosed in the appropriate
189	comment syntax for the file format. We also recommend that a
190	file or class name and description of purpose be included on the
191	same "printed page" as the copyright notice for easier
192	identification within third-party archives.
193
194	Copyright [yyyy] [name of copyright owner]
195
196	Licensed under the Apache License, Version 2.0 (the "License");
197	you may not use this file except in compliance with the License.
198	You may obtain a copy of the License at
199
200	http://www.apache.org/licenses/LICENSE-2.0
201
202	Unless required by applicable law or agreed to in writing, software
203	distributed under the License is distributed on an "AS IS" BASIS,
204	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
205	See the License for the specific language governing permissions and
206	limitations under the License.
207
208
209	SUBVERSION SUBCOMPONENTS:
210
211	Subversion includes a number of subcomponents with separate copyright
212	notices and license terms. Your use of the source code for the these
213	subcomponents is subject to the terms and conditions of the following
214	licenses.
215
216	For portions of the Python bindings test suite at
217	subversion/bindings/swig/python/tests/trac/:
218
219	I. Licensed to the Apache Software Foundation (ASF) under one
220	or more contributor license agreements. See the NOTICE file
221	distributed with this work for additional information
222	regarding copyright ownership. The ASF licenses this file
223	to you under the Apache License, Version 2.0 (the
224	"License"); you may not use this file except in compliance
225	with the License. You may obtain a copy of the License at
226
227	http://www.apache.org/licenses/LICENSE-2.0
228
229	Unless required by applicable law or agreed to in writing,
230	software distributed under the License is distributed on an
231	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
232	KIND, either express or implied. See the License for the
233	specific language governing permissions and limitations
234	under the License.
235
236	II. Copyright (C) 2003, 2004, 2005 Edgewall Software
237	Copyright (C) 2003, 2004, 2005 Jonas Borgström <jonas@edgewall.com>
238	Copyright (C) 2005 Christopher Lenz <cmlenz@gmx.de>
239
240	All rights reserved.
241
242	Redistribution and use in source and binary forms, with or without
243	modification, are permitted provided that the following conditions
244	are met:
245
246	1. Redistributions of source code must retain the above copyright
247	notice, this list of conditions and the following disclaimer.
248	2. Redistributions in binary form must reproduce the above copyright
249	notice, this list of conditions and the following disclaimer in the
250	the documentation and/or other materials provided with the
251	distribution.
252	3. The name of the author may not be used to endorse or promote
253	products derived from this software without specific prior written
254	permission.
255
256	THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS
257	OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
258	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
259	ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
260	DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
261	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
262	GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
263	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
264	IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
265	OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
266	IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
267
268	For the file subversion/libsvn_subr/utf_width.c
269
270	* Markus Kuhn -- 2007-05-26 (Unicode 5.0)
271	*
272	* Permission to use, copy, modify, and distribute this software
273	* for any purpose and without fee is hereby granted. The author
274	* disclaims all warranties with regard to this software.

Lines 38-43 Link Here

(-)a/src/svnqt/client_impl.cpp (+45 lines)
38		38
39	#include <tqmap.h>	39	#include <tqmap.h>
40	#include <tqstringlist.h>	40	#include <tqstringlist.h>
		41
		42	#if (!(SVN_VER_MAJOR == 1 && SVN_VER_MINOR <= 8))
		43	apr_array_header_t* svn_sort__hash(apr_hash_t *ht,
		44	int (comparison_func)(const svn_sort__item_t, const svn_sort__item_t), apr_pool_t pool)
		45	{
		46	apr_hash_index_t *hi;
		47	apr_array_header_t *ary;
		48	svn_boolean_t sorted;
		49	svn_sort_item_type *prev_item;
		50
		51	/* allocate an array with enough elements to hold all the keys. */
		52	ary = apr_array_make(pool, apr_hash_count(ht), sizeof(svn_sort_item_type));
		53
		54	/* loop over hash table and push all keys into the array */
		55	sorted = TRUE;
		56	prev_item = NULL;
		57	for (hi = apr_hash_first(pool, ht); hi; hi = apr_hash_next(hi))
		58	{
		59	svn_sort_item_type item = (svn_sort_item_type)apr_array_push(ary);
		60	apr_hash_this(hi, &item->key, &item->klen, &item->value);
		61
		62	if (prev_item == NULL)
		63	{
		64	prev_item = item;
		65	continue;
		66	}
		67
		68	if (sorted)
		69	{
		70	sorted = (comparison_func((svn_sort__item_t)prev_item, (svn_sort__item_t)item) < 0);
		71	prev_item = item;
		72	}
		73	}
		74
		75	/* quicksort the array if it isn't already sorted. */
		76	if (!sorted)
		77	{
		78	qsort(ary->elts, ary->nelts, ary->elt_size,
		79	(int ()(const void, const void*))comparison_func);
		80	}
		81
		82	return ary;
		83	}
		84	#endif
		85
41	namespace svn	86	namespace svn
42	{	87	{
43		88