[Kde-cygwin-cvs] CVS: qt-3/src/tools qdeepcopy.cpp,1.1.1.6,1.2 qdeepcopy.h,1.1.1.6,1.2 qmutexpool.cp
Status: Inactive
Brought to you by:
habacker
Menu
▾
▴
[Kde-cygwin-cvs] CVS: qt-3/src/tools qdeepcopy.cpp,1.1.1.6,1.2 qdeepcopy.h,1.1.1.6,1.2 qmutexpool.cpp,1.1.1.7,1.2 qmutexpool_p.h,1.1.1.7,1.2 qpair.h,1.1.1.4,1.2 qptrcollection.h,1.1.1.2,1.2 qsemaphore.cpp,1.1.1.4,1.2 qsettings_p.h,1.1.1.12,1.2 qt_tools.pri,1.1.1.8,1.2 qthreadinstance_p.h,1.1.1.5,1.2 qthreadstorage.h,1.1.1.5,1.2 qthreadstorage_unix.cpp,1.1.1.5,1.2 qunicodetables.cpp,1.1.1.5,1.2 qunicodetables_p.h,1.1.1.9,1.2 qwinexport.h,1.1.1.6,1.2
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:14
|
Update of /cvsroot/kde-cygwin/qt-3/src/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/src/tools Modified Files: qdeepcopy.cpp qdeepcopy.h qmutexpool.cpp qmutexpool_p.h qpair.h qptrcollection.h qsemaphore.cpp qsettings_p.h qt_tools.pri qthreadinstance_p.h qthreadstorage.h qthreadstorage_unix.cpp qunicodetables.cpp qunicodetables_p.h qwinexport.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qdeepcopy.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qdeepcopy.cpp,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qdeepcopy.cpp 22 Sep 2005 12:54:13 -0000 1.1.1.6 +++ qdeepcopy.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Implementation of QDeepCopy class ** ** Created : 20020613 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qdeepcopy.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qdeepcopy.h,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qdeepcopy.h 22 Sep 2005 12:54:07 -0000 1.1.1.6 +++ qdeepcopy.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of QDeepCopy class ** ** Created : 20020613 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qmutexpool.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qmutexpool.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qmutexpool.cpp 22 Sep 2005 12:54:14 -0000 1.1.1.7 +++ qmutexpool.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ... ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2002 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qmutexpool_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qmutexpool_p.h,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qmutexpool_p.h 22 Sep 2005 12:54:14 -0000 1.1.1.7 +++ qmutexpool_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ... ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2002 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qpair.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qpair.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qpair.h 22 Sep 2005 12:54:04 -0000 1.1.1.4 +++ qpair.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -3,7 +3,7 @@ ** Definition of QPair class ** ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2001 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qptrcollection.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qptrcollection.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- qptrcollection.h 22 Sep 2005 12:54:13 -0000 1.1.1.2 +++ qptrcollection.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -3,7 +3,7 @@ ** Definition of base class for all pointer based collection classes ** ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qsemaphore.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qsemaphore.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qsemaphore.cpp 22 Sep 2005 12:54:10 -0000 1.1.1.4 +++ qsemaphore.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** QSemaphore class for Unix ** ** Created : 20010725 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** 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.2 diff -u -r1.1.1.12 -r1.2 --- qsettings_p.h 22 Sep 2005 12:54:04 -0000 1.1.1.12 +++ qsettings_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of QSettings related classes ** ** Created : 990124 ** -** Copyright (C) 1999-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1999-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** @@ -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: 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.2 diff -u -r1.1.1.8 -r1.2 --- qt_tools.pri 22 Sep 2005 12:54:15 -0000 1.1.1.8 +++ qt_tools.pri 23 Sep 2005 09:40:30 -0000 1.2 @@ -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-* { Index: qthreadinstance_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qthreadinstance_p.h,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qthreadinstance_p.h 22 Sep 2005 12:54:21 -0000 1.1.1.5 +++ qthreadinstance_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ... ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2003 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qthreadstorage.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qthreadstorage.h,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qthreadstorage.h 22 Sep 2005 12:54:06 -0000 1.1.1.5 +++ qthreadstorage.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ... ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2003 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qthreadstorage_unix.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qthreadstorage_unix.cpp,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qthreadstorage_unix.cpp 22 Sep 2005 12:54:13 -0000 1.1.1.5 +++ qthreadstorage_unix.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ... ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2003 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qunicodetables.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qunicodetables.cpp,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qunicodetables.cpp 22 Sep 2005 12:54:10 -0000 1.1.1.5 +++ qunicodetables.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ??? ** -** Copyright (C) 2002-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2002-2003 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qunicodetables_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qunicodetables_p.h,v retrieving revision 1.1.1.9 retrieving revision 1.2 diff -u -r1.1.1.9 -r1.2 --- qunicodetables_p.h 22 Sep 2005 12:54:10 -0000 1.1.1.9 +++ qunicodetables_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -3,7 +3,7 @@ ** ** ??? ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2003 Trolltech AS. All rights reserved. ** ** This file is part of the widgets module of the Qt GUI Toolkit. ** Index: qwinexport.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qwinexport.h,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qwinexport.h 22 Sep 2005 12:54:11 -0000 1.1.1.6 +++ qwinexport.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** Global type declarations and definitions ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** |
