diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-01 21:38:09 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-01 21:38:09 (GMT) |
| commit | 1d021032f6920fe90bc23a028ae15ab434868363 (patch) | |
| tree | d03fbde992158177aeb22d83e0412c58f189197b /src/corelib | |
| parent | 36a5ecba6ca65e8445fa9b391e239f62c2002159 (diff) | |
| parent | fef0ec67bf1b49221b3f383f6ea1c9a65fc08c57 (diff) | |
| download | Qt-1d021032f6920fe90bc23a028ae15ab434868363.zip Qt-1d021032f6920fe90bc23a028ae15ab434868363.tar.gz Qt-1d021032f6920fe90bc23a028ae15ab434868363.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_symbian.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/tools/qscopedpointer.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp index 4566ec0..a6d486e 100644 --- a/src/corelib/kernel/qeventdispatcher_symbian.cpp +++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp @@ -642,8 +642,8 @@ public: QIdleDetectorThread() : m_state(STATE_RUN), m_stop(false) { - qt_symbian_throwIfError(m_lock.CreateLocal()); - TInt err = m_idleDetectorThread.Create(KNullDesC(), &idleDetectorThreadFunc, 1024, &User::Allocator(), this); + qt_symbian_throwIfError(m_lock.CreateLocal(0)); + TInt err = m_idleDetectorThread.Create(KNullDesC(), &idleDetectorThreadFunc, 1024, NULL, this); if (err != KErrNone) m_lock.Close(); qt_symbian_throwIfError(err); @@ -694,7 +694,7 @@ private: enum IdleStates {STATE_KICKED, STATE_RUN} m_state; bool m_stop; RThread m_idleDetectorThread; - RFastLock m_lock; + RSemaphore m_lock; }; Q_GLOBAL_STATIC(QIdleDetectorThread, idleDetectorThread); diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp index e7dd769..b06112d 100644 --- a/src/corelib/tools/qscopedpointer.cpp +++ b/src/corelib/tools/qscopedpointer.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE called resource acquisition is initialization(RAII). QScopedPointer guarantees that the object pointed to will get deleted when - the current scope dissapears. + the current scope disappears. Consider this function which does heap allocations, and have various exit points: @@ -227,7 +227,7 @@ QT_BEGIN_NAMESPACE /*! \class QScopedArrayPointer - + \brief The QScopedArrayPointer class stores a pointer to a dynamically allocated array of objects, and deletes it upon destruction. |