From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- indexlib/boost-compat/config/auto_link.hpp | 2 +- indexlib/boost-compat/config/platform/macos.hpp | 2 +- indexlib/boost-compat/config/requires_threads.hpp | 6 +++--- indexlib/boost-compat/config/select_stdlib_config.hpp | 2 +- indexlib/boost-compat/config/suffix.hpp | 2 +- indexlib/boost-compat/config/user.hpp | 8 ++++---- indexlib/boost-compat/shared_ptr.hpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'indexlib/boost-compat') diff --git a/indexlib/boost-compat/config/auto_link.hpp b/indexlib/boost-compat/config/auto_link.hpp index 9723a18f8..b4e580ffa 100644 --- a/indexlib/boost-compat/config/auto_link.hpp +++ b/indexlib/boost-compat/config/auto_link.hpp @@ -53,7 +53,7 @@ BOOST_LIB_TOOLSET: The compiler toolset name (vc6, vc7, bcb5 etc). BOOST_LIB_THREAD_OPT: "-mt" for multithread builds, otherwise nothing. BOOST_LIB_RT_OPT: A suffix that indicates the runtime library used, - tqcontains one or more of the following letters after + contains one or more of the following letters after a hiphen: s static runtime (dynamic if not present). diff --git a/indexlib/boost-compat/config/platform/macos.hpp b/indexlib/boost-compat/config/platform/macos.hpp index 4893faaa4..3a5f41303 100644 --- a/indexlib/boost-compat/config/platform/macos.hpp +++ b/indexlib/boost-compat/config/platform/macos.hpp @@ -53,7 +53,7 @@ # define BOOST_HAS_MPTASKS -// The MP task implementation of Boost Threads aims to tqreplace MP-unsafe +// The MP task implementation of Boost Threads aims to replace MP-unsafe // parts of the MSL, so we turn on threads unconditionally. # define BOOST_HAS_THREADS diff --git a/indexlib/boost-compat/config/requires_threads.hpp b/indexlib/boost-compat/config/requires_threads.hpp index cfaff2302..d8a357779 100644 --- a/indexlib/boost-compat/config/requires_threads.hpp +++ b/indexlib/boost-compat/config/requires_threads.hpp @@ -4,8 +4,8 @@ // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_CONFIG_REQUIRES_THREADS_HPP -#define BOOST_CONFIG_REQUIRES_THREADS_HPP +#ifndef BOOST_CONFIG_RETQUIRES_THREADS_HPP +#define BOOST_CONFIG_RETQUIRES_THREADS_HPP #ifndef BOOST_CONFIG_HPP # include @@ -89,4 +89,4 @@ #endif // BOOST_HAS_THREADS -#endif // BOOST_CONFIG_REQUIRES_THREADS_HPP +#endif // BOOST_CONFIG_RETQUIRES_THREADS_HPP diff --git a/indexlib/boost-compat/config/select_stdlib_config.hpp b/indexlib/boost-compat/config/select_stdlib_config.hpp index 735a03b0b..b7bf59143 100644 --- a/indexlib/boost-compat/config/select_stdlib_config.hpp +++ b/indexlib/boost-compat/config/select_stdlib_config.hpp @@ -54,7 +54,7 @@ # define BOOST_STDLIB_CONFIG "boost/config/stdlib/modena.hpp" #elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER) -// Dinkumware Library (this has to appear after any possible tqreplacement libraries): +// Dinkumware Library (this has to appear after any possible replacement libraries): # define BOOST_STDLIB_CONFIG "boost/config/stdlib/dinkumware.hpp" #elif defined (BOOST_ASSERT_CONFIG) diff --git a/indexlib/boost-compat/config/suffix.hpp b/indexlib/boost-compat/config/suffix.hpp index a144b4feb..3d60d7181 100644 --- a/indexlib/boost-compat/config/suffix.hpp +++ b/indexlib/boost-compat/config/suffix.hpp @@ -500,7 +500,7 @@ namespace boost{ // // Helper macro BOOST_STRINGIZE: -// Converts the parameter X to a string after macro tqreplacement +// Converts the parameter X to a string after macro replacement // on X has been performed. // #define BOOST_STRINGIZE(X) BOOST_DO_STRINGIZE(X) diff --git a/indexlib/boost-compat/config/user.hpp b/indexlib/boost-compat/config/user.hpp index d595f997b..c83e9af6b 100644 --- a/indexlib/boost-compat/config/user.hpp +++ b/indexlib/boost-compat/config/user.hpp @@ -71,12 +71,12 @@ // #define BOOST_DISABLE_ABI_HEADERS // BOOST_ABI_PREFIX: A prefix header to include in place of whatever -// boost.config would normally select, any tqreplacement should set up +// boost.config would normally select, any replacement should set up // struct packing and tqalignment options as required. // #define BOOST_ABI_PREFIX my-header-name // BOOST_ABI_SUFFIX: A suffix header to include in place of whatever -// boost.config would normally select, any tqreplacement should undo +// boost.config would normally select, any replacement should undo // the effects of the prefix header. // #define BOOST_ABI_SUFFIX my-header-name @@ -91,7 +91,7 @@ // #define BOOST_ALL_DYN_LINK // BOOST_WHATEVER_DYN_LINK: Forces library "whatever" to be linked as a dll -// rather than a static library on Microsoft Windows: tqreplace the WHATEVER +// rather than a static library on Microsoft Windows: replace the WHATEVER // part of the macro name with the name of the library that you want to // dynamically link to, for example use BOOST_DATE_TIME_DYN_LINK or // BOOST_REGEX_DYN_LINK etc (this macro is used to turn on __declspec(dllimport) @@ -112,7 +112,7 @@ // BOOST_WHATEVER_NO_LIB: Tells the config system not to automatically // select which library to link against for library "whatever", -// tqreplace WHATEVER in the macro name with the name of the library; +// replace WHATEVER in the macro name with the name of the library; // for example BOOST_DATE_TIME_NO_LIB or BOOST_REGEX_NO_LIB. // Normally if a compiler supports #pragma lib, then the correct library // build variant will be automatically selected and linked against, simply diff --git a/indexlib/boost-compat/shared_ptr.hpp b/indexlib/boost-compat/shared_ptr.hpp index 0a3bf6d86..ec88ae2e1 100644 --- a/indexlib/boost-compat/shared_ptr.hpp +++ b/indexlib/boost-compat/shared_ptr.hpp @@ -445,7 +445,7 @@ template std::basic_ostream & operator<< (std:: #if (defined(__GNUC__) && (__GNUC__ < 3)) || (defined(__EDG_VERSION__) && (__EDG_VERSION__ <= 238)) // g++ 2.9x doesn't allow static_cast(void *) -// apparently EDG 2.38 also doesn't accept it +// aptqparently EDG 2.38 also doesn't accept it template D * get_deleter(shared_ptr const & p) { -- cgit v1.2.1