Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk(). Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -680,7 +680,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out,
|
||||
// then load the archive file
|
||||
{
|
||||
wxFFileInputStream in(tmparc);
|
||||
if (in.Ok())
|
||||
if (in.IsOk())
|
||||
out.Write(in);
|
||||
}
|
||||
|
||||
@@ -690,7 +690,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out,
|
||||
// for the non-seekable test, have the archiver output to "-"
|
||||
// and read the archive via a pipe
|
||||
PFileInputStream in(wxString::Format(archiver, wxT("-")));
|
||||
if (in.Ok())
|
||||
if (in.IsOk())
|
||||
out.Write(in);
|
||||
}
|
||||
}
|
||||
@@ -893,7 +893,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in,
|
||||
// write the archive to a temporary file
|
||||
{
|
||||
wxFFileOutputStream out(tmparc);
|
||||
if (out.Ok())
|
||||
if (out.IsOk())
|
||||
out.Write(in);
|
||||
}
|
||||
|
||||
@@ -905,7 +905,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in,
|
||||
// for the non-seekable test, have the archiver extract "-" and
|
||||
// feed it the archive via a pipe
|
||||
PFileOutputStream out(wxString::Format(unarchiver, wxT("-")));
|
||||
if (out.Ok())
|
||||
if (out.IsOk())
|
||||
out.Write(in);
|
||||
}
|
||||
|
||||
@@ -958,7 +958,7 @@ void ArchiveTestCase<ClassFactoryT>::VerifyDir(wxString& path,
|
||||
if (!isDir) {
|
||||
wxFFileInputStream in(path);
|
||||
CPPUNIT_ASSERT_MESSAGE(
|
||||
"entry not found in archive" + error_entry, in.Ok());
|
||||
"entry not found in archive" + error_entry, in.IsOk());
|
||||
|
||||
size_t size = (size_t)in.GetLength();
|
||||
wxCharBuffer buf(size);
|
||||
|
@@ -180,7 +180,7 @@ void ZipPipeTestCase::runTest()
|
||||
|
||||
{
|
||||
PFileInputStream in(cmd);
|
||||
if (in.Ok())
|
||||
if (in.IsOk())
|
||||
out.Write(in);
|
||||
}
|
||||
|
||||
|
@@ -153,7 +153,8 @@ public:
|
||||
ProcessData(&*Values.begin(), Values.size(), pfnWriter, pfnReader);
|
||||
}
|
||||
|
||||
bool Ok(void) const {
|
||||
bool IsOk() const
|
||||
{
|
||||
return m_ok;
|
||||
}
|
||||
};
|
||||
@@ -214,8 +215,8 @@ void DataStreamTestCase::LongLongRW()
|
||||
|
||||
CPPUNIT_ASSERT( TestRW(wxLongLong(0x12345678l)) == wxLongLong(0x12345678l) );
|
||||
CPPUNIT_ASSERT( TestRW(wxLongLong(0x12345678l, 0xabcdef01l)) == wxLongLong(0x12345678l, 0xabcdef01l) );
|
||||
CPPUNIT_ASSERT( TestMultiRW<wxLongLong>(ValuesLL, &wxDataOutputStream::WriteLL, &wxDataInputStream::ReadLL).Ok() );
|
||||
CPPUNIT_ASSERT( TestMultiRW<wxULongLong>(ValuesULL, &wxDataOutputStream::WriteLL, &wxDataInputStream::ReadLL).Ok() );
|
||||
CPPUNIT_ASSERT( TestMultiRW<wxLongLong>(ValuesLL, &wxDataOutputStream::WriteLL, &wxDataInputStream::ReadLL).IsOk() );
|
||||
CPPUNIT_ASSERT( TestMultiRW<wxULongLong>(ValuesULL, &wxDataOutputStream::WriteLL, &wxDataInputStream::ReadLL).IsOk() );
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -238,8 +239,8 @@ void DataStreamTestCase::Int64RW()
|
||||
|
||||
CPPUNIT_ASSERT( TestRW(wxUint64(0x12345678l)) == wxUint64(0x12345678l) );
|
||||
CPPUNIT_ASSERT( TestRW((wxUint64(0x12345678l) << 32) + wxUint64(0xabcdef01l)) == (wxUint64(0x12345678l) << 32) + wxUint64(0xabcdef01l) );
|
||||
CPPUNIT_ASSERT( TestMultiRW<wxInt64>(ValuesI64, &wxDataOutputStream::Write64, &wxDataInputStream::Read64).Ok() );
|
||||
CPPUNIT_ASSERT( TestMultiRW<wxUint64>(ValuesUI64, &wxDataOutputStream::Write64, &wxDataInputStream::Read64).Ok() );
|
||||
CPPUNIT_ASSERT( TestMultiRW<wxInt64>(ValuesI64, &wxDataOutputStream::Write64, &wxDataInputStream::Read64).IsOk() );
|
||||
CPPUNIT_ASSERT( TestMultiRW<wxUint64>(ValuesUI64, &wxDataOutputStream::Write64, &wxDataInputStream::Read64).IsOk() );
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@@ -220,7 +220,7 @@ protected:
|
||||
wxInputStream *LargeFileTest_wxFile::MakeInStream(const wxString& name) const
|
||||
{
|
||||
auto_ptr<wxFileInputStream> in(new wxFileInputStream(name));
|
||||
CPPUNIT_ASSERT(in->Ok());
|
||||
CPPUNIT_ASSERT(in->IsOk());
|
||||
return in.release();
|
||||
}
|
||||
|
||||
@@ -252,7 +252,7 @@ protected:
|
||||
wxInputStream *LargeFileTest_wxFFile::MakeInStream(const wxString& name) const
|
||||
{
|
||||
auto_ptr<wxFFileInputStream> in(new wxFFileInputStream(name));
|
||||
CPPUNIT_ASSERT(in->Ok());
|
||||
CPPUNIT_ASSERT(in->IsOk());
|
||||
return in.release();
|
||||
}
|
||||
|
||||
|
@@ -129,7 +129,7 @@ void TextStreamTestCase::MiscTests()
|
||||
{
|
||||
wxString filename = wxT("testdata.fc");
|
||||
wxFileInputStream fsIn(filename);
|
||||
if ( !fsIn.Ok() )
|
||||
if ( !fsIn.IsOk() )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user