[Kde-cygwin-cvs] CVS: qt-3/src/tools qglobal.h,1.1.1.17,1.1.1.18 qgpluginmanager.cpp,1.1.1.13,1.1.1.
Status: Inactive
Brought to you by:
habacker
Menu
▾
▴
[Kde-cygwin-cvs] CVS: qt-3/src/tools qglobal.h,1.1.1.17,1.1.1.18 qgpluginmanager.cpp,1.1.1.13,1.1.1.14 qlibrary.cpp,1.1.1.16,1.1.1.17 qlibrary_p.h,1.1.1.11,1.1.1.12 qlocale.cpp,1.1.1.10,1.1.1.11 qmemarray.h,1.1.1.11,1.1.1.12 qsettings.cpp,1.1.1.15,1.1.1.16 qsettings_p.h,1.1.1.12,1.1.1.13 qstring.cpp,1.1.1.16,1.1.1.17 qstring.h,1.1.1.18,1.1.1.19 qt_tools.pri,1.1.1.8,1.1.1.9
|
From: Christian E. <che...@us...> - 2005-09-30 19:59:56
|
Update of /cvsroot/kde-cygwin/qt-3/src/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831/src/tools Modified Files: Tag: QT_WIN32_3_3_BRANCH qglobal.h qgpluginmanager.cpp qlibrary.cpp qlibrary_p.h qlocale.cpp qmemarray.h qsettings.cpp qsettings_p.h qstring.cpp qstring.h qt_tools.pri Log Message: reapply patches which were lost during my not so good update to 3.3.5 Index: qglobal.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qglobal.h,v retrieving revision 1.1.1.17 retrieving revision 1.1.1.18 diff -u -r1.1.1.17 -r1.1.1.18 --- qglobal.h 22 Sep 2005 12:54:07 -0000 1.1.1.17 +++ qglobal.h 30 Sep 2005 16:58:32 -0000 1.1.1.18 @@ -564,6 +564,8 @@ # define QT_NO_QWS_IM # elif defined(Q_OS_MACX) # define Q_WS_MACX +# elif defined(Q_CYGWIN_WIN) +# define Q_WS_WIN # else # define Q_WS_X11 # endif Index: qgpluginmanager.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qgpluginmanager.cpp,v retrieving revision 1.1.1.13 retrieving revision 1.1.1.14 diff -u -r1.1.1.13 -r1.1.1.14 --- qgpluginmanager.cpp 22 Sep 2005 12:54:08 -0000 1.1.1.13 +++ qgpluginmanager.cpp 30 Sep 2005 16:58:32 -0000 1.1.1.14 @@ -314,7 +314,7 @@ if ( !enabled() || !QDir( path ).exists( ".", TRUE ) ) return; -#if defined(Q_OS_WIN32) +#if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN) QString filter = "*.dll"; #elif defined(Q_OS_MACX) QString filter = "*.dylib; *.so; *.bundle"; Index: qlibrary.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qlibrary.cpp,v retrieving revision 1.1.1.16 retrieving revision 1.1.1.17 diff -u -r1.1.1.16 -r1.1.1.17 --- qlibrary.cpp 22 Sep 2005 12:54:04 -0000 1.1.1.16 +++ qlibrary.cpp 30 Sep 2005 16:58:32 -0000 1.1.1.17 @@ -406,6 +406,8 @@ filters << ".dylib"; //the last one is also the default one.. #elif defined(Q_OS_HPUX) filters << ".sl"; +#elif defined(Q_OS_CYGWIN) + filters << ".dll"; #else filters << ".so"; #endif Index: qlibrary_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qlibrary_p.h,v retrieving revision 1.1.1.11 retrieving revision 1.1.1.12 diff -u -r1.1.1.11 -r1.1.1.12 --- qlibrary_p.h 22 Sep 2005 12:54:04 -0000 1.1.1.11 +++ qlibrary_p.h 30 Sep 2005 16:58:32 -0000 1.1.1.12 @@ -63,7 +63,7 @@ public: QLibraryPrivate( QLibrary *lib ); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN32 HINSTANCE pHnd; #else void *pHnd; Index: qlocale.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/Attic/qlocale.cpp,v retrieving revision 1.1.1.10 retrieving revision 1.1.1.11 diff -u -r1.1.1.10 -r1.1.1.11 --- qlocale.cpp 22 Sep 2005 12:54:16 -0000 1.1.1.10 +++ qlocale.cpp 30 Sep 2005 16:58:32 -0000 1.1.1.11 @@ -43,6 +43,7 @@ #include "qlocale.h" #include "qlocale_p.h" #include "qnamespace.h" +#include "qplatformdefs.h" #ifdef QT_QLOCALE_USES_FCVT # include <qmutex.h> @@ -1676,7 +1677,7 @@ return QString::fromLatin1("nan"); } -#if defined(Q_OS_WIN) +#if defined(Q_WS_WIN) /* Win95 doesn't have a function to return the ISO lang/country name of the user's locale. Instead it can return a "Windows code". This maps windows codes to ISO country names. */ Index: qmemarray.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qmemarray.h,v retrieving revision 1.1.1.11 retrieving revision 1.1.1.12 diff -u -r1.1.1.11 -r1.1.1.12 --- qmemarray.h 22 Sep 2005 12:54:08 -0000 1.1.1.11 +++ qmemarray.h 30 Sep 2005 16:58:32 -0000 1.1.1.12 @@ -96,6 +96,8 @@ int bsearch( const type &d ) const { return QGArray::bsearch((const char*)&d,sizeof(type)); } // ### Qt 4.0: maybe provide uint overload as work-around for MSVC bug + type& operator[]( uint i ) const + { return (type &)(*(type *)QGArray::at(i*sizeof(type))); } type& operator[]( int i ) const { return (type &)(*(type *)QGArray::at(i*sizeof(type))); } type& at( uint i ) const Index: qsettings.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qsettings.cpp,v retrieving revision 1.1.1.15 retrieving revision 1.1.1.16 diff -u -r1.1.1.15 -r1.1.1.16 --- qsettings.cpp 22 Sep 2005 12:54:04 -0000 1.1.1.15 +++ qsettings.cpp 30 Sep 2005 16:58:32 -0000 1.1.1.16 @@ -253,6 +253,7 @@ */ #if defined(Q_OS_UNIX) +#define HANDLE QHANDLE typedef int HANDLE; #define Q_LOCKREAD F_RDLCK #define Q_LOCKWRITE F_WRLCK Index: qsettings_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qsettings_p.h,v retrieving revision 1.1.1.12 retrieving revision 1.1.1.13 diff -u -r1.1.1.12 -r1.1.1.13 --- qsettings_p.h 22 Sep 2005 12:54:04 -0000 1.1.1.12 +++ qsettings_p.h 30 Sep 2005 16:58:32 -0000 1.1.1.13 @@ -113,20 +113,22 @@ void sysInit(); void sysClear(); +/* obsolete functions since already handled in public class + QStringList sysReadListEntry( const QString &, bool * = 0 ) const; + QStringList sysReadListEntry( const QString &, const QChar& sep, bool * = 0 ) const; + bool sysWriteEntry( const QString &, const QStringList &, const QChar& sep ) + bool sysWriteEntry( const QString&key, const QStringList&data ) +*/ #if !defined(Q_NO_BOOL_TYPE) bool sysWriteEntry( const QString &, bool ); #endif bool sysWriteEntry( const QString &, double ); bool sysWriteEntry( const QString &, int ); bool sysWriteEntry( const QString &, const QString & ); - bool sysWriteEntry( const QString &, const QStringList & ); - bool sysWriteEntry( const QString &, const QStringList &, const QChar& sep ); QStringList sysEntryList(const QString &) const; QStringList sysSubkeyList(const QString &) const; - QStringList sysReadListEntry( const QString &, bool * = 0 ) const; - QStringList sysReadListEntry( const QString &, const QChar& sep, bool * = 0 ) const; QString sysReadEntry( const QString &, const QString &def = QString::null, bool * = 0 ) const; int sysReadNumEntry( const QString &, int def = 0, bool * = 0 ) const; double sysReadDoubleEntry( const QString &, double def = 0, bool * = 0 ) const; Index: qstring.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qstring.cpp,v retrieving revision 1.1.1.16 retrieving revision 1.1.1.17 diff -u -r1.1.1.16 -r1.1.1.17 --- qstring.cpp 22 Sep 2005 12:54:18 -0000 1.1.1.16 +++ qstring.cpp 30 Sep 2005 16:58:32 -0000 1.1.1.17 @@ -6987,7 +6987,7 @@ implicit sharing mechanism is implemented this way. */ -#if defined(Q_OS_WIN32) +#if defined(Q_WS_WIN) #include <windows.h> Index: qstring.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qstring.h,v retrieving revision 1.1.1.18 retrieving revision 1.1.1.19 diff -u -r1.1.1.18 -r1.1.1.19 --- qstring.h 22 Sep 2005 12:54:21 -0000 1.1.1.18 +++ qstring.h 30 Sep 2005 16:58:32 -0000 1.1.1.19 @@ -637,8 +637,10 @@ QChar at( uint i ) const { return i < d->len ? d->unicode[i] : QChar::null; } QChar operator[]( int i ) const { return at((uint)i); } + QChar operator[]( uint i ) const { return at((uint)i); } QCharRef at( uint i ); QCharRef operator[]( int i ); + QCharRef operator[]( uint i ); QChar constref(uint i) const { return at(i); } @@ -808,6 +810,7 @@ inline QCharRef QString::at( uint i ) { return QCharRef(this,i); } inline QCharRef QString::operator[]( int i ) { return at((uint)i); } +inline QCharRef QString::operator[]( uint i ) { return at(i); } class Q_EXPORT QConstString : private QString { @@ -1099,7 +1102,7 @@ #endif -#if defined(Q_OS_WIN32) +#if defined(Q_WS_WIN) extern Q_EXPORT QString qt_winQString(void*); extern Q_EXPORT const void* qt_winTchar(const QString& str, bool addnul); extern Q_EXPORT void* qt_winTchar_new(const QString& str); Index: qt_tools.pri =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qt_tools.pri,v retrieving revision 1.1.1.8 retrieving revision 1.1.1.9 diff -u -r1.1.1.8 -r1.1.1.9 --- qt_tools.pri 22 Sep 2005 12:54:15 -0000 1.1.1.8 +++ qt_tools.pri 30 Sep 2005 16:58:32 -0000 1.1.1.9 @@ -69,7 +69,7 @@ $$TOOLS_P/qucom_p.h \ $$TOOLS_H/quuid.h - win32:SOURCES += $$TOOLS_CPP/qdir_win.cpp \ + win32:!unix:SOURCES += $$TOOLS_CPP/qdir_win.cpp \ $$TOOLS_CPP/qfile_win.cpp \ $$TOOLS_CPP/qfileinfo_win.cpp \ $$TOOLS_CPP/qlibrary_win.cpp \ @@ -79,6 +79,9 @@ $$TOOLS_CPP/qthreadstorage_win.cpp \ $$TOOLS_CPP/qcriticalsection_p.cpp + win32:unix:SOURCES += $$TOOLS_CPP/qsettings_win.cpp \ + $$TOOLS_CPP/qcriticalsection_p.cpp + win32-borland:SOURCES += $$TOOLS_CPP/qwinexport.cpp wince-* { |
