Changeset 561 for trunk/src/3rdparty/clucene
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/3rdparty/clucene/src/CLucene/StdHeader.cpp
r2 r561 18 18 # define CRTDBG_MAP_ALLOC 19 19 # include <stdlib.h> 20 #ifndef UNDER_CE 20 21 # include <crtdbg.h> 22 #endif 21 23 #endif 22 24 -
trunk/src/3rdparty/clucene/src/CLucene/StdHeader.h
r2 r561 59 59 #include <unistd.h> 60 60 #elif defined(_CL_HAVE_IO_H) && defined(_CL_HAVE_DIRECT_H) 61 #ifndef UNDER_CE 61 62 #include <io.h> 62 63 #include <direct.h> 64 #endif 63 65 #else 64 66 #error "Neither unistd.h or (io.h & direct.h) were available" … … 76 78 #error "Haven't implemented STAT_MACROS_BROKEN fix yet" 77 79 #elif defined(_CL_HAVE_SYS_STAT_H) 80 #ifdef UNDER_CE 81 #include <types.h> 82 #else 78 83 #include <sys/stat.h> 84 #endif 79 85 #else 80 86 #error "Haven't implemented platforms with no sys/stat.h" … … 180 186 181 187 #if defined(_CL_HAVE_ERRNO_H) 188 #ifndef UNDER_CE 182 189 #include <errno.h> 190 #endif 183 191 #else 184 192 #error "Haven't implemented platforms with no errno.h" … … 186 194 187 195 #if defined(_CL_HAVE_FCNTL_H) 196 #ifndef UNDER_CE 188 197 #include <fcntl.h> 198 #endif 189 199 #else 190 200 #error "Haven't implemented platforms with no fcntl.h" -
trunk/src/3rdparty/clucene/src/CLucene/config/define_std.h
r2 r561 73 73 #define _CL_HAVE_UNISTD_H 74 74 #endif 75 #ifdef UNDER_CE 76 #undef _CL_HAVE_SYS_TIMEB_H 77 #endif 75 78 76 79 //////////////////////////////////////////////// -
trunk/src/3rdparty/clucene/src/CLucene/config/repl_tchar.h
r2 r561 94 94 #else //HAVE_TCHAR_H 95 95 #include <tchar.h> 96 97 #ifdef UNDER_CE 98 #include <QString> 99 #define _i64tot i64tot 100 inline TCHAR* i64tot(__int64 value, TCHAR* str, int radix) 101 { 102 QT_USE_NAMESPACE 103 _tcscpy(str, (TCHAR *) QString::number(value, radix).utf16()); 104 return str; 105 } 106 107 #define _tcstoi64 tcstoi64 108 inline __int64 tcstoi64(const TCHAR *nptr, TCHAR **endptr, int base) 109 { 110 QT_USE_NAMESPACE 111 bool ok; 112 return QString::fromUtf16((ushort*) nptr).toInt(&ok, base); 113 } 114 115 #endif 96 116 97 117 //some tchar headers miss these... -
trunk/src/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp
r2 r561 625 625 626 626 QString lockFile(getLockPrefix()); 627 lockFile.append(QLatin1 String("-")).append(name);627 lockFile.append(QLatin1Char('-')).append(name); 628 628 629 629 return _CLNEW FSLock(lockDir, lockFile); -
trunk/src/3rdparty/clucene/src/CLucene/util/Misc.cpp
r2 r561 25 25 #endif 26 26 27 #ifdef UNDER_CE 28 #include <QTime> 29 #endif 30 27 31 CL_NS_DEF(util) 28 32 29 33 uint64_t Misc::currentTimeMillis() 30 34 { 35 #ifndef UNDER_CE 31 36 #if defined(_CLCOMPILER_MSVC) || defined(__MINGW32__) || defined(__BORLANDC__) 32 37 struct _timeb tstruct; … … 42 47 return (((uint64_t) tstruct.tv_sec) * 1000) + tstruct.tv_usec / 1000; 43 48 #endif 49 #else //UNDER_CE 50 QT_USE_NAMESPACE 51 QTime t = QTime::currentTime(); 52 return t.second() * 1000 + t.msec(); 53 #endif //UNDER_CE 44 54 } 45 55 … … 182 192 CND_PRECONDITION(!ext.isEmpty(), "extention is NULL"); 183 193 184 buffer.clear(); 185 if (x == -1) { 186 buffer = QString(segment + ext); 187 } else { 188 buffer = QString(QLatin1String("%1%2%3")).arg(segment).arg(ext).arg(x); 189 } 194 buffer = segment + ext; 195 if (x != -1) 196 buffer += QString::number(x); 190 197 } 191 198 -
trunk/src/3rdparty/clucene/src/CLucene/util/fileinputstream.cpp
r2 r561 26 26 #include "jstreamsconfig.h" 27 27 #include "fileinputstream.h" 28 29 #ifndef UNDER_CE 28 30 #include <cerrno> 31 #endif 29 32 #include <cstring> 30 33 namespace jstreams { … … 40 43 error += filepath; 41 44 error += "': "; 45 #ifndef UNDER_CE 42 46 error += strerror(errno); 47 #endif 43 48 status = Error; 44 49 return;
Note:
See TracChangeset
for help on using the changeset viewer.