From d22ecbaa3e1e62ca42f27dced1a0ff9f2a65fa34 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Sun, 29 Apr 2012 02:03:09 +0000 Subject: [PATCH] writEAble => writAble --- Foundation/include/Poco/FIFOBuffer.h | 10 +++--- Foundation/testsuite/src/CoreTest.cpp | 50 +++++++++++++-------------- Foundation/testsuite/src/CoreTest.h | 6 ++-- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Foundation/include/Poco/FIFOBuffer.h b/Foundation/include/Poco/FIFOBuffer.h index db0d3b561..4f057722e 100644 --- a/Foundation/include/Poco/FIFOBuffer.h +++ b/Foundation/include/Poco/FIFOBuffer.h @@ -63,16 +63,16 @@ class FIFOBuffer /// is needed. { public: - mutable Poco::BasicEvent Writeable; + mutable Poco::BasicEvent Writable; /// Event indicating "writeability" of the buffer, /// triggerred as follows: /// /// * when buffer transitions from non-full to full, - /// Writeable event observers are notified, with + /// Writable event observers are notified, with /// false value as the argument /// /// * when buffer transitions from full to non-full, - /// Writeable event observers are notified, with + /// Writable event observers are notified, with /// true value as the argument mutable Poco::BasicEvent Readable; @@ -248,9 +248,9 @@ private: Readable.notify(this, f); if (usedBefore == _buffer.size() && _used < _buffer.size()) - Writeable.notify(this, t); + Writable.notify(this, t); else if (usedBefore < _buffer.size() && _used == _buffer.size()) - Writeable.notify(this, f); + Writable.notify(this, f); } FIFOBuffer(); diff --git a/Foundation/testsuite/src/CoreTest.cpp b/Foundation/testsuite/src/CoreTest.cpp index 041d89789..f62081330 100644 --- a/Foundation/testsuite/src/CoreTest.cpp +++ b/Foundation/testsuite/src/CoreTest.cpp @@ -245,7 +245,7 @@ void CoreTest::testFIFOBufferChar() std::vector v; f.Readable += delegate(this, &CoreTest::onReadable); - f.Writeable += delegate(this, &CoreTest::onWriteable); + f.Writable += delegate(this, &CoreTest::onWritable); for (T c = '0'; c < '0' + 10; ++c) v.push_back(c); @@ -325,13 +325,13 @@ void CoreTest::testFIFOBufferChar() assert(1 == _notToReadable); assert(0 == _readableToNot); - assert(0 == _notToWriteable); - assert(0 == _writeableToNot); + assert(0 == _notToWritable); + assert(0 == _writableToNot); f.read(b, 6); assert(1 == _notToReadable); assert(1 == _readableToNot); - assert(0 == _notToWriteable); - assert(0 == _writeableToNot); + assert(0 == _notToWritable); + assert(0 == _writableToNot); assert (5 == b.size()); assert (20 == f.size()); @@ -342,13 +342,13 @@ void CoreTest::testFIFOBufferChar() assert(1 == _notToReadable); assert(1 == _readableToNot); - assert(0 == _notToWriteable); - assert(0 == _writeableToNot); + assert(0 == _notToWritable); + assert(0 == _writableToNot); assert (5 == f.write(b)); assert(2 == _notToReadable); assert(1 == _readableToNot); - assert(0 == _notToWriteable); - assert(0 == _writeableToNot); + assert(0 == _notToWritable); + assert(0 == _writableToNot); assert (20 == f.size()); assert (5 == f.used()); @@ -371,13 +371,13 @@ void CoreTest::testFIFOBufferChar() assert(2 == _notToReadable); assert(1 == _readableToNot); - assert(0 == _notToWriteable); - assert(0 == _writeableToNot); + assert(0 == _notToWritable); + assert(0 == _writableToNot); f.resize(3, false); assert(2 == _notToReadable); assert(2 == _readableToNot); - assert(0 == _notToWriteable); - assert(0 == _writeableToNot); + assert(0 == _notToWritable); + assert(0 == _writableToNot); assert (3 == f.size()); assert (0 == f.used()); assert (f.isEmpty()); @@ -390,23 +390,23 @@ void CoreTest::testFIFOBufferChar() assert(2 == _notToReadable); assert(2 == _readableToNot); - assert(0 == _notToWriteable); - assert(0 == _writeableToNot); + assert(0 == _notToWritable); + assert(0 == _writableToNot); f.write(b); assert(3 == _notToReadable); assert(2 == _readableToNot); - assert(0 == _notToWriteable); - assert(1 == _writeableToNot); + assert(0 == _notToWritable); + assert(1 == _writableToNot); f.read(b); assert(3 == _notToReadable); assert(3 == _readableToNot); - assert(1 == _notToWriteable); - assert(1 == _writeableToNot); + assert(1 == _notToWritable); + assert(1 == _writableToNot); assert (f.isEmpty()); f.Readable -= delegate(this, &CoreTest::onReadable); - f.Writeable -= delegate(this, &CoreTest::onReadable); + f.Writable -= delegate(this, &CoreTest::onReadable); } @@ -684,10 +684,10 @@ void CoreTest::onReadable(bool& b) }; -void CoreTest::onWriteable(bool& b) +void CoreTest::onWritable(bool& b) { - if (b) ++_notToWriteable; - else ++_writeableToNot; + if (b) ++_notToWritable; + else ++_writableToNot; } @@ -695,8 +695,8 @@ void CoreTest::setUp() { _readableToNot = 0; _notToReadable = 0; - _writeableToNot = 0; - _notToWriteable = 0; + _writableToNot = 0; + _notToWritable = 0; } diff --git a/Foundation/testsuite/src/CoreTest.h b/Foundation/testsuite/src/CoreTest.h index af496a1a3..50f946e0c 100644 --- a/Foundation/testsuite/src/CoreTest.h +++ b/Foundation/testsuite/src/CoreTest.h @@ -65,13 +65,13 @@ public: protected: void onReadable(bool& b); - void onWriteable(bool& b); + void onWritable(bool& b); private: int _readableToNot; int _notToReadable; - int _writeableToNot; - int _notToWriteable; + int _writableToNot; + int _notToWritable; };