From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- indexlib/boost-compat/config/abi/borland_prefix.hpp | 6 +++--- indexlib/boost-compat/config/auto_link.hpp | 2 +- indexlib/boost-compat/config/platform/macos.hpp | 2 +- indexlib/boost-compat/config/select_stdlib_config.hpp | 2 +- indexlib/boost-compat/config/suffix.hpp | 6 +++--- indexlib/boost-compat/config/user.hpp | 12 ++++++------ indexlib/boost-compat/weak_ptr.hpp | 6 +++--- indexlib/compat.h | 2 +- indexlib/manager.h | 2 +- indexlib/match.cpp | 10 +++++----- indexlib/match.h | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) (limited to 'indexlib') diff --git a/indexlib/boost-compat/config/abi/borland_prefix.hpp b/indexlib/boost-compat/config/abi/borland_prefix.hpp index 49f424949..f8d23b7a2 100644 --- a/indexlib/boost-compat/config/abi/borland_prefix.hpp +++ b/indexlib/boost-compat/config/abi/borland_prefix.hpp @@ -8,11 +8,11 @@ // -b (on or off - effect emum sizes) // -Vx (on or off - empty members) // -Ve (on or off - empty base classes) -// -aX (alignment - 5 options). +// -aX (tqalignment - 5 options). // -pX (Calling convention - 4 options) -// -VmX (member pointer size and layout - 5 options) +// -VmX (member pointer size and tqlayout - 5 options) // -VC (on or off, changes name mangling) -// -Vl (on or off, changes struct layout). +// -Vl (on or off, changes struct tqlayout). // In addition the following warnings are sufficiently annoying (and // unfixable) to have them turned off by default: diff --git a/indexlib/boost-compat/config/auto_link.hpp b/indexlib/boost-compat/config/auto_link.hpp index b4e580ffa..9723a18f8 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, - contains one or more of the following letters after + tqcontains 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 3a5f41303..4893faaa4 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 replace MP-unsafe +// The MP task implementation of Boost Threads aims to tqreplace MP-unsafe // parts of the MSL, so we turn on threads unconditionally. # define BOOST_HAS_THREADS diff --git a/indexlib/boost-compat/config/select_stdlib_config.hpp b/indexlib/boost-compat/config/select_stdlib_config.hpp index b7bf59143..735a03b0b 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 replacement libraries): +// Dinkumware Library (this has to appear after any possible tqreplacement 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 77d9decac..a144b4feb 100644 --- a/indexlib/boost-compat/config/suffix.hpp +++ b/indexlib/boost-compat/config/suffix.hpp @@ -332,7 +332,7 @@ namespace std { // The same problem occurs with has_facet. // These macros provide a consistent way to access a locale's facets. // Usage: -// replace +// tqreplace // std::use_facet(loc); // with // BOOST_USE_FACET(Type, loc); @@ -357,7 +357,7 @@ namespace std { // BOOST_NESTED_TEMPLATE workaround ------------------------------------------// // Member templates are supported by some compilers even though they can't use -// the A::template member syntax, as a workaround replace: +// the A::template member syntax, as a workaround tqreplace: // // typedef typename A::template rebind binder; // @@ -500,7 +500,7 @@ namespace boost{ // // Helper macro BOOST_STRINGIZE: -// Converts the parameter X to a string after macro replacement +// Converts the parameter X to a string after macro tqreplacement // 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 5a4a9d477..d595f997b 100644 --- a/indexlib/boost-compat/config/user.hpp +++ b/indexlib/boost-compat/config/user.hpp @@ -67,16 +67,16 @@ // BOOST_DISABLE_ABI_HEADERS: Stops boost headers from including any // prefix/suffix headers that normally control things like struct -// packing and alignment. +// packing and tqalignment. // #define BOOST_DISABLE_ABI_HEADERS // BOOST_ABI_PREFIX: A prefix header to include in place of whatever -// boost.config would normally select, any replacement should set up -// struct packing and alignment options as required. +// boost.config would normally select, any tqreplacement 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 replacement should undo +// boost.config would normally select, any tqreplacement 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: replace the WHATEVER +// rather than a static library on Microsoft Windows: tqreplace 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", -// replace WHATEVER in the macro name with the name of the library; +// tqreplace 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/weak_ptr.hpp b/indexlib/boost-compat/weak_ptr.hpp index c23850079..8a0637847 100644 --- a/indexlib/boost-compat/weak_ptr.hpp +++ b/indexlib/boost-compat/weak_ptr.hpp @@ -51,11 +51,11 @@ public: // // has a serious problem. // -// r.px may already have been invalidated. The px(r.px) +// r.px may already have been tqinvalidated. The px(r.px) // conversion may require access to *r.px (virtual inheritance). // // It is not possible to avoid spurious access violations since -// in multithreaded programs r.px may be invalidated at any point. +// in multithreaded programs r.px may be tqinvalidated at any point. // template @@ -106,7 +106,7 @@ public: catch(bad_weak_ptr const &) { // Q: how can we get here? - // A: another thread may have invalidated r after the use_count test above. + // A: another thread may have tqinvalidated r after the use_count test above. return shared_ptr(); } diff --git a/indexlib/compat.h b/indexlib/compat.h index f7c1c2702..f0dd0d182 100644 --- a/indexlib/compat.h +++ b/indexlib/compat.h @@ -51,7 +51,7 @@ struct iterator { } #endif -/* compatibility replacements for functions not defined in older libstdc++ */ +/* compatibility tqreplacements for functions not defined in older libstdc++ */ template T kMin(const T &a, const T &b) { return a < b ? a : b; } template T kMax(const T &a, const T &b) { return a > b ? a : b; } diff --git a/indexlib/manager.h b/indexlib/manager.h index c2672e239..da321cb7b 100644 --- a/indexlib/manager.h +++ b/indexlib/manager.h @@ -51,7 +51,7 @@ class memory_manager { /** Returns the size of the block */ virtual unsigned size() const = 0; /** Resizes the block. - * This invalidates all previously returned pointers + * This tqinvalidates all previously returned pointers */ virtual void resize( unsigned ) = 0; }; diff --git a/indexlib/match.cpp b/indexlib/match.cpp index a73dc5f5a..03851a841 100644 --- a/indexlib/match.cpp +++ b/indexlib/match.cpp @@ -47,17 +47,17 @@ namespace { } indexlib::Match::Match( std::string str, unsigned flags ): - masks_( 256 ), + tqmasks_( 256 ), caseinsensitive_( flags & caseinsensitive ), pattern_rest_( str, kMin( str.size(), sizeof( unsigned ) * 8 - 1 ) ) { hot_bit_ = kMin( str.size(), sizeof( unsigned ) * 8 - 1 ); for ( unsigned i = 0; i != hot_bit_; ++i ) { if ( caseinsensitive_ ) { - setbit( masks_[ ( unsigned char )std::toupper( str[ i ] ) ], i ); - setbit( masks_[ ( unsigned char )std::tolower( str[ i ] ) ], i ); + setbit( tqmasks_[ ( unsigned char )std::toupper( str[ i ] ) ], i ); + setbit( tqmasks_[ ( unsigned char )std::tolower( str[ i ] ) ], i ); } else { - setbit( masks_[ ( unsigned char )str[ i ] ], i ); + setbit( tqmasks_[ ( unsigned char )str[ i ] ], i ); } } } @@ -69,7 +69,7 @@ bool indexlib::Match::process( const char* string ) const { unsigned state = 0; while ( *string ) { state |= 1; - state &= masks_[ ( unsigned char )*string ]; + state &= tqmasks_[ ( unsigned char )*string ]; state <<= 1; ++string; if ( getbit( state, hot_bit_ ) && ( pattern_rest_ == std::string( string, pattern_rest_.size() ) ) ) return true; diff --git a/indexlib/match.h b/indexlib/match.h index 568eb3d0d..6cbf448b7 100644 --- a/indexlib/match.h +++ b/indexlib/match.h @@ -64,8 +64,8 @@ class Match { bool process( const char* string ) const; bool process( std::string str ) const { return process( str.c_str() ); } private: - typedef std::vector masks_type; - masks_type masks_; + typedef std::vector tqmasks_type; + tqmasks_type tqmasks_; unsigned hot_bit_; bool caseinsensitive_; std::string pattern_rest_; -- cgit v1.2.1