Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/3rdparty/clucene/src/CLucene/StdHeader.cpp

    r2 r561  
    1818#   define CRTDBG_MAP_ALLOC
    1919#   include <stdlib.h>
     20#ifndef UNDER_CE
    2021#   include <crtdbg.h>
     22#endif
    2123#endif
    2224
  • trunk/src/3rdparty/clucene/src/CLucene/StdHeader.h

    r2 r561  
    5959 #include <unistd.h>
    6060#elif defined(_CL_HAVE_IO_H) && defined(_CL_HAVE_DIRECT_H)
     61#ifndef UNDER_CE
    6162 #include <io.h>
    6263 #include <direct.h>
     64#endif
    6365#else
    6466 #error "Neither unistd.h or (io.h & direct.h) were available"
     
    7678 #error "Haven't implemented STAT_MACROS_BROKEN fix yet"
    7779#elif defined(_CL_HAVE_SYS_STAT_H)
     80#ifdef UNDER_CE
     81 #include <types.h>
     82#else
    7883 #include <sys/stat.h>
     84#endif
    7985#else
    8086 #error "Haven't implemented platforms with no sys/stat.h"
     
    180186
    181187#if defined(_CL_HAVE_ERRNO_H)
     188#ifndef UNDER_CE
    182189 #include <errno.h>
     190#endif
    183191#else
    184192 #error "Haven't implemented platforms with no errno.h"
     
    186194
    187195#if defined(_CL_HAVE_FCNTL_H)
     196#ifndef UNDER_CE
    188197 #include <fcntl.h>
     198#endif
    189199#else
    190200 #error "Haven't implemented platforms with no fcntl.h"
  • trunk/src/3rdparty/clucene/src/CLucene/config/define_std.h

    r2 r561  
    7373    #define _CL_HAVE_UNISTD_H
    7474#endif
     75#ifdef UNDER_CE
     76#undef _CL_HAVE_SYS_TIMEB_H
     77#endif
    7578
    7679////////////////////////////////////////////////
  • trunk/src/3rdparty/clucene/src/CLucene/config/repl_tchar.h

    r2 r561  
    9494#else //HAVE_TCHAR_H
    9595 #include <tchar.h>
     96
     97#ifdef UNDER_CE
     98#include <QString>
     99#define _i64tot i64tot
     100inline 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
     108inline __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
    96116 
    97117 //some tchar headers miss these...
  • trunk/src/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp

    r2 r561  
    625625
    626626    QString lockFile(getLockPrefix());
    627     lockFile.append(QLatin1String("-")).append(name);
     627    lockFile.append(QLatin1Char('-')).append(name);
    628628
    629629    return _CLNEW FSLock(lockDir, lockFile);
  • trunk/src/3rdparty/clucene/src/CLucene/util/Misc.cpp

    r2 r561  
    2525#endif
    2626
     27#ifdef UNDER_CE
     28#include <QTime>
     29#endif
     30
    2731CL_NS_DEF(util)
    2832
    2933uint64_t Misc::currentTimeMillis()
    3034{
     35#ifndef UNDER_CE
    3136#if defined(_CLCOMPILER_MSVC) || defined(__MINGW32__) || defined(__BORLANDC__)
    3237    struct _timeb tstruct;
     
    4247    return (((uint64_t) tstruct.tv_sec) * 1000) + tstruct.tv_usec / 1000;
    4348#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
    4454}
    4555
     
    182192        CND_PRECONDITION(!ext.isEmpty(), "extention is NULL");
    183193
    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);
    190197}
    191198
  • trunk/src/3rdparty/clucene/src/CLucene/util/fileinputstream.cpp

    r2 r561  
    2626#include "jstreamsconfig.h"
    2727#include "fileinputstream.h"
     28
     29#ifndef UNDER_CE
    2830#include <cerrno>
     31#endif
    2932#include <cstring>
    3033namespace jstreams {
     
    4043        error += filepath;
    4144        error += "': ";
     45#ifndef UNDER_CE
    4246        error += strerror(errno);
     47#endif
    4348        status = Error;
    4449        return;
Note: See TracChangeset for help on using the changeset viewer.